Wed Feb 15 20:35:56 UTC 2012

1371 files changed, 0 insertions, 97167 deletions

diff --git a/community-staging/blender/PKGBUILD b/community-staging/blender/PKGBUILD
deleted file mode 100644
index 824e25a61..000000000
--- a/community-staging/blender/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $
-# Contributor: John Sowiak <john@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-# 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.61
-pkgrel=5
-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' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio')
-makedepends=('cmake' 'boost' 'cuda-toolkit')
-optdepends=('cuda-toolkit: cycles renderer cuda support')
-options=(!strip)
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('11a4721ff92286f678bb2e05e5f29c97')
-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=ON \
-    -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DWITH_CYCLES:BOOL=ON \
-    -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \
-    -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \
-    -DWITH_FFTW3:BOOL=ON \
-    -DWITH_MOD_OCEANSIM: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/community-staging/blender/blender.install b/community-staging/blender/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/community-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/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD
deleted file mode 100644
index 76265bd87..000000000
--- a/community-staging/cclive/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 63944 2012-02-07 19:09:43Z jelle $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: joyfulgirl@archlinux.us
-# Contributor: nathan owe ndowens04 at gmail dot com
-
-pkgname=cclive
-pkgver=0.7.8
-pkgrel=2
-pkgdesc='Commandline downloader for popular video websites.'
-arch=('i686' 'x86_64')
-url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('01ffbe54e48440721b3c283c993928f1')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD
deleted file mode 100644
index 66f7041f1..000000000
--- a/community-staging/cegui/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 63883 2012-02-06 13:54:09Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>, 
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-
-pkgname=cegui
-pkgver=0.7.6
-pkgrel=2
-pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
-arch=('i686' 'x86_64')
-url="http://crayzedsgui.sourceforge.net"
-#options=('!libtool')
-license=("MIT")
-depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
-makedepends=('python2' 'doxygen')
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
-options=(!libtool)
-md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3')
-
-build() {
-  cd $srcdir/CEGUI-${pkgver}
-
-  sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-xerces-c \
-    --enable-null-renderer
-
-  make
-}
-
-package() {
-  cd $srcdir/CEGUI-${pkgver}
- 
-  make DESTDIR=${pkgdir} install
-
-  #build docs                                                                                                                                 
-  cd doc/doxygen && doxygen                                                                                                                   
-  cd .. && make DESTDIR=${pkgdir} install-html
-
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/community-staging/cherokee/PKGBUILD b/community-staging/cherokee/PKGBUILD
deleted file mode 100644
index 8fd23f38a..000000000
--- a/community-staging/cherokee/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 63850 2012-02-06 06:17:53Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=cherokee
-pkgver=1.2.101
-pkgrel=3
-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-staging/cherokee/cherokee.logrotate b/community-staging/cherokee/cherokee.logrotate
deleted file mode 100644
index 19207fd02..000000000
--- a/community-staging/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-staging/cherokee/cherokee.rc b/community-staging/cherokee/cherokee.rc
deleted file mode 100644
index 2d413dc13..000000000
--- a/community-staging/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-staging/cherokee/fix-ctk-path-handler-match.patch b/community-staging/cherokee/fix-ctk-path-handler-match.patch
deleted file mode 100644
index abd20c5ef..000000000
--- a/community-staging/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-staging/courier-maildrop/PKGBUILD b/community-staging/courier-maildrop/PKGBUILD
deleted file mode 100644
index e11ea49ca..000000000
--- a/community-staging/courier-maildrop/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 57086 2009-10-31 13:13:36Z allan $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=courier-maildrop
-_srcname=maildrop
-pkgver=2.5.5
-pkgrel=2
-pkgdesc="mail delivery agent - procmail like but nicer syntax"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://courier-mta.org/maildrop/"
-depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm')
-conflicts=('courier-mta')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2)
-md5sums=('5d71455ab26096ecf4f624fbee0320cb')
-
-build() {
-  cd ${srcdir}/${_srcname}-${pkgver}
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/courier \
-    --localstatedir=/var \
-    --mandir=/usr/share/man \
-    --with-db=gdbm \
-    --with-devel
-  make LDFLAGS+=-lstdc++
-}
-
-package() {
-  cd ${srcdir}/${_srcname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-  chmod u+s ${pkgdir}/usr/bin/maildrop
-  cd ${pkgdir}/usr/share/maildrop/html
-  for files in *; do
-    install -Dm644 ${files} ${pkgdir}/usr/share/htmldoc/${files}
-  done
-  rm -rf ${pkgdir}/usr/share/maildrop
-
-  # docs say we can remove .a files after make
-  cd ${pkgdir}
-  find ${pkgdir} -name '*\.a' -exec rm -f {} \;
-}
diff --git a/community-staging/courier-mta/PKGBUILD b/community-staging/courier-mta/PKGBUILD
deleted file mode 100644
index 52deb71eb..000000000
--- a/community-staging/courier-mta/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-# -----------  NOTE TO ALL USERS ------------
-# Go read http://www.courier-mta.org/install.html b4 running or building courier
-
-pkgname=courier-mta
-pkgver=0.67.0
-pkgrel=2
-pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
-arch=(i686 x86_64)
-license=('GPL2')
-backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \
-        'etc/courier/imapd' 'etc/courier/imapd-ssl' \
-        'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \
-        'etc/courier/courierd' 'etc/courier/sqwebmaild' \
-        'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \
-        'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \
-        'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \
-        'etc/conf.d/courier-mta')
-url="http://courier-mta.org"
-depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
-optdepends=('libldap')
-makedepends=('apache' 'pam' 'expect' 'gnupg' 'libldap' 'gamin')
-provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop')
-conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp')
-options=('!libtool')
-install=courier-mta.install
-source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2
-        courier.rc.d
-        courier-mta.rc.d 
-		courier-mta.conf.d
-        esmtpd.rc.d
-        esmtpd-ssl.rc.d
-        esmtpd-msa.rc.d
-        imapd.rc.d
-        imapd-ssl.rc.d
-        pop3d.rc.d
-        pop3d-ssl.rc.d
-        webmaild.rc.d)
-md5sums=('c2e26499f9f48577aa7a0735f5e96997'
-         '9055ba622efd37603186ce1f37277224'
-         '5cbeb5c323706058e545f74ad7752ebe'
-         'f3ff70b40c7a1f7a017e8c4cc4d92f4f'
-         'caabce8c7b66296b602316aa5af5d4c5'
-         '1c8b1b66ebafa4ff09ffc0106a9dc82c'
-         'dae6c7d5ff0cce0fba5729fedf2a9051'
-         'd0cc5eab5d3e0ec33dadd0392421f63e'
-         '5873a96aa149edda281730010fb4db34'
-         'faa09e06a5dc41ee89ab1f8fa6886b63'
-         '520501daa66c0a94f2e9844ce4919a09'
-         '33a93f400c3e87bcd207295b7d7333ca')
-
-# MIGRATION NOTE:
-# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed.
-# Remove those files and this note and also courier-mta.install
-
-build() {
-  cd ${srcdir}/courier-${pkgver}
-
-  # fix a tiny bug
-  sed -i -e \
-    's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \
-    configure && chmod 755 configure
-
-  LDFLAGS+=",-L /usr/lib/courier-authlib -lcourierauth"
-  echo $LDFLAGS
-  # courier is more about configuring than compiling :-), lets start the mess
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/courier \
-    --libdir=/usr/lib \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var/spool/courier \
-    --disable-root-check \
-    --enable-unicode \
-    --enable-workarounds-for-imap-client-bugs \
-    --enable-mimetypes=/etc/mime.types \
-    --with-piddir=/var/run/courier \
-    --with-locking-method=lockf \
-    --with-trashquota \
-    --with-db=gdbm \
-    --with-trashquota \
-    --with-random=/dev/urandom --without-ispell \
-    --with-mailuser=courier --with-mailgroup=courier \
-    --with-certdb=/etc/ssl/certs/
-  make
-}
-
-package() {
-  cd ${srcdir}/courier-${pkgver}
-
-  #chown mail.mail ${pkgdir}/var/spool/courier
-  make DESTDIR=${pkgdir} install
-  # docs say we can get rid of those after make
-  find ${pkgdir} -name '*\.a' -exec -rm -f {} \;
-  # install the perftest-script for testings
-  install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1
-  ###############################################################################
-  # this is what usually "make install-configure" does
-  # *.dist files get rid of "dist"
-  for distfile in ${pkgdir}/etc/courier/*.dist; do
-    mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist)
-  done
-  # install pam files according to the layout used in Archlinux
-  for pamfile in ${pkgdir}/etc/courier/*.authpam; do
-    sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile}
-    #echo "password  required  pam_unix.so" >> $pamfile
-    install -Dm 644 ${pamfile} \
-      ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//")
-    rm -f ${pamfile}
-  done
-
-  ###############################################################################
-  # Arch Linux specific tweaks to make things easier for the user
-  # create passwordfile for webadmin -> standard archwebadmin
-  sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile
-  yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password
-  # arch specific scripts
-  install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta
-  install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta
-  install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier
-  install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd
-  install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl
-  install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d
-  install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl
-  install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd
-  install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl
-  install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa
-  install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild
-   #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \
-   # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache
-  # bug http://bugs.archlinux.org/task/5154
-   find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \;
-  # fixing some permissions
-   chown -R courier:courier ${pkgdir}/usr/lib/courier/modules
-   rm -r ${pkgdir}/var/run
-   #chown -R courier:courier ${pkgdir}/var/run/courier
-   chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share}
-  # make a link to /usr/sbin/sendmail
-   install -dm 755 ${pkgdir}/usr/sbin
-   cd ${pkgdir}/usr/sbin
-   ln -s ../bin/sendmail ./sendmail
-}
diff --git a/community-staging/courier-mta/courier-mta.conf.d b/community-staging/courier-mta/courier-mta.conf.d
deleted file mode 100644
index 5856a5cda..000000000
--- a/community-staging/courier-mta/courier-mta.conf.d
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Parameters to be passed to courier-imap
-#
-#
-# Select the service you want started with courier-imap
-#
-# Available options :
-# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild
-#
-CI_DAEMONS="courier esmtpd imapd pop3d"
-
-# If you want authdaemond to be automatically started and
-# stopped by courier-imap, set this to "true"
-AUTO_AUTHDAEMON="false"
-
-# Courier will start this many seconds after autodaemond if
-# AUTO_AUTHDAEMON is set to "true"
-AUTO_AUTHDAEMON_LAG=2
diff --git a/community-staging/courier-mta/courier-mta.install b/community-staging/courier-mta/courier-mta.install
deleted file mode 100644
index b0d827e43..000000000
--- a/community-staging/courier-mta/courier-mta.install
+++ /dev/null
@@ -1,61 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
- --> if you are using LDAP services to provide lookup in sqwebmail or aliases
- --> then you have to install:
-          libldap
-EOM
-   # create the *.dat files
-  makealiases
-  makesmtpaccess
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-  echo "Please migrate to the new daemon format:"
-  echo "/etc/rc.d/courier-imap has been split into separate daemons:"
-  echo "    imapd, imapd-ssl, pop3d, pop3d-ssl"
-  echo "This elimates the need for /etc/conf.d/courier-imap"
-  echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure"
-  echo "you first start authdaemond before any other of these daemons."
-  echo "Example prior to this change:"
-  echo "    DAEMONS=( ... courier-mta ...)"
-  echo "Example after this change:"
-  echo "    DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl"
-  echo "                  pop3d pop3d-ssl webmaild ... )"
-  echo "This allows better control over the daemons and will generate"
-  echo "correct entries in /run/daemons"
-  echo "An old configuration will keep working but please do migrate in time"
-  echo "as support for this will be removed some time in 2012."
-}
-
-
-pre_remove() {
-   # manual backup, since courier is always processing the whole directory
-   # - so it would process "system" AND "system.pacsave" -> bad
-  [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup
-  cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system
-  cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default
-  cat << EOM
- --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default
- --> files have been backed up to /etc/courier/_backup since the *.pacsave
- --> files cannot stay in place. Read about couriers alias handling from the
- --> documentation!
-EOM
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/community-staging/courier-mta/courier-mta.rc.d b/community-staging/courier-mta/courier-mta.rc.d
deleted file mode 100644
index 416946a5a..000000000
--- a/community-staging/courier-mta/courier-mta.rc.d
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta
-[ -z $AUTO_AUTHDAEMON_LAG ]   && AUTO_AUTHDAEMON_LAG=2
-[ -z $AUTO_AUTHDAEMON ]       && AUTO_AUTHDAEMON="false"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if [ "$AUTO_AUTHDAEMON" == "true" ]; then
-      /etc/rc.d/authdaemond start
-      sleep ${AUTO_AUTHDAEMON_LAG}
-    fi
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-    for daemon in $CI_DAEMONS; do
-      stat_busy "Starting Courier ${daemon}"
-      /usr/sbin/${daemon} start
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon $daemon
-        stat_done
-      fi
-    done
-    ;;
-  stop)
-    for daemon in $CI_DAEMONS; do
-      stat_busy "Stopping Courier ${daemon}"
-      /usr/sbin/${daemon} stop > /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon $daemon
-        stat_done
-      fi
-    done
-    if [ "$AUTO_AUTHDAEMON" == "true" ]; then
-      /etc/rc.d/authdaemond stop
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly b/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly
deleted file mode 100644
index 6c541321e..000000000
--- a/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Cleans the cache of the sqwebmail server
-if [ -x /usr/share/sqwebmail/cleancache.pl ]; then
-  su -c "/usr/share/sqwebmail/cleancache.pl" bin
-fi
diff --git a/community-staging/courier-mta/courier.rc.d b/community-staging/courier-mta/courier.rc.d
deleted file mode 100644
index 7c581a24a..000000000
--- a/community-staging/courier-mta/courier.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier daemon"
-    /usr/sbin/courier start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon courier
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier daemon"
-    /usr/sbin/courier stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon courier
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/esmtpd-msa.rc.d b/community-staging/courier-mta/esmtpd-msa.rc.d
deleted file mode 100644
index 31458aca8..000000000
--- a/community-staging/courier-mta/esmtpd-msa.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier esmtpd-msa"
-    /usr/sbin/esmtpd-msa start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon esmtpd-msa
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier esmtpd-msa"
-    /usr/sbin/esmtpd-msa stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon esmtpd-msa
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/esmtpd-ssl.rc.d b/community-staging/courier-mta/esmtpd-ssl.rc.d
deleted file mode 100644
index 2a13be03f..000000000
--- a/community-staging/courier-mta/esmtpd-ssl.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier esmtpd-ssl"
-    /usr/sbin/esmtpd-ssl start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon esmtpd-ssl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier esmtpd-ssl"
-    /usr/sbin/esmtpd-ssl stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon esmtpd-ssl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/esmtpd.rc.d b/community-staging/courier-mta/esmtpd.rc.d
deleted file mode 100644
index dbaa9d680..000000000
--- a/community-staging/courier-mta/esmtpd.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier esmtpd"
-    /usr/sbin/esmtpd start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon esmtpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier esmtpd"
-    /usr/sbin/esmtpd stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon esmtpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/imapd-ssl.rc.d b/community-staging/courier-mta/imapd-ssl.rc.d
deleted file mode 100644
index 3dc74cfdf..000000000
--- a/community-staging/courier-mta/imapd-ssl.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier imapd-ssl"
-    /usr/sbin/imapd-ssl start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon imapd-ssl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier imapd-ssl"
-    /usr/sbin/imapd-ssl stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon imapd-ssl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/imapd.rc.d b/community-staging/courier-mta/imapd.rc.d
deleted file mode 100644
index 8bce59f6c..000000000
--- a/community-staging/courier-mta/imapd.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier imapd"
-    /usr/sbin/imapd start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon imapd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier imapd"
-    /usr/sbin/imapd stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon imapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/pop3d-ssl.rc.d b/community-staging/courier-mta/pop3d-ssl.rc.d
deleted file mode 100644
index 6e7ae4e12..000000000
--- a/community-staging/courier-mta/pop3d-ssl.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier pop3d-ssl"
-    /usr/sbin/pop3d-ssl start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pop3d-ssl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier pop3d-ssl"
-    /usr/sbin/pop3d-ssl stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pop3d-ssl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/pop3d.rc.d b/community-staging/courier-mta/pop3d.rc.d
deleted file mode 100644
index 25f8379ba..000000000
--- a/community-staging/courier-mta/pop3d.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier pop3d"
-    /usr/sbin/pop3d start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pop3d
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier pop3d"
-    /usr/sbin/pop3d stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pop3d
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/courier-mta/webmaild.rc.d b/community-staging/courier-mta/webmaild.rc.d
deleted file mode 100644
index 835cc2bf0..000000000
--- a/community-staging/courier-mta/webmaild.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier webmaild"
-    /usr/sbin/webmaild start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon webmaild
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier webmaild"
-    /usr/sbin/webmaild stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon webmaild
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/freemat/ChangeLog b/community-staging/freemat/ChangeLog
deleted file mode 100644
index dba4cf7ec..000000000
--- a/community-staging/freemat/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-staging/freemat/PKGBUILD b/community-staging/freemat/PKGBUILD
deleted file mode 100644
index f1c5a7f73..000000000
--- a/community-staging/freemat/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 63904 2012-02-06 17:21:24Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=freemat
-pkgver=4.1
-pkgrel=2
-pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
-url="http://freemat.sourceforge.net"
-license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
-install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
-         '2d11a28aa2a7df89c4618ed1c4be5973')
-
-build() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  rm -f CMakeCache.txt
-  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
-  find . -type f -name 'add.so' -exec rm -f {} \;
-  patch -p1 <$srcdir/build-fix.patch
-  echo >libs/libMatC/CJitFuncClang.hpp
-  echo >libs/libMatC/CJitFuncClang.cpp
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DUSE_LLVM=OFF \
-	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	.
-  make
-}
-package() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  make DESTDIR=$pkgdir install
-  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
-  rm $pkgdir/usr/bin/blas.ini
-}
diff --git a/community-staging/freemat/build-fix.patch b/community-staging/freemat/build-fix.patch
deleted file mode 100644
index c1ea63088..000000000
--- a/community-staging/freemat/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
-+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
-@@ -20,6 +20,7 @@
- #include <qimage.h>
- #include <qpainter.h>
- #include <QtOpenGL>
-+#include <GL/glu.h>
- #include <math.h>
- #include "IEEEFP.hpp"
- 
diff --git a/community-staging/freemat/freemat.install b/community-staging/freemat/freemat.install
deleted file mode 100644
index 051cca866..000000000
--- a/community-staging/freemat/freemat.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
-
-post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
diff --git a/community-staging/gambas2/PKGBUILD b/community-staging/gambas2/PKGBUILD
deleted file mode 100644
index 5071cbad2..000000000
--- a/community-staging/gambas2/PKGBUILD
+++ /dev/null
@@ -1,950 +0,0 @@
-# $Id: PKGBUILD 63870 2012-02-06 13:24:34Z 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=8
-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' '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 301af4a4e..000000000
--- a/community-staging/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1104 +0,0 @@
-# $Id: PKGBUILD 63877 2012-02-06 13:43:50Z 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=3.0.0
-pkgrel=5
-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'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
-         '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=('f2c51e18b67ae6b21065ea0aed9b588e'
-         '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}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  ##
-}
-
-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}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  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]*}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[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/gnote/PKGBUILD b/community-staging/gnote/PKGBUILD
deleted file mode 100644
index 96ba4189d..000000000
--- a/community-staging/gnote/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63878 2012-02-06 13:48:40Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: uastasi <uastasi@archlinux.us>
-pkgname=gnote
-pkgver=0.8.2
-pkgrel=2
-pkgdesc="A note taking application."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Gnote"
-license=('GPL3')
-depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'boost')
-options=('!libtool')
-install=gnote.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.xz)
-sha256sums=('7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/usr/lib/gnote \
-        --disable-scrollkeeper \
-        --disable-schemas-compile \
-        --disable-static
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gnote/gnote.install b/community-staging/gnote/gnote.install
deleted file mode 100644
index 0f8eb1012..000000000
--- a/community-staging/gnote/gnote.install
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=gnote
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD
deleted file mode 100644
index ca5b1d0a3..000000000
--- a/community-staging/gource/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63868 2012-02-06 13:11:21Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
-# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
-pkgname=gource
-pkgver=0.37
-pkgrel=2
-pkgdesc="software version control visualization"
-license=(GPL3)
-arch=(i686 x86_64)
-url=http://code.google.com/p/gource/
-depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew')
-source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('9c023429a8a495e6473d4c166788278a')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR=$pkgdir install
-}
-# vim: ts=2:sw=2 et:
diff --git a/community-staging/gsmartcontrol/PKGBUILD b/community-staging/gsmartcontrol/PKGBUILD
deleted file mode 100644
index 87325e3d5..000000000
--- a/community-staging/gsmartcontrol/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-pkgname=gsmartcontrol
-pkgver=0.8.6
-pkgrel=3
-pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
-arch=('i686' 'x86_64')
-url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
-license=('GPL3')
-depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage')
-optdepends=('gnomesu: for gsmartcontrol-root' 
-            'gksu: for gsmartcontrol-root')
-install=${pkgname}.install
-source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d2ac685e2e73b05f7ba74c93623af739')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./configure --prefix=/usr
-	make 
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/gsmartcontrol/gsmartcontrol.install b/community-staging/gsmartcontrol/gsmartcontrol.install
deleted file mode 100644
index b95cc069d..000000000
--- a/community-staging/gsmartcontrol/gsmartcontrol.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community-staging/i3-wm/PKGBUILD b/community-staging/i3-wm/PKGBUILD
deleted file mode 100644
index 9dd493960..000000000
--- a/community-staging/i3-wm/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 63861 2012-02-06 10:32:56Z ttopper $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-
-pkgname=i3-wm
-_pkgsourcename=i3
-pkgver=4.1.2
-pkgrel=4
-pkgdesc="An improved dynamic tiling window manager"
-arch=('i686' 'x86_64')
-url="http://i3wm.org/"
-license=('BSD')
-replaces=("i3" "i3bar")
-groups=("i3")
-depends=('libxcursor' 'xcb-util-wm' 'xcb-util-keysyms' 'libev' 'yajl' 'startup-notification' 'pcre')
-makedepends=('bison' 'flex')
-optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
-            'dmenu: As menu.'
-            'i3lock: For locking your screen.'
-            'i3status: To display systeminformation with a bar.'
-            'perl: To migrate your configuration to v4 format.')
-options=('docs' '!strip')
-source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2")
-md5sums=('0e81c381f9bf3ebf155aaa394e71834f')
-
-build() {
-  cd "$srcdir/$_pkgsourcename-$pkgver"
-  
-  # In order to avoid problems with bison use only a single process
-  MAKEFLAGS="-j1"
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgsourcename-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  
-  install -Dm644 man/i3.1 \
-    ${pkgdir}/usr/share/man/man1/i3.1
-  install -Dm644 i3bar/doc/i3bar.1 \
-    ${pkgdir}/usr/share/man/man1/i3bar.1
-  install -Dm644 man/i3-config-wizard.1 \
-    ${pkgdir}/usr/share/man/man1/i3-config-wizard.1
-  install -Dm644 man/i3-input.1 \
-    ${pkgdir}/usr/share/man/man1/i3-input.1
-  install -Dm644 man/i3-msg.1 \
-    ${pkgdir}/usr/share/man/man1/i3-msg.1
-  install -Dm644 man/i3-migrate-config-to-v4.1 \
-    ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1
-  install -Dm644 man/i3-nagbar.1 \
-    ${pkgdir}/usr/share/man/man1/i3-nagbar.1
-  install -Dm644 LICENSE \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  
-  make clean
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/leafnode/PKGBUILD b/community-staging/leafnode/PKGBUILD
deleted file mode 100644
index 30ef81d71..000000000
--- a/community-staging/leafnode/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63914 2012-02-06 17:38:59Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=leafnode
-pkgver=1.11.8
-pkgrel=5
-pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://leafnode.sourceforge.net/"
-depends=('pcre' 'xinetd')
-license=('GPL')
-install=leafnode.install
-options=(!emptydirs)
-backup=('etc/xinetd.d/leafnode')
-source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	leafnode.xinetd)
-md5sums=('a3edafeb854efaa3fbb0f7951d02160f'
-         'db3c6ad1ff9fc03442949456d1d21304')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \
-	--with-user=9 \
-	--with-group=13
-  sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h
-  sed -i 's|#define NEWS_GROUP .*|#define NEWS_GROUP "news"|' config.h
-  make
-}
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  chown -R root.root $pkgdir
-  install -D -m0644 $srcdir/leafnode.xinetd $pkgdir/etc/xinetd.d/leafnode
-}
diff --git a/community-staging/leafnode/leafnode.install b/community-staging/leafnode/leafnode.install
deleted file mode 100644
index 5f8a74c04..000000000
--- a/community-staging/leafnode/leafnode.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  echo "-- Adding user 'news' and group 'news', chowning /var/spool/news"
-  grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
-  grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
-  chown -R root:news etc/leafnode
-  # create dir if necessary
-  if [ ! -d var/spool/news ]; then
-    install -d -m 770 -o news -g news var/spool/news
-  fi
-}
-
-post_remove() {
-  echo "-- Don't forget to remove /var/spool/news directory"
-}
diff --git a/community-staging/leafnode/leafnode.xinetd b/community-staging/leafnode/leafnode.xinetd
deleted file mode 100644
index 94c7c6ca7..000000000
--- a/community-staging/leafnode/leafnode.xinetd
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# /etc/xinetd.d/leafnode
-#
-
-service nntp
-{
-	socket_type		= stream
-	wait			= no
-	user			= news
-	server			= /usr/sbin/leafnode
-	log_type		= SYSLOG news
-	log_on_success		+= USERID
-	log_on_failure		+= USERID
-	port			= 119
-	disable			= yes
-	groups			= yes
-}
-
diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD
deleted file mode 100644
index 24c864cc2..000000000
--- a/community-staging/lightspark/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 63846 2012-02-06 05:35:44Z ebelanger $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=lightspark
-pkgver=0.5.4.1
-pkgrel=1
-pkgdesc='An alternative Flash Player for Linux.'
-arch=('i686' 'x86_64')
-url='http://lightspark.sourceforge.net'
-license=('LGPL3')
-conflicts=('lightspark-git')
-depends=('ftgl' 'ffmpeg' 'glew' 'curl' 'boost-libs' 'gtkglext' 'libxml++' 'desktop-file-utils' 'hicolor-icon-theme')
-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{,.asc})
-md5sums=('cf24336e42ad356f1026b7071b110a88'
-         '9bd295cd6d56bfee6370bbaeef034d4c')
-
-build() {
-  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-staging/lightspark/lightspark.install b/community-staging/lightspark/lightspark.install
deleted file mode 100644
index 75e2b7b55..000000000
--- a/community-staging/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-staging/nginx/PKGBUILD b/community-staging/nginx/PKGBUILD
deleted file mode 100644
index c5cdb2da7..000000000
--- a/community-staging/nginx/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 63893 2012-02-06 16:23:20Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
-# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
-
-pkgname=nginx
-pkgver=1.0.11
-pkgrel=2
-pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl')
-makedepends=('passenger')
-optdepends=('passenger')
-url="http://nginx.org"
-license=('custom')
-backup=("etc/nginx/conf/fastcgi.conf"
-        "etc/nginx/conf/fastcgi_params"
-        "etc/nginx/conf/koi-win"
-        "etc/nginx/conf/koi-utf"
-        "etc/nginx/conf/mime.types"
-        "etc/nginx/conf/nginx.conf"
-        "etc/nginx/conf/scgi_params"
-        "etc/nginx/conf/uwsgi_params"
-        "etc/nginx/conf/win-utf"
-        "etc/logrotate.d/nginx"
-        "etc/conf.d/nginx")
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-        nginx)
-md5sums=('a41a01d7cd46e13ea926d7c9ca283a95'
-         '0e8032d3ba26c3276e8c7c30588d375f')
-
-_doc_root=/usr/share/nginx/http
-_server_root=/etc/nginx
-_conf_path=${_server_root}/conf
-_tmp_path=/var/spool/nginx
-_log_path=/var/log/nginx
-_user=http
-_group=http
-
-build() {
-	cd "$srcdir/nginx-${pkgver}"
-
-	./configure \
-        --prefix=${_server_root} \
-        --sbin-path=/usr/sbin/nginx \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/lock/nginx.lock \
-        --http-client-body-temp-path=${_tmp_path}/client_body_temp \
-        --http-proxy-temp-path=${_tmp_path}/proxy_temp \
-        --http-fastcgi-temp-path=${_tmp_path}/fastcgi_temp \
-        --http-log-path=${_log_path}/access.log \
-        --error-log-path=${_log_path}/error.log \
-        --user=${_user} --group=${_group} \
-        --with-imap --with-imap_ssl_module --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --with-http_dav_module \
-        --with-http_gzip_static_module \
-        --with-ipv6 \
-        --add-module=/usr/lib/passenger/ext/nginx \
-        --http-scgi-temp-path=${_tmp_path} \
-        --http-uwsgi-temp-path=${_tmp_path}
-        #--with-http_mp4_module \
-        #--with-http_realip_module \
-        #--with-http_addition_module \
-        #--with-http_xslt_module \
-        #--with-http_image_filter_module \
-        #--with-http_geoip_module \
-        #--with-http_sub_module \
-        #--with-http_flv_module \
-        #--with-http_random_index_module \
-        #--with-http_secure_link_module \
-        #--with-http_degradation_module \
-        #--with-http_perl_module \
-
-	make
-}
-
-package() {
-	cd "$srcdir/nginx-${pkgver}"
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir"/etc/logrotate.d/
-	cat <<EOF > $pkgdir/etc/logrotate.d/nginx
-	$_log_path/*log {
-		create 640 http log
-		compress
-		postrotate
-			/bin/kill -USR1 \`cat /var/run/nginx.pid 2>/dev/null\` 2> /dev/null || true
-		endscript
-	}
-EOF
-
-	sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf
-
-	install -d $pkgdir/$_tmp_path
-
-	# move default document root outside server root
-	install -d $pkgdir/$_doc_root
-	mv $pkgdir/$_server_root/html/* $pkgdir/$_doc_root/
-	rm -rf $pkgdir/$_server_root/html
-	rm -f $pkgdir/$_doc_root/index.html
-
-	# let's create links for relative paths in config file
-	ln -s $_log_path $pkgdir/$_server_root/logs
-	ln -s $_doc_root $pkgdir/$_server_root/html
-
-	install -D -m755 $srcdir/nginx $pkgdir/etc/rc.d/nginx
-	install -D -m644 LICENSE $pkgdir/usr/share/licenses/nginx/LICENSE
-	mkdir -p $pkgdir/etc/conf.d
-	echo "NGINX_CONFIG=/etc/nginx/conf/nginx.conf" >$pkgdir/etc/conf.d/nginx
-	rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/nginx/nginx b/community-staging/nginx/nginx
deleted file mode 100644
index 9de10e99a..000000000
--- a/community-staging/nginx/nginx
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# general config
-
-NGINX_CONFIG="/etc/nginx/conf/nginx.conf"
-
-. /etc/conf.d/nginx
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking configuration"
-  /usr/sbin/nginx -t -q -c "$NGINX_CONFIG"
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting Nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c "$NGINX_CONFIG" &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Nginx"
-    NGINX_PID=`cat /var/run/nginx.pid 2>/dev/null`
-    kill -QUIT $NGINX_PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in `seq 1 10`; do
-        [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading Nginx Configuration" kill -HUP `cat /var/run/nginx.pid`
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community-staging/ngrep/PKGBUILD b/community-staging/ngrep/PKGBUILD
deleted file mode 100644
index 0307ae17e..000000000
--- a/community-staging/ngrep/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63940 2012-02-07 18:48:50Z jelle $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=ngrep
-pkgver=1.45
-pkgrel=8
-pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
-arch=('i686' 'x86_64')
-url='http://ngrep.sourceforge.net/'
-license=('custom')
-depends=('libpcap>=1.0.0')
-# Fix build failure when using "-j" (FS#27091).
-options=(!makeflags)
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ngrep-fix-ipv6-support.patch")
-md5sums=('bc8150331601f3b869549c94866b4f1c' '90e6dfb335bccf12615d3c468ceeb60f')
-# Added patch for broken ipv6 support (FS#27225)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/ngrep-fix-ipv6-support.patch
-
-  ./configure --prefix=/usr --with-pcap-includes=/usr/include/pcap --enable-ipv6
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -Dm0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-}
diff --git a/community-staging/ngrep/ngrep-fix-ipv6-support.patch b/community-staging/ngrep/ngrep-fix-ipv6-support.patch
deleted file mode 100644
index 9a07d7d38..000000000
--- a/community-staging/ngrep/ngrep-fix-ipv6-support.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -rupN trunk/ngrep-fix-ipv6-support.patch trunk.notarch/ngrep-fix-ipv6-support.patch
---- trunk/ngrep-fix-ipv6-support.patch	1970-01-01 01:00:00.000000000 +0100
-+++ trunk.notarch/ngrep-fix-ipv6-support.patch	2011-11-30 05:12:48.068790633 +0100
-@@ -0,0 +1,40 @@
-+--- ngrep-1.45.ds2/ngrep.c	2010-04-21 12:16:52.000000000 +0200
-++++ ngrep-1.45.ds2-ipv6-patch/ngrep.c	2010-04-21 12:11:49.581088102 +0200
-+@@ -711,10 +711,12 @@ void process(u_char *d, struct pcap_pkth
-+             data = (unsigned char *)(tcp_pkt) + tcphdr_offset;
-+             len -= link_offset + ip_hl + tcphdr_offset;
-+ 
-++/* 
-+ #if USE_IPv6
-+             if (ip_ver == 6)
-+                 len -= ntohs(ip6_pkt->ip6_plen);
-+-#endif
-++#endif 
-++*/
-+ 
-+             if ((int32_t)len < 0)
-+                 len = 0;
-+@@ -731,11 +733,12 @@ void process(u_char *d, struct pcap_pkth
-+             data = (unsigned char *)(udp_pkt) + udphdr_offset;
-+             len -= link_offset + ip_hl + udphdr_offset;
-+ 
-++/*
-+ #if USE_IPv6
-+             if (ip_ver == 6)
-+                 len -= ntohs(ip6_pkt->ip6_plen);
-+ #endif
-+-
-++*/
-+             if ((int32_t)len < 0)
-+                 len = 0;
-+ 
-+@@ -769,7 +772,7 @@ void process(u_char *d, struct pcap_pkth
-+             uint16_t icmp6hdr_offset    = (frag_offset) ? 0 : 4;
-+ 
-+             data = (unsigned char *)(icmp6_pkt) + icmp6hdr_offset;
-+-            len -= link_offset + ip_hl + ntohs(ip6_pkt->ip6_plen) + icmp6hdr_offset;
-++            len -= link_offset + ip_hl + icmp6hdr_offset;
-+ 
-+             if ((int32_t)len < 0)
-+                 len = 0;
-+
-diff -rupN trunk/ngrep-system-pcre.patch trunk.notarch/ngrep-system-pcre.patch
---- trunk/ngrep-system-pcre.patch	1970-01-01 01:00:00.000000000 +0100
-+++ trunk.notarch/ngrep-system-pcre.patch	2011-11-30 05:12:48.068790633 +0100
-@@ -0,0 +1,59 @@
-+diff -urN ngrep-1.45/configure.in ngrep-1.45-patched/configure.in
-+--- ngrep-1.45/configure.in	2006-11-14 21:43:56.000000000 -0600
-++++ ngrep-1.45-patched/configure.in	2006-11-29 10:34:48.000000000 -0600
-+@@ -28,8 +28,8 @@
-+ dnl
-+ 
-+ EXTRA_DEFINES=""
-+-EXTRA_INCLUDES=""
-+-EXTRA_LIBS=""
-++EXTRA_INCLUDES="$EXTRA_INCLUDES"
-++EXTRA_LIBS="$EXTRA_LIBS"
-+ 
-+ 
-+ dnl
-+@@ -130,8 +130,8 @@
-+   echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
-+   echo 
-+ 
-+-  REGEX_DIR='pcre-5.0'
-+-  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
-++#  REGEX_DIR='pcre-5.0'
-++#  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
-+   USE_PCRE="1"
-+ 
-+ else
-+@@ -146,7 +146,7 @@
-+ 
-+ fi
-+ 
-+-( cd $REGEX_DIR && ./configure )
-++#( cd $REGEX_DIR && ./configure )
-+ 
-+ AC_SUBST(REGEX_DIR)
-+ AC_SUBST(REGEX_OBJS)
-+diff -urN ngrep-1.45/Makefile.in ngrep-1.45-patched/Makefile.in
-+--- ngrep-1.45/Makefile.in	2006-11-28 07:35:37.000000000 -0600
-++++ ngrep-1.45-patched/Makefile.in	2006-11-29 08:20:32.000000000 -0600
-+@@ -38,7 +38,7 @@
-+ 
-+ all: $(TARGET) 
-+ 
-+-$(TARGET): $(REGEX_OBJS) $(OBJS) 
-++$(TARGET): $(OBJS) 
-+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+ 
-+ debug: $(REGEX_OBJS) $(OBJS)
-+diff -urN ngrep-1.45/ngrep.c ngrep-1.45-patched/ngrep.c
-+--- ngrep-1.45/ngrep.c	2006-11-28 07:38:43.000000000 -0600
-++++ ngrep-1.45-patched/ngrep.c	2006-11-29 08:10:48.000000000 -0600
-+@@ -92,7 +92,7 @@
-+ #endif
-+ 
-+ #if USE_PCRE
-+-#include "pcre-5.0/pcre.h"
-++#include "pcre.h"
-+ #else
-+ #include "regex-0.12/regex.h"
-+ #endif
-+
diff --git a/community-staging/opencollada/PKGBUILD b/community-staging/opencollada/PKGBUILD
deleted file mode 100644
index 2e08bdaba..000000000
--- a/community-staging/opencollada/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Liganic <liganic-aur@gmx.net>
-pkgname=opencollada
-pkgver=867
-pkgrel=1
-pkgdesc="Stream based reader and writer library for COLLADA files"
-arch=(i686 x86_64)
-url="https://code.google.com/p/opencollada/"
-license=('GPL')
-depends=('libxml2')
-makedepends=('subversion' 'ruby' 'cmake')
-options=(!libtool !strip)
-
-_svntrunk=http://opencollada.googlecode.com/svn/trunk/
-_svnmod=opencollada
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to SVN server...."
-
-  if [[ -d "$_svnmod/.svn" ]]; then
-    (cd "$_svnmod" && svn up -r "$pkgver")
-  else
-    svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting build..."
-
-  _builddir="$srcdir/$_svnmod-build"
-
-  rm -rf $_builddir
-  cp -r "$srcdir/$_svnmod" $_builddir
-  cd $_builddir
-
-  mkdir cmake
-  cd cmake
-  cmake ../ 
-  cd $_builddir/cmake
-  make
-
-#  cd scripts/
-#  chmod +x unixbuild.sh
-#  ./unixbuild.sh $pkgdir/usr/
-}
-
-package() {
-  _builddir="$srcdir/$_svnmod-build"
-#  sed -i "s/libdir='.*'/libdir=\'\/usr\/lib\'/" $pkgdir/usr/lib/*.la*
-
-# Headers
-  rm -rf `find $_builddir -type d -name .svn`
-  mkdir -p $pkgdir/usr/include/opencollada/
-  cd $_builddir
-  _include_dirs=$(find . -type d -name include -and -not -path '*Externals*' -print)
-  for dir in $_include_dirs;do
-    mkdir -p $pkgdir/usr/include/opencollada/${dir}
-    cp -r ${dir}/* $pkgdir/usr/include/opencollada/${dir}/..
-   done
-
-  rm -rf $pkgdir/usr/include/opencollada/generated*
-
-  cp -r $_builddir/cmake/lib/ $pkgdir/usr/
-  cp -r $_builddir/cmake/bin/ $pkgdir/usr/
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/p3scan/PKGBUILD b/community-staging/p3scan/PKGBUILD
deleted file mode 100644
index a974f27d7..000000000
--- a/community-staging/p3scan/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 63918 2012-02-06 17:50:35Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: v01d <phreakuencies@gmail.com>
-
-pkgname=p3scan
-pkgver=2.3.2
-pkgrel=6
-pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection"
-arch=('i686' 'x86_64')
-url="http://p3scan.sourceforge.net/"
-depends=('pcre' 'openssl')
-license=('GPL')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "rc.p3scan")
-md5sums=('9f8decc7d4701228788e3c8717096ca0' 'f6e3450c3a932477c49082559b7abef8')
-install=p3scan.install
-md5sums=('9f8decc7d4701228788e3c8717096ca0'
-         '482a783e699b6532cbc478977f429eb5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # Fix CFLAGS and other options hardcoded in Makefiles
-  unset CFLAGS
-  sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile
-  sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile
-  sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # Create base dirs, the Makefile assumes they're there
-  install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8
-
-  # install with root set on $pkgdir
-  make DESTDIR=$pkgdir install
-
-  # delete init script provided and use an arch compatible one
-  rm -f $pkgdir/etc/rc.d/rc.p3scan
-  install -D -m755 -g root -o root $srcdir/rc.p3scan $pkgdir/etc/rc.d/p3scan
-
-  # BUG?: make absolute link a relative one
-  (
-    cd $pkgdir/etc/p3scan
-    ln -sf p3scan-en.mail p3scan.mail
-  )
-
-  # BUG: fix .conf file (the license has C style comments, they should be conf-style comments)
-  sed -ri 's|^[/ ]\*/?|# |g' $pkgdir/etc/p3scan/p3scan.conf
-
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-  mv $pkgdir/usr/doc $pkgdir/usr/share/
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/p3scan/p3scan.install b/community-staging/p3scan/p3scan.install
deleted file mode 100644
index 0f139dd28..000000000
--- a/community-staging/p3scan/p3scan.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "==> You may want an Anti-Virus program to use with p3scan. Installing clamav is recommended."
-}
-
-post_upgrade() {
-  post_install $1 $2
-}
diff --git a/community-staging/p3scan/rc.p3scan b/community-staging/p3scan/rc.p3scan
deleted file mode 100644
index fc8b79b22..000000000
--- a/community-staging/p3scan/rc.p3scan
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting p3scan"
-    [ -d /var/run/p3scan ] || mkdir -p /var/run/p3scan
-    if [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi
-
-    # Start p3scan
-    /usr/sbin/p3scan    
-    if ! [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi
-    add_daemon p3scan
-    stat_done
-  ;;
-  stop)
-    stat_busy "Stopping p3scan"
-
-    # Stop p3scan
-    if [ -a /var/run/p3scan/p3scan.pid ]; then
-      kill `cat /var/run/p3scan/p3scan.pid` &>/dev/null || stat_die
-      rm -f /var/run/p3scan/p3scan.pid
-      rm_daemon p3scan
-      stat_done
-    else
-      stat_fail
-    fi
-  ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-  ;;
-  *)
-    echo "Usage: $0 { start | stop | restart }"
-esac
-exit 0
diff --git a/community-staging/pidgin-musictracker/PKGBUILD b/community-staging/pidgin-musictracker/PKGBUILD
deleted file mode 100644
index ba23ed37a..000000000
--- a/community-staging/pidgin-musictracker/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 63942 2012-02-07 18:55:19Z jelle $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Ionut Biru <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=pidgin-musictracker
-pkgver=0.4.22
-pkgrel=3
-pkgdesc="A plugin for Pidgin which displays the music track currently playing."
-url='http://code.google.com/p/pidgin-musictracker'
-license=('GPL2')
-depends=('pidgin' 'gtk2' 'dbus-glib')
-makedepends=('xmms2')
-arch=('i686' 'x86_64')
-source=("http://pidgin-musictracker.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-options=('!libtool')
-md5sums=('8d7225c705484db86b864cab5a536423')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/pound/ChangeLog b/community-staging/pound/ChangeLog
deleted file mode 100644
index 1a9677113..000000000
--- a/community-staging/pound/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-
-2009-03-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.4.4
-	* Fixed an issue with the rc.d pound script
-
-2008-06-22  Mateusz Herych <heniekk@gmail.com>
-
-	* Adding for x86_64 community - 2.4.3
-
-2008-06-22  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Adding for i686 community - 2.4.3
-
-2008-05-22  Mateusz Herych <heniekk@gmail.com>
-
-	* Adding to community for x86_64
-
-2008-05-21  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Adding to community for i686
-
diff --git a/community-staging/pound/PKGBUILD b/community-staging/pound/PKGBUILD
deleted file mode 100644
index 6da0f166c..000000000
--- a/community-staging/pound/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 63925 2012-02-06 19:45:08Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=pound
-pkgver=2.6
-pkgrel=1
-pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
-arch=('i686' 'x86_64')
-url="http://www.apsis.ch/pound/index_html"
-license=('GPL')
-depends=('pcre' 'openssl')
-backup=(etc/pound/pound.cfg)
-source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz
-	pound.init
-	pound.runit
-	pound.cfg
-	pound-2.5-openssl.patch)
-md5sums=('8c913b527332694943c4c67c8f152071'
-         '4df8548f106fca08323e8e4071beaa43'
-         '716cc0bf334b594751bece24c7d1df2d'
-         '8937808acd22c6391ebe4340af8df854'
-         'c2c48dc395ffc045f9d35394992292d0')
-
-build() {
-    cd $srcdir/Pound-$pkgver
-    # Patch to build against OpenSSL 1.0.0 (Thanks Fedora!)
-#    patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1
-    ./configure --prefix=/usr --sysconfdir=/etc/pound
-    make 
-}
-package() {
-    cd $srcdir/Pound-$pkgver
-    install -d $pkgdir/usr/sbin
-    make DESTDIR=$pkgdir install 
-    chown root.root -R $pkgdir/usr
-    install -d $pkgdir/etc/rc.d
-    install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound
-    install -d $pkgdir/etc/sv
-    install -d $pkgdir/etc/sv/pound
-    install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run
-    install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg
-}
diff --git a/community-staging/pound/pound-2.5-openssl.patch b/community-staging/pound/pound-2.5-openssl.patch
deleted file mode 100644
index efefd5487..000000000
--- a/community-staging/pound/pound-2.5-openssl.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-diff -up Pound-2.5/config.c.openssl Pound-2.5/config.c
---- Pound-2.5/config.c.openssl	2010-02-10 12:23:09.000000000 +0100
-+++ Pound-2.5/config.c	2010-02-10 12:23:07.000000000 +0100
-@@ -431,14 +431,22 @@ t_hash(const TABNODE *e)
-         res = (res ^ *k++) * 16777619;
-     return res;
- }
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
-+#endif
- 
- static int
- t_cmp(const TABNODE *d1, const TABNODE *d2)
- {
-     return strcmp(d1->key, d2->key);
- }
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
-+#endif
- 
- /*
-  * parse a service
-@@ -460,7 +468,11 @@ parse_service(const char *svc_name)
-     pthread_mutex_init(&res->mut, NULL);
-     if(svc_name)
-         strncpy(res->name, svc_name, KEY_SIZE);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL)
-+#else
-     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL)
-+#endif
-         conf_err("lh_new failed - aborted");
-     ign_case = ignore_case;
-     while(conf_fgets(lin, MAXBUF)) {
-diff -up Pound-2.5/pound.h.openssl Pound-2.5/pound.h
---- Pound-2.5/pound.h.openssl	2010-02-02 12:49:02.000000000 +0100
-+++ Pound-2.5/pound.h	2010-02-10 12:15:18.000000000 +0100
-@@ -322,6 +322,10 @@ typedef struct _tn {
- /* maximal session key size */
- #define KEY_SIZE    127
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+DECLARE_LHASH_OF(TABNODE);
-+#endif
-+
- /* service definition */
- typedef struct _service {
-     char                name[KEY_SIZE + 1]; /* symbolic name */
-@@ -337,7 +341,11 @@ typedef struct _service {
-     int                 sess_ttl;   /* session time-to-live */
-     regex_t             sess_start; /* pattern to identify the session data */
-     regex_t             sess_pat;   /* pattern to match the session data */
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
-+#else
-     LHASH               *sessions;  /* currently active sessions */
-+#endif
-     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
-     int                 disabled;   /* true if the service is disabled */
-     struct _service     *next;
-diff -up Pound-2.5/svc.c.openssl Pound-2.5/svc.c
---- Pound-2.5/svc.c.openssl	2010-02-02 12:49:02.000000000 +0100
-+++ Pound-2.5/svc.c	2010-02-10 12:13:29.000000000 +0100
-@@ -27,12 +27,17 @@
- 
- #include    "pound.h"
- 
-+#ifndef LHASH_OF
-+#define LHASH_OF(x) LHASH
-+#define CHECKED_LHASH_OF(type, h) h
-+#endif
-+
- /*
-  * Add a new key/content pair to a hash table
-  * the table should be already locked
-  */
- static void
--t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
-+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
- {
-     TABNODE *t, *old;
- 
-@@ -53,7 +58,11 @@ t_add(LHASH *const tab, const char *key,
-     }
-     memcpy(t->content, content, cont_len);
-     t->last_acc = time(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
-+#else
-     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
-+#endif
-         free(old->key);
-         free(old->content);
-         free(old);
-@@ -68,12 +77,16 @@ t_add(LHASH *const tab, const char *key,
-  * side-effect: update the time of last access
-  */
- static void *
--t_find(LHASH *const tab, char *const key)
-+t_find(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
-+#endif
-         res->last_acc = time(NULL);
-         return res->content;
-     }
-@@ -84,12 +97,16 @@ t_find(LHASH *const tab, char *const key
-  * Delete a key
-  */
- static void
--t_remove(LHASH *const tab, char *const key)
-+t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
-+#endif
-         free(res->key);
-         free(res->content);
-         free(res);
-@@ -98,59 +115,75 @@ t_remove(LHASH *const tab, char *const k
- }
- 
- typedef struct  {
--    LHASH   *tab;
-+    LHASH_OF(TABNODE) *tab;
-     time_t  lim;
-     void    *content;
-     int     cont_len;
- }   ALL_ARG;
- 
- static void
--t_old(TABNODE *t, void *arg)
-+t_old_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
--
--    a = (ALL_ARG *)arg;
-     if(t->last_acc < a->lim)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
-+#else
-+#define t_old t_old_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Expire all old nodes
-  */
- static void
--t_expire(LHASH *const tab, const time_t lim)
-+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
- {
-     ALL_ARG a;
-     int down_load;
- 
-     a.tab = tab;
-     a.lim = lim;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
- static void
--t_cont(TABNODE *t, void *arg)
-+t_cont_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
--
--    a = (ALL_ARG *)arg;
-     if(memcmp(t->content, a->content, a->cont_len) == 0)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
-+#else
-+#define t_cont t_cont_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Remove all nodes with the given content
-  */
- static void
--t_clean(LHASH *const tab, void *const content, const size_t cont_len)
-+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
- {
-     ALL_ARG a;
-     int down_load;
-@@ -158,10 +191,14 @@ t_clean(LHASH *const tab, void *const co
-     a.tab = tab;
-     a.content = content;
-     a.cont_len = cont_len;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
-@@ -1410,13 +1447,11 @@ typedef struct  {
- }   DUMP_ARG;
- 
- static void
--t_dump(TABNODE *t, void *arg)
-+t_dump_doall_arg(TABNODE *t, DUMP_ARG *a)
- {
--    DUMP_ARG    *a;
-     BACKEND     *be, *bep;
-     int         n_be, sz;
- 
--    a = (DUMP_ARG *)arg;
-     memcpy(&bep, t->content, sizeof(bep));
-     for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
-         if(be == bep)
-@@ -1432,19 +1467,28 @@ t_dump(TABNODE *t, void *arg)
-     return;
- }
- 
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
-+#else
-+#define t_dump t_dump_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
-+#endif
- 
- /*
-  * write sessions to the control socket
-  */
- static void
--dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
-+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
- {
-     DUMP_ARG a;
- 
-     a.control_sock = control_sock;
-     a.backends = backends;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
-+#else
-     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
-+#endif
-     return;
- }
- 
diff --git a/community-staging/pound/pound.cfg b/community-staging/pound/pound.cfg
deleted file mode 100644
index fda8a07f4..000000000
--- a/community-staging/pound/pound.cfg
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-## Pound configration file
-###############################################################################
-##
-##
-## GLOBAL SETTINGS
-##
-## Specify the user and group Pound will run as.
-#User         "http"
-#Group        "http"
-##
-## Specify the directory that Pound will chroot to at runtime.
-#RootJail     "/"
-##
-## Have Pound run in the foreground (if 0) or as a daemon (if 1).
-#Daemon       1
-##
-## Specify the log facility to use.
-#LogFacility  daemon
-##
-## Specify the logging level.
-#LogLevel     1
-##
-## Ignore case when matching URLs.
-#IgnoreCase   0
-##
-## Enable or disable the dynamic rescaling code.
-#DynScale     0
-##
-## Specify how often Pound will check for resurected back-end hosts.
-#Alive        30
-##
-## Specify for how long Pound will wait for a client request.
-#Client       10
-##
-## How long should Pound wait for a response from the back-end.
-#TimeOut      15
-##
-## How long should Pound wait for a connection to the back-end.
-#ConnTO       15
-##
-## How long should Pound continue to answer interrupted connections.
-#Grace        30
-##
-## Use an OpenSSL hardware acceleration card.
-#SSLEngine    "name"
-##
-## Set the control socket path.
-#Control      "/tmp/poundctl.socket"
-##
-##
-## LISTENERS
-##
-## Configure services and backends for the HTTP reverse proxy.
-#ListenHTTP
-#    Address  10.0.0.1
-#    Port     80
-#    Service
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8080
-#        End
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8081
-#        End
-#    End
-#End
-##
-## Configure services and backends for the HTTPS reverse proxy.
-#ListenHTTPS
-#    Address  10.0.0.1
-#    Port     443
-#    Cert     "/etc/ssl/certs/pound.pem"
-#    Service
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8080
-#        End
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8081
-#        End
-#    End
-#End
diff --git a/community-staging/pound/pound.init b/community-staging/pound/pound.init
deleted file mode 100644
index 369d6626d..000000000
--- a/community-staging/pound/pound.init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting Pound"
-        /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon pound
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Pound"
-	[ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid`
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/pound.pid
-            rm_daemon pound
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community-staging/pound/pound.runit b/community-staging/pound/pound.runit
deleted file mode 100644
index 2e0be991e..000000000
--- a/community-staging/pound/pound.runit
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-exec 2>&1
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-BIN=/usr/sbin/pound
-OPTS="-f /etc/pound/pound.cfg -p /var/run/pound.pid"
-SVC=pound
-
-PID=`pidof $BIN`
-if [ -z "$PID" ]
-then
-	if [ -f /var/run/$SVC.pid ] 
-	then
-		rm /var/run/$SVC.pid
-		rm_daemon $SVC
-	fi
-	echo "Starting $SVC daemon"
-	$BIN $OPTS
-else
-	[ -z $PID ] || exec watchpid $PID
-fi
-
diff --git a/community-staging/privoxy/PKGBUILD b/community-staging/privoxy/PKGBUILD
deleted file mode 100644
index f54a314b8..000000000
--- a/community-staging/privoxy/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 63948 2012-02-07 20:45:04Z jelle $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Juergen Hoetzel <juergen@hoetzel.info>
-# Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
-
-pkgname=privoxy
-pkgver=3.0.19
-pkgrel=2
-pkgdesc='A web proxy with advanced filtering capabilities.'
-arch=('i686' 'x86_64')
-url='http://www.privoxy.org'
-license=('GPL')
-depends=('pcre' 'zlib')
-makedepends=('autoconf')
-backup=('etc/conf.d/privoxy'
-        'etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
-        'etc/privoxy/'{match-all,user}.action
-        'etc/logrotate.d/privoxy')
-install='privoxy.install'
-source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
-        'privoxy'
-        'privoxy.logrotate.d'
-        'privoxy.conf.d')
-md5sums=('57acc79059565cc42eda67982842785d'
-         '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
-         '79480f311313cc43974f6cbe6b672927'
-         '27830ef79418e277b90c1c1fa933f876')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
-  autoheader
-  autoconf
-  ./configure --prefix=/usr --sysconfdir=/etc/privoxy
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
-  make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
-    CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
-
-  # Don't overwrite existing log files!
-  rm "${pkgdir}/var/log/privoxy/"*
-
-  install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
-
-  # Fix config paths.
-  sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \
-    -e '/^user-manual/s#.*#\#user-manual /usr/share/doc/privoxy/user-manual/#' \
-    "${pkgdir}/etc/privoxy/config"
-
-  # Fix group ownership and permissions.
-  chgrp -R 42 "${pkgdir}/etc/privoxy/"
-  chgrp -R 42 "${pkgdir}/var/log/privoxy/"
-
-  find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
-  find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
-  chmod 0700 "${pkgdir}/var/log/privoxy"
-}
diff --git a/community-staging/privoxy/privoxy b/community-staging/privoxy/privoxy
deleted file mode 100644
index 754453de5..000000000
--- a/community-staging/privoxy/privoxy
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
-# read logdir and logfile from privoxy config
-prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prld" ] || prld=/var/log/privoxy
-prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prlf" ] || prlf=logfile
-
-PID=`pidof -o %PPID /usr/sbin/privoxy`
-
-case "$1" in
-  start)
-    stat_busy "Starting Privoxy"
-    # create missing logdir and logfile
-    [ -d "$prld" ] || mkdir -p "$prld"
-    if [ ! -f "$prlf" ]; then
-      touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
-        chmod 0660 "$prld/$prlf"
-    fi
-    [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
-                                       ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon privoxy
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Privoxy"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon privoxy
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/privoxy/privoxy.conf.d b/community-staging/privoxy/privoxy.conf.d
deleted file mode 100644
index 9aa11cd67..000000000
--- a/community-staging/privoxy/privoxy.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# Location of the config file.
-PRIVOXY_CONF='/etc/privoxy/config'
-
-# User and group that privoxy will be run as.
-PRIVOXY_USER='privoxy'
-PRIVOXY_GROUP='privoxy'
-
-# Additional arguments.
-PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
-
diff --git a/community-staging/privoxy/privoxy.install b/community-staging/privoxy/privoxy.install
deleted file mode 100644
index c3ed75111..000000000
--- a/community-staging/privoxy/privoxy.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  groupadd -g 42 privoxy &>/dev/null
-  useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null
-  chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy
-
-  if [ ! -d /var/spool/privoxy ]; then
-    install -dm0770 -o privoxy -g privoxy /var/spool/privoxy
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  userdel privoxy &>/dev/null
-  groupdel privoxy &>/dev/null
-  rm -rf var/spool/privoxy
-}
diff --git a/community-staging/privoxy/privoxy.logrotate.d b/community-staging/privoxy/privoxy.logrotate.d
deleted file mode 100644
index 386766c3e..000000000
--- a/community-staging/privoxy/privoxy.logrotate.d
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/privoxy/* {
-   create 660 root privoxy
-   notifempty
-   compress
-   postrotate
-     /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
-   endscript
-}
diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD
deleted file mode 100644
index e0084d40d..000000000
--- a/community-staging/root/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.32.00
-pkgrel=4
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
-makedepends=('fftw')
-install='root.install'
-options=('!emptydirs')
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
-        'root.sh'
-        'rootd'
-        'root.xml'
-        'fix-mathcore-generation-r42566.diff')
-md5sums=('1c30e4e6eeae62ff1ad5118cd1309679'
-         '0e883ad44f99da9bc7c23bc102800b62'
-         'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7'
-         '12877cabd620284f50ea16ef97a54aac')
-
-build() {
-  cd root
-
-  # temporary workaround: remove on next patch release after 5.32.00
-  # bug reported at: https://savannah.cern.ch/bugs/?90906
-  patch -Np0 -i ${srcdir}/fix-mathcore-generation-r42566.diff
-
-  if [ ${CARCH} == 'i686' ]; then
-    TARGET=linux;
-  else
-    TARGET=linuxx8664gcc;
-  fi
-
-  msg 'python2 switch'
-  find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
-                           -e 's/python -O/python2 -O/g' \
-                           -e 's/python -c/python2 -c/g' -i {} \;
-  sed \
-    -e 's/python 2/python2 2/g' \
-    -i configure
-  sed \
-    -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
-    -i cint/reflex/python/genreflex/Makefile.am
-  sed \
-    -e 's/python /python2 /' \
-    -i config/genreflex.in config/genreflex-rootcint.in
-
-  local sys_libs=""
-  for sys_lib in ftgl freetype glew pcre zlib lzma; do
-    sys_libs+="--disable-builtin-${sys_lib} "
-  done
-  # move from aur if possible
-  #--disable-builtin-afterimage \
-
-  ./configure \
-    ${TARGET} \
-    --prefix=/usr \
-    --enable-gdml \
-    --enable-gsl-shared \
-    --enable-minuit2 \
-    --enable-soversion \
-    --enable-roofit \
-    --enable-python \
-    --with-python-incdir=/usr/include/python2.7 \
-    --with-python-libdir=/usr/lib \
-    ${sys_libs}
-
-  make
-}
-
-package() {
-  cd root
-
-  make DESTDIR=${pkgdir} install
-
-  install -D ${srcdir}/root.sh \
-    ${pkgdir}/etc/profile.d/root.sh
-  install -D ${srcdir}/rootd \
-    ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.xml \
-    ${pkgdir}/usr/share/mime/packages/root.xml
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
-    ${pkgdir}/usr/share/applications/root-system-bin.desktop
-  # replace @prefix@ with /usr for the desktop
-  sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
-    ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
-
-  # use a file that pacman can track instead of adding directly to ld.so.conf
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
-
-  rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community-staging/root/fix-mathcore-generation-r42566.diff b/community-staging/root/fix-mathcore-generation-r42566.diff
deleted file mode 100644
index ae22c23c0..000000000
--- a/community-staging/root/fix-mathcore-generation-r42566.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: cint/cint/src/typedef.cxx
-===================================================================
---- cint/cint/src/typedef.cxx	(revision 42564)
-+++ cint/cint/src/typedef.cxx	(revision 42566)
-@@ -297,18 +297,27 @@
-       }
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strcmp(type1, "::")) {  // FIXME: This makes no sense, there cannot be typedef ::{...};
-+   if (!strcmp(type1, "::")) {
-       // skip a :: without a namespace in front of it (i.e. global namespace!)
-       c = G__fgetspace(); // skip the next ':'
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strncmp(type1, "::", 2)) { // Strip a leading :: (global namespace operator)
--      // A leading '::' causes other typename matching functions to fail so
--      // we remove it. This is not the ideal solution (neither was the one
--      // above since it does not allow for distinction between global
--      // namespace and local namespace) ... but at least it is an improvement
--      // over the current behavior.
--      strcpy((char*)type1, type1 + 2);  // Okay since we reduce the size ...
-+   if (!strncmp(type1, "::", 2)) {
-+      // Strip a leading :: (global namespace operator).
-+      // A leading '::' causes other typename matching
-+      // functions to fail so we remove it. This is not
-+      // the ideal solution (neither is the one above)
-+      // since it does not allow for decriminating between
-+      // global namespace and local namespace, but at
-+      // least it is an improvement over the current
-+      // behavior.
-+      //
-+      // Note: We must use memmove because the source
-+      //       and destination strings overlap!
-+      //
-+      int t1len = strlen(type1);
-+      memmove(type1, type1 + 2, t1len - 2);
-+      type1.Set(t1len - 2, '\0');
-    }
-    while (isspace(c)) {
-       len = strlen(type1);
diff --git a/community-staging/root/root.install b/community-staging/root/root.install
deleted file mode 100644
index afabb7aea..000000000
--- a/community-staging/root/root.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-  update-desktop-database >/dev/null
-
-  update-mime-database /usr/share/mime >/dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
-  # leave for pre 5.30.03-3
-  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
-    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-    mv /tmp/.pacroot etc/ld.so.conf
-    chmod 644 etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community-staging/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
-    export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
-    export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community-staging/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-root">
-    <comment>ROOT file</comment>
-    <comment xml:lang="de">ROOT-Datei</comment>
-    <glob pattern="*.root"/>
-    <magic priority="80">
-      <match value="root" type="string" offset="0:64"/>
-    </magic>
-  </mime-type>
-</mime-info>
diff --git a/community-staging/root/rootd b/community-staging/root/rootd
deleted file mode 100644
index fb2c3388c..000000000
--- a/community-staging/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
-  start)
-  stat_busy "Starting ROOT file server daemon"
-    [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/rootd`
-      echo $PID >/var/run/rootd.pid
-      add_daemon rootd
-      stat_done
-    fi
-    ;;
-  stop)
-  stat_busy "Stopping ROOT file server daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rootd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/setconf/PKGBUILD b/community-staging/setconf/PKGBUILD
deleted file mode 100644
index 26b898bf9..000000000
--- a/community-staging/setconf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 63823 2012-02-05 20:27:23Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-pkgname=setconf
-pkgver=0.3.2
-pkgrel=3
-pkgdesc="Utility to easily change settings in Makefiles and configuration files"
-arch=('x86_64' 'i686')
-url="http://setconf.roboticoverlords.org/"
-license=('GPL')
-depends=('pcre' 'gc')
-makedepends=('shedskin>=0.9.1')
-source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2")
-sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  shedskin "$pkgname.py"
-  make CPPFLAGS="-march=native -fomit-frame-pointer"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/snort/PKGBUILD b/community-staging/snort/PKGBUILD
deleted file mode 100644
index d43d9497c..000000000
--- a/community-staging/snort/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 63946 2012-02-07 20:21:01Z jelle $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-
-pkgname=snort
-pkgver=2.9.2.1
-pkgrel=2
-pkgdesc='A lightweight network intrusion detection system.'
-arch=('i686' 'x86_64')
-url='http://www.snort.org'
-license=('GPL')
-depends=('libdaq' 'libdnet' 'libpcap' 'pcre' 'zlib')
-makedepends=('ca-certificates')
-backup=('etc/conf.d/snort'
-        'etc/snort/snort.conf'
-        'etc/snort/threshold.conf'
-        'etc/snort/confreference.config'
-        'etc/snort/classification.config')
-options=('!makeflags' '!libtool')
-install='snort.install'
-source=('http://www.snort.org/downloads/1416'
-        'snort'
-        'snort.conf.d')
-md5sums=('2f3e2b6ee72adbdfac73cb1c6c14bd61'
-         '361b8b9e40b9af0164f6b3e3da2e8277'
-         'b4fb8a68490589cd34df93de7609bfac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc/snort --with-libpcap-includes=/usr/include/pcap \
-              --without-mysql --without-postgresql --without-oracle --without-odbc --enable-zlib \
-              --enable-ipv6
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  mkdir -p "${pkgdir}/"{etc/rc.d,etc/snort/rules}
-
-  install -d -m755 "${pkgdir}/var/log/snort"
-  install -D -m644 etc/{*.conf*,*.map} "${pkgdir}/etc/snort/"
-  install -D -m644 "${srcdir}/snort.conf.d" "${pkgdir}/etc/conf.d/snort"
-  install -D -m755 "${srcdir}/snort" "${pkgdir}/etc/rc.d/snort"
-
-  sed -i 's#/usr/local/lib/#/usr/lib/#' "${pkgdir}/etc/snort/snort.conf"
-}
diff --git a/community-staging/snort/snort b/community-staging/snort/snort
deleted file mode 100644
index 5dfa72fbf..000000000
--- a/community-staging/snort/snort
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/snort ] && . /etc/conf.d/snort
-
-PID=`pidof -o %PPID /usr/bin/snort`
-case "$1" in
-  start)
-    stat_busy "Starting Intrusion Database System: SNORT"
-    [ -z "$PID" ] && /usr/bin/snort ${SNORT_OPTIONS} -u ${USER} -g ${GROUP} \
-                    -i ${INTERFACE} -c ${SNORT_CONF}
-	 if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon snort
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Intrusion Database System: SNORT"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon snort
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/snort/snort.conf.d b/community-staging/snort/snort.conf.d
deleted file mode 100644
index 86b566abc..000000000
--- a/community-staging/snort/snort.conf.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Parameters to be passed to snort
-#
-
-# options taken from Fedora
-# http://cvs.fedoraproject.org/viewcvs/devel/snort/sysconfig.snort?rev=1.2&view=markup
-
-# Where is the snort.conf file.
-SNORT_CONF="/etc/snort/snort.conf"
-
-# What user account should we run under.
-USER="snort"
-
-# What group account should we run under. 
-GROUP="snort"
-
-# define the interface we listen on
-INTERFACE="eth0"
-
-# If you are using prelude, delete the '-A fast' option
-SNORT_OPTIONS="-A fast -b -l /var/log/snort -D -p"
diff --git a/community-staging/snort/snort.install b/community-staging/snort/snort.install
deleted file mode 100644
index 673f22c6c..000000000
--- a/community-staging/snort/snort.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  getent group snort >/dev/null || usr/sbin/groupadd -g 29 snort
-  getent passwd snort >/dev/null || usr/sbin/useradd -c 'Snort user' -u 29 -g snort -d /var/log/snort -s /bin/false snort
-  usr/bin/passwd -l snort &>/dev/null
-
-  [ -f var/log/snort/alert ] || : >var/log/snort/alert
-  chown snort.snort var/log/snort/ -R
-
-cat << _EOF  
-
->>> You have to edit the HOME_NET variable in the /etc/snort/snort.conf file to reflect your local network.
->>> If you do not change it, snort may not work.
-
-_EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel snort &>/dev/null
-  usr/sbin/groupdel snort &>/dev/null
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/ted/PKGBUILD b/community-staging/ted/PKGBUILD
deleted file mode 100644
index 3634104b8..000000000
--- a/community-staging/ted/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63906 2012-02-06 17:24:53Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=ted
-pkgver=2.21
-pkgrel=5
-pkgdesc="An easy rich text processor (with footnote support)"
-arch=('i686' 'x86_64')
-url="http://www.nllgg.nl/Ted/"
-depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
-license=('GPL')
-source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz 
-        ted-2.21-libpng15.patch)
-md5sums=('34ae855938a3b364eb587cca504ba356'
-         '0c339b0fa7aec6b150e07e9027cd360c')
-
-build() {
-  cd "$srcdir/Ted-$pkgver"
-  sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile
-  patch -p0 -i ../ted-2.21-libpng15.patch
-  make compile.shared
-  make package.shared
-}
-
-package() {
-  cd "$srcdir/Ted-$pkgver"
-  mkdir -p "$pkgdir/usr/share/"
-  cd "$pkgdir/usr/share/"
-  tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz"
-  mv bin ../
-  mkdir -p "$pkgdir/usr/share/man/man1"
-  cd "$pkgdir/usr/share/Ted/"
-  mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/
-  sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh
-  mv *.sh "$pkgdir/usr/bin/"
-}
diff --git a/community-staging/ted/ted-2.21-libpng15.patch b/community-staging/ted/ted-2.21-libpng15.patch
deleted file mode 100644
index afd30f9a4..000000000
--- a/community-staging/ted/ted-2.21-libpng15.patch
+++ /dev/null
@@ -1,423 +0,0 @@
-This patch is from netbsd pkgsrc
-
-ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/
-
---- bitmap/bmpng.c
-+++ bitmap/bmpng.c
-@@ -20,23 +20,32 @@
- /*									*/
- /************************************************************************/
- 
--static int bpPngiToBitmap(	const png_info *		pngi,
-+static int bpPngiToBitmap(	const png_structp		pngp,
-+				png_info *			pngi,
- 				BitmapDescription *		bd )
-     {
-     unsigned int	col;
-+    png_uint_32		res_x, res_y;
-+    int			unit_type= 0;
- 
--    bd->bdPixelsWide= pngi->width;
--    bd->bdPixelsHigh= pngi->height;
-+    bd->bdPixelsWide= png_get_image_width( pngp, pngi );
-+    bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
-     bd->bdHasAlpha= 0;
- 
--    switch( pngi->color_type )
-+    switch( png_get_color_type( pngp, pngi ) )
- 	{
- 	case PNG_COLOR_TYPE_PALETTE:
-+	    {
-+	    int		num_palette;
-+	    png_colorp	palette;
-+
-+	    png_get_PLTE( pngp, pngi, &palette, &num_palette );
-+
- 	    bd->bdColorEncoding= BMcoRGB8PALETTE;
--	    bd->bdColorCount= pngi->num_palette;
-+	    bd->bdColorCount= num_palette;
- 	    bd->bdBitsPerSample= 8;
- 	    bd->bdSamplesPerPixel= 3;
--	    bd->bdBitsPerPixel= pngi->bit_depth;
-+	    bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
- 
- 	    bd->bdRGB8Palette= (RGB8Color *)
- 				malloc( bd->bdColorCount* sizeof(RGB8Color) );
-@@ -46,47 +55,51 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	    for ( col= 0; col < bd->bdColorCount; col++ )
- 		{
--		bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
--		bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
--		bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
-+		bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
-+		bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
-+		bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
- 		bd->bdRGB8Palette[col].rgb8Alpha= 0;
- 		}
-+	    }
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB:
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY:
- 	    bd->bdColorEncoding= BMcoWHITEBLACK;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB_ALPHA:
- 	    bd->bdHasAlpha= 1;
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY_ALPHA:
- 	    bd->bdHasAlpha= 1;
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 
- 	default:
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 	}
- 
--    bd->bdBytesPerRow= pngi->rowbytes;
-+    bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
-     bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
- 
--    switch( pngi->phys_unit_type )
-+    if  ( !  png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
-+	{ unit_type= PNG_RESOLUTION_UNKNOWN;	}
-+
-+    switch( unit_type )
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
- 	    bd->bdUnit= BMunPIXEL;
-@@ -96,12 +109,12 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	case PNG_RESOLUTION_METER:
- 	    bd->bdUnit= BMunM;
--	    bd->bdXResolution= pngi->x_pixels_per_unit;
--	    bd->bdYResolution= pngi->y_pixels_per_unit;
-+	    bd->bdXResolution= res_x;
-+	    bd->bdYResolution= res_y;
- 	    break;
- 
- 	default:
--	    LDEB(pngi->phys_unit_type);
-+	    LDEB(unit_type);
- 	    return -1;
- 	}
- 
-@@ -119,11 +132,11 @@ static int bmPngReadContents(	png_info *
-     unsigned char *		buffer;
- 
-     numberOfPasses= 1;
--    if  ( pngi->interlace_type )
-+    if  ( png_get_interlace_type( png, pngi ) )
- 	{ numberOfPasses= png_set_interlace_handling( png ); }
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  pngi->bit_depth == 16				)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  png_get_bit_depth( png, pngi ) == 16			)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -133,9 +146,6 @@ static int bmPngReadContents(	png_info *
- 	}
- 
-     png_start_read_image( png );
--    /*
--    png_read_update_info( png, pngi );
--    */
- 
-     buffer= (unsigned char *)malloc( bd->bdBufferLength );
-     if  ( ! buffer )
-@@ -236,9 +246,9 @@ int bmPngReadPng(	BitmapDescription *	bd
- 
-     png_read_info( pngp, pngip );
- 
--    if  ( bpPngiToBitmap( pngip, bd ) )
-+    if  ( bpPngiToBitmap( pngp, pngip, bd ) )
- 	{
--	LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette); 
-+	LLDEB(bd->bdColorCount,bd->bdRGB8Palette); 
- 	png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
- 	return -1;
- 	}
-@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
- 
- static int bpPngiFromBitmap(	png_structp			png,
- 				png_info *			pngi,
-+				png_colorp *			pPalette,
- 				const BitmapDescription *       bd )
-     {
--    png_info_init( pngi );
--    pngi->width= bd->bdPixelsWide;
--    pngi->height= bd->bdPixelsHigh;
-+    int			bit_depth;
-+    int			color_type;
-+    png_color_8		sig_bit;
- 
-     switch( bd->bdUnit )
- 	{
- 	case BMunM:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= bd->bdXResolution;
--	    pngi->y_pixels_per_unit= bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    bd->bdXResolution,
-+			    bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunINCH:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
--	    pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    (int)( 39.37* bd->bdXResolution ),
-+			    (int)( 39.37* bd->bdYResolution ),
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPOINT:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
--	    pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    POINTS_PER_M* bd->bdXResolution,
-+			    POINTS_PER_M* bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPIXEL:
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
--	    pngi->x_pixels_per_unit= 1;
--	    pngi->y_pixels_per_unit= 1;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 
- 	default:
- 	    LDEB(bd->bdUnit);
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 	}
- 
-@@ -329,41 +338,48 @@ static int bpPngiFromBitmap(	png_structp
- 
- 	case BMcoBLACKWHITE:
- 	case BMcoWHITEBLACK:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
-+	    bit_depth= bd->bdBitsPerPixel;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_GRAY;	}
--	    pngi->sig_bit.gray= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_GRAY;		}
-+	    sig_bit.gray= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB:
--	    pngi->bit_depth= bd->bdBitsPerSample;
-+	    bit_depth= bd->bdBitsPerSample;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_RGB;		}
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_RGB;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB8PALETTE:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
--	    pngi->color_type= PNG_COLOR_TYPE_PALETTE;
-+	    bit_depth= bd->bdBitsPerPixel;
-+	    color_type= PNG_COLOR_TYPE_PALETTE;
- 
--	    pngi->valid |= PNG_INFO_PLTE;
--	    pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
--	    if  ( ! pngi->palette )
--		{ XDEB(pngi->palette); return -1;	}
--	    pngi->num_palette= bd->bdColorCount;
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
--	    for ( i= 0; i < pngi->num_palette; i++ )
-+	    if  ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
- 		{
--		pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
--		pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
--		pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
-+		return -1;
- 		}
-+
-+	    *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
-+						    sizeof( png_color ) );
-+	    if  ( ! *pPalette )
-+		{ XDEB(*pPalette); return -1;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
-+	    for ( i= 0; i < bd->bdColorCount; i++ )
-+		{
-+		(*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
-+		(*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
-+		(*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		}
-+
-+	    png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
- 	    break;
- 
- 	default:
-@@ -371,7 +387,13 @@ static int bpPngiFromBitmap(	png_structp
- 	    return -1;
- 	}
- 
--    pngi->interlace_type= 0;
-+    png_set_sBIT( png, pngi, &sig_bit );
-+    png_set_IHDR( png, pngi,
-+			bd->bdPixelsWide, bd->bdPixelsHigh,
-+			bit_depth, color_type,
-+			PNG_INTERLACE_NONE,
-+			PNG_COMPRESSION_TYPE_BASE,
-+			PNG_FILTER_TYPE_BASE );
- 
-     return 0;
-     }
-@@ -395,8 +417,8 @@ static void bmPngWriteContents(	png_stru
- 	    }
- 	}
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  bd->bdBitsPerSample == 16			)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  bd->bdBitsPerSample == 16				)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -431,9 +453,9 @@ static void bmPngWriteContents(	png_stru
- 	    from= scratch;
- 	    }
- 
--	if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	      bd->bdBitsPerSample == 16			&&
--	      scratch					)
-+	if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	      bd->bdBitsPerSample == 16					&&
-+	      scratch							)
- 	    {
- 	    int			col;
- 	    const BmUint16 *	fr= (const BmUint16 *)from;
-@@ -453,10 +475,6 @@ static void bmPngWriteContents(	png_stru
- 
-     png_write_end( png, pngi );
- 
--    if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	  pngi->palette					)
--	{ free( pngi->palette );	}
--
-     if  ( scratch )
- 	{ free( scratch );	}
- 
-@@ -510,50 +528,43 @@ int bmPngWritePng(		const BitmapDescript
- 				const unsigned char *		buffer,
- 				SimpleOutputStream *		sos )
-     {
-+    int			rval= 0;
-     png_structp		pngp= (png_structp)0;
-     png_infop		pngip= (png_infop)0;
-+    png_colorp		palette= (png_colorp)0;
- 
-     pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
- 				    (png_error_ptr)0, (png_error_ptr)0 );
-     if  ( ! pngp )
--	{ LDEB(1); return -1;	}
-+	{ XDEB(pngp); rval= -1; goto ready;	}
- 
-     pngip = png_create_info_struct( pngp );
-     if  ( ! pngip )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, (png_infop *)0 );
--	return -1;
--	}
-+	{ XDEB(pngip); rval= -1; goto ready;	}
-+
-+    /*
-+    As the info struct is built by libpng this is not needed:
-+    (The call will disappear from libpng in version 1.4)
-+    png_info_init( pngi ); 
-+    */
- 
-     if  ( setjmp( png_jmpbuf( pngp ) ) )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, &pngip );
--	/*  Crashes:
--	if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	      pngip->palette				)
--	    { free( pngip->palette );	}
--	*/
--	return -1;
--	}
-+	{ LDEB(1); rval= -1; goto ready;	}
- 
-     png_init_io( pngp, (FILE *)0 );
-     png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
- 
--    if  ( bpPngiFromBitmap( pngp, pngip, bd ) )
--	{
--	LDEB(bd->bdColorEncoding);
--	png_destroy_write_struct( &pngp, &pngip );
--	return -1;
--	}
--
--    /*
--    png_write_info( pngp, pngip );
--    */
-+    if  ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
-+	{ LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
- 
-     bmPngWriteContents( pngp, pngip, buffer, bd );
- 
-+  ready:
-+
-+    if  ( palette )
-+	{ free( palette );	}
-+
-     png_destroy_write_struct( &pngp, &pngip );
--    return 0;
-+
-+    return rval;
-     }
diff --git a/community-staging/winefish/PKGBUILD b/community-staging/winefish/PKGBUILD
deleted file mode 100644
index a907d0c50..000000000
--- a/community-staging/winefish/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 63889 2012-02-06 16:17:18Z tdziedzic $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Claudio Riva <firetux83@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=winefish
-pkgver=1.3.3
-pkgrel=11
-pkgdesc="LaTeX editor based on Bluefish with auto-completion and syntax highlighting"
-url="http://winefish.berlios.de/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'desktop-file-utils' 'shared-mime-info')
-makedepends=('pkgconfig')
-optdepends=('aspell: for spell check')
-install=$pkgname.install
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tgz)
-md5sums=('63531e4dde7a53ab3a74e1152c7af1e9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-update-databases \
-    --with-freedesktop_org-menu=/usr/share/applications \
-    --with-icon-path=/usr/share/pixmaps --mandir=/usr/share/man
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/winefish/winefish.install b/community-staging/winefish/winefish.install
deleted file mode 100644
index 8ae71b3e6..000000000
--- a/community-staging/winefish/winefish.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
diff --git a/community-staging/xmms-imms/PKGBUILD b/community-staging/xmms-imms/PKGBUILD
deleted file mode 100644
index a0d44ffe9..000000000
--- a/community-staging/xmms-imms/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63923 2012-02-06 18:36:35Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Kritoke <kritoke@nospam.gmail.com>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=xmms-imms
-pkgver=3.1.0_rc8
-pkgrel=3
-pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste."
-arch=(i686 x86_64)
-license=("GPL")
-url="http://imms.luminal.org/"
-depends=('xmms' 'pcre' 'sqlite3' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw')
-replaces=('imms')
-source=(http://imms.googlecode.com/files/imms-${pkgver/_/-}.tar.bz2)
-md5sums=('31b77cbc2dba334b039c5618bbbf203e')
-
-build() {
-  cd $srcdir/imms-${pkgver/_/-}
-
-  if [ $NOEXTRACT -ne 1 ]; then
-    autoheader
-    aclocal
-    autoconf
-    ./configure --prefix=/usr --disable-immsremote
-  fi
-
-  make || return 1
-  mkdir -p $pkgdir/usr/bin
-  make prefix=$pkgdir/usr DESTDIR=$startdir/pkg/usr/lib/xmms/General \
-	 BMPDESTDIR=$pkgdir/usr/lib/bmp/General install || return 1
-}
diff --git a/community-testing/amsn/PKGBUILD b/community-testing/amsn/PKGBUILD
deleted file mode 100644
index 2b2c84101..000000000
--- a/community-testing/amsn/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63431 2012-02-02 21:11:19Z jelle $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jeff Mickey <j@codemac.net>
-
-pkgname=amsn
-pkgver=0.98.4
-pkgrel=2
-pkgdesc="MSN client written in Tcl/Tk"
-arch=('i686' 'x86_64')
-url="http://amsn.sourceforge.net/"
-license=('GPL2')
-depends=('tk' 'tls')
-makedepends=('libjpeg' 'libpng' 'farsight2' 'libv4l')
-optdepends=('farsight2: for video conferencing')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2 amsn-0.98.4-libpng15.patch amsn-0.98.4-v4l2.patch)
-md5sums=('96fd20e8709ced4443432d125a5e0a5a'
-         '182eef321e78632499c24b3009c085ad'
-         '02d4ec8faed521387d6e44481f43c91a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patch for libpng15
-  patch -Np0 -i $srcdir/amsn-0.98.4-libpng15.patch
-
-  # patch for linux kernel header changes
-  patch -Np0 -i $srcdir/amsn-0.98.4-v4l2.patch
-  # python2 fix
-  for file in lang/missing.py plugins/music/infosongbird; do
-      sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file}
-  done
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/amsn/amsn-0.98.4-libpng15.patch b/community-testing/amsn/amsn-0.98.4-libpng15.patch
deleted file mode 100644
index 24f875d02..000000000
--- a/community-testing/amsn/amsn-0.98.4-libpng15.patch
+++ /dev/null
@@ -1,471 +0,0 @@
---- utils/TkCximage/src/CxImage/ximapng.cpp
-+++ utils/TkCximage/src/CxImage/ximapng.cpp
-@@ -15,7 +15,7 @@
- void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
- {
- 	strcpy(info.szLastError,message);
--	longjmp(png_ptr->jmpbuf, 1);
-+	longjmp(png_jmpbuf(png_ptr), 1);
- }
- ////////////////////////////////////////////////////////////////////////////////
- #if CXIMAGE_SUPPORT_DECODE
-@@ -62,7 +62,7 @@
-     /* Set error handling if you are using the setjmp/longjmp method (this is
-     * the normal method of doing things with libpng).  REQUIRED unless you
-     * set up your own error handlers in the png_create_read_struct() earlier. */
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		delete [] row_pointers;
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -77,15 +77,15 @@
- 	png_read_info(png_ptr, info_ptr);
- 
- 	if (info.nEscape == -1){
--		head.biWidth = info_ptr->width;
--		head.biHeight= info_ptr->height;
-+		head.biWidth = png_get_image_width(png_ptr, info_ptr);
-+		head.biHeight= png_get_image_height(png_ptr, info_ptr);
- 		info.dwType = CXIMAGE_FORMAT_PNG;
--		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	/* calculate new number of channels */
- 	int channels=0;
--	switch(info_ptr->color_type){
-+	switch(png_get_color_type(png_ptr, info_ptr)){
- 	case PNG_COLOR_TYPE_GRAY:
- 	case PNG_COLOR_TYPE_PALETTE:
- 		channels = 1;
-@@ -101,71 +101,76 @@
- 		break;
- 	default:
- 		strcpy(info.szLastError,"unknown PNG color type");
--		longjmp(png_ptr->jmpbuf, 1);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	//find the right pixel depth used for cximage
--	int pixel_depth = info_ptr->pixel_depth;
-+#if MIGHT_BE_BUGGY
-+	int pixel_depth = png_get_pixel_depth(png_ptr, info_ptr);
- 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
-+#endif
-+	int pixel_depth;
-+	if (channels == 1) pixel_depth=8;
- 	if (channels == 2) pixel_depth=8;
- 	if (channels >= 3) pixel_depth=24;
- 
--	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
--		longjmp(png_ptr->jmpbuf, 1);
-+	if (!Create(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), pixel_depth, CXIMAGE_FORMAT_PNG)){
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- 
- 	/* get metrics */
--	switch (info_ptr->phys_unit_type)
-+	png_uint_32 res_x, res_y;
-+	int unit_type;
-+	png_get_pHYs_dpi(png_ptr, info_ptr, &res_x, &res_y, &unit_type);
-+	switch (unit_type)
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
--		SetXDPI(info_ptr->x_pixels_per_unit);
--		SetYDPI(info_ptr->y_pixels_per_unit);
-+		SetXDPI(res_x);
-+		SetYDPI(res_y);
- 		break;
- 	case PNG_RESOLUTION_METER:
--		SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
--		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		SetXDPI((long)floor(res_x * 254.0 / 10000.0 + 0.5));
-+		SetYDPI((long)floor(res_y * 254.0 / 10000.0 + 0.5));
- 		break;
- 	}
- 
--	if (info_ptr->num_palette>0){
--		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
--		SetClrImportant(info_ptr->num_palette);
--	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
-+	if (num_palette>0){
-+		SetPalette((rgb_color*)palette,num_palette);
-+		SetClrImportant(num_palette);
-+	} else if (png_get_bit_depth(png_ptr, info_ptr) ==2) { //<DP> needed for 2 bpp grayscale PNGs
- 		SetPaletteColor(0,0,0,0);
- 		SetPaletteColor(1,85,85,85);
- 		SetPaletteColor(2,170,170,170);
- 		SetPaletteColor(3,255,255,255);
- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- 	
--	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
-+	int nshift = max(0,(png_get_bit_depth(png_ptr, info_ptr)>>3)-1)<<3;
- 
--	if (info_ptr->num_trans!=0){ //palette transparency
--		if (info_ptr->num_trans==1){
--			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--				info.nBkgndIndex = info_ptr->trans_color.index;
--#else
--				info.nBkgndIndex = info_ptr->trans_values.index;
--#endif
-+png_uint_32    png_get_tRNS   (png_const_structp   png_ptr,   png_infop
-+info_ptr,  png_bytep  *trans_alpha,   int   *num_trans,   png_color_16p
-+*trans_color);
-+	png_bytep trans_alpha;
-+	int num_trans;
-+	png_color_16p trans_color;
-+	png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
-+	if (num_trans!=0){ //palette transparency
-+		if (num_trans==1){
-+			if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE){
-+				info.nBkgndIndex = trans_color->index;
- 			} else{
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
--#else
--				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
--#endif
-+				info.nBkgndIndex = trans_color->gray>>nshift;
- 			}
- 		}
--		if (info_ptr->num_trans>1){
-+		if (num_trans>1){
- 			RGBQUAD* pal=GetPalette();
- 			if (pal){
- 				DWORD ip;
--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
--#else
--					pal[ip].rgbReserved=info_ptr->trans[ip];
--#endif
--				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
-+				for (ip=0;ip<min(head.biClrUsed,(unsigned long)num_trans);ip++)
-+					pal[ip].rgbReserved=trans_alpha[ip];
-+				for (ip=num_trans;ip<head.biClrUsed;ip++){
- 					pal[ip].rgbReserved=255;
- 				}
- 				info.bAlphaPaletteEnabled=true;
-@@ -178,15 +183,9 @@
- 		int num_trans;
- 		png_color_16 *image_background;
- 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
--			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
--			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
--#else
--			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
--			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
--			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
--#endif
-+			info.nBkgndColor.rgbRed   = (BYTE)(trans_color->red>>nshift);
-+			info.nBkgndColor.rgbGreen = (BYTE)(trans_color->green>>nshift);
-+			info.nBkgndColor.rgbBlue  = (BYTE)(trans_color->blue>>nshift);
- 			info.nBkgndColor.rgbReserved = 0;
- 			info.nBkgndIndex = 0;
- 		}
-@@ -202,15 +201,15 @@
- 	}
- 
- 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
--	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
-+	if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR){
- 		png_set_bgr(png_ptr);
- 	}
- 
- 	// <vho> - handle cancel
--	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
- 
- 	// row_bytes is the width x number of channels x (bit-depth / 8)
--	row_pointers = new BYTE[info_ptr->rowbytes + 8];
-+	row_pointers = new BYTE[png_get_rowbytes(png_ptr, info_ptr) + 8];
- 
- 	// turn on interlace handling
- 	int number_passes = png_set_interlace_handling(png_ptr);
-@@ -221,8 +220,10 @@
- 		SetCodecOption(0);
- 	}
- 
--	int chan_offset = info_ptr->bit_depth >> 3;
--	int pixel_offset = info_ptr->pixel_depth >> 3;
-+	int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
-+	int chan_offset = bit_depth >> 3;
-+	//int pixel_offset = info_ptr->pixel_depth >> 3;
-+	int pixel_offset = (bit_depth * channels) >> 3;
- 
- 	for (int pass=0; pass < number_passes; pass++) {
- 		iter.Upset();
-@@ -230,7 +231,7 @@
- 		do	{
- 
- 			// <vho> - handle cancel
--			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			if (AlphaIsValid()) {
-@@ -241,7 +242,7 @@
- 				BYTE* prow= iter.GetRow(ay);
- 
- 				//recover data from previous scan
--				if (info_ptr->interlace_type && pass>0 && pass!=7){
-+				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0 && pass!=7){
- 					for(ax=0;ax<head.biWidth;ax++){
- 						long px = ax * pixel_offset;
- 						if (channels == 2){
-@@ -278,10 +279,10 @@
- #endif // CXIMAGE_SUPPORT_ALPHA		// vho
- 			{
- 				//recover data from previous scan
--				if (info_ptr->interlace_type && pass>0){
--					iter.GetRow(row_pointers, info_ptr->rowbytes);
-+				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0){
-+					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
- 					//re-expand buffer for images with bit depth > 8
--					if (info_ptr->bit_depth > 8){
-+					if (png_get_bit_depth(png_ptr, info_ptr) > 8){
- 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
- 							row_pointers[ax*chan_offset] = row_pointers[ax];
- 					}
-@@ -291,15 +292,15 @@
- 				png_read_row(png_ptr, row_pointers, NULL);
- 
- 				//shrink 16 bit depth images down to 8 bits
--				if (info_ptr->bit_depth > 8){
-+				if (png_get_bit_depth(png_ptr, info_ptr) > 8){
- 					for(long ax=0;ax<(head.biWidth*channels);ax++)
- 						row_pointers[ax] = row_pointers[ax*chan_offset];
- 				}
- 
- 				//copy the pixels
--				iter.SetRow(row_pointers, info_ptr->rowbytes);
-+				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
- 				//<DP> expand 2 bpp images only in the last pass
--				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
-+				if (png_get_bit_depth(png_ptr, info_ptr)==2 && pass==(number_passes-1))
- 					expand2to4bpp(iter.GetRow());
- 
- 				//go on
-@@ -340,6 +341,11 @@
- 	BYTE trans[256];	//for transparency (don't move)
- 	png_struct *png_ptr;
- 	png_info *info_ptr;
-+	png_uint_32 width, height;
-+	png_byte bit_depth;
-+	png_byte color_type;
-+	png_byte interlace_type;
-+	BYTE channels;
- 
-   cx_try
-   {
-@@ -362,9 +368,8 @@
-    /* Set error handling.  REQUIRED if you aren't supplying your own
-     * error hadnling functions in the png_create_write_struct() call.
-     */
--	if (setjmp(png_ptr->jmpbuf)){
-+	if (setjmp(png_jmpbuf(png_ptr))){
- 		/* If we get here, we had a problem reading the file */
--		if (info_ptr->palette) free(info_ptr->palette);
- 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
- 		cx_throw("Error saving PNG file");
- 	}
-@@ -376,20 +381,18 @@
-     png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
- 
- 	/* set the file information here */
--	info_ptr->width = GetWidth();
--	info_ptr->height = GetHeight();
--	info_ptr->pixel_depth = (BYTE)GetBpp();
--	info_ptr->channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
--	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
--	info_ptr->compression_type = info_ptr->filter_type = 0;
--	info_ptr->valid = 0;
-+	width = GetWidth();
-+	height = GetHeight();
-+	//pixel_depth = (BYTE)GetBpp();
-+	channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
-+	bit_depth = (BYTE)(GetBpp()/channels);
- 
- 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
- 	case 1:
--		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
-+		interlace_type = PNG_INTERLACE_ADAM7;
- 		break;
- 	default:
--		info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+		interlace_type = PNG_INTERLACE_NONE;
- 	}
- 
- 	/* set compression level */
-@@ -399,19 +402,19 @@
- 
- 	if (GetNumColors()){
- 		if (bGrayScale){
--			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+			color_type = PNG_COLOR_TYPE_GRAY;
- 		} else {
--			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+			color_type = PNG_COLOR_TYPE_PALETTE;
- 		}
- 	} else {
--		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+		color_type = PNG_COLOR_TYPE_RGB;
- 	}
- #if CXIMAGE_SUPPORT_ALPHA
- 	if (AlphaIsValid()){
--		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
--		info_ptr->channels++;
--		info_ptr->bit_depth = 8;
--		info_ptr->pixel_depth += 8;
-+		color_type |= PNG_COLOR_MASK_ALPHA;
-+		channels++;
-+		bit_depth = 8;
-+		//pixel_depth += 8;
- 	}
- #endif
- 
-@@ -428,29 +431,21 @@
- 	/* set metrics */
- 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
- 
--	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
--				info_ptr->color_type, info_ptr->interlace_type,
-+	png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
-+				color_type, interlace_type,
- 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 
- 	//<DP> simple transparency
- 	if (info.nBkgndIndex >= 0){
--		info_ptr->num_trans = 1;
--		info_ptr->valid |= PNG_INFO_tRNS;
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--		info_ptr->trans_alpha = trans;
--		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
--		info_ptr->trans_color.red   = tc.rgbRed;
--		info_ptr->trans_color.green = tc.rgbGreen;
--		info_ptr->trans_color.blue  = tc.rgbBlue;
--		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
--#else
--		info_ptr->trans = trans;
--		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
--		info_ptr->trans_values.red   = tc.rgbRed;
--		info_ptr->trans_values.green = tc.rgbGreen;
--		info_ptr->trans_values.blue  = tc.rgbBlue;
--		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
--#endif
-+		png_color_16 trans_color;
-+
-+		trans_color.index = (BYTE)info.nBkgndIndex;
-+		trans_color.red   = tc.rgbRed;
-+		trans_color.green = tc.rgbGreen;
-+		trans_color.blue  = tc.rgbBlue;
-+		trans_color.gray  = (BYTE)info.nBkgndIndex;
-+
-+		png_set_tRNS(png_ptr, info_ptr, trans, 1, &trans_color);
- 
- 		// the transparency indexes start from 0 for non grayscale palette
- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-@@ -459,30 +454,27 @@
- 
- 	/* set the palette if there is one */
- 	if (GetPalette()){
--		if (!bGrayScale){
--			info_ptr->valid |= PNG_INFO_PLTE;
--		}
--
- 		int nc = GetClrImportant();
- 		if (nc==0) nc = GetNumColors();
- 
- 		if (info.bAlphaPaletteEnabled){
- 			for(WORD ip=0; ip<nc;ip++)
- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
--			info_ptr->num_trans = (WORD)nc;
--			info_ptr->valid |= PNG_INFO_tRNS;
--#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
--			info_ptr->trans_alpha = trans;
--#else
--			info_ptr->trans = trans;
--#endif
-+			png_set_tRNS(png_ptr, info_ptr, trans, (WORD)nc, NULL);
- 		}
- 
- 		// copy the palette colors
--		info_ptr->palette = new png_color[nc];
--		info_ptr->num_palette = (png_uint_16) nc;
--		for (int i=0; i<nc; i++)
--			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
-+		if (!bGrayScale) {
-+			png_color *palette;
-+
-+			palette = (png_color *)png_malloc(png_ptr, nc*sizeof(palette[0]));
-+			for (int i=0; i<nc; i++)
-+				GetPaletteColor(i, &palette[i].red, &palette[i].green, &palette[i].blue);
-+			png_set_PLTE(png_ptr, info_ptr, palette, nc);
-+			png_data_freer(png_ptr, info_ptr,
-+				       PNG_DESTROY_WILL_FREE_DATA,
-+				       PNG_FREE_PLTE);
-+		}
- 	}  
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
-@@ -496,8 +488,8 @@
- 	}	}	}
- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
- 
--	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
--	info_ptr->rowbytes = row_size;
-+	int row_size = max(info.dwEffWidth, png_get_rowbytes(png_ptr, info_ptr));
-+	//info_ptr->rowbytes = row_size;
- 	BYTE *row_pointers = new BYTE[row_size];
- 
- 	/* write the file information */
-@@ -515,7 +507,7 @@
- 			if (AlphaIsValid()){
- 				for (long ax=head.biWidth-1; ax>=0;ax--){
- 					c = BlindGetPixelColor(ax,ay);
--					int px = ax * info_ptr->channels;
-+					int px = ax * png_get_channels(png_ptr, info_ptr);
- 					if (!bGrayScale){
- 						row_pointers[px++]=c.rgbRed;
- 						row_pointers[px++]=c.rgbGreen;
-@@ -530,7 +522,7 @@
- #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			{
- 				iter.GetRow(row_pointers, row_size);
--				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+				if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) //HACK BY OP
- 					RGBtoBGR(row_pointers, row_size);
- 				png_write_row(png_ptr, row_pointers);
- 			}
-@@ -547,12 +539,6 @@
- 	/* It is REQUIRED to call this to finish writing the rest of the file */
- 	png_write_end(png_ptr, info_ptr);
- 
--	/* if you malloced the palette, free it here */
--	if (info_ptr->palette){
--		delete [] (info_ptr->palette);
--		info_ptr->palette = NULL;
--	}
--
- 	/* clean up after the write, and free any memory allocated */
- 	png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
- 
---- utils/TkCximage/src/CxImage/ximapng.h
-+++ utils/TkCximage/src/CxImage/ximapng.h
-@@ -64,8 +64,8 @@
- 
-     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- 	{
--		strncpy((char*)png_ptr->error_ptr,error_msg,255);
--		longjmp(png_ptr->jmpbuf, 1);
-+		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
-+		longjmp(png_jmpbuf(png_ptr), 1);
- 	}
- };
- 
diff --git a/community-testing/amsn/amsn-0.98.4-v4l2.patch b/community-testing/amsn/amsn-0.98.4-v4l2.patch
deleted file mode 100644
index 815a6ad19..000000000
--- a/community-testing/amsn/amsn-0.98.4-v4l2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Add support for v4l2 on Linux so it can compile against modern
-kernel headers. #363201
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- configure.ac
-+++ configure.ac
-@@ -382,6 +382,10 @@
- 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
- fi
- 
-+if test "$FOUND_OS" = "linux"; then
-+    AC_CHECK_HEADERS(linux/videodev2.h)
-+fi
-+
- #---------------------------------------------------------------------------------------------
- 
- dnl ---------------------------------------------------------------------
---- utils/linux/capture/capture.h
-+++ utils/linux/capture/capture.h
-@@ -33,7 +33,11 @@
- #ifdef HAVE_SYS_VIDEODEV2_H
- #   include <sys/videodev2.h>
- #else
--#   include <linux/videodev.h>
-+	#ifdef HAVE_LINUX_VIDEODEV2_H
-+		#include <linux/videodev2.h>
-+	#else
-+		#include <linux/videodev.h>
-+	#endif
- #endif
- 
- #include "grab-ng.h"
diff --git a/community-testing/amsn/amsn-jpeg7.patch b/community-testing/amsn/amsn-jpeg7.patch
deleted file mode 100644
index d9c9f103d..000000000
--- a/community-testing/amsn/amsn-jpeg7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/TkCximage/src/CxImage/ximajpg.cpp.orig	2009-07-18 05:29:43.000000000 -0300
-+++ utils/TkCximage/src/CxImage/ximajpg.cpp	2009-07-18 05:30:31.000000000 -0300
-@@ -142,6 +142,7 @@
-  */ //</DP>
- 
- 	// Set the scale <ignacio>
-+        SetJpegScale(8); // Set an initial value (FIX for jpeg-7)
- 	cinfo.scale_denom = GetJpegScale();
- 
- 	// Borrowed the idea from GIF implementation <ignacio>
diff --git a/community-testing/amsn/amsn-libpng14.patch b/community-testing/amsn/amsn-libpng14.patch
deleted file mode 100644
index 8b6e8a05d..000000000
--- a/community-testing/amsn/amsn-libpng14.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- utils/TkCximage/src/CxImage/ximapng.cpp	2008-03-07 20:14:37.000000000 +0100
-+++ utils/TkCximage/src/CxImage/ximapng.cpp_fixed	2010-01-28 23:08:13.000000000 +0100
-@@ -142,9 +142,9 @@
- 	if (info_ptr->num_trans!=0){ //palette transparency
- 		if (info_ptr->num_trans==1){
- 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
--				info.nBkgndIndex = info_ptr->trans_values.index;
-+				info.nBkgndIndex = info_ptr->trans_color.index;
- 			} else{
--				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
-+				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
- 			}
- 		}
- 		if (info_ptr->num_trans>1){
-@@ -152,7 +152,7 @@
- 			if (pal){
- 				DWORD ip;
- 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
--					pal[ip].rgbReserved=info_ptr->trans[ip];
-+					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
- 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
- 					pal[ip].rgbReserved=255;
- 				}
-@@ -166,9 +166,9 @@
- 		int num_trans;
- 		png_color_16 *image_background;
- 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
--			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
--			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
--			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
-+			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
-+			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
-+			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
- 			info.nBkgndColor.rgbReserved = 0;
- 			info.nBkgndIndex = 0;
- 		}
-@@ -417,12 +417,12 @@
- 	if (info.nBkgndIndex >= 0){
- 		info_ptr->num_trans = 1;
- 		info_ptr->valid |= PNG_INFO_tRNS;
--		info_ptr->trans = trans;
--		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
--		info_ptr->trans_values.red   = tc.rgbRed;
--		info_ptr->trans_values.green = tc.rgbGreen;
--		info_ptr->trans_values.blue  = tc.rgbBlue;
--		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
-+		info_ptr->trans_alpha = trans;
-+		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
-+		info_ptr->trans_color.red   = tc.rgbRed;
-+		info_ptr->trans_color.green = tc.rgbGreen;
-+		info_ptr->trans_color.blue  = tc.rgbBlue;
-+		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
- 
- 		// the transparency indexes start from 0 for non grayscale palette
- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-@@ -443,7 +443,7 @@
- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
- 			info_ptr->num_trans = (WORD)nc;
- 			info_ptr->valid |= PNG_INFO_tRNS;
--			info_ptr->trans = trans;
-+			info_ptr->trans_alpha = trans;
- 		}
- 
- 		// copy the palette colors
diff --git a/community-testing/amsn/amsn.changelog b/community-testing/amsn/amsn.changelog
deleted file mode 100644
index 8dab097ad..000000000
--- a/community-testing/amsn/amsn.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-2010-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.98.4
-
-2010-03-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.98.3
-
-2009-07-26  Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#15542 fixed in 0.97.2-14
diff --git a/community-testing/ario/PKGBUILD b/community-testing/ario/PKGBUILD
deleted file mode 100644
index 4c6a86ea3..000000000
--- a/community-testing/ario/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 63040 2012-01-30 18:51:46Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=ario
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster"
-arch=('i686' 'x86_64')
-url="http://ario-player.sourceforge.net/"
-license=('GPL')
-depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade' 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils')
-makedepends=('intltool' 'perl-xml-parser')
-options=('!libtool')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz)
-sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
- }
-
-package () {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/ario/ario.changelog b/community-testing/ario/ario.changelog
deleted file mode 100644
index baca8a7b1..000000000
--- a/community-testing/ario/ario.changelog
+++ /dev/null
@@ -1,36 +0,0 @@
-2012-01-26  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-	
-2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5.1
-
-2010-08-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5
-
-2010-02-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.4.4
-
-2010-01-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.4.3
-
-2009-12-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.4.2
-
-2009-12-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.4.1
-
-2009-12-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.4
-
-2009-05-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* 'taglib' dependency added - version 1.3-2
-
-2009-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.3
-
-2009-03-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* updated to major version 1.2.2
-
-2009-01-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* adopted in [community]
-	* updated to major version 1.2.1
diff --git a/community-testing/ario/ario.install b/community-testing/ario/ario.install
deleted file mode 100644
index b711352cb..000000000
--- a/community-testing/ario/ario.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/armagetronad/PKGBUILD b/community-testing/armagetronad/PKGBUILD
deleted file mode 100644
index f66768d68..000000000
--- a/community-testing/armagetronad/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 63042 2012-01-30 18:51:56Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com>
-
-pkgname=armagetronad
-pkgver=0.2.8.3.1
-pkgrel=3
-pkgdesc='A Tron Clone in 3D.'
-arch=('i686' 'x86_64')
-url='http://armagetronad.net/'
-license=('GPL')
-depends=('sdl_image' 'libxml2' 'sdl_mixer' 'mesa' 'ftgl')
-source=(http://downloads.sourceforge.net/sourceforge/armagetronad/armagetronad-$pkgver.src.tar.gz
-        armagetronad.desktop
-        gcc43.patch)
-md5sums=('ed8dbdec493de5cd4535a787f35eed1b'
-         '29d1b1231acadff12cf3014a3867ba5c'
-         '9045d99559ef33fc18136630e8de916c')
-
-build() {
-     cd armagetronad-$pkgver
-
-     # python2 fix
-     sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' language/update.py
-
-     sed -i 's|FTGL.h|ftgl.h|g' configure
-     sed -i 's|png_check_sig|png_sig_cmp|g' configure
-     patch -p1 < ../gcc43.patch
-     ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --mandir=/usr/share/man \
-        --disable-games \
-        --enable-automakedefaults
-     make
-     make DESTDIR=$pkgdir install
-     install -D -m 644 $srcdir/armagetronad.desktop $pkgdir/usr/share/applications/armagetronad.desktop
-     rm -rf $pkgdir/usr/share/applnk
-     rm $pkgdir/usr/bin/armagetronad-uninstall
-     mv $pkgdir/usr/bin/armagetronad $pkgdir/usr/bin/armagetronad_bin
-     printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > $pkgdir/usr/bin/armagetronad
-     chmod +x $pkgdir/usr/bin/armagetronad
-}
diff --git a/community-testing/armagetronad/armagetronad.desktop b/community-testing/armagetronad/armagetronad.desktop
deleted file mode 100644
index 125b4261d..000000000
--- a/community-testing/armagetronad/armagetronad.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Armagetronad
-GenericName=3D Tron clone
-GenericName[pl]=Klon gry Tron w 3D
-Exec=armagetronad
-Icon=/usr/share/armagetronad/desktop/icons/small/armagetronad.png
-Categories=Game;
-Terminal=false
-Type=Application
-Encoding=UTF-8
-StartupNotify=false
diff --git a/community-testing/armagetronad/gcc43.patch b/community-testing/armagetronad/gcc43.patch
deleted file mode 100644
index 358f48221..000000000
--- a/community-testing/armagetronad/gcc43.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -ur a/src/network/md5.cpp b/src/network/md5.cpp
---- a/src/network/md5.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/md5.cpp	2009-08-24 20:21:51.000000000 +0200
-@@ -75,7 +75,7 @@
-  */
- 
- #include "md5.h"
--
-+#include<cstring>
- #include <string>
- #include <memory>
- 
-Tylko w b/src/network: md5.cpp~
-diff -ur a/src/network/nNetwork.cpp b/src/network/nNetwork.cpp
---- a/src/network/nNetwork.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nNetwork.cpp	2009-08-24 20:20:40.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tMemManager.h"
- #include "tInitExit.h"
- #include "nSimulatePing.h"
-Tylko w b/src/network: nNetwork.cpp~
-diff -ur a/src/network/nNetwork.h b/src/network/nNetwork.h
---- a/src/network/nNetwork.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nNetwork.h	2009-08-24 20:21:18.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #ifndef ArmageTron_NET_H
- #define ArmageTron_NET_H
--
-+#include<cstring>
- #include "tError.h"
- #include "tString.h"
- #include "tHeap.h"
-Tylko w b/src/network: nNetwork.h~
-diff -ur a/src/network/nSocket.h b/src/network/nSocket.h
---- a/src/network/nSocket.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/network/nSocket.h	2009-08-24 20:22:09.000000000 +0200
-@@ -33,7 +33,7 @@
- 
- #ifndef NET_SOCKET_H
- #define NET_SOCKET_H
--
-+#include<cstring>
- #include <iostream>
- #include "tConsole.h"
- #include "tException.h"
-Tylko w b/src/network: nSocket.h~
-diff -ur a/src/render/rModel.h b/src/render/rModel.h
---- a/src/render/rModel.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/render/rModel.h	2009-08-24 20:20:57.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #ifndef ArmageTron_MODEL_H
- #define ArmageTron_MODEL_H
--
-+#include<cstring>
- #include "defs.h"
- #include "tArray.h"
- #include "tLinkedList.h"
-Tylko w b/src/render: rModel.h~
-diff -ur a/src/tools/tArray.cpp b/src/tools/tArray.cpp
---- a/src/tools/tArray.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tArray.cpp	2009-08-24 20:22:25.000000000 +0200
-@@ -27,7 +27,7 @@
- */
- 
- #define NO_MALLOC_REPLACEMENT
--
-+#include<cstring>
- #include "tMemManager.h"
- #include <iostream>
- #include <stdlib.h>
-Tylko w b/src/tools: tArray.cpp~
-diff -ur a/src/tools/tCommandLine.cpp b/src/tools/tCommandLine.cpp
---- a/src/tools/tCommandLine.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tCommandLine.cpp	2009-08-24 20:24:19.000000000 +0200
-@@ -30,7 +30,7 @@
- #ifndef		TCOMMANDLINE_H_INCLUDED
- #include	"tCommandLine.h"
- #endif
--
-+#include<cstring>
- #include    "tLocale.h"
- #include    "tConfiguration.h"
- #include    "tException.h"
-Tylko w b/src/tools: tCommandLine.cpp~
-diff -ur a/src/tools/tConfiguration.cpp b/src/tools/tConfiguration.cpp
---- a/src/tools/tConfiguration.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tConfiguration.cpp	2009-08-24 20:22:42.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "config.h"
- #include <fstream>
- #include <iomanip>
-Tylko w b/src/tools: tConfiguration.cpp~
-diff -ur a/src/tools/tCrypt.cpp b/src/tools/tCrypt.cpp
---- a/src/tools/tCrypt.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tCrypt.cpp	2009-08-24 20:22:54.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tCrypt.h"
- #include "tMemManager.h"
- 
-Tylko w b/src/tools: tCrypt.cpp~
-diff -ur a/src/tools/tDirectories.cpp b/src/tools/tDirectories.cpp
---- a/src/tools/tDirectories.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tDirectories.cpp	2009-08-24 20:23:06.000000000 +0200
-@@ -27,7 +27,7 @@
- */
- 
- #include "config.h"
--
-+#include<cstring>
- #include <errno.h>
- #include <sys/types.h>
- #include <stdio.h>
-Tylko w b/src/tools: tDirectories.cpp~
-diff -ur a/src/tools/tError.cpp b/src/tools/tError.cpp
---- a/src/tools/tError.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tError.cpp	2009-08-24 20:28:01.000000000 +0200
-@@ -24,8 +24,9 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "config.h"
-+#include<cstdlib>
- #include <iostream>
- #if HAVE_UNISTD_H
- #include <unistd.h>
-Tylko w b/src/tools: tError.cpp~
-diff -ur a/src/tools/tLocale.cpp b/src/tools/tLocale.cpp
---- a/src/tools/tLocale.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tLocale.cpp	2009-08-24 20:23:49.000000000 +0200
-@@ -30,7 +30,7 @@
- #include "tConsole.h"
- #include "tDirectories.h"
- #include "tSafePTR.h"
--
-+#include<cstring>
- #include <fstream>
- #include <string>
- #include <map>
-Tylko w b/src/tools: tLocale.cpp~
-diff -ur a/src/tools/tMemManager.cpp b/src/tools/tMemManager.cpp
---- a/src/tools/tMemManager.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tMemManager.cpp	2009-08-24 20:24:42.000000000 +0200
-@@ -29,7 +29,7 @@
- #define NO_MALLOC_REPLACEMENT
- 
- #include "defs.h"
--
-+#include<cstring>
- #include <iostream>
- #include <sstream>
- #include <stdio.h>  // need basic C IO since STL IO does memory management
-Tylko w b/src/tools: tMemManager.cpp~
-diff -ur a/src/tools/tRandom.cpp b/src/tools/tRandom.cpp
---- a/src/tools/tRandom.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tRandom.cpp	2009-08-24 20:24:31.000000000 +0200
-@@ -29,7 +29,7 @@
- #ifndef		TRANDOM_H_INCLUDED
- #include	"tRandom.h"
- #endif
--
-+#include<cstdlib>
- #ifdef      HAVE_STDLIB
- #include    <stdlib.h>
- #endif
-Tylko w b/src/tools: tRandom.cpp~
-diff -ur a/src/tools/tString.cpp b/src/tools/tString.cpp
---- a/src/tools/tString.cpp	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tools/tString.cpp	2009-08-24 20:24:03.000000000 +0200
-@@ -24,7 +24,7 @@
- ***************************************************************************
- 
- */
--
-+#include<cstring>
- #include "tMemManager.h"
- #include "tString.h"
- #include "tLocale.h"
-Tylko w b/src/tools: tString.cpp~
-diff -ur a/src/tron/gAIBase.h b/src/tron/gAIBase.h
---- a/src/tron/gAIBase.h	2009-08-24 20:08:14.000000000 +0200
-+++ b/src/tron/gAIBase.h	2009-08-24 20:21:33.000000000 +0200
-@@ -29,7 +29,7 @@
- #define ArmageTron_AIBASE_H
- 
- #include "rSDL.h"
--
-+#include<memory>
- #include "eTimer.h"
- #include "ePath.h"
- #include "ePlayer.h"
-Tylko w b/src/tron: gAIBase.h~
diff --git a/community-testing/blender/PKGBUILD b/community-testing/blender/PKGBUILD
deleted file mode 100644
index 824e25a61..000000000
--- a/community-testing/blender/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $
-# Contributor: John Sowiak <john@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-# 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.61
-pkgrel=5
-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' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'openimageio')
-makedepends=('cmake' 'boost' 'cuda-toolkit')
-optdepends=('cuda-toolkit: cycles renderer cuda support')
-options=(!strip)
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('11a4721ff92286f678bb2e05e5f29c97')
-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=ON \
-    -DOPENIMAGEIO_ROOT_DIR:STRING=/usr \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DWITH_CYCLES:BOOL=ON \
-    -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \
-    -DCUDA_TOOLKIT_ROOT_DIR:STRING=/opt/cuda-toolkit/ \
-    -DWITH_FFTW3:BOOL=ON \
-    -DWITH_MOD_OCEANSIM: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/community-testing/blender/blender.install b/community-testing/blender/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/community-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/community-testing/bti/PKGBUILD b/community-testing/bti/PKGBUILD
deleted file mode 100644
index ca2987c1b..000000000
--- a/community-testing/bti/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: uvok <uvok at online dot de>
-# Contributor: Urist <9362773 at gmail.com>
-
-pkgname=bti
-pkgver=032
-pkgrel=2
-pkgdesc='Console client for Twitter and identi.ca'
-arch=('i686' 'x86_64')
-url='http://gregkh.github.com/bti/'
-license=('GPL')
-depends=('pcre' 'libxml2' 'curl' 'liboauth')
-makedepends=('git')
-
-build() {
-  local _gitroot='git://github.com/gregkh/bti.git'
-  git clone ${_gitroot}
-
-  cd bti
-  git checkout ${pkgver}
-
-  ./autogen.sh
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd bti
-  
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/bwbar/PKGBUILD b/community-testing/bwbar/PKGBUILD
deleted file mode 100644
index 06a608c23..000000000
--- a/community-testing/bwbar/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 63046 2012-01-30 18:52:14Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Mark Rosenstand <mark@borkware.net>
-
-pkgname=bwbar
-pkgver=1.2.3
-pkgrel=3
-arch=(i686 x86_64)
-pkgdesc="Generates text and graphical readout of the current bandwidth usage."
-url="http://www.kernel.org/pub/software/web/bwbar/"
-license=("GPL")
-depends=('libpng')
-#source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz)
-source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz)
-md5sums=('766265ddf0615b552ff19d12f78be719')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i '1,1i#include <zlib.h>' bwbar.c
-  sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' bwbar.c
-  ./configure
-  make
-  install -D -m755 bwbar $pkgdir/usr/bin/bwbar
-}
diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD
deleted file mode 100644
index 39e582e95..000000000
--- a/community-testing/calibre/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 63443 2012-02-03 14:01:38Z 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.38
-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.xz"
-        'desktop_integration.patch'
-        'calibre-mount-helper')
-md5sums=('4d054354bbede1ea74a063cac6688a48'
-         '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-testing/calibre/calibre-mount-helper b/community-testing/calibre/calibre-mount-helper
deleted file mode 100644
index 00cac4270..000000000
--- a/community-testing/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-testing/calibre/calibre.install b/community-testing/calibre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/community-testing/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-testing/calibre/desktop_integration.patch b/community-testing/calibre/desktop_integration.patch
deleted file mode 100644
index 4dbf53757..000000000
--- a/community-testing/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-testing/caph/PKGBUILD b/community-testing/caph/PKGBUILD
deleted file mode 100644
index 0d99f5aca..000000000
--- a/community-testing/caph/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63050 2012-01-30 18:52:36Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: jose <jose1711 [at] gmail (dot) com>
-
-pkgname=caph
-arch=('i686' 'x86_64')
-pkgver=1.1
-pkgrel=2
-pkgdesc="A sandbox game based on physics which uses doodles as a primary gameplay element"
-license=('GPL')
-url="http://sourceforge.net/projects/caphgame/"
-depends=('sdl' 'libgl' 'libpng')
-makedepends=('mesa')
-source=("http://sourceforge.net/projects/caphgame/files/caph/caphgame-${pkgver}/caph-${pkgver}.tar.bz2" 
-        "caph.desktop")
-md5sums=('dbc2cfbb5cd98a77c5b731515d3a77b9'
-         '79c6448995026f77fd912dd109b50287')
-
-build() {
-  cd $srcdir/caph-${pkgver}/src
-  mkdir -p $pkgdir/usr/{bin,share/{caph/maps,doc/caph}}
-  ./confg
-  ./build
-}
-
-package() {
-  cd $srcdir/caph-${pkgver}/src
-  install -D -m755 ./caph $pkgdir/usr/bin/caph
-  install -D -m644 ../doc/caph/* $pkgdir/usr/share/doc/caph/ || true
-  install -D -m644 ../share/caph/* $pkgdir/usr/share/caph/ || true
-  install -D -m644 ../share/caph/maps/* $pkgdir/usr/share/caph/maps || true
-  install -D -m644 $srcdir/caph.desktop $pkgdir/usr/share/applications/caph.desktop
-  install -D -m644 ../share/caph/brush.png $pkgdir/usr/share/pixmaps/caph.png
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/caph/caph.desktop b/community-testing/caph/caph.desktop
deleted file mode 100644
index 6cc6c711c..000000000
--- a/community-testing/caph/caph.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Caph
-Comment=Sandbox game based on physics
-Exec=caph
-Icon=caph.png
-Categories=Game;LogicGame;
diff --git a/community-testing/cclive/PKGBUILD b/community-testing/cclive/PKGBUILD
deleted file mode 100644
index 6798ff79e..000000000
--- a/community-testing/cclive/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 64053 2012-02-08 23:51:06Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: joyfulgirl@archlinux.us
-# Contributor: nathan owe ndowens04 at gmail dot com
-
-pkgname=cclive
-pkgver=0.7.8
-pkgrel=2
-pkgdesc='Commandline downloader for popular video websites.'
-arch=('i686' 'x86_64')
-url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('01ffbe54e48440721b3c283c993928f1')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/ccze/PKGBUILD b/community-testing/ccze/PKGBUILD
deleted file mode 100644
index 909f73b7e..000000000
--- a/community-testing/ccze/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 64055 2012-02-08 23:51:14Z allan $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> 
-
-pkgname=ccze
-pkgver=0.2.1
-pkgrel=6
-pkgdesc="Robust and modular log colorizer with many plugins"
-arch=('i686' 'x86_64')
-url="http://freshmeat.net/projects/ccze/"
-license=('GPL')
-depends=('ncurses' 'pcre')
-makedepends=('patch')
-source=(ftp://ftp.debian.org/debian/pool/main/c/$pkgname/${pkgname}_${pkgver}.orig.tar.gz \
-        $pkgname-fix-segfault.diff)
-md5sums=('221966bce7c5f011eca38157241a0432'
-         '294e82702d179264abc43596da955358')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  patch -Np0 -i ${srcdir}/$pkgname-fix-segfault.diff
-
-  #killing a bug
-  sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' -i src/Makefile.in
-  sed -e '/#undef error_t/d' -i system.h.in
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/ccze/ccze-fix-segfault.diff b/community-testing/ccze/ccze-fix-segfault.diff
deleted file mode 100644
index b2ca7d815..000000000
--- a/community-testing/ccze/ccze-fix-segfault.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ccze.c.orig	2003-05-13 20:09:30.000000000 +0200
-+++ src/ccze.c	2010-08-29 18:14:53.000000000 +0200
-@@ -212 +212 @@
--      plugin = strtok (optarg, "=");
-+      plugin = strtok (arg, "=");
-@@ -252 +252 @@
--      subopts = optarg;
-+      subopts = arg;
-@@ -276 +276 @@
--      subopts = optarg;
-+      subopts = arg;
diff --git a/community-testing/cegui/PKGBUILD b/community-testing/cegui/PKGBUILD
deleted file mode 100644
index 7b1b78783..000000000
--- a/community-testing/cegui/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 64057 2012-02-08 23:51:21Z allan $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>, 
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-
-pkgname=cegui
-pkgver=0.7.6
-pkgrel=2
-pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
-arch=('i686' 'x86_64')
-url="http://crayzedsgui.sourceforge.net"
-#options=('!libtool')
-license=("MIT")
-depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
-makedepends=('python2' 'doxygen')
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
-options=(!libtool)
-md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3')
-
-build() {
-  cd $srcdir/CEGUI-${pkgver}
-
-  sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-xerces-c \
-    --enable-null-renderer
-
-  make
-}
-
-package() {
-  cd $srcdir/CEGUI-${pkgver}
- 
-  make DESTDIR=${pkgdir} install
-
-  #build docs                                                                                                                                 
-  cd doc/doxygen && doxygen                                                                                                                   
-  cd .. && make DESTDIR=${pkgdir} install-html
-
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/community-testing/cherokee/PKGBUILD b/community-testing/cherokee/PKGBUILD
deleted file mode 100644
index 400858e94..000000000
--- a/community-testing/cherokee/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 64059 2012-02-08 23:51:31Z allan $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=cherokee
-pkgver=1.2.101
-pkgrel=3
-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 100644
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/clanlib/PKGBUILD b/community-testing/clanlib/PKGBUILD
deleted file mode 100644
index aa424de20..000000000
--- a/community-testing/clanlib/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 63054 2012-01-30 18:52:49Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=clanlib
-pkgver=2.3.4
-pkgrel=2
-pkgdesc="A multi-platform game development library."
-arch=('i686' 'x86_64')
-url="http://clanlib.org/"
-license=('zlib')
-depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3')
-makedepends=('doxygen' 'graphviz')
-options=('!libtool')
-source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz)
-md5sums=('cc89f632aa194399e909bbbd13beca1b')
-
-build() { 
-	cd ${srcdir}/ClanLib-${pkgver}
-
-	./configure --prefix=/usr --enable-docs
-
-	make
-  # Somehow this breaks. :(
-	#make html
-}
-
-package() {
-	cd ${srcdir}/ClanLib-${pkgver}
-
-	make DESTDIR=${pkgdir} install
-	#make DESTDIR=${pkgdir} install-html
-
-	install -d ${pkgdir}/usr/share/licenses/${pkgname}
-	install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/compiz/PKGBUILD b/community-testing/compiz/PKGBUILD
deleted file mode 100644
index 0d049ce7c..000000000
--- a/community-testing/compiz/PKGBUILD
+++ /dev/null
@@ -1,125 +0,0 @@
-# $Id: PKGBUILD 17032 2010-05-17 11:13:51Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Hussam Al-Tayeb ht990332@gmail.com
-# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net>
-# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-
-pkgbase=compiz
-pkgname=('compiz-core'
-	'compiz-decorator-kde'
-	'compiz-decorator-gtk')
-pkgver=0.8.8
-pkgrel=3
-pkgdesc="Composite manager for Aiglx and Xgl"
-url="http://www.compiz.org/"
-license=('GPL' 'LGPL' 'MIT')
-arch=('i686' 'x86_64')
-groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion')
-makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace'
- 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity')
-options=(!libtool !emptydirs)
-conflicts=('compiz' 'compiz-core-git' 'compiz-git')
-replaces=('compiz')
-source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch)
-sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e'
-          '148656352f8a20b3781ee185025c5c8d4b7d720f')
-
-build()
-{
-  cd "$srcdir/compiz-$pkgver"
-  patch -p1 -i ../compiz-build.patch
-  ./configure   --prefix=/usr \
-	    --enable-gnome \
-	    --enable-gtk \
-	    --enable-metacity \
-	    --enable-gconf \
-            --with-gconf-schema-file-dir=/etc/gconf/schemas \
-	    --enable-dbus \
-	    --enable-librsvg \
-	    --disable-kde \
-	    --enable-kde4
-
-  make
-}
-
-package_compiz-core()
-{
-
-  pkgdesc="Composite manager for Aiglx and Xgl"
-  depends=('startup-notification' 'librsvg' \
-         'libgl' 'dbus' 'mesa' 'libxslt' 'fuse')
-
-  cd "$srcdir/compiz-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the decorations
-   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
-   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
-   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
-   rm -rf "${pkgdir}"/etc
-
-  # install MIT license
-  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
-	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
-}
-
-package_compiz-decorator-gtk()
-{
-  pkgdesc="Compiz decorator for GNOME"
-  depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity')
-  install=compiz-decorator-gtk.install
-
-  cd "$srcdir/compiz-$pkgver"
-
-  pushd gtk
-  make DESTDIR="$pkgdir" install
-  install -Dm644 window-decorator/gwd.schemas \
-                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
-  popd
-
-  for i in dbus gconf ini inotify png regex svg glib kconfig
-  do
-    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
-  done
-
-  gconf-merge-schema \
-    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
-        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
-
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the other packages
-   rm -rf "${pkgdir}"/etc
-   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
-   rm -rf "$pkgdir"/usr/include
-   cd "$pkgdir"/usr/lib
-   rm libdecoration*
-   rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
-   cd "${pkgdir}"/usr/lib/compiz
-   rm $(ls --hide=*gconf*)
-   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
-   
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
-}
-
-package_compiz-decorator-kde()
-{
-  pkgdesc="Compiz decorator for KDE"
-  depends=('kdebase-workspace' 'compiz-core')
-
-  cd "$srcdir"/compiz-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Let's remove stuff that are in compiz-core package or gtk decorator
-  rm -rf "$pkgdir"/usr/{include,lib}
-  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
-
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
-}
-
diff --git a/community-testing/compiz/compiz-build.patch b/community-testing/compiz/compiz-build.patch
deleted file mode 100644
index f22a3fa21..000000000
--- a/community-testing/compiz/compiz-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
-+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
-@@ -986,10 +986,10 @@
- {
-     Atom    atom = Atoms::compizWindowBlurDecor;
-     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    Region  topRegion = NULL;
--    Region  bottomRegion = NULL;
--    Region  leftRegion = NULL;
--    Region  rightRegion = NULL;
-+    ::Region  topRegion = NULL;
-+    ::Region  bottomRegion = NULL;
-+    ::Region  leftRegion = NULL;
-+    ::Region  rightRegion = NULL;
-     int     size = 0;
-     int     w, h;
- 
diff --git a/community-testing/compiz/compiz-decorator-gtk.install b/community-testing/compiz/compiz-decorator-gtk.install
deleted file mode 100644
index b3738fda9..000000000
--- a/community-testing/compiz/compiz-decorator-gtk.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-}
-
-post_remove() {
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-}
-
diff --git a/community-testing/coq/PKGBUILD b/community-testing/coq/PKGBUILD
deleted file mode 100644
index 15223d9d4..000000000
--- a/community-testing/coq/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: George Giorgidze <giorgidze@gmail.com>
-
-pkgname=coq
-pkgver=8.3pl3
-pkgrel=2
-pkgdesc='Formal proof management system.'
-arch=('i686' 'x86_64')
-url='http://coq.inria.fr/'
-license=('GPL')
-options=('!emptydirs')
-depends=('gtk2' 'lablgtk2' 'ocaml')
-makedepends=('camlp5-transitional' 'netpbm' 'hevea')
-source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz")
-md5sums=('37e9a52110a025128667c03fed75f9c2')
-
-build() {
-  cd coq-${pkgver}
-
-  ./configure \
-    -prefix '/usr' \
-    -mandir '/usr/share/man' \
-    -opt \
-    -with-doc yes
-
-  make world
-
-  make doc-html
-}
-
-package() {
-  cd coq-${pkgver}
-
-  make COQINSTALLPREFIX=${pkgdir} install
-
-  make COQINSTALLPREFIX=${pkgdir} install-doc-html
-}
diff --git a/community-testing/courier-maildrop/PKGBUILD b/community-testing/courier-maildrop/PKGBUILD
deleted file mode 100644
index e11ea49ca..000000000
--- a/community-testing/courier-maildrop/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 57086 2009-10-31 13:13:36Z allan $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=courier-maildrop
-_srcname=maildrop
-pkgver=2.5.5
-pkgrel=2
-pkgdesc="mail delivery agent - procmail like but nicer syntax"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://courier-mta.org/maildrop/"
-depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm')
-conflicts=('courier-mta')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2)
-md5sums=('5d71455ab26096ecf4f624fbee0320cb')
-
-build() {
-  cd ${srcdir}/${_srcname}-${pkgver}
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/courier \
-    --localstatedir=/var \
-    --mandir=/usr/share/man \
-    --with-db=gdbm \
-    --with-devel
-  make LDFLAGS+=-lstdc++
-}
-
-package() {
-  cd ${srcdir}/${_srcname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-  chmod u+s ${pkgdir}/usr/bin/maildrop
-  cd ${pkgdir}/usr/share/maildrop/html
-  for files in *; do
-    install -Dm644 ${files} ${pkgdir}/usr/share/htmldoc/${files}
-  done
-  rm -rf ${pkgdir}/usr/share/maildrop
-
-  # docs say we can remove .a files after make
-  cd ${pkgdir}
-  find ${pkgdir} -name '*\.a' -exec rm -f {} \;
-}
diff --git a/community-testing/courier-mta/PKGBUILD b/community-testing/courier-mta/PKGBUILD
deleted file mode 100644
index 52deb71eb..000000000
--- a/community-testing/courier-mta/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-# -----------  NOTE TO ALL USERS ------------
-# Go read http://www.courier-mta.org/install.html b4 running or building courier
-
-pkgname=courier-mta
-pkgver=0.67.0
-pkgrel=2
-pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig"
-arch=(i686 x86_64)
-license=('GPL2')
-backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \
-        'etc/courier/imapd' 'etc/courier/imapd-ssl' \
-        'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \
-        'etc/courier/courierd' 'etc/courier/sqwebmaild' \
-        'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \
-        'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \
-        'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \
-        'etc/conf.d/courier-mta')
-url="http://courier-mta.org"
-depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates')
-optdepends=('libldap')
-makedepends=('apache' 'pam' 'expect' 'gnupg' 'libldap' 'gamin')
-provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop')
-conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp')
-options=('!libtool')
-install=courier-mta.install
-source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2
-        courier.rc.d
-        courier-mta.rc.d 
-		courier-mta.conf.d
-        esmtpd.rc.d
-        esmtpd-ssl.rc.d
-        esmtpd-msa.rc.d
-        imapd.rc.d
-        imapd-ssl.rc.d
-        pop3d.rc.d
-        pop3d-ssl.rc.d
-        webmaild.rc.d)
-md5sums=('c2e26499f9f48577aa7a0735f5e96997'
-         '9055ba622efd37603186ce1f37277224'
-         '5cbeb5c323706058e545f74ad7752ebe'
-         'f3ff70b40c7a1f7a017e8c4cc4d92f4f'
-         'caabce8c7b66296b602316aa5af5d4c5'
-         '1c8b1b66ebafa4ff09ffc0106a9dc82c'
-         'dae6c7d5ff0cce0fba5729fedf2a9051'
-         'd0cc5eab5d3e0ec33dadd0392421f63e'
-         '5873a96aa149edda281730010fb4db34'
-         'faa09e06a5dc41ee89ab1f8fa6886b63'
-         '520501daa66c0a94f2e9844ce4919a09'
-         '33a93f400c3e87bcd207295b7d7333ca')
-
-# MIGRATION NOTE:
-# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed.
-# Remove those files and this note and also courier-mta.install
-
-build() {
-  cd ${srcdir}/courier-${pkgver}
-
-  # fix a tiny bug
-  sed -i -e \
-    's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \
-    configure && chmod 755 configure
-
-  LDFLAGS+=",-L /usr/lib/courier-authlib -lcourierauth"
-  echo $LDFLAGS
-  # courier is more about configuring than compiling :-), lets start the mess
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/courier \
-    --libdir=/usr/lib \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var/spool/courier \
-    --disable-root-check \
-    --enable-unicode \
-    --enable-workarounds-for-imap-client-bugs \
-    --enable-mimetypes=/etc/mime.types \
-    --with-piddir=/var/run/courier \
-    --with-locking-method=lockf \
-    --with-trashquota \
-    --with-db=gdbm \
-    --with-trashquota \
-    --with-random=/dev/urandom --without-ispell \
-    --with-mailuser=courier --with-mailgroup=courier \
-    --with-certdb=/etc/ssl/certs/
-  make
-}
-
-package() {
-  cd ${srcdir}/courier-${pkgver}
-
-  #chown mail.mail ${pkgdir}/var/spool/courier
-  make DESTDIR=${pkgdir} install
-  # docs say we can get rid of those after make
-  find ${pkgdir} -name '*\.a' -exec -rm -f {} \;
-  # install the perftest-script for testings
-  install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1
-  ###############################################################################
-  # this is what usually "make install-configure" does
-  # *.dist files get rid of "dist"
-  for distfile in ${pkgdir}/etc/courier/*.dist; do
-    mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist)
-  done
-  # install pam files according to the layout used in Archlinux
-  for pamfile in ${pkgdir}/etc/courier/*.authpam; do
-    sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile}
-    #echo "password  required  pam_unix.so" >> $pamfile
-    install -Dm 644 ${pamfile} \
-      ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//")
-    rm -f ${pamfile}
-  done
-
-  ###############################################################################
-  # Arch Linux specific tweaks to make things easier for the user
-  # create passwordfile for webadmin -> standard archwebadmin
-  sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile
-  yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password
-  # arch specific scripts
-  install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta
-  install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta
-  install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier
-  install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd
-  install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl
-  install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d
-  install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl
-  install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd
-  install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl
-  install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa
-  install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild
-   #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \
-   # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache
-  # bug http://bugs.archlinux.org/task/5154
-   find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \;
-  # fixing some permissions
-   chown -R courier:courier ${pkgdir}/usr/lib/courier/modules
-   rm -r ${pkgdir}/var/run
-   #chown -R courier:courier ${pkgdir}/var/run/courier
-   chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share}
-  # make a link to /usr/sbin/sendmail
-   install -dm 755 ${pkgdir}/usr/sbin
-   cd ${pkgdir}/usr/sbin
-   ln -s ../bin/sendmail ./sendmail
-}
diff --git a/community-testing/courier-mta/courier-mta.conf.d b/community-testing/courier-mta/courier-mta.conf.d
deleted file mode 100644
index 5856a5cda..000000000
--- a/community-testing/courier-mta/courier-mta.conf.d
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Parameters to be passed to courier-imap
-#
-#
-# Select the service you want started with courier-imap
-#
-# Available options :
-# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild
-#
-CI_DAEMONS="courier esmtpd imapd pop3d"
-
-# If you want authdaemond to be automatically started and
-# stopped by courier-imap, set this to "true"
-AUTO_AUTHDAEMON="false"
-
-# Courier will start this many seconds after autodaemond if
-# AUTO_AUTHDAEMON is set to "true"
-AUTO_AUTHDAEMON_LAG=2
diff --git a/community-testing/courier-mta/courier-mta.install b/community-testing/courier-mta/courier-mta.install
deleted file mode 100644
index b0d827e43..000000000
--- a/community-testing/courier-mta/courier-mta.install
+++ /dev/null
@@ -1,61 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
- --> if you are using LDAP services to provide lookup in sqwebmail or aliases
- --> then you have to install:
-          libldap
-EOM
-   # create the *.dat files
-  makealiases
-  makesmtpaccess
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-  echo "Please migrate to the new daemon format:"
-  echo "/etc/rc.d/courier-imap has been split into separate daemons:"
-  echo "    imapd, imapd-ssl, pop3d, pop3d-ssl"
-  echo "This elimates the need for /etc/conf.d/courier-imap"
-  echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure"
-  echo "you first start authdaemond before any other of these daemons."
-  echo "Example prior to this change:"
-  echo "    DAEMONS=( ... courier-mta ...)"
-  echo "Example after this change:"
-  echo "    DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl"
-  echo "                  pop3d pop3d-ssl webmaild ... )"
-  echo "This allows better control over the daemons and will generate"
-  echo "correct entries in /run/daemons"
-  echo "An old configuration will keep working but please do migrate in time"
-  echo "as support for this will be removed some time in 2012."
-}
-
-
-pre_remove() {
-   # manual backup, since courier is always processing the whole directory
-   # - so it would process "system" AND "system.pacsave" -> bad
-  [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup
-  cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system
-  cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default
-  cat << EOM
- --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default
- --> files have been backed up to /etc/courier/_backup since the *.pacsave
- --> files cannot stay in place. Read about couriers alias handling from the
- --> documentation!
-EOM
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/community-testing/courier-mta/courier-mta.rc.d b/community-testing/courier-mta/courier-mta.rc.d
deleted file mode 100644
index 416946a5a..000000000
--- a/community-testing/courier-mta/courier-mta.rc.d
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta
-[ -z $AUTO_AUTHDAEMON_LAG ]   && AUTO_AUTHDAEMON_LAG=2
-[ -z $AUTO_AUTHDAEMON ]       && AUTO_AUTHDAEMON="false"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if [ "$AUTO_AUTHDAEMON" == "true" ]; then
-      /etc/rc.d/authdaemond start
-      sleep ${AUTO_AUTHDAEMON_LAG}
-    fi
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-    for daemon in $CI_DAEMONS; do
-      stat_busy "Starting Courier ${daemon}"
-      /usr/sbin/${daemon} start
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon $daemon
-        stat_done
-      fi
-    done
-    ;;
-  stop)
-    for daemon in $CI_DAEMONS; do
-      stat_busy "Stopping Courier ${daemon}"
-      /usr/sbin/${daemon} stop > /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon $daemon
-        stat_done
-      fi
-    done
-    if [ "$AUTO_AUTHDAEMON" == "true" ]; then
-      /etc/rc.d/authdaemond stop
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly b/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly
deleted file mode 100644
index 6c541321e..000000000
--- a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Cleans the cache of the sqwebmail server
-if [ -x /usr/share/sqwebmail/cleancache.pl ]; then
-  su -c "/usr/share/sqwebmail/cleancache.pl" bin
-fi
diff --git a/community-testing/courier-mta/courier.rc.d b/community-testing/courier-mta/courier.rc.d
deleted file mode 100644
index 7c581a24a..000000000
--- a/community-testing/courier-mta/courier.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier daemon"
-    /usr/sbin/courier start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon courier
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier daemon"
-    /usr/sbin/courier stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon courier
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/esmtpd-msa.rc.d b/community-testing/courier-mta/esmtpd-msa.rc.d
deleted file mode 100644
index 31458aca8..000000000
--- a/community-testing/courier-mta/esmtpd-msa.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier esmtpd-msa"
-    /usr/sbin/esmtpd-msa start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon esmtpd-msa
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier esmtpd-msa"
-    /usr/sbin/esmtpd-msa stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon esmtpd-msa
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/esmtpd-ssl.rc.d b/community-testing/courier-mta/esmtpd-ssl.rc.d
deleted file mode 100644
index 2a13be03f..000000000
--- a/community-testing/courier-mta/esmtpd-ssl.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier esmtpd-ssl"
-    /usr/sbin/esmtpd-ssl start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon esmtpd-ssl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier esmtpd-ssl"
-    /usr/sbin/esmtpd-ssl stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon esmtpd-ssl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/esmtpd.rc.d b/community-testing/courier-mta/esmtpd.rc.d
deleted file mode 100644
index dbaa9d680..000000000
--- a/community-testing/courier-mta/esmtpd.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier esmtpd"
-    /usr/sbin/esmtpd start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon esmtpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier esmtpd"
-    /usr/sbin/esmtpd stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon esmtpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/imapd-ssl.rc.d b/community-testing/courier-mta/imapd-ssl.rc.d
deleted file mode 100644
index 3dc74cfdf..000000000
--- a/community-testing/courier-mta/imapd-ssl.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier imapd-ssl"
-    /usr/sbin/imapd-ssl start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon imapd-ssl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier imapd-ssl"
-    /usr/sbin/imapd-ssl stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon imapd-ssl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/imapd.rc.d b/community-testing/courier-mta/imapd.rc.d
deleted file mode 100644
index 8bce59f6c..000000000
--- a/community-testing/courier-mta/imapd.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier imapd"
-    /usr/sbin/imapd start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon imapd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier imapd"
-    /usr/sbin/imapd stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon imapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/pop3d-ssl.rc.d b/community-testing/courier-mta/pop3d-ssl.rc.d
deleted file mode 100644
index 6e7ae4e12..000000000
--- a/community-testing/courier-mta/pop3d-ssl.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier pop3d-ssl"
-    /usr/sbin/pop3d-ssl start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pop3d-ssl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier pop3d-ssl"
-    /usr/sbin/pop3d-ssl stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pop3d-ssl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/pop3d.rc.d b/community-testing/courier-mta/pop3d.rc.d
deleted file mode 100644
index 25f8379ba..000000000
--- a/community-testing/courier-mta/pop3d.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier pop3d"
-    /usr/sbin/pop3d start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pop3d
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier pop3d"
-    /usr/sbin/pop3d stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pop3d
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/courier-mta/webmaild.rc.d b/community-testing/courier-mta/webmaild.rc.d
deleted file mode 100644
index 835cc2bf0..000000000
--- a/community-testing/courier-mta/webmaild.rc.d
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-
-    [ -d /var/run/courier ] || mkdir -p /var/run/courier
-	chown courier:courier /var/run/courier
-    
-    if ck_daemon authdaemond; then
-      echo "ERROR: authdaemond is not running"
-      stat_fail
-      exit 1
-    fi
-
-    stat_busy "Starting Courier webmaild"
-    /usr/sbin/webmaild start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon webmaild
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Courier webmaild"
-    /usr/sbin/webmaild stop > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon webmaild
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/critter/PKGBUILD b/community-testing/critter/PKGBUILD
deleted file mode 100644
index 078c9650d..000000000
--- a/community-testing/critter/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 63060 2012-01-30 18:53:12Z ibiru $
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us>
-
-pkgname=critter
-_origname=CriticalMass
-pkgver=1.0.2
-pkgrel=6
-pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/criticalmass"
-license=('GPL')
-depends=('sdl_image' 'sdl_mixer' 'mesa')
-source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2
-        critter-gcc43.patch
-        criticalmass-1.0.2-libpng15.patch
-        critter.desktop)
-md5sums=('e2aff114bffa717fb79c82e1dc473ebe'
-         'e936920acce56bfa3b0123ca8b1193a6'
-         '76448ba5b7a42aec8fd2a5d1bc31b8e2'
-         '98c17809aed964c445adad09827035df')
-
-build() {
-  cd ${srcdir}/$_origname-${pkgver}
-
-  patch -Np1 -i ../critter-gcc43.patch
-  patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch
-  sed -i 's|-lpng12|-lpng15|g' configure
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${srcdir}/$_origname-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 critter.png ${pkgdir}/usr/share/pixmaps/critter.png
-  install -Dm644 ../critter.desktop \
-    ${pkgdir}/usr/share/applications/critter.desktop
-}
diff --git a/community-testing/critter/criticalmass-1.0.2-libpng15.patch b/community-testing/critter/criticalmass-1.0.2-libpng15.patch
deleted file mode 100644
index ac1b8c0c6..000000000
--- a/community-testing/critter/criticalmass-1.0.2-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- game/main.cpp
-+++ game/main.cpp
-@@ -28,6 +28,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <zlib.h>
-+
- void migrateConfig( void)
- {
-     //if onlineCheck is not set, default it to true
---- utilssdl/PNG.cpp
-+++ utilssdl/PNG.cpp
-@@ -45,7 +45,7 @@
- {
-     png_size_t check;
- 
--    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
-+    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
-     if( check != length)
-     {
- 	png_error( png, "Write Error");
-@@ -72,7 +72,7 @@
- 	return false;
-     }
- 
--    if( setjmp(_png->jmpbuf))
-+    if( setjmp(png_jmpbuf(_png)))
-     {
- 	fclose( fp);
- 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/community-testing/critter/critter-gcc43.patch b/community-testing/critter/critter-gcc43.patch
deleted file mode 100644
index ade42d8e4..000000000
--- a/community-testing/critter/critter-gcc43.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp CriticalMass-1.0.2/tinyxml/tinyxml.cpp
---- CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp	2003-03-03 12:34:58.000000000 +1000
-+++ CriticalMass-1.0.2/tinyxml/tinyxml.cpp	2008-04-01 22:26:47.000000000 +1000
-@@ -22,7 +22,8 @@
- */

- 

- #include "tinyxml.h"

--

-+#include <cstring>

-+#include <cstdlib>

- 

- TiXmlNode::TiXmlNode( NodeType _type )

- {

-diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp
---- CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp	2003-03-03 12:34:58.000000000 +1000
-+++ CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp	2008-04-01 22:27:02.000000000 +1000
-@@ -24,7 +24,7 @@
- 

- #include "tinyxml.h"

- #include <ctype.h>

--

-+#include <cstring>

- const char* TiXmlBase::SkipWhiteSpace( const char* p )

- {

- 	while ( p && *p && 

-diff -Naur CriticalMass-1.0.2-old/utils/ResourceManager.cpp CriticalMass-1.0.2/utils/ResourceManager.cpp
---- CriticalMass-1.0.2-old/utils/ResourceManager.cpp	2005-01-02 12:59:29.000000000 +1000
-+++ CriticalMass-1.0.2/utils/ResourceManager.cpp	2008-04-01 22:27:19.000000000 +1000
-@@ -15,6 +15,7 @@
- #include <iomanip>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <cstring>
- 
- #include <Trace.hpp>
- #include <ResourceManager.hpp>
-diff -Naur CriticalMass-1.0.2-old/utils/Value.hpp CriticalMass-1.0.2/utils/Value.hpp
---- CriticalMass-1.0.2-old/utils/Value.hpp	2004-12-18 12:41:24.000000000 +1000
-+++ CriticalMass-1.0.2/utils/Value.hpp	2008-04-01 22:27:39.000000000 +1000
-@@ -17,6 +17,7 @@
- 
- #include <stdio.h>
- #include <string>
-+#include <cstdlib>
- 
- #include <Trace.hpp>
- 
-diff -Naur CriticalMass-1.0.2-old/utils/zStream.cpp CriticalMass-1.0.2/utils/zStream.cpp
---- CriticalMass-1.0.2-old/utils/zStream.cpp	2005-08-01 06:06:14.000000000 +1000
-+++ CriticalMass-1.0.2/utils/zStream.cpp	2008-04-01 22:28:03.000000000 +1000
-@@ -17,6 +17,7 @@
- #include <zStream.hpp>
- #include <zStreamBufferImplLZMA.hpp>
- #include <zStreamBufferImplZLib.hpp>
-+#include <cstdlib>
- 
- ofstream &operator<<( ofstream &outfile, Uint32 i)
- {       
-diff -Naur CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp
---- CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp	2005-08-01 06:06:14.000000000 +1000
-+++ CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp	2008-04-01 22:28:23.000000000 +1000
-@@ -14,6 +14,7 @@
- //
- #include <Trace.hpp>
- #include <zStreamBufferImplZLib.hpp>
-+#include <cstdlib>
- 
- bool ziStreamBufferImplZLib::init( void)
- {
diff --git a/community-testing/critter/critter.desktop b/community-testing/critter/critter.desktop
deleted file mode 100644
index ded5a9fbf..000000000
--- a/community-testing/critter/critter.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Critical Mass
-Comment=SDL/OpenGL space shoot'em up game
-Exec=critter
-Icon=critter
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Game;
diff --git a/community-testing/cwiid/PKGBUILD b/community-testing/cwiid/PKGBUILD
deleted file mode 100644
index bea7e8c3f..000000000
--- a/community-testing/cwiid/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63062 2012-01-30 18:53:20Z ibiru $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Wieland Hoffmann <the_mineo@web.de>
-# Contributor: Birger Moellering <bmoellering@googlemail.com>
-
-pkgname=cwiid
-pkgver=0.6.00
-pkgrel=10
-pkgdesc="Linux Nintendo Wiimote interface"
-arch=('i686' 'x86_64')
-url="http://abstrakraft.org/cwiid"
-depends=('bluez' 'gtk2' 'python2')
-makedepends=('flex' 'bison')
-license=('GPL')
-install=cwiid.install
-source=("http://abstrakraft.org/cwiid/downloads/$pkgname-$pkgver.tgz"
-        'bluez4.patch')
-md5sums=('8d574afdeedc5e5309c87a72d744316a'
-         '19b288723d1f2b97a3e5288ab9de3313')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # bluez v4 compatibility
-  patch -Np1 -i "$srcdir/bluez4.patch"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --disable-ldconfig \
-              --with-python=python2
-
-  LDFLAGS+="$(pkg-config --libs bluez) -lrt -pthread" make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  chmod 644 "$pkgdir/usr/lib/libcwiid.a"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cwiid/bluez4.patch b/community-testing/cwiid/bluez4.patch
deleted file mode 100644
index dbbc790c5..000000000
--- a/community-testing/cwiid/bluez4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cwiid-0.6.00.orig/libcwiid/bluetooth.c.old	2008-09-30 16:52:55.000000000 -0500
-+++ cwiid-0.6.00.orig/libcwiid/bluetooth.c	2008-09-30 16:53:19.000000000 -0500
-@@ -122,7 +122,7 @@
- 		}
- 
- 		/* timeout (10000) in milliseconds */
--		if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
-+		if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
- 		                    (*bdinfo)[bdinfo_count].name, 10000)) {
- 			cwiid_err(NULL, "Bluetooth name read error");
- 			err = 1;
diff --git a/community-testing/cwiid/cwiid.install b/community-testing/cwiid/cwiid.install
deleted file mode 100644
index 05e698be7..000000000
--- a/community-testing/cwiid/cwiid.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  echo "==> In order to use wminput ensure you load the uinput kernel"
-  echo "==> module and have assigned correct access to /dev/uinput"
-}
-
-post_upgrade() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/darktable/PKGBUILD b/community-testing/darktable/PKGBUILD
deleted file mode 100644
index 62fd7c7fe..000000000
--- a/community-testing/darktable/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 63064 2012-01-30 18:53:27Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Christian Himpel <chressie at gmail dot com>
-# Contributor: Johannes Hanika <hanatos at gmail dot com>
-
-pkgname=darktable
-pkgver=0.9.3
-_pkgver=0.9
-pkgrel=5
-pkgdesc="Utility to organize and develop raw images"
-arch=('i686' 'x86_64')
-url=http://darktable.sf.net/
-license=('GPL3')
-depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
-	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3')
-makedepends=('intltool>=0.40' 'cmake' 'librsvg')
-#	     'gnome-doc-utils' 'libxslt' 'fop')
-optdepends=('librsvg')
-install=darktable.install
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('49253a3a2990a4bf8e0b0a19295f19bd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-#  mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt
-  mkdir -p build
-  cd build
-  cmake \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DDONT_INSTALL_GCONF_SCHEMAS=True \
-      -DBINARY_PACKAGE_BUILD=1 \
-      -DUSE_GCONF_BACKEND=Off \
-      -DBUILD_USERMANUAL=False \
-      ..
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver/build
-  make DESTDIR=$pkgdir install
-  mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
-#  mkdir -p "${pkgdir}/usr/share/gconf/schemas/"
-#  mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/"
-}
diff --git a/community-testing/darktable/darktable.install b/community-testing/darktable/darktable.install
deleted file mode 100644
index 9fd6af293..000000000
--- a/community-testing/darktable/darktable.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=darktable
-
-post_install() {
-#  usr/sbin/gconfpkg --install ${pkgname}
-  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-#  usr/sbin/gconfpkg --uninstall ${pkgname}
-  true
-}
-
-post_remove() {
-  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
-}
diff --git a/community-testing/devil/PKGBUILD b/community-testing/devil/PKGBUILD
deleted file mode 100644
index 5a9fd947a..000000000
--- a/community-testing/devil/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63066 2012-01-30 18:53:37Z ibiru $
-# Maintainer: Laurent Carlier <lordheavym@gmail.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: TheHoff <forums>
-
-pkgname=devil
-pkgver=1.7.8
-pkgrel=10
-pkgdesc="Library for reading several different image formats"
-arch=('i686' 'x86_64')
-url="http://openil.sourceforge.net/"
-depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
-install=devil.install
-options=('!libtool' '!docs' '!emptydirs')
-license=('GPL')
-source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
-md5sums=('7918f215524589435e5ec2e8736d5e1d'
-         '0f839ccefd43b0ee8b4b3f99806147fc')
-
-build() {
-   cd ${srcdir}/devil-$pkgver
-
-   patch -Np1 -i ${srcdir}/libpng14.patch
-
-   ./configure --prefix=/usr --enable-ILU
-   make
-}
-
-package() {
-   cd ${srcdir}/devil-$pkgver
-
-   make prefix=${pkgdir}/usr install
-}
diff --git a/community-testing/devil/devil.install b/community-testing/devil/devil.install
deleted file mode 100644
index 8336ac3d1..000000000
--- a/community-testing/devil/devil.install
+++ /dev/null
@@ -1,11 +0,0 @@
-infodir=usr/share/info
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/community-testing/devil/libpng14.patch b/community-testing/devil/libpng14.patch
deleted file mode 100644
index b8434692b..000000000
--- a/community-testing/devil/libpng14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
---- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_icon.c	2010-01-17 00:54:09.000000000 +0200
-@@ -525,7 +525,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(ico_png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
-diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
---- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_png.c	2010-01-17 00:55:26.000000000 +0200
-@@ -105,7 +105,7 @@
- 	Read = iread(Signature, 1, 8);
- 	iseek(-Read, IL_SEEK_CUR);
- 
--	return png_check_sig(Signature, 8);
-+	return png_sig_cmp(Signature, 0, 8) == 0;
- }
- 
- 
-@@ -278,7 +278,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
diff --git a/community-testing/dia/PKGBUILD b/community-testing/dia/PKGBUILD
deleted file mode 100644
index 43f9da7e9..000000000
--- a/community-testing/dia/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 63068 2012-01-30 18:53:45Z ibiru $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-
-pkgname=dia
-pkgver=0.97.2
-pkgrel=2
-pkgdesc="A GTK+ based diagram creation program"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Dia"
-install=dia.install
-depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2')
-makedepends=('intltool' 'python2' 'docbook-xsl')
-optdepends=('python2')
-options=('!libtool' 'docs')
-source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz"
-	"dia-overflow-fix.patch")
-md5sums=('1e1180a513fb567709b09bc19f12105e'
-         '8fd9a2ad35b5a6fd8c758d7c73dbfe66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON=/usr/bin/python2
-  sed -i 's#python2\.1#python2 python2.1#' configure
-#  patch -p1 <$srcdir/dia-overflow-fix.patch
-
-  ./configure --prefix=/usr \
-    --with-cairo \
-    --with-python \
-    --disable-gnome \
-    --with-hardbooks
-  sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
-  make
-  cd doc
-  make html
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  cd doc
-  make DESTDIR="${pkgdir}" install-html
-  ln -sf dia/html "${pkgdir}"/usr/share/dia/help
-}
diff --git a/community-testing/dia/dia-overflow-fix.patch b/community-testing/dia/dia-overflow-fix.patch
deleted file mode 100644
index a6e64f3c6..000000000
--- a/community-testing/dia/dia-overflow-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -wbBur dia-0.97.1/plug-ins/xfig/xfig-export.c dia-0.97.1.my/plug-ins/xfig/xfig-export.c
---- dia-0.97.1/plug-ins/xfig/xfig-export.c	2009-11-07 17:28:34.000000000 +0300
-+++ dia-0.97.1.my/plug-ins/xfig/xfig-export.c	2010-11-15 17:44:05.640896280 +0300
-@@ -417,6 +417,9 @@
-     if (text[i] > 127) {
-       newlen += 3;
-     }
-+    if (text[i] == '\\') {
-+      newlen += 1;
-+    }
-   }
-   returntext = g_malloc(sizeof(char)*(newlen+1));
-   j = 0;
-@@ -1085,10 +1088,10 @@
-   figtext = figText(renderer, (unsigned char *) text);
-   /* xfig texts are specials */
-   fprintf(renderer->file, "4 %d %d %d 0 %d %s 0.0 6 0.0 0.0 %d %d %s\\001\n",
--	  figAlignment(renderer, alignment),
--	  figColor(renderer, color), 
--	  figDepth(renderer),
--	  figFont(renderer),
-+	  (int)figAlignment(renderer, alignment),
-+	  (int)figColor(renderer, color), 
-+	  (int)figDepth(renderer),
-+	  (int)figFont(renderer),
- 	  xfig_dtostr(d_buf, figFontSize(renderer)),
- 	  (int)figCoord(renderer, pos->x),
- 	  (int)figCoord(renderer, pos->y),
diff --git a/community-testing/dia/dia.install b/community-testing/dia/dia.install
deleted file mode 100644
index a49438e1f..000000000
--- a/community-testing/dia/dia.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/dillo/PKGBUILD b/community-testing/dillo/PKGBUILD
deleted file mode 100644
index 93cda3eda..000000000
--- a/community-testing/dillo/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63070 2012-01-30 18:53:52Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=dillo
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="A small, fast graphical web browser built on FLTK"
-arch=(i686 x86_64)
-url="http://www.dillo.org"
-license=('GPL')
-depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor'
-         'libxi' 'libxinerama')
-backup=(etc/dillo/{dillorc,dpidrc})
-source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('81b82112cefcc7d54fe2972a21f42930')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \
-              --enable-ssl
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community-testing/directfb/DirectFB-1.4.9-libpng-1.5.patch
deleted file mode 100644
index e428afbaf..000000000
--- a/community-testing/directfb/DirectFB-1.4.9-libpng-1.5.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 20 Feb 2011 19:18:19 -0500
-Subject: [PATCH] png: add support for libpng 1.5.x
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- .../idirectfbimageprovider_png.c                   |   56 ++++++++++++-------
- 1 files changed, 35 insertions(+), 21 deletions(-)
-
-diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-index 6d65ea3..7d82c5c 100644
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
-@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
-      if (!data->png_ptr)
-           goto error;
- 
--     if (setjmp( data->png_ptr->jmpbuf )) {
-+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
-           D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
-           goto error;
-      }
-@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-           rect = dst_data->area.wanted;
-      }
- 
--     if (setjmp( data->png_ptr->jmpbuf )) {
-+     if (setjmp( png_jmpbuf( data->png_ptr ))) {
-           D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
- 
-           if (data->stage < STAGE_IMAGE)
-@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-      }
-      else {
-           CoreSurfaceBufferLock lock;
-+          png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
- 
-           ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
-           if (ret)
-@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
- 
-           switch (data->color_type) {
-                case PNG_COLOR_TYPE_PALETTE:
--                    if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
-+                    if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
-                          /*
-                           * Special indexed PNG to LUT8 loading.
-                           */
-@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-                     }
-                     else {
-                          if (data->color_type == PNG_COLOR_TYPE_GRAY) {
--                              int num = 1 << data->info_ptr->bit_depth;
-+                              int num = 1 << bit_depth;
- 
-                               for (x=0; x<num; x++) {
-                                    int value = x * 255 / (num - 1);
-@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
-                               }
-                          }
- 
--                         switch (data->info_ptr->bit_depth) {
-+                         switch (bit_depth) {
-                               case 8:
-                                    for (y=0; y<data->height; y++) {
-                                         u8  *S = data->image + data->pitch * y;
-@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
- 
-                               default:
-                                    D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
--                                            data->info_ptr->bit_depth );
-+                                            bit_depth );
-                          }
- 
-                          dfb_scale_linear_32( image_argb, data->width, data->height,
-@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
-                    NULL, NULL, NULL );
- 
-      if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
-+          png_bytep     trans;
-+          png_color_16p trans_color;
-+          int           num_trans;
-+
-+          png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
-+
-           data->color_keyed = true;
- 
-           /* generate color key based on palette... */
-           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
-                u32        key;
--               png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans_alpha;
--               int        num_colors = MIN( MAXCOLORMAPSIZE,
--                                            data->info_ptr->num_palette );
--               u8         cmap[3][num_colors];
-+               png_colorp palette;
-+               int        num_colors;
-+               u8        *cmap[3];
-+
-+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
-+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
-+               cmap[0] = alloca (num_colors);
-+               cmap[1] = alloca (num_colors);
-+               cmap[2] = alloca (num_colors);
- 
-                for (i=0; i<num_colors; i++) {
-                     cmap[0][i] = palette[i].red;
-@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
- 
-                key = FindColorKey( num_colors, &cmap[0][0] );
- 
--               for (i=0; i<data->info_ptr->num_trans; i++) {
-+               for (i=0; i<num_trans; i++) {
-                     if (!trans[i]) {
-                          palette[i].red   = (key & 0xff0000) >> 16;
-                          palette[i].green = (key & 0x00ff00) >>  8;
-@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
-           }
-           else {
-                /* ...or based on trans rgb value */
--               png_color_16p trans = &data->info_ptr->trans_color;
--
--               data->color_key = (((trans->red & 0xff00) << 8) |
--                                  ((trans->green & 0xff00)) |
--                                  ((trans->blue & 0xff00) >> 8));
-+               data->color_key = (((trans_color->red & 0xff00) << 8) |
-+                                  ((trans_color->green & 0xff00)) |
-+                                  ((trans_color->blue & 0xff00) >> 8));
-           }
-      }
- 
-      switch (data->color_type) {
-           case PNG_COLOR_TYPE_PALETTE: {
--               png_colorp palette    = data->info_ptr->palette;
--               png_bytep  trans      = data->info_ptr->trans_alpha;
--               int        num_trans  = data->info_ptr->num_trans;
--               int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
-+               png_colorp    palette;
-+               png_bytep     trans;
-+               png_color_16p trans_color;
-+               int           num_trans;
-+               int           num_colors;
-+
-+               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
-+               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
-+               png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
- 
-                for (i=0; i<num_colors; i++) {
-                     data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
--- 
-1.7.4.1
-
-From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 20 Feb 2011 19:38:50 -0500
-Subject: [PATCH] tools: add support for libpng 1.5.x
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tools/directfb-csource.c |   20 +++++++++++++-------
- tools/mkdfiff.c          |    2 +-
- tools/mkdgifft.cpp       |    2 +-
- 3 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
-index 8f2cbf0..487ea3c 100644
---- a/tools/directfb-csource.c
-+++ b/tools/directfb-csource.c
-@@ -338,7 +338,7 @@ static DFBResult load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
-@@ -405,17 +405,22 @@ static DFBResult load_image (const char            *filename,
-        }
- 
-      switch (src_format) {
--          case DSPF_LUT8:
--               if (info_ptr->num_palette) {
-+          case DSPF_LUT8: {
-+               png_colorp png_palette;
-+               int        num_palette;
-+
-+               png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
-+
-+               if (num_palette) {
-                     png_byte *alpha;
-                     int       i, num;
- 
--                    *palette_size = MIN (info_ptr->num_palette, 256);
-+                    *palette_size = MIN (num_palette, 256);
-                     for (i = 0; i < *palette_size; i++) {
-                          palette[i].a = 0xFF;
--                         palette[i].r = info_ptr->palette[i].red;
--                         palette[i].g = info_ptr->palette[i].green;
--                         palette[i].b = info_ptr->palette[i].blue;
-+                         palette[i].r = png_palette[i].red;
-+                         palette[i].g = png_palette[i].green;
-+                         palette[i].b = png_palette[i].blue;
-                     }
-                     if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
-                          png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
-@@ -424,6 +429,7 @@ static DFBResult load_image (const char            *filename,
-                     }
-                }
-                break;
-+          }
-           case DSPF_RGB32:
-                 png_set_filler (png_ptr, 0xFF,
- #ifdef WORDS_BIGENDIAN
-diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
-index 68a3b4f..edb58a7 100644
---- a/tools/mkdfiff.c
-+++ b/tools/mkdfiff.c
-@@ -97,7 +97,7 @@ load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
-diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
-index 96e4220..d4b6bf4 100644
---- a/tools/mkdgifft.cpp
-+++ b/tools/mkdgifft.cpp
-@@ -595,7 +595,7 @@ load_image (const char            *filename,
-      if (!png_ptr)
-           goto cleanup;
- 
--     if (setjmp (png_ptr->jmpbuf)) {
-+     if (setjmp (png_jmpbuf (png_ptr))) {
-           if (desc->preallocated[0].data) {
-                free (desc->preallocated[0].data);
-                desc->preallocated[0].data = NULL;
--- 
-1.7.4.1
-
diff --git a/community-testing/directfb/PKGBUILD b/community-testing/directfb/PKGBUILD
deleted file mode 100644
index 30d2d048d..000000000
--- a/community-testing/directfb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 63072 2012-01-30 18:54:00Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=directfb
-pkgver=1.4.14
-pkgrel=2
-pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
-arch=('i686' 'x86_64')
-url="http://www.directfb.org"
-license=('LGPL')
-depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
-options=('!libtool')
-changelog=$pkgname.changelog
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz DirectFB-1.4.9-libpng-1.5.patch)
-md5sums=('de0745d25a6ac9e337d4d5572df85471'
-         '84f3181e96692efc5ff68e5dac19541f')
-
-build() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \
-              --enable-x11 --enable-sdl --disable-vnc --disable-osx \
-              --enable-video4linux2 --enable-voodoo
-  make
-} 
-
-package() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/directfb/directfb.changelog b/community-testing/directfb/directfb.changelog
deleted file mode 100644
index 721fd1deb..000000000
--- a/community-testing/directfb/directfb.changelog
+++ /dev/null
@@ -1,40 +0,0 @@
-2010-11-27  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-	* directfb 1.4.11-1
-	* Upstream update
-
-2010-08-29  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-	* directfb 1.4.5-1
-	* Upstream update
-
-2010-01-20  Eric Belanger  <eric@archlinux.org>
-
-	* directfb 1.4.3-1
-	* Upstream update
-
-2009-11-08  Eric Belanger  <eric@archlinux.org>
-
-	* directfb 1.4.2-1
-	* Upstream update
-
-2009-07-13  Eric Belanger  <eric@archlinux.org>
-
-	* directfb 1.4.1-1
-	* Upstream update
-
-2009-05-03  Eric Belanger  <eric@archlinux.org>
-
-	* directfb 1.2.8-1
-	* Upstream update
-
-2009-03-06  Eric Belanger  <eric@archlinux.org>
-
-	* directfb 1.2.7-1
-	* Upstream update
-
-2008-07-29  Eric Belanger  <eric@archlinux.org>
-
-	* directfb 1.2.0-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/community-testing/djview4/PKGBUILD b/community-testing/djview4/PKGBUILD
deleted file mode 100644
index 6c50c2c13..000000000
--- a/community-testing/djview4/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 63074 2012-01-30 18:54:08Z ibiru $
-# Contributor: Paulo Matias <matias.archlinux-br.org>
-# Contributor: Leslie P. Polzer <polzer.gnu.org>
-# Contributor: erm67 <erm67.yahoo.it>
-# Contributor: Daniel J Griffiths
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=djview4
-pkgver=4.8
-pkgrel=2
-pkgdesc='Portable DjVu viewer and browser plugin'
-url='http://djvu.sourceforge.net/djview4.html'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qt' 'djvulibre')
-source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz")
-sha1sums=('266d207afb63a1ee63eed054190bf88888fda572')
-
-install=install
-
-build() {
-	cd "${srcdir}/djview-${pkgver}"
-	QTDIR=/usr ./configure --prefix=/usr
-	sed 's/netscape/mozilla/g' -i nsdejavu/Makefile
-	sed 's/swap/rofl_swap/g' -i src/qdjvuwidget.cpp
-	make
-}
-
-package() {
-	cd "${srcdir}/djview-${pkgver}"
-	make DESTDIR="${pkgdir}" install-djview install-nsdejavu
-
-	cd desktopfiles
-	install -Dm644 hi32-djview4.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/djvulibre-djview4.png
-	install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/djvulibre-djview4.png
-	install -Dm644 hi64-djview4.png "${pkgdir}"/usr/share/pixmaps/djvulibre-djview4.png
-	install -Dm644 djvulibre-djview4.desktop "${pkgdir}"/usr/share/applications/djvulibre-djview4.desktop
-}
diff --git a/community-testing/djview4/install b/community-testing/djview4/install
deleted file mode 100644
index f2bd04ceb..000000000
--- a/community-testing/djview4/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	if type xdg-icon-resource &>/dev/null; then
-		xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	fi
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-testing/dosbox/PKGBUILD b/community-testing/dosbox/PKGBUILD
deleted file mode 100644
index 70e8decca..000000000
--- a/community-testing/dosbox/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 63076 2012-01-30 18:54:22Z ibiru $
-# Maintainer :
-# Contribute : Jelle van der Waa <jelle@vdwaa.nl>
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=dosbox
-pkgver=0.74
-pkgrel=3
-pkgdesc="An emulator with builtin DOS for running DOS Games"
-arch=('i686' 'x86_64')
-url="http://dosbox.sourceforge.net/"
-license=('GPL')
-depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
-	'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
-
-build(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  sed -i 's/png_check_sig/png_sig_cmp/' configure 
-  ./configure   --prefix=/usr \
-    --sysconfdir=/etc/dosbox  
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-
-
-  # install docs, make does not install them
-  install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
-  install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video
-
-  install -Dm644 "${srcdir}/${pkgname}.png" \
-    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -Dm644 "${srcdir}/${pkgname}.desktop" \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
-md5sums=('b9b240fa87104421962d14eee71351e8'
-         '2aac25fc06979e375953fcc36824dc5e'
-         '85169ca599028bee8e29e0b3b7b34dd8'
-         '3fba2e3c7c43290319b2928f40ed30e5')
diff --git a/community-testing/dosbox/dosbox.desktop b/community-testing/dosbox/dosbox.desktop
deleted file mode 100644
index dbaf05ced..000000000
--- a/community-testing/dosbox/dosbox.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=dosbox Emulator
-GenericName=Emulator
-Comment=An emulator to run old DOS games
-Icon=dosbox
-Exec=dosbox
-Terminal=false
-Categories=Emulator;Application;
diff --git a/community-testing/dosbox/dosbox.png b/community-testing/dosbox/dosbox.png
deleted file mode 100644
index b8a917986..000000000
--- a/community-testing/dosbox/dosbox.png
+++ /dev/null
diff --git a/community-testing/dosbox/gcc46.patch b/community-testing/dosbox/gcc46.patch
deleted file mode 100644
index eae9ae63e..000000000
--- a/community-testing/dosbox/gcc46.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
---- dosbox-0.74/include/dos_inc.h	2010-05-10 17:43:54.000000000 +0000
-+++ dosbox-0.74.new//include/dos_inc.h	2011-06-17 20:42:43.982548979 +0000
-@@ -28,6 +28,8 @@
- #include "mem.h"
- #endif
- 
-+#include <stddef.h> //for offsetof
-+
- #ifdef _MSC_VER
- #pragma pack (1)
- #endif
diff --git a/community-testing/efax-gtk/PKGBUILD b/community-testing/efax-gtk/PKGBUILD
deleted file mode 100644
index 180af8917..000000000
--- a/community-testing/efax-gtk/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63078 2012-01-30 18:54:29Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=efax-gtk
-pkgver=3.2.9
-pkgrel=2
-pkgdesc="A GUI front end for the 'efax' fax program"
-arch=('i686' 'x86_64')
-url="http://efax-gtk.sourceforge.net/"
-license=('GPL')
-depends=('dbus-glib' 'ghostscript' 'c++-gtk-utils')
-makedepends=('pkg-config')
-optdepends=('heirloom-mailx: to use the mail_fax script')
-backup=('etc/efax-gtkrc')
-install=efax-gtk.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz")
-md5sums=('57fac8815c8f49fc7415d3558eb3f842')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --with-spooldir=/usr/bin
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -m 755 mail_fax print_fax "${pkgdir}/usr/bin"
-}
diff --git a/community-testing/efax-gtk/efax-gtk.install b/community-testing/efax-gtk/efax-gtk.install
deleted file mode 100644
index 69e30acd6..000000000
--- a/community-testing/efax-gtk/efax-gtk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}
diff --git a/community-testing/emerald/PKGBUILD b/community-testing/emerald/PKGBUILD
deleted file mode 100644
index 787963c17..000000000
--- a/community-testing/emerald/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63080 2012-01-30 18:54:39Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: nesl247 <nesl247@gmail.com>
-
-pkgname=emerald
-pkgver=0.8.8
-pkgrel=2
-pkgdesc="Emerald window decorator"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org"
-license=('GPL')
-depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \
-         'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkg-config' 'gettext')
-groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
-options=(!libtool)
-conflicts=('emerald-git')
-install=emerald.install
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  LIBS+="-lm -ldl" ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/emerald/deprecated_symbols.patch b/community-testing/emerald/deprecated_symbols.patch
deleted file mode 100644
index b32ce154a..000000000
--- a/community-testing/emerald/deprecated_symbols.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001
-From: ShadowKyogre <shadowkyogre@aim.com>
-Date: Fri, 05 Nov 2010 01:53:24 +0000
-Subject: Fix deprecated symbols and incorrect decoration property setting
-
----
-diff --git a/src/main.c b/src/main.c
-index 5f0ec35..150da99 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -27,8 +27,8 @@
- #include <emerald.h>
- #include <engine.h>
- 
--#define BASE_PROP_SIZE 12
--#define QUAD_PROP_SIZE 9
-+//#define BASE_PROP_SIZE 12
-+//#define QUAD_PROP_SIZE 9
- 
- #ifndef DECOR_INTERFACE_VERSION
- #define DECOR_INTERFACE_VERSION 0
-@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val)
-     gdk_error_trap_push();
- 
-     type = None;
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow,
- 				atom,
- 				0, G_MAXLONG,
-@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data)
-     WnckWindow *win = data;
- 
-     gdk_error_trap_push();
--    XSetTransientForHint(gdk_display,
-+    XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 			 GDK_WINDOW_XID(dialog->window),
- 			 wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow)
-     int format, result;
-     char *retval;
- 
--    atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
-+    atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
- 
-     gdk_error_trap_push();
- 
--    result = XGetWindowProperty(gdk_display,
-+    result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- 				xwindow, atom,
- 				0, G_MAXLONG,
- 				FALSE, XA_STRING, &type, &format, &nitems,
-@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win)
-     }
- 
-     gdk_error_trap_push();
--    XKillClient(gdk_display, wnck_window_get_xid(win));
--    XSync(gdk_display, FALSE);
-+    XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
-+    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-     gdk_error_trap_pop();
- }
- 
-@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius,
- 
- static int update_shadow(frame_settings * fs)
- {
--    Display *xdisplay = gdk_display;
-+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-     XRenderPictFormat *format;
-     GdkPixmap *pixmap;
-     Picture src, dst, tmp;
---
-cgit v0.8.3.1-30-gff3a
-
---- a/src/main.c.old	2010-12-07 19:56:08.633333370 +0100
-+++ a/src/main.c	2010-12-07 19:56:39.273333379 +0100
-@@ -3757,7 +3757,7 @@
- 
- static void hide_tooltip(void)
- {
--    if (GTK_WIDGET_VISIBLE(tip_window))
-+    if (gtk_widget_get_visible (tip_window))
- 	g_get_current_time(&tooltip_last_popdown);
- 
-     gtk_widget_hide(tip_window);
-
---- emerald-0.8.4/libengine/themer.c	2009-10-13 20:56:23.000000000 -0400
-+++ emerald-0.8.4.new/libengine/themer.c	2010-03-10 
-01:20:03.046827674 -0500
-@@ -461,7 +461,7 @@
- }
- gdouble get_float(SettingItem * item)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
-     }
-     else {
-@@ -647,7 +647,7 @@
- }
- void set_float(SettingItem * item, gdouble f)
- {
--    if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-+    if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
-          gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
-     } 
-     else {
-
diff --git a/community-testing/emerald/emerald.install b/community-testing/emerald/emerald.install
deleted file mode 100644
index c2fa624ae..000000000
--- a/community-testing/emerald/emerald.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/evas-svn/PKGBUILD b/community-testing/evas-svn/PKGBUILD
deleted file mode 100644
index 829c2adaa..000000000
--- a/community-testing/evas-svn/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 63082 2012-01-30 18:54:45Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=evas-svn
-pkgver=66901
-pkgrel=2
-pkgdesc="A hardware-accelerated canvas API for X-Windows"
-arch=('i686' 'x86_64')
-groups=('e17-libs-svn' 'e17-svn')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('giflib' 'librsvg' 'eet-svn' 'cairo' 'libjpeg' 'libxrender' 'mesa' 
-	'fribidi' 'fontconfig')
-makedepends=('subversion')
-conflicts=('evas')
-provides=('evas')
-options=('!libtool' '!emptydirs')
-md5sums=()
-         
-_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas"
-_svnmod="evas"
-
-build() {
-   cd "$srcdir"
-
-msg "Connecting to $_svntrunk SVN server...."
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-
-  ./autogen.sh --prefix=/usr --enable-fb --enable-xrender-x11 \
-	--enable-gl-x11 --enable-fontconfig --enable-async-preload \
-	--enable-async-events --enable-pipe-render --enable-async-render
-  make
-}
-
-package() {
-  cd "$srcdir/$_svnmod-build"
-  make DESTDIR="$pkgdir" install
-
-# install license files
-  install -Dm644 "$srcdir/$_svnmod-build/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  rm -r "$srcdir/$_svnmod-build"
-
-}
diff --git a/community-testing/exim/ChangeLog b/community-testing/exim/ChangeLog
deleted file mode 100644
index 80a101472..000000000
--- a/community-testing/exim/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-2011-10-10 Angel Velasquez <angvp@archlinux.org>
-	* Updated to 4.77
-
-2011-07-15 Angel Velasquez <angvp@archlinux.org>
-	* Rebuilt without tcp_wrappers
-	* Fixing logrotate issue FS#25094
-	* ChangeLog file changed name from exim.changelog to ChangeLog
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Rebuilt against db 5.2.28
-
-2010-05-09 Angel Velasquez <angvp@archlinux.org>
-    * Updated to 4.76
-    * Removed previous patch since is no longer needed
-    * Removed newaliases script FS#22744
-    * Removed sudo dependency
-
-2010-05-07 Angel Velasquez <angvp@archlinux.org>
-    * Adding patch for security issue see: http://goo.gl/QBict
-
-2010-05-06 Angel Velasquez <angvp@archlinux.org>
-    * Setting sticky id to deliver mail. Closes FS#24109 
-
-2010-04-30 Angel Velasquez <angvp@archlinux.org>
-    * exim 4.75
-    * Config updated with the aliases path. Closes FS#22743
-    * Removed sed hackings and added a exim.Makefile . Closes FS#22744
-    * Replaced creation of the user at build time. Closes FS#22745
-
diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD
deleted file mode 100644
index 872f5a587..000000000
--- a/community-testing/exim/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 64065 2012-02-08 23:52:26Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=exim
-pkgver=4.77
-pkgrel=3
-pkgdesc="Message Transfer Agent"
-arch=('x86_64' 'i686')
-url="http://www.exim.org/"
-license=('GPL')
-backup=(etc/mail/aliases etc/mail/exim.conf \
-        etc/logrotate.d/exim etc/conf.d/exim)
-install=exim.install
-changelog=ChangeLog
-depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
-provides=('smtp-server')
-conflicts=('smtp-server')
-options=('!makeflags')
-source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
-        aliases
-        exim
-        exim.logrotate
-        exim.conf.d
-        exim.Makefile)
-sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475'
-            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
-            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
-            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cp "$srcdir/$pkgname.Makefile" Local/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim
-  install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim
-  install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
-  install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim
-  mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \
-    ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin}
-  chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim
-  cd build-Linux-*
-  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\
-          exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\
-          exim_fixdb eximstats exinext exiqgrep exiwhat; do
-          install -m 0755 "$i" "$pkgdir/usr/sbin"
-  done
-
-  cd "$srcdir/exim-$pkgver/src"
-  sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
-      -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \
-      >"$pkgdir/etc/mail/exim.conf"
-
-  cp "$srcdir/aliases" "$pkgdir/etc/mail"
-  cd "$pkgdir/usr/sbin"
-  for i in mailq rmail rsmtp runq sendmail; do
-      ln -s exim "$i"
-  done
-  # fhs compliancy
-  ln -s ../sbin/exim ../lib/sendmail
-
-  mkdir -p "$pkgdir/etc/rc.d"
-  cp "$srcdir/exim" "$pkgdir/etc/rc.d"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/exim/aliases b/community-testing/exim/aliases
deleted file mode 100644
index 5a76ff7d5..000000000
--- a/community-testing/exim/aliases
+++ /dev/null
@@ -1,35 +0,0 @@
-#  
-#  /etc/mail/aliases
-#
-#  NOTE:  Make sure you run 'newaliases' after modifying this file
-#
-
-# Basic system aliases -- these MUST be present.
-MAILER-DAEMON:	postmaster
-postmaster:	root
-hostmaster:	root
-webmaster:	hostmaster
-ftpmaster:	hostmaster
-admin:		hostmaster
-administrator:	hostmaster
-
-# General redirections for pseudo accounts.
-bin:		root
-daemon:		root
-games:		root
-ingres:		root
-nobody:		root
-system:		root
-toor:		root
-uucp:		root
-
-# Well-known aliases.
-manager:	root
-dumper:		root
-operator:	root
-
-# trap decode to catch security attacks
-decode:		root
-
-# Person who should get root's mail
-#root:
diff --git a/community-testing/exim/exim b/community-testing/exim/exim
deleted file mode 100644
index 8e9640b32..000000000
--- a/community-testing/exim/exim
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/exim`
-
-case "$1" in
-  start)
-    stat_busy "Starting Exim"
-    [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon exim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Exim"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/exim.pid
-      rm_daemon exim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile
deleted file mode 100644
index a304ce829..000000000
--- a/community-testing/exim/exim.Makefile
+++ /dev/null
@@ -1,1227 +0,0 @@
-# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $
-
-##################################################
-#          The Exim mail transport agent         #
-##################################################
-
-# This is the template for Exim's main build-time configuration file. It
-# contains settings that are independent of any operating system. These are
-# things that are mostly sysadmin choices. The items below are divided into
-# those you must specify, those you probably want to specify, those you might
-# often want to specify, and those that you almost never need to mention.
-
-# Edit this file and save the result to a file called Local/Makefile within the
-# Exim distribution directory before running the "make" command.
-
-# Things that depend on the operating system have default settings in
-# OS/Makefile-Default, but these are overridden for some OS by files called
-# called OS/Makefile-<osname>. You can further override these by creating files
-# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-# operating system - look at the names in the OS directory to see which names
-# are recognized.
-
-# However, if you are building Exim for a single OS only, you don't need to
-# worry about setting up Local/Makefile-<osname>. Any build-time configuration
-# settings you require can in fact be placed in the one file called
-# Local/Makefile. It is only if you are building for several OS from the same
-# source files that you need to worry about splitting off your own OS-dependent
-# settings into separate files. (There's more explanation about how this all
-# works in the toplevel README file, under "Modifying the building process", as
-# well as in the Exim specification.)
-
-# One OS-specific thing that may need to be changed is the command for running
-# the C compiler; the overall default is gcc, but some OS Makefiles specify cc.
-# You can override anything that is set by putting CC=whatever in your
-# Local/Makefile.
-
-# NOTE: You should never need to edit any of the distributed Makefiles; all
-# overriding can be done in your Local/Makefile(s). This will make it easier
-# for you when the next release comes along.
-
-# The location of the X11 libraries is something else that is quite variable
-# even between different versions of the same operating system (and indeed
-# there are different versions of X11 as well, of course). The four settings
-# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB
-# (dynamic run-time library). You need not worry about X11 unless you want to
-# compile the Exim monitor utility. Exim itself does not use X11.
-
-# Another area of variability between systems is the type and location of the
-# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB.
-# By default the code assumes ndbm; this often works with gdbm or DB, provided
-# they are correctly installed, via their compatibility interfaces. However,
-# Exim can also be configured to use the native calls for Berkeley DB (obsolete
-# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm.
-
-# For some operating systems, a default DBM library (other than ndbm) is
-# selected by a setting in the OS-specific Makefile. Most modern OS now have
-# a DBM library installed as standard, and in many cases this will be selected
-# for you by the OS-specific configuration. If Exim compiles without any
-# problems, you probably do not have to worry about the DBM library. If you
-# do want or need to change it, you should first read the discussion in the
-# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's
-# interface to the DBM library.
-
-# In Local/Makefiles blank lines and lines starting with # are ignored. It is
-# also permitted to use the # character to add a comment to a setting, for
-# example
-#
-# EXIM_GID=42   # the "mail" group
-#
-# However, with some versions of "make" this works only if there is no white
-# space between the end of the setting and the #, so perhaps it is best
-# avoided. A consequence of this facility is that it is not possible to have
-# the # character present in any setting, but I can't think of any cases where
-# this would be wanted.
-###############################################################################
-
-
-
-###############################################################################
-#                    THESE ARE THINGS YOU MUST SPECIFY                        #
-###############################################################################
-
-# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and
-# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number.
-
-# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it
-# really is a very good idea to specify it here rather than at run time. This
-# is particularly true if you let the logs go to their default location in the
-# spool directory, because it means that the location of the logs is known
-# before Exim has read the run time configuration file.
-
-#------------------------------------------------------------------------------
-# BIN_DIRECTORY defines where the exim binary will be installed by "make
-# install". The path is also used internally by Exim when it needs to re-invoke
-# itself, either to send an error message, or to recover root privilege. Exim's
-# utility binaries and scripts are also installed in this directory. There is
-# no "standard" place for the binary directory. Some people like to keep all
-# the Exim files under one directory such as /usr/exim; others just let the
-# Exim binaries go into an existing directory such as /usr/sbin or
-# /usr/local/sbin. The installation script will try to create this directory,
-# and any superior directories, if they do not exist.
-
-BIN_DIRECTORY=/usr/sbin
-
-
-#------------------------------------------------------------------------------
-# CONFIGURE_FILE defines where Exim's run time configuration file is to be
-# found. It is the complete pathname for the file, not just a directory. The
-# location of all other run time files and directories can be changed in the
-# run time configuration file. There is a lot of variety in the choice of
-# location in different OS, and in the preferences of different sysadmins. Some
-# common locations are in /etc or /etc/mail or /usr/local/etc or
-# /usr/local/etc/mail. Another possibility is to keep all the Exim files under
-# a single directory such as /usr/exim. Whatever you choose, the installation
-# script will try to make the directory and any superior directories if they
-# don't exist. It will also install a default runtime configuration if this
-# file does not exist.
-
-CONFIGURE_FILE=/etc/mail/exim.conf
-
-# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
-# In this case, Exim will use the first of them that exists when it is run.
-# However, if a list is specified, the installation script no longer tries to
-# make superior directories or to install a default runtime configuration.
-
-
-#------------------------------------------------------------------------------
-# The Exim binary must normally be setuid root, so that it starts executing as
-# root, but (depending on the options with which it is called) it does not
-# always need to retain the root privilege. These settings define the user and
-# group that is used for Exim processes when they no longer need to be root. In
-# particular, this applies when receiving messages and when doing remote
-# deliveries. (Local deliveries run as various non-root users, typically as the
-# owner of a local mailbox.) Specifying these values as root is not supported.
-
-EXIM_USER=ref:exim
-
-# If you specify EXIM_USER as a name, this is looked up at build time, and the
-# uid number is built into the binary. However, you can specify that this
-# lookup is deferred until runtime. In this case, it is the name that is built
-# into the binary. You can do this by a setting of the form:
-
-# EXIM_USER=ref:exim
-
-# In other words, put "ref:" in front of the user name. If you set EXIM_USER
-# like this, any value specified for EXIM_GROUP is also passed "by reference".
-# Although this costs a bit of resource at runtime, it is convenient to use
-# this feature when building binaries that are to be run on multiple systems
-# where the name may refer to different uids. It also allows you to build Exim
-# on a system where there is no Exim user defined.
-
-# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
-# also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
-# you want to use a group other than the default group for the given user.
-
-# EXIM_GROUP=
-
-# Many sites define a user called "exim", with an appropriate default group,
-# and use
-#
-# EXIM_USER=exim
-#
-# while leaving EXIM_GROUP unspecified (commented out).
-
-
-#------------------------------------------------------------------------------
-# SPOOL_DIRECTORY defines the directory where all the data for messages in
-# transit is kept. It is strongly recommended that you define it here, though
-# it is possible to leave this till the run time configuration.
-
-# Exim creates the spool directory if it does not exist. The owner and group
-# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to
-# all the files and directories that are created in the spool directory.
-
-# Almost all installations choose this:
-
-SPOOL_DIRECTORY=/var/spool/exim
-
-
-
-###############################################################################
-#           THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY                     #
-###############################################################################
-
-# If you need extra header file search paths on all compiles, put the -I
-# options in INCLUDE.  If you want the extra searches only for certain
-# parts of the build, see more specific xxx_INCLUDE variables below.
-
-# INCLUDE=-I/example/include
-
-# You need to specify some routers and transports if you want the Exim that you
-# are building to be capable of delivering mail. You almost certainly need at
-# least one type of lookup. You should consider whether you want to build
-# the Exim monitor or not.
-
-
-#------------------------------------------------------------------------------
-# These settings determine which individual router drivers are included in the
-# Exim binary. There are no defaults in the code; those routers that are wanted
-# must be defined here by setting the appropriate variables to the value "yes".
-# Including a router in the binary does not cause it to be used automatically.
-# It has also to be configured in the run time configuration file. By
-# commenting out those you know you don't want to use, you can make the binary
-# a bit smaller. If you are unsure, leave all of these included for now.
-
-ROUTER_ACCEPT=yes
-ROUTER_DNSLOOKUP=yes
-ROUTER_IPLITERAL=yes
-ROUTER_MANUALROUTE=yes
-ROUTER_QUERYPROGRAM=yes
-ROUTER_REDIRECT=yes
-
-# This one is very special-purpose, so is not included by default.
-
-# ROUTER_IPLOOKUP=yes
-
-
-#------------------------------------------------------------------------------
-# These settings determine which individual transport drivers are included in
-# the Exim binary. There are no defaults; those transports that are wanted must
-# be defined here by setting the appropriate variables to the value "yes".
-# Including a transport in the binary does not cause it to be used
-# automatically. It has also to be configured in the run time configuration
-# file. By commenting out those you know you don't want to use, you can make
-# the binary a bit smaller. If you are unsure, leave all of these included for
-# now.
-
-TRANSPORT_APPENDFILE=yes
-TRANSPORT_AUTOREPLY=yes
-TRANSPORT_PIPE=yes
-TRANSPORT_SMTP=yes
-
-# This one is special-purpose, and commonly not required, so it is not
-# included by default.
-
-TRANSPORT_LMTP=yes
-
-
-#------------------------------------------------------------------------------
-# The appendfile transport can write messages to local mailboxes in a number
-# of formats. The code for three specialist formats, maildir, mailstore, and
-# MBX, is included only when requested. If you do not know what this is about,
-# leave these settings commented out.
-
-SUPPORT_MAILDIR=yes
-# SUPPORT_MAILSTORE=yes
-# SUPPORT_MBX=yes
-
-
-#------------------------------------------------------------------------------
-# See below for dynamic lookup modules.
-# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/
-# If not using package management but using this anyway, then think about how
-# you perform upgrades and revert them. You should consider the benefit of
-# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can
-# maintain two concurrent sets of modules.
-
-# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for
-# your platform.  Eg:
-# CFLAGS_DYNAMIC=-shared -rdynamic
-# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
-
-#------------------------------------------------------------------------------
-# These settings determine which file and database lookup methods are included
-# in the binary. See the manual chapter entitled "File and database lookups"
-# for discussion. DBM and lsearch (linear search) are included by default. If
-# you are unsure about the others, leave them commented out for now.
-# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is
-# for the specialist case of using the DNS as a general database facility (not
-# common).
-# If set to "2" instead of "yes" then the corresponding lookup will be
-# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to
-# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to
-# EXTRALIBS so that dlopen() is available to Exim. You need to define
-# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup
-# modules.
-# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and
-# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS
-# (where * is the name as given here in this list). That ensures that only
-# the dynamic library and not the exim binary will be linked against the
-# library.
-# NOTE: LDAP cannot be built as a module!
-
-LOOKUP_DBM=yes
-LOOKUP_LSEARCH=yes
-LOOKUP_DNSDB=yes
-
-# LOOKUP_CDB=yes
-LOOKUP_DSEARCH=yes
-# LOOKUP_IBASE=yes
-LOOKUP_LDAP=yes
-# LOOKUP_MYSQL=yes
-# LOOKUP_NIS=yes
-# LOOKUP_NISPLUS=yes
-# LOOKUP_ORACLE=yes
-# LOOKUP_PASSWD=yes
-# LOOKUP_PGSQL=yes
-# LOOKUP_SQLITE=yes
-# LOOKUP_WHOSON=yes
-
-# These two settings are obsolete; all three lookups are compiled when
-# LOOKUP_LSEARCH is enabled. However, we retain these for backward
-# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set.
-
-# LOOKUP_WILDLSEARCH=yes
-# LOOKUP_NWILDLSEARCH=yes
-
-
-#------------------------------------------------------------------------------
-# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate
-# which LDAP library you have. Unfortunately, though most of their functions
-# are the same, there are minor differences. Currently Exim knows about four
-# LDAP libraries: the one from the University of Michigan (also known as
-# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes
-# with Solaris 7 onwards. Uncomment whichever of these you are using.
-
-# LDAP_LIB_TYPE=OPENLDAP1
-LDAP_LIB_TYPE=OPENLDAP2
-# LDAP_LIB_TYPE=NETSCAPE
-# LDAP_LIB_TYPE=SOLARIS
-
-# If you don't set any of these, Exim assumes the original University of
-# Michigan (OpenLDAP 1) library.
-
-
-#------------------------------------------------------------------------------
-# The PCRE library is required for exim.  There is no longer an embedded
-# version of the PCRE library included with the source code, instead you
-# must use a system library or build your own copy of PCRE.
-# In either case you must specify the library link info here.  If the
-# PCRE header files are not in the standard search path you must also
-# modify the INCLUDE path (above)
-# The default setting of PCRE_LIBS should work on the vast majority of
-# systems
-
-PCRE_LIBS=-lpcre
-
-
-#------------------------------------------------------------------------------
-# Additional libraries and include directories may be required for some
-# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on
-# the command for linking Exim itself, not on any auxiliary programs. You
-# don't need to set LOOKUP_INCLUDE if the relevant directories are already
-# specified in INCLUDE. The settings below are just examples; -lpq is for
-# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
-
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
-
-
-#------------------------------------------------------------------------------
-# Compiling the Exim monitor: If you want to compile the Exim monitor, a
-# program that requires an X11 display, then EXIM_MONITOR should be set to the
-# value "eximon.bin". Comment out this setting to disable compilation of the
-# monitor. The locations of various X11 directories for libraries and include
-# files are defaulted in the OS/Makefile-Default file, but can be overridden in
-# local OS-specific make files.
-
-
-
-
-#------------------------------------------------------------------------------
-# Compiling Exim with content scanning support: If you want to compile Exim
-# with support for message body content scanning, set WITH_CONTENT_SCAN to
-# the value "yes". This will give you malware and spam scanning in the DATA ACL,
-# and the MIME ACL. Please read the documentation to learn more about these
-# features.
-
-WITH_CONTENT_SCAN=yes
-
-# If you want to use the deprecated "demime" condition in the DATA ACL,
-# uncomment the line below. Doing so will also explicitly turn on the
-# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
-# the "demime" condition.
-
-WITH_OLD_DEMIME=yes
-
-# If you're using ClamAV and are backporting fixes to an old version, instead
-# of staying current (which is the more usual approach) then you may need to
-# use an older API which uses a STREAM command, now deprecated, instead of
-# zINSTREAM.  If you need to set this, please let the Exim developers know, as
-# if nobody reports a need for it, we'll remove this option and clean up the
-# code.  zINSTREAM was introduced with ClamAV 0.95.
-#
-# WITH_OLD_CLAMAV_STREAM=yes
-
-#------------------------------------------------------------------------------
-# By default Exim includes code to support DKIM (DomainKeys Identified
-# Mail, RFC4871) signing and verification.  Verification of signatures is
-# turned on by default.  See the spec for information on conditionally
-# disabling it.  To disable the inclusion of the entire feature, set
-# DISABLE_DKIM to "yes"
-
-# DISABLE_DKIM=yes
-
-
-#------------------------------------------------------------------------------
-# Compiling Exim with experimental features. These are documented in
-# experimental-spec.txt. "Experimental" means that the way these features are
-# implemented may still change. Backward compatibility is not guaranteed.
-
-# Uncomment the following lines to add SPF support. You need to have libspf2
-# installed on your system (www.libspf2.org). Depending on where it is installed
-# you may have to edit the CFLAGS and LDFLAGS lines.
-
-# EXPERIMENTAL_SPF=yes
-# CFLAGS  += -I/usr/local/include
-# LDFLAGS += -lspf2
-
-# Uncomment the following lines to add SRS (Sender rewriting scheme) support.
-# You need to have libsrs_alt installed on your system (srs.mirtol.com).
-# Depending on where it is installed you may have to edit the CFLAGS and
-# LDFLAGS lines.
-
-# EXPERIMENTAL_SRS=yes
-# CFLAGS  += -I/usr/local/include
-# LDFLAGS += -lsrs_alt
-
-# Uncomment the following lines to add Brightmail AntiSpam support. You need
-# to have the Brightmail client SDK installed. Please check the experimental
-# documentation for implementation details. You need to edit the CFLAGS and
-# LDFLAGS lines.
-
-# EXPERIMENTAL_BRIGHTMAIL=yes
-# CFLAGS  += -I/opt/brightmail/bsdk-6.0/include
-# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib
-
-
-
-###############################################################################
-#                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
-###############################################################################
-
-# The items in this section are those that are commonly changed according to
-# the sysadmin's preferences, but whose defaults are often acceptable. The
-# first five are concerned with security issues, where differing levels of
-# paranoia are appropriate in different environments. Sysadmins also vary in
-# their views on appropriate levels of defence in these areas. If you do not
-# understand these issues, go with the defaults, which are used by many sites.
-
-
-#------------------------------------------------------------------------------
-# Although Exim is normally a setuid program, owned by root, it refuses to run
-# local deliveries as root by default. There is a runtime option called
-# "never_users" which lists the users that must never be used for local
-# deliveries. There is also the setting below, which provides a list that
-# cannot be overridden at runtime. This guards against problems caused by
-# unauthorized changes to the runtime configuration. You are advised not to
-# remove "root" from this option, but you can add other users if you want. The
-# list is colon-separated. It must NOT contain any spaces.
-
-# FIXED_NEVER_USERS=root:bin:daemon
-FIXED_NEVER_USERS=root
-
-
-#------------------------------------------------------------------------------
-# By default, Exim insists that its configuration file be owned by root. You
-# can specify one additional permitted owner here.
-
-# CONFIGURE_OWNER=
-
-# If the configuration file is group-writeable, Exim insists by default that it
-# is owned by root. You can specify one additional permitted group owner here.
-
-# CONFIGURE_GROUP=
-
-# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked
-# up at build time, and the uid or gid number is built into the binary.
-# However, you can specify that the lookup is deferred until runtime. In this
-# case, it is the name that is built into the binary. You can do this by a
-# setting of the form:
-
-# CONFIGURE_OWNER=ref:mail
-# CONFIGURE_GROUP=ref:sysadmin
-
-# In other words, put "ref:" in front of the user or group name. Although this
-# costs a bit of resource at runtime, it is convenient to use this feature when
-# building binaries that are to be run on multiple systems where the names may
-# refer to different uids or gids. It also allows you to build Exim on a system
-# where the relevant user or group is not defined.
-
-
-#------------------------------------------------------------------------------
-# The -C option allows Exim to be run with an alternate runtime configuration
-# file. When this is used by root, root privilege is retained by the binary
-# (for any other caller including the Exim user, it is dropped). You can
-# restrict the location of alternate configurations by defining a prefix below.
-# Any file used with -C must then start with this prefix (except that /dev/null
-# is also permitted if the caller is root, because that is used in the install
-# script). If the prefix specifies a directory that is owned by root, a
-# compromise of the Exim account does not permit arbitrary alternate
-# configurations to be used. The prefix can be more restrictive than just a
-# directory (the second example).
-
-# ALT_CONFIG_PREFIX=/some/directory/
-# ALT_CONFIG_PREFIX=/some/directory/exim.conf-
-
-
-#------------------------------------------------------------------------------
-# When a user other than root uses the -C option to override the configuration
-# file (including the Exim user when re-executing Exim to regain root
-# privileges for local message delivery), this will normally cause Exim to
-# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which
-# contains a list of trusted configuration filenames, one per line. If the -C
-# option is used by the Exim user or by the user specified in the
-# CONFIGURE_OWNER setting, to specify a configuration file which is listed in
-# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
-
-# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs
-
-
-#------------------------------------------------------------------------------
-# Uncommenting this option disables the use of the -D command line option,
-# which changes the values of macros in the runtime configuration file.
-# This is another protection against somebody breaking into the Exim account.
-
-# DISABLE_D_OPTION=yes
-
-
-#------------------------------------------------------------------------------
-# By contrast, you might be maintaining a system which relies upon the ability
-# to override values with -D and assumes that these will be passed through to
-# the delivery processes.  As of Exim 4.73, this is no longer the case by
-# default.  Going forward, we strongly recommend that you use a shim Exim
-# configuration file owned by root stored under TRUSTED_CONFIG_LIST.
-# That shim can set macros before .include'ing your main configuration file.
-#
-# As a strictly transient measure to ease migration to 4.73, the
-# WHITELIST_D_MACROS value definies a colon-separated list of macro-names
-# which are permitted to be overridden from the command-line which will be
-# honoured by the Exim user.  So these are macros that can persist to delivery
-# time.
-# Examples might be -DTLS or -DSPOOL=/some/dir.  The values on the
-# command-line are filtered to only permit: [A-Za-z0-9_/.-]*
-#
-# This option is highly likely to be removed in a future release.  It exists
-# only to make 4.73 as easy as possible to migrate to.  If you use it, we
-# encourage you to schedule time to rework your configuration to not depend
-# upon it.  Most people should not need to use this.
-#
-# By default, no macros are whitelisted for -D usage.
-
-# WHITELIST_D_MACROS=TLS:SPOOL
-
-#------------------------------------------------------------------------------
-# Exim has support for the AUTH (authentication) extension of the SMTP
-# protocol, as defined by RFC 2554. If you don't know what SMTP authentication
-# is, you probably won't want to include this code, so you should leave these
-# settings commented out. If you do want to make use of SMTP authentication,
-# you must uncomment at least one of the following, so that appropriate code is
-# included in the Exim binary. You will then need to set up the run time
-# configuration to make use of the mechanism(s) selected.
-
-AUTH_CRAM_MD5=yes
-# AUTH_CYRUS_SASL=yes
-AUTH_DOVECOT=yes
-AUTH_PLAINTEXT=yes
-AUTH_SPA=yes
-
-
-#------------------------------------------------------------------------------
-# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the
-# Cyrus SASL library installed before trying to build Exim, and you probably
-# want to uncomment the following line:
-
-# AUTH_LIBS=-lsasl2
-
-
-#------------------------------------------------------------------------------
-# When Exim is decoding MIME "words" in header lines, most commonly for use
-# in the $header_xxx expansion, it converts any foreign character sets to the
-# one that is set in the headers_charset option. The default setting is
-# defined by this setting:
-
-HEADERS_CHARSET="ISO-8859-1"
-
-# If you are going to make use of $header_xxx expansions in your configuration
-# file, or if your users are going to use them in filter files, and the normal
-# character set on your host is something other than ISO-8859-1, you might
-# like to specify a different default here. This value can be overridden in
-# the runtime configuration, and it can also be overridden in individual filter
-# files.
-#
-# IMPORTANT NOTE: The iconv() function is needed for character code
-# conversions. Please see the next item...
-
-
-#------------------------------------------------------------------------------
-# Character code conversions are possible only if the iconv() function is
-# installed on your operating system. There are two places in Exim where this
-# is relevant: (a) The $header_xxx expansion (see the previous item), and (b)
-# the Sieve filter support. For those OS where iconv() is known to be installed
-# as standard, the file in OS/Makefile-xxxx contains
-#
-# HAVE_ICONV=yes
-#
-# If you are not using one of those systems, but have installed iconv(), you
-# need to uncomment that line above. In some cases, you may find that iconv()
-# and its header file are not in the default places. You might need to use
-# something like this:
-#
-# HAVE_ICONV=yes
-# CFLAGS=-O -I/usr/local/include
-# EXTRALIBS_EXIM=-L/usr/local/lib -liconv
-#
-# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
-# as well.
-
-
-#------------------------------------------------------------------------------
-# The passwords for user accounts are normally encrypted with the crypt()
-# function. Comparisons with encrypted passwords can be done using Exim's
-# "crypteq" expansion operator. (This is commonly used as part of the
-# configuration of an authenticator for use with SMTP AUTH.) At least one
-# operating system has an extended function called crypt16(), which uses up to
-# 16 characters of a password (the normal crypt() uses only the first 8). Exim
-# supports the use of crypt16() as well as crypt() but note the warning below.
-
-# You can always indicate a crypt16-encrypted password by preceding it with
-# "{crypt16}". If you want the default handling (without any preceding
-# indicator) to use crypt16(), uncomment the following line:
-
-# DEFAULT_CRYPT=crypt16
-
-# If you do that, you can still access the basic crypt() function by preceding
-# an encrypted password with "{crypt}". For more details, see the description
-# of the "crypteq" condition in the manual chapter on string expansions.
-
-# Some operating systems do not include a crypt16() function, so Exim has one
-# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will
-# be set in an OS-specific Makefile for the OS that have such a function, so
-# you should not need to bother with it.
-
-# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
-# It turns out that the above is not entirely accurate. As well as crypt16()
-# there is a function called bigcrypt() that some operating systems have. This
-# may or may not use the same algorithm, and both of them may be different to
-# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined.
-#
-# However, since there is now a move away from the traditional crypt()
-# functions towards using SHA1 and other algorithms, tidying up this area of
-# Exim is seen as very low priority. In practice, if you need to, you can
-# define DEFAULT_CRYPT to the name of any function that has the same interface
-# as the traditional crypt() function.
-# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
-
-
-#------------------------------------------------------------------------------
-# Exim can be built to support the SMTP STARTTLS command, which implements
-# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you
-# must install the OpenSSL library package or the GnuTLS library. Exim contains
-# no cryptographic code of its own. Uncomment the following lines if you want
-# to build Exim with TLS support. If you don't know what this is all about,
-# leave these settings commented out.
-
-# This setting is required for any TLS support (either OpenSSL or GnuTLS)
-SUPPORT_TLS=yes
-
-# Uncomment this setting if you are using OpenSSL
-TLS_LIBS=-lssl -lcrypto
-
-# Uncomment these settings if you are using GnuTLS
-# USE_GNUTLS=yes
-# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
-
-# If you are running Exim as a server, note that just building it with TLS
-# support is not all you need to do. You also need to set up a suitable
-# certificate, and tell Exim about it by means of the tls_certificate
-# and tls_privatekey run time options. You also need to set tls_advertise_hosts
-# to specify the hosts to which Exim advertises TLS support. On the other hand,
-# if you are running Exim only as a client, building it with TLS support
-# is all you need to do.
-
-# Additional libraries and include files are required for both OpenSSL and
-# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed
-# with all your other libraries. If they are in a special directory, you may
-# need something like
-
-# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
-# or
-# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
-
-# TLS_LIBS is included only on the command for linking Exim itself, not on any
-# auxiliary programs. If the include files are not in a standard place, you can
-# set TLS_INCLUDE to specify where they are, for example:
-
-# TLS_INCLUDE=-I/usr/local/openssl/include/
-# or
-# TLS_INCLUDE=-I/opt/gnu/include
-
-# You don't need to set TLS_INCLUDE if the relevant directories are already
-# specified in INCLUDE.
-
-
-#------------------------------------------------------------------------------
-# The default distribution of Exim contains only the plain text form of the
-# documentation. Other forms are available separately. If you want to install
-# the documentation in "info" format, first fetch the Texinfo documentation
-# sources from the ftp directory and unpack them, which should create files
-# with the extension "texinfo" in the doc directory. You may find that the
-# version number of the texinfo files is different to your Exim version number,
-# because the main documentation isn't updated as often as the code. For
-# example, if you have Exim version 4.43, the source tarball upacks into a
-# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40.
-# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you
-# have unpacked them. Then set INFO_DIRECTORY to the location of your info
-# directory. This varies from system to system, but is often /usr/share/info.
-# Once you have done this, "make install" will build the info files and
-# install them in the directory you have defined.
-
-# INFO_DIRECTORY=/usr/share/info
-
-
-#------------------------------------------------------------------------------
-# Exim log directory and files: Exim creates several log files inside a
-# single log directory. You can define the directory and the form of the
-# log file name here. If you do not set anything, Exim creates a directory
-# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses
-# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change
-# this, you can set LOG_FILE_PATH to a path name containing one occurrence of
-# %s. This will be replaced by one of the strings "main", "panic", or "reject"
-# to form the final file names. Some installations may want something like this:
-
-LOG_FILE_PATH=/var/log/exim/%slog
-
-# which results in files with names /var/log/exim_mainlog, etc. The directory
-# in which the log files are placed must exist; Exim does not try to create
-# it for itself. It is also your responsibility to ensure that Exim is capable
-# of writing files using this path name. The Exim user (see EXIM_USER above)
-# must be able to create and update files in the directory you have specified.
-
-# You can also configure Exim to use syslog, instead of or as well as log
-# files, by settings such as these
-
-# LOG_FILE_PATH=syslog
-# LOG_FILE_PATH=syslog:/var/log/exim_%slog
-
-# The first of these uses only syslog; the second uses syslog and also writes
-# to log files. Do not include white space in such a setting as it messes up
-# the building process.
-
-
-#------------------------------------------------------------------------------
-# When logging to syslog, the following option caters for syslog replacements
-# that are able to accept log entries longer than the 1024 characters allowed
-# by RFC 3164. It is up to you to make sure your syslog daemon can handle this.
-# Non-printable characters are usually unacceptable regardless, so log entries
-# are still split on newline characters.
-
-# SYSLOG_LONG_LINES=yes
-
-# If you are not interested in the process identifier (pid) of the Exim that is
-# making the call to syslog, then comment out the following line.
-
-SYSLOG_LOG_PID=yes
-
-
-#------------------------------------------------------------------------------
-# Cycling log files: this variable specifies the maximum number of old
-# log files that are kept by the exicyclog log-cycling script. You don't have
-# to use exicyclog. If your operating system has other ways of cycling log
-# files, you can use them instead. The exicyclog script isn't run by default;
-# you have to set up a cron job for it if you want it.
-
-EXICYCLOG_MAX=10
-
-
-#------------------------------------------------------------------------------
-# The compress command is used by the exicyclog script to compress old log
-# files. Both the name of the command and the suffix that it adds to files
-# need to be defined here. See also the EXICYCLOG_MAX configuration.
-
-COMPRESS_COMMAND=/bin/gzip
-COMPRESS_SUFFIX=gz
-
-
-#------------------------------------------------------------------------------
-# If the exigrep utility is fed compressed log files, it tries to uncompress
-# them using this command.
-
-ZCAT_COMMAND=/bin/zcat
-
-
-#------------------------------------------------------------------------------
-# Compiling in support for embedded Perl: If you want to be able to
-# use Perl code in Exim's string manipulation language and you have Perl
-# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded
-# Perl costs quite a lot of resources. Only do this if you really need it.
-
-# EXIM_PERL=perl.o
-
-
-#------------------------------------------------------------------------------
-# Support for dynamically-loaded string expansion functions via ${dlfunc. If
-# you are using gcc the dynamically-loaded object must be compiled with the
-# -shared option, and you will need to add -export-dynamic to EXTRALIBS so
-# that the local_scan API is made available by the linker. You may also need
-# to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
-
-# EXPAND_DLFUNC=yes
-
-
-#------------------------------------------------------------------------------
-# Exim has support for PAM (Pluggable Authentication Modules), a facility
-# which is available in the latest releases of Solaris and in some GNU/Linux
-# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim
-# support, which is intended for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by the following setting:
-
-SUPPORT_PAM=yes
-
-# You probably need to add -lpam to EXTRALIBS, and in some releases of
-# GNU/Linux -ldl is also needed.
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via Radius is also available. The Exim support,
-# which is intended for use in conjunction with the SMTP AUTH facilities,
-# is included only when requested by setting the following parameter to the
-# location of your Radius configuration file:
-
-# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf
-# RADIUS_CONFIG_FILE=/etc/radius.conf
-
-# If you have set RADIUS_CONFIG_FILE, you should also set one of these to
-# indicate which RADIUS library is used:
-
-# RADIUS_LIB_TYPE=RADIUSCLIENT
-# RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-# RADIUS_LIB_TYPE=RADLIB
-
-# RADIUSCLIENT is the radiusclient library; you probably need to add
-#   -lradiusclient to EXTRALIBS.
-#
-# The API for the radiusclient library was changed at release 0.4.0.
-# Unfortunately, the header file does not define a version number that clients
-# can use to support both the old and new APIs. If you are using version 0.4.0
-# or later of the radiusclient library, you should use RADIUSCLIENTNEW.
-#
-# RADLIB is the Radius library that comes with FreeBSD (the header file is
-#   called radlib.h); you probably need to add -lradius to EXTRALIBS.
-#
-# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library,
-# using the original API.
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via the Cyrus SASL pwcheck daemon is available.
-# Note, however, that pwcheck is now deprecated in favour of saslauthd (see
-# next item). The Exim support for pwcheck, which is intented for use in
-# conjunction with the SMTP AUTH facilities, is included only when requested by
-# setting the following parameter to the location of the pwcheck daemon's
-# socket.
-#
-# There is no need to install all of SASL on your system. You just need to run
-# ./configure --with-pwcheck, cd to the pwcheck directory within the sources,
-# make and make install. You must create the socket directory (default
-# /var/pwcheck) and chown it to exim's user and group. Once you have installed
-# pwcheck, you should arrange for it to be started by root at boot time.
-
-# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
-
-
-#------------------------------------------------------------------------------
-# Support for authentication via the Cyrus SASL saslauthd daemon is available.
-# The Exim support, which is intented for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by setting the following
-# parameter to the location of the saslauthd daemon's socket.
-#
-# There is no need to install all of SASL on your system. You just need to run
-# ./configure --with-saslauthd (and any other options you need, for example, to
-# select or deselect authentication mechanisms), cd to the saslauthd directory
-# within the sources, make and make install. You must create the socket
-# directory (default /var/state/saslauthd) and chown it to exim's user and
-# group. Once you have installed saslauthd, you should arrange for it to be
-# started by root at boot time.
-
-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
-
-
-#------------------------------------------------------------------------------
-# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-# this setting. See the manual section entitled "Use of tcpwrappers" in the
-# chapter on building and installing Exim.
-#
-# USE_TCP_WRAPPERS=yes
-#
-# You may well also have to specify a local "include" file and an additional
-# library for TCP wrappers, so you probably need something like this:
-#
-# USE_TCP_WRAPPERS=yes
-# CFLAGS=-O -I/usr/local/include
-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
-#
-# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
-# as well.
-#
-# To use a name other than exim in the tcpwrappers config file,
-# e.g. if you're running multiple daemons with different access lists,
-# or multiple MTAs with the same access list, define
-# TCP_WRAPPERS_DAEMON_NAME accordingly
-#
-# TCP_WRAPPERS_DAEMON_NAME="exim"
-
-
-#------------------------------------------------------------------------------
-# The default action of the exim_install script (which is run by "make
-# install") is to install the Exim binary with a unique name such as
-# exim-4.43-1, and then set up a symbolic link called "exim" to reference it,
-# moving the symbolic link from any previous version. If you define NO_SYMLINK
-# (the value doesn't matter), the symbolic link is not created or moved. You
-# will then have to "turn Exim on" by setting up the link manually.
-
-# NO_SYMLINK=yes
-
-
-#------------------------------------------------------------------------------
-# Another default action of the install script is to install a default runtime
-# configuration file if one does not exist. This configuration has a router for
-# expanding system aliases. The default assumes that these aliases are kept
-# in the traditional file called /etc/aliases. If such a file does not exist,
-# the installation script creates one that contains just comments (no actual
-# aliases). The following setting can be changed to specify a different
-# location for the system alias file.
-
-SYSTEM_ALIASES_FILE=/etc/mail/aliases
-
-
-#------------------------------------------------------------------------------
-# There are some testing options (-be, -bt, -bv) that read data from the
-# standard input when no arguments are supplied. By default, the input lines
-# are read using the standard fgets() function. This does not support line
-# editing during interactive input (though the terminal's "erase" character
-# works as normal). If your operating system has the readline() function, and
-# in addition supports dynamic loading of library functions, you can cause
-# Exim to use readline() for the -be testing option (only) by uncommenting the
-# following setting. Dynamic loading is used so that the library is loaded only
-# when the -be testing option is given; by the time the loading occurs,
-# Exim has given up its root privilege and is running as the calling user. This
-# is the reason why readline() is NOT supported for -bt and -bv, because Exim
-# runs as root or as exim, respectively, for those options. When USE_READLINE
-# is "yes", as well as supporting line editing, a history of input lines in the
-# current run is maintained.
-
-# USE_READLINE=yes
-
-# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
-# Note that this option adds to the size of the Exim binary, because the
-# dynamic loading library is not otherwise included.
-
-
-
-###############################################################################
-#              THINGS YOU ALMOST NEVER NEED TO MENTION                        #
-###############################################################################
-
-# The settings in this section are available for use in special circumstances.
-# In the vast majority of installations you need not change anything below.
-
-
-#------------------------------------------------------------------------------
-# The following commands live in different places in some OS. Either the
-# ultimate default settings, or the OS-specific files should already point to
-# the right place, but they can be overridden here if necessary. These settings
-# are used when building various scripts to ensure that the correct paths are
-# used when the scripts are run. They are not used in the Makefile itself. Perl
-# is not necessary for running Exim unless you set EXIM_PERL (see above) to get
-# it embedded, but there are some utilities that are Perl scripts. If you
-# haven't got Perl, Exim will still build and run; you just won't be able to
-# use those utilities.
-
-# CHOWN_COMMAND=/usr/bin/chown
-# CHGRP_COMMAND=/usr/bin/chgrp
-# CHMOD_COMMAND=/usr/bin/chmod
-# MV_COMMAND=/bin/mv
-# RM_COMMAND=/bin/rm
-# TOUCH_COMMAND=/usr/bin/touch
-# PERL_COMMAND=/usr/bin/perl
-
-
-#------------------------------------------------------------------------------
-# The following macro can be used to change the command for building a library
-# of functions. By default the "ar" command is used, with options "cq".
-# Only in rare circumstances should you need to change this.
-
-# AR=ar cq
-
-
-#------------------------------------------------------------------------------
-# In some operating systems, the value of the TMPDIR environment variable
-# controls where temporary files are created. Exim does not make use of
-# temporary files, except when delivering to MBX mailboxes. However, if Exim
-# calls any external libraries (e.g. DBM libraries), they may use temporary
-# files, and thus be influenced by the value of TMPDIR. For this reason, when
-# Exim starts, it checks the environment for TMPDIR, and if it finds it is set,
-# it replaces the value with what is defined here. Commenting this setting
-# suppresses the check altogether.
-
-TMPDIR="/tmp"
-
-
-#------------------------------------------------------------------------------
-# The following macros can be used to change the default modes that are used
-# by the appendfile transport. In most installations the defaults are just
-# fine, and in any case, you can change particular instances of the transport
-# at run time if you want.
-
-# APPENDFILE_MODE=0600
-# APPENDFILE_DIRECTORY_MODE=0700
-# APPENDFILE_LOCKFILE_MODE=0600
-
-
-#------------------------------------------------------------------------------
-# In some installations there may be multiple machines sharing file systems,
-# where a different configuration file is required for Exim on the different
-# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look
-# for a configuration file whose name is that defined by CONFIGURE_FILE,
-# with the node name obtained by uname() tacked on the end, separated by a
-# period (for example, /usr/exim/configure.host.in.some.domain). If this file
-# does not exist, then the bare configuration file name is tried.
-
-# CONFIGURE_FILE_USE_NODE=yes
-
-
-#------------------------------------------------------------------------------
-# In some esoteric configurations two different versions of Exim are run,
-# with different setuid values, and different configuration files are required
-# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then
-# Exim will first look for a configuration file whose name is that defined
-# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by
-# a period (for eximple, /usr/exim/configure.0). If this file does not exist,
-# then the bare configuration file name is tried. In the case when both
-# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files
-# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>.
-
-# CONFIGURE_FILE_USE_EUID=yes
-
-
-#------------------------------------------------------------------------------
-# The size of the delivery buffers: These specify the sizes (in bytes) of
-# the buffers that are used when copying a message from the spool to a
-# destination. There is rarely any need to change these values.
-
-# DELIVER_IN_BUFFER_SIZE=8192
-# DELIVER_OUT_BUFFER_SIZE=8192
-
-
-#------------------------------------------------------------------------------
-# The mode of the database directory: Exim creates a directory called "db"
-# in its spool directory, to hold its databases of hints. This variable
-# determines the mode of the created directory. The default value in the
-# source is 0750.
-
-# EXIMDB_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# Database file mode: The mode of files created in the "db" directory defaults
-# to 0640 in the source, and can be changed here.
-
-# EXIMDB_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# Database lock file mode: The mode of zero-length files created in the "db"
-# directory to use for locking purposes defaults to 0640 in the source, and
-# can be changed here.
-
-# EXIMDB_LOCKFILE_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# This parameter sets the maximum length of the header portion of a message
-# that Exim is prepared to process. The default setting is one megabyte. The
-# limit exists in order to catch rogue mailers that might connect to your SMTP
-# port, start off a header line, and then just pump junk at it for ever. The
-# message_size_limit option would also catch this, but it may not be set.
-# The value set here is the default; it can be changed at runtime.
-
-# HEADER_MAXSIZE="(1024*1024)"
-
-
-#------------------------------------------------------------------------------
-# The mode of the input directory: The input directory is where messages are
-# kept while awaiting delivery. Exim creates it if necessary, using a mode
-# which can be defined here (default 0750).
-
-# INPUT_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The mode of Exim's log directory, when it is created by Exim inside the spool
-# directory, defaults to 0750 but can be changed here.
-
-# LOG_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The log files themselves are created as required, with a mode that defaults
-# to 0640, but which can be changed here.
-
-# LOG_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# The TESTDB lookup is for performing tests on the handling of lookup results,
-# and is not useful for general running. It should be included only when
-# debugging the code of Exim.
-
-# LOOKUP_TESTDB=yes
-
-
-#------------------------------------------------------------------------------
-# /bin/sh is used by default as the shell in which to run commands that are
-# defined in the makefiles. This can be changed if necessary, by uncommenting
-# this line and specifying another shell, but note that a Bourne-compatible
-# shell is expected.
-
-# MAKE_SHELL=/bin/sh
-
-
-#------------------------------------------------------------------------------
-# The maximum number of named lists of each type (address, domain, host, and
-# local part) can be increased by changing this value. It should be set to
-# a multiple of 16.
-
-MAX_NAMED_LIST=16
-
-
-#------------------------------------------------------------------------------
-# Network interfaces: Unless you set the local_interfaces option in the runtime
-# configuration file to restrict Exim to certain interfaces only, it will run
-# code to find all the interfaces there are on your host. Unfortunately,
-# the call to the OS that does this requires a buffer large enough to hold
-# data for all the interfaces - it was designed in the days when a host rarely
-# had more than three or four interfaces. Nowadays hosts can have very many
-# virtual interfaces running on the same hardware. If you have more than 250
-# virtual interfaces, you will need to uncomment this setting and increase the
-# value.
-
-# MAXINTERFACES=250
-
-
-#------------------------------------------------------------------------------
-# Per-message logs: While a message is in the process of being delivered,
-# comments on its progress are written to a message log, for the benefit of
-# human administrators. These logs are held in a directory called "msglog"
-# in the spool directory. Its mode defaults to 0750, but can be changed here.
-# The message log directory is also used for storing files that are used by
-# transports for returning data to a message's sender (see the "return_output"
-# option for transports).
-
-# MSGLOG_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# There are three options which are used when compiling the Perl interface and
-# when linking with Perl. The default values for these are placed automatically
-# at the head of the Makefile by the script which builds it. However, if you
-# want to override them, you can do so here.
-
-# PERL_CC=
-# PERL_CCOPTS=
-# PERL_LIBS=
-
-
-#------------------------------------------------------------------------------
-# Identifying the daemon: When an Exim daemon starts up, it writes its pid
-# (process id) to a file so that it can easily be identified. The path of the
-# file can be specified here. Some installations may want something like this:
-
-PID_FILE_PATH=/var/run/exim.pid
-
-# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
-# using the name "exim-daemon.pid".
-
-# If you start up a daemon without the -bd option (for example, with just
-# the -q15m option), a pid file is not written. Also, if you override the
-# configuration file with the -oX option, no pid file is written. In other
-# words, the pid file is written only for a "standard" daemon.
-
-
-#------------------------------------------------------------------------------
-# If Exim creates the spool directory, it is given this mode, defaulting in the
-# source to 0750.
-
-# SPOOL_DIRECTORY_MODE=0750
-
-
-#------------------------------------------------------------------------------
-# The mode of files on the input spool which hold the contents of messages can
-# be changed here. The default is 0640 so that information from the spool is
-# available to anyone who is a member of the Exim group.
-
-# SPOOL_MODE=0640
-
-
-#------------------------------------------------------------------------------
-# Moving frozen messages: If the following is uncommented, Exim is compiled
-# with support for automatically moving frozen messages out of the main spool
-# directory, a facility that is found useful by some large installations. A
-# run time option is required to cause the moving actually to occur. Such
-# messages become "invisible" to the normal management tools.
-
-# SUPPORT_MOVE_FROZEN_MESSAGES=yes
-
-
-#------------------------------------------------------------------------------
-# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you
-# really, really, really know what you are doing. And even then, think again.
-# You should never uncomment this when compiling a binary for distribution.
-# Use it only when compiling Exim for your own use.
-#
-# Uncommenting this line enables the use of a runtime option called
-# disable_fsync, which can be used to stop Exim using fsync() to ensure that
-# files are written to disc before proceeding. When this is disabled, crashes
-# and hardware problems such as power outages can cause data to be lost. This
-# feature should only be used in very exceptional circumstances. YOU HAVE BEEN
-# WARNED.
-
-# ENABLE_DISABLE_FSYNC=yes
-
-HAVE_IPV6=YES
-LOOKUP_LIBS=-lldap -llber
-EXTRALIBS_EXIM=-lpam
-# End of EDITME for Exim 4.
diff --git a/community-testing/exim/exim.conf.d b/community-testing/exim/exim.conf.d
deleted file mode 100644
index b9bec4335..000000000
--- a/community-testing/exim/exim.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-EXIM_ARGS="-bd -q15m"
diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install
deleted file mode 100644
index 8ed329559..000000000
--- a/community-testing/exim/exim.install
+++ /dev/null
@@ -1,25 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
-  if getent passwd exim > /dev/null 2>&1; then
-    usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1
-  else
-    usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim 
-  fi
-  passwd -l exim > /dev/null
-  chown root.exim /var/spool/exim /var/log/exim
-  chown exim.exim /var/spool/exim/db
-  chmod u+s /usr/sbin/exim
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  getent passwd exim >/dev/null 2>&1 && userdel exim
-}
-
diff --git a/community-testing/exim/exim.logrotate b/community-testing/exim/exim.logrotate
deleted file mode 100644
index 070ba4747..000000000
--- a/community-testing/exim/exim.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/exim/*log {
-   su exim exim
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/community-testing/extremetuxracer/PKGBUILD b/community-testing/extremetuxracer/PKGBUILD
deleted file mode 100644
index 19139aede..000000000
--- a/community-testing/extremetuxracer/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 63084 2012-01-30 18:54:55Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Eric Belanger <eric.archlinux.org>
-# Contributor: Fabio Scotoni <CCuleX.gmail.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-pkgname=extremetuxracer
-pkgver=0.4
-pkgrel=3
-pkgdesc="Downhill racing game starring Tux"
-arch=('x86_64' 'i686')
-url="http://www.extremetuxracer.com"
-license=('GPL')
-depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu')
-conflicts=('ppracer' 'etracer')
-replaces=('ppracer' 'etracer')
-source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz"
-       "$pkgname.png"
-       "$pkgname.desktop"
-       "libpng15.patch")
-sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d'
-            'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb'
-            '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8'
-            '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8')
-
-build() {
-  cd "$srcdir/extremetuxracer-$pkgver"
-
-  patch -Np1 -i ${srcdir}/libpng15.patch
-  sed -i -e 's/libpng12/libpng15/g' configure
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/extremetuxracer-$pkgver"
-  make DESTDIR="$pkgdir" install
-
- # Install icon and desktop file
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/extremetuxracer/extremetuxracer.desktop b/community-testing/extremetuxracer/extremetuxracer.desktop
deleted file mode 100644
index 6593607b8..000000000
--- a/community-testing/extremetuxracer/extremetuxracer.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-Name=Extreme Tux Racer
-Comment=Open source racing game featuring Tux the Linux Penguin. 
-Icon=/usr/share/pixmaps/extremetuxracer.png
-Exec=etracer
-Terminal=false
-StartupNotify=true
-Categories=Application;Game;ArcadeGame
-
diff --git a/community-testing/extremetuxracer/extremetuxracer.png b/community-testing/extremetuxracer/extremetuxracer.png
deleted file mode 100644
index 6c4aec00b..000000000
--- a/community-testing/extremetuxracer/extremetuxracer.png
+++ /dev/null
diff --git a/community-testing/extremetuxracer/libpng15.patch b/community-testing/extremetuxracer/libpng15.patch
deleted file mode 100644
index 5c9999857..000000000
--- a/community-testing/extremetuxracer/libpng15.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp	2007-09-01 19:38:12.000000000 +0300
-+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp	2010-01-25 03:47:21.000000000 +0200
-@@ -53,7 +53,7 @@
-     if (!info_ptr)
-     {
-         png_destroy_read_struct(&png_ptr,
--           (png_infopp)NULL, (png_infopp)NULL);
-+           NULL, NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -62,7 +62,7 @@
-     if (!end_info)
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr,
--          (png_infopp)NULL);
-+          NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -77,7 +77,7 @@
- 	
- 	
- 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
--       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+       &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	
- 	if(bit_depth == 16)
-         png_set_strip_16(png_ptr);
-@@ -88,7 +88,7 @@
- 		png_set_expand(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 	
- 	if( color_type == PNG_COLOR_TYPE_GRAY ||
-@@ -96,7 +96,7 @@
- 		png_set_gray_to_rgb(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 		
- 	this->width=width;
-@@ -114,7 +114,7 @@
- 	}
- 	
- 	png_read_end(png_ptr, info_ptr);
--	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 	fclose(fp);
- }
- 
diff --git a/community-testing/fbgrab/PKGBUILD b/community-testing/fbgrab/PKGBUILD
deleted file mode 100644
index 4201a7b31..000000000
--- a/community-testing/fbgrab/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 63086 2012-01-30 18:55:03Z ibiru $
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-
-pkgname=fbgrab
-pkgver=1.0
-pkgrel=6
-pkgdesc="A framebuffer screenshot grabber"
-arch=(i686 x86_64)
-url="http://hem.bredband.net/gmogmo/fbgrab/"
-license=("GPL")
-depends=('libpng')
-makedepends=('libpng')
-source=(http://hem.bredband.net/gmogmo/fbgrab/fbgrab-1.0.tar.gz)
-md5sums=('7af4d8774684182ed690d5da82d6d234')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i '1,1i#include <zlib.h>' fbgrab.c
-  gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-  strip fbgrab
-  install -D -m755 $startdir/src/$pkgname-$pkgver/fbgrab $startdir/pkg/usr/bin/fbgrab
-  install -D -m644 $startdir/src/$pkgname-$pkgver/fbgrab.1.man $startdir/pkg/usr/share/man/man1/fbgrab.1
-}
diff --git a/community-testing/fbreader/PKGBUILD b/community-testing/fbreader/PKGBUILD
deleted file mode 100644
index c5880cbe0..000000000
--- a/community-testing/fbreader/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 63088 2012-01-30 18:55:12Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=fbreader
-pkgver=0.12.10
-pkgrel=3
-pkgdesc="An e-book reader for Linux"
-arch=('i686' 'x86_64')
-url="http://www.fbreader.org/"
-license=('GPL')
-depends=('fribidi' 'bzip2' 'curl' 'gtk2' 'liblinebreak' 'sqlite3')
-source=(http://www.fbreader.org/files/sources/fbreader-sources-$pkgver.tgz
-	build-fix.patch)
-md5sums=('da9ec4721efdb0ec0aaa182bff16ad82'
-         '66ac17d8640625b6d2a806de4aa4e76c')
-
-build() {
-  export CPPFLAGS="-I/usr/include/cairo"
-  export TARGET_ARCH=desktop
-  export UI_TYPE=gtk
-  export TARGET_STATUS=release
-  export srcdir
-
-  cd $srcdir/fbreader-$pkgver
-  patch -p0 makefiles/config.mk <$srcdir/build-fix.patch
-  sed -i 's#Library::Library &Library::Instance()#Library \&Library::Instance()#' fbreader/src/library/Library.cpp
-  make INSTALLDIR=/usr
-  make INSTALLDIR=/usr DESTDIR=$pkgdir install
-}
diff --git a/community-testing/fbreader/build-fix.patch b/community-testing/fbreader/build-fix.patch
deleted file mode 100644
index 7316464b8..000000000
--- a/community-testing/fbreader/build-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.mk.orig	2010-02-23 18:22:10.000000000 +0000
-+++ config.mk	2010-02-28 13:55:11.000000000 +0000
-@@ -21,7 +21,7 @@
- ARCHIVER_LIBS ?= -lz -lbz2
- NETWORK_LIBS ?= -lcurl
- 
--CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
-+CFLAGS += -I$(srcdir)/liblinebreak-20080321 -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
- ifeq "$(ZLSHARED)" "yes"
-   CFLAGS += -fPIC -DZLSHARED
- endif
-@@ -38,6 +38,8 @@
- 	LDFLAGS += -pg
- endif
- 
-+LDFLAGS += -L$(srcdir)/liblinebreak-20080321/DebugDir
-+
- ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include
- 
- ZLSHARED ?= yes
diff --git a/community-testing/fbshot/PKGBUILD b/community-testing/fbshot/PKGBUILD
deleted file mode 100644
index d68dec0af..000000000
--- a/community-testing/fbshot/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 63090 2012-01-30 18:55:17Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: sp42b <sp42b|a_t|gmx.net>
-
-pkgname=fbshot
-pkgver=0.3
-pkgrel=4
-pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)."
-arch=('i686' 'x86_64')
-url="http://www.sfires.net/fbshot/"
-license=('GPL')
-depends=('libpng')
-source=(http://www.sfires.net/stuff/fbshot/$pkgname-$pkgver.tar.gz)
-md5sums=('2cc6cc25cdc4cd447a8b0a9662907635')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i '1,1i#include <zlib.h>' fbshot.c
-  make
-  install -Dm755 fbshot $pkgdir/usr/bin/fbshot
-  install -Dm644 fbshot.1.man $pkgdir/usr/share/man/man1/fbshot.1
-}
diff --git a/community-testing/fbv/ChangeLog b/community-testing/fbv/ChangeLog
deleted file mode 100644
index 7fd5bbf99..000000000
--- a/community-testing/fbv/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-26 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
diff --git a/community-testing/fbv/PKGBUILD b/community-testing/fbv/PKGBUILD
deleted file mode 100644
index fe4d2cfb7..000000000
--- a/community-testing/fbv/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 63092 2012-01-30 18:55:24Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Aectann <aectann@infoline.su>
-
-pkgname=fbv
-pkgver=1.0b
-pkgrel=5
-pkgdesc="FrameBuffer image viewer"
-arch=('i686' 'x86_64')
-url="http://s-tech.elsat.net.pl/fbv/"
-license=('GPL')
-depends=('libpng' 'libungif' 'libjpeg')
-source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz)
-md5sums=('3e466375b930ec22be44f1041e77b55d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf
-  sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
-  make
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/usr/share/man/man1
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/fityk/PKGBUILD b/community-testing/fityk/PKGBUILD
deleted file mode 100644
index 9c95247c7..000000000
--- a/community-testing/fityk/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Cuneyt Unlu <unlucu AT gmail.com>
-
-pkgname=fityk
-pkgver=1.1.1
-pkgrel=4
-pkgdesc='A program for nonlinear fitting of analytical functions to data.'
-arch=('i686' 'x86_64')
-url='http://www.unipress.waw.pl/fityk/'
-license=('GPL')
-depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot' 'desktop-file-utils') # wxgtk supplied by statically linked wxWidgets
-makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion')
-options=('!libtool')
-install='fityk.install'
-
-build() {
-  # daily snapshot because fityk requires a version that hasn't been released yet...
-  svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets
-
-  cd wxWidgets
-  ./configure --prefix=${srcdir}/usr --disable-shared --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
-  make
-  make install
-
-  cd ${srcdir}
-  git clone git://github.com/wojdyr/fityk.git
-  cd fityk
-  git checkout v${pkgver}
-  #cd ${pkgname}-${pkgver}
-
-  # disable xyconvert because wxwidgets>=2.9 is needed (dev version) and it isn't standard with arch yet
-    #--disable-xyconvert \
-  ./autogen.sh \
-    --prefix=/usr \
-    --without-doc \
-    --with-wx-prefix=${srcdir}/usr
-  #./configure \
-
-  make
-}
-
-package() {
-  cd fityk
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/fityk/fityk.install b/community-testing/fityk/fityk.install
deleted file mode 100644
index df476d572..000000000
--- a/community-testing/fityk/fityk.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-mime-database /usr/share/mime
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-mime-database /usr/share/mime
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-mime-database /usr/share/mime
-  update-desktop-database -q
-}
diff --git a/community-testing/flam3/PKGBUILD b/community-testing/flam3/PKGBUILD
deleted file mode 100644
index 27f5b00e1..000000000
--- a/community-testing/flam3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 63096 2012-01-30 18:55:40Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=flam3
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
-arch=('i686' 'x86_64')
-url="http://flam3.com/"
-license=('GPL3')
-depends=('libjpeg' 'libpng' 'libxml2')
-options=('!libtool')
-source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch)
-sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9'
-          '17ece6cc00899e5135dad2bc79f97dfbd73107a6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-  patch -p1 -i ../../flam3-3.0.1-libpng15.patch
-  ./configure --prefix=/usr --enable-shared
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/flam3/flam3-3.0.1-libpng15.patch b/community-testing/flam3/flam3-3.0.1-libpng15.patch
deleted file mode 100644
index 61f905589..000000000
--- a/community-testing/flam3/flam3-3.0.1-libpng15.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-http://code.google.com/p/flam3/issues/detail?id=8
-
---- src/png.c
-+++ src/png.c
-@@ -142,7 +142,7 @@
-   }
-   if (setjmp(png_jmpbuf(png_ptr))) {
-      if (png_image) {
--	 for (y = 0 ; y < info_ptr->height ; y++)
-+	 for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
- 	     free (png_image[y]);
- 	 free (png_image);
-      }
-@@ -161,19 +161,19 @@
-   png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE);
-   png_read_info (png_ptr, info_ptr);
- 
--  if (8 != info_ptr->bit_depth) {
-+  if (8 != png_get_bit_depth(png_ptr, info_ptr)) {
-     fprintf(stderr, "bit depth type must be 8, not %d.\n",
--	    info_ptr->bit_depth);
-+	    png_get_bit_depth(png_ptr, info_ptr));
-     return 0;
-   }
- 
--  *width = info_ptr->width;
--  *height = info_ptr->height;
-+  *width = png_get_image_width(png_ptr, info_ptr);
-+  *height = png_get_image_height(png_ptr, info_ptr);
-   p = q = malloc(4 * *width * *height);
--  png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*));
-+  png_image = (png_byte **)malloc (png_get_image_height(png_ptr, info_ptr) * sizeof (png_byte*));
- 
--  linesize = info_ptr->width;
--  switch (info_ptr->color_type) {
-+  linesize = png_get_image_width(png_ptr, info_ptr);
-+  switch (png_get_color_type(png_ptr, info_ptr)) {
-     case PNG_COLOR_TYPE_RGB:
-       linesize *= 3;
-       break;
-@@ -182,21 +182,21 @@
-       break;
-   default:
-     fprintf(stderr, "color type must be RGB or RGBA not %d.\n",
--	    info_ptr->color_type);
-+	    png_get_color_type(png_ptr, info_ptr));
-     return 0;
-   }
- 
--  for (y = 0 ; y < info_ptr->height ; y++) {
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
-     png_image[y] = malloc (linesize);
-   }
-   png_read_image (png_ptr, png_image);
-   png_read_end (png_ptr, info_ptr);
- 
--  for (y = 0 ; y < info_ptr->height ; y++) {
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
-     unsigned char *s = png_image[y];
--    for (x = 0 ; x < info_ptr->width ; x++) {
-+    for (x = 0 ; x < png_get_image_width(png_ptr, info_ptr) ; x++) {
- 
--      switch (info_ptr->color_type) {
-+      switch (png_get_color_type(png_ptr, info_ptr)) {
-       case PNG_COLOR_TYPE_RGB:
- 	p[0] = s[0];
- 	p[1] = s[1];
-@@ -217,7 +217,7 @@
-     }
-   }
- 
--  for (y = 0 ; y < info_ptr->height ; y++)
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
-     free (png_image[y]);
-   free (png_image);
-   png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
diff --git a/community-testing/flowcanvas/PKGBUILD b/community-testing/flowcanvas/PKGBUILD
deleted file mode 100644
index a4e71b144..000000000
--- a/community-testing/flowcanvas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63098 2012-01-30 18:55:46Z ibiru $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Max a.k.a. Synthead <synthead@gmail.com>
-# Contributor: christhemonkey <christhemonkey at gmail dot com>
-
-pkgname=flowcanvas
-pkgver=0.7.1
-pkgrel=3
-pkgdesc="Gtkmm/Gnomecanvasmm widget for boxes-and-lines style environments"
-arch=('i686' 'x86_64')
-url="http://drobilla.net/software/flowcanvas/"
-depends=('libgnomecanvasmm' 'graphviz')
-makedepends=('boost' 'python2')
-license=('GPL')
-install=$pkgname.install
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('a4908f6385ce9fd2ce97c8caa823f053')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/flowcanvas/flowcanvas.install b/community-testing/flowcanvas/flowcanvas.install
deleted file mode 100644
index dbd9898d3..000000000
--- a/community-testing/flowcanvas/flowcanvas.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  \ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/fltk2/PKGBUILD b/community-testing/fltk2/PKGBUILD
deleted file mode 100644
index 782982bac..000000000
--- a/community-testing/fltk2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63100 2012-01-30 18:55:51Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=fltk2
-pkgver=2.0
-_pkgver=2.0.x-alpha-r9166
-pkgrel=8
-pkgdesc="Graphical user interface toolkit for X"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.fltk.org/"
-depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama')
-makedepends=('mesa')
-source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2)
-md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa')
-
-build() {
-  cd $srcdir/fltk-${_pkgver}
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-  patch -p0 src/filename_list.cxx <<EOF
-66c66
-<   int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
----
->   int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort);
-EOF
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/fox/PKGBUILD b/community-testing/fox/PKGBUILD
deleted file mode 100644
index ee80bf061..000000000
--- a/community-testing/fox/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63102 2012-01-30 18:55:55Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=fox
-pkgver=1.6.44
-pkgrel=2
-pkgdesc="Free Objects for X: GUI Toolkit for C++"
-arch=('i686' 'x86_64')
-url="http://www.fox-toolkit.org/"
-license=('LGPL' 'custom')
-depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff')
-optdepends=('perl')
-options=('!libtool')
-source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
-md5sums=('6ccc8cbcfa6e4c8b6e4deeeb39c36434')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-  ./configure   --prefix=/usr \
-                --enable-release \
-                --with-xft=yes \
-                --with-opengl=yes \
-                --with-xim \
-                --with-xshm \
-                --with-shape \
-                --with-xcursor \
-                --with-xrender \
-                --with-xrandr \
-                --with-xfixes \
-                --with-xinput
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  cd ${srcdir}/${pkgname}-${pkgver}/tests
-  make ControlPanel
-  install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/
-  install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-testing/freedroidrpg/PKGBUILD b/community-testing/freedroidrpg/PKGBUILD
deleted file mode 100644
index f149f3537..000000000
--- a/community-testing/freedroidrpg/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 63104 2012-01-30 18:56:05Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: nut543 <kfs1@online.no>
-
-#pkgbase=freedroidrpg
-#pkgname=('freedroidrpg' 'freedroidrpg-data')
-pkgname='freedroidrpg'
-pkgver=0.15
-pkgrel=2
-arch=('i686' 'x86_64')
-# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
-depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa')
-optdepends=('python2' 'espeak')
-pkgdesc="a mature science fiction role playing game set in the future"
-url="http://freedroid.sourceforge.net"
-license=("GPL")
-source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz
-	freedroidrpg.jpg
-	freedroidrpg.desktop)
-md5sums=('003a3f34619cfaa87add2030fea5d120'
-         'b73d9dac44c7e83a6c80fbe4eb96ba79'
-         '9a10c2a2064439cdcff5b945dfb1c3ac')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-  install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg
-  install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop
-}
diff --git a/community-testing/freedroidrpg/freedroidrpg.desktop b/community-testing/freedroidrpg/freedroidrpg.desktop
deleted file mode 100644
index 33ee2f5b8..000000000
--- a/community-testing/freedroidrpg/freedroidrpg.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=freedroidrpg
-Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG
-Exec=freedroidRPG
-Encoding=UTF-8
-Icon=/usr/share/icons/freedroidrpg.jpg
-Categories=Game;RolePlaying;
-Terminal=false
-StartupNotify=false
diff --git a/community-testing/freedroidrpg/freedroidrpg.jpg b/community-testing/freedroidrpg/freedroidrpg.jpg
deleted file mode 100644
index 4daa89313..000000000
--- a/community-testing/freedroidrpg/freedroidrpg.jpg
+++ /dev/null
diff --git a/community-testing/freemat/ChangeLog b/community-testing/freemat/ChangeLog
deleted file mode 100644
index dba4cf7ec..000000000
--- a/community-testing/freemat/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-testing/freemat/PKGBUILD b/community-testing/freemat/PKGBUILD
deleted file mode 100644
index bb56f241f..000000000
--- a/community-testing/freemat/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 64067 2012-02-08 23:52:37Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=freemat
-pkgver=4.1
-pkgrel=2
-pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
-url="http://freemat.sourceforge.net"
-license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
-install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
-         '2d11a28aa2a7df89c4618ed1c4be5973')
-
-build() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  rm -f CMakeCache.txt
-  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
-  find . -type f -name 'add.so' -exec rm -f {} \;
-  patch -p1 <$srcdir/build-fix.patch
-  echo >libs/libMatC/CJitFuncClang.hpp
-  echo >libs/libMatC/CJitFuncClang.cpp
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DUSE_LLVM=OFF \
-	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	.
-  make
-}
-package() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  make DESTDIR=$pkgdir install
-  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
-  rm $pkgdir/usr/bin/blas.ini
-}
diff --git a/community-testing/freemat/build-fix.patch b/community-testing/freemat/build-fix.patch
deleted file mode 100644
index c1ea63088..000000000
--- a/community-testing/freemat/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
-+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
-@@ -20,6 +20,7 @@
- #include <qimage.h>
- #include <qpainter.h>
- #include <QtOpenGL>
-+#include <GL/glu.h>
- #include <math.h>
- #include "IEEEFP.hpp"
- 
diff --git a/community-testing/freemat/freemat.install b/community-testing/freemat/freemat.install
deleted file mode 100644
index 051cca866..000000000
--- a/community-testing/freemat/freemat.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
-
-post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
diff --git a/community-testing/freewrl/PKGBUILD b/community-testing/freewrl/PKGBUILD
deleted file mode 100644
index 2e425d26b..000000000
--- a/community-testing/freewrl/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 63106 2012-01-30 18:56:16Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=freewrl
-pkgver=1.22.10
-pkgrel=8
-pkgdesc="VRML viewer"
-arch=('i686' 'x86_64')
-url="http://freewrl.sourceforge.net/"
-license=('GPL')
-depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox'
-	 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js')
-makedepends=('java-environment')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	build-fix.patch)
-md5sums=('07fd8f193d14799ffb95a59a4887fc88'
-         '52e4b6aacebcaf18cbec8975e0eb7fd8')
-
-build() {
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/build-fix.patch
-  export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-  export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185"
-  ./configure \
-    --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \
-    --enable-libcurl --with-expat=/usr --with-target=x11 --disable-plugin \
-    --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js \
-    --disable-seamonkey-js
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/freewrl/build-fix.patch b/community-testing/freewrl/build-fix.patch
deleted file mode 100644
index c0de71d07..000000000
--- a/community-testing/freewrl/build-fix.patch
+++ /dev/null
@@ -1,1201 +0,0 @@
-diff -wbBur freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c
---- freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c	2010-08-19 06:20:36.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c	2011-07-04 01:19:07.000000000 +0400
-@@ -54,7 +54,7 @@
- #include "ColladaParser.h"
- 
- #if HAVE_EXPAT_H
--# include <expat.h>
-+# include </usr/include/expat.h>
- #endif
- 
- #define PROTOINSTANCE_MAX_LEVELS 10
-diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldGet.c freewrl-1.22.10.my/src/lib/world_script/fieldGet.c
---- freewrl-1.22.10/src/lib/world_script/fieldGet.c	2010-10-13 23:45:26.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/fieldGet.c	2011-07-04 20:21:21.000000000 +0400
-@@ -412,7 +412,7 @@
- 				/* create a new SFFloat object */
- 				
- 				fp = (float *)fp_in; 
--				newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp));
-+				newjsval = JS_NewJSVal(cx,(double)*fp);
- 				fp_in = offsetPointer_deref(float *,fp_in,elementlen);
- 
- 				/* put this object into the MF class */
-@@ -449,7 +449,7 @@
- 				/* create a new SFTime object */
- 				
- 				fp = (float *)fp_in; 
--				newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp));
-+				newjsval = JS_NewJSVal(cx,(double)*fp);
- 				fp_in = offsetPointer_deref(float *,fp_in,elementlen);
- 
- 				/* put this object into the MF class */
-diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldSet.c freewrl-1.22.10.my/src/lib/world_script/fieldSet.c
---- freewrl-1.22.10/src/lib/world_script/fieldSet.c	2010-09-22 00:00:25.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/fieldSet.c	2011-07-04 20:03:53.000000000 +0400
-@@ -748,7 +748,7 @@
- 
- 	#ifdef SETFIELDVERBOSE
- 	strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--       	strp = JS_GetStringBytes(strval);
-+	strp = JS_EncodeString(scriptContext, strval);
- 	printf ("start of setField_javascriptEventOut, to %ld:%d = %p, fieldtype %d string %s\n",(long)tn, tptr, memptr, fieldType, strp);
- 	#endif
- 
-@@ -813,7 +813,7 @@
- 		case FIELDTYPE_SFImage: {
- 			/* the string should be saved as an SFImage */
- 			strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        	strp = JS_GetStringBytes(strval);
-+	        	strp = JS_EncodeString(scriptContext, strval);
- 
- 			Parser_scanStringValueToMem(tn, tptr, FIELDTYPE_SFImage, strp, FALSE);
- 			break;
-@@ -824,7 +824,7 @@
- 			uintptr_t *newptr;
- 
- 			strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        	strp = JS_GetStringBytes(strval);
-+	        	strp = JS_EncodeString(scriptContext, strval);
- 
- 			/* copy the string over, delete the old one, if need be */
- 			/* printf ("fieldSet SFString, tn %d tptr %d offset from struct %d\n",
-@@ -844,7 +844,7 @@
- 				struct X3D_Node *mynode;
- 
- 				strval = JS_ValueToString(scriptContext, JSglobal_return_val);
--	        		strp = JS_GetStringBytes(strval);
-+	        		strp = JS_EncodeString(scriptContext, strval);
- 				
- 				/* we will have at least one node here, in an ascii string */
- 				while ((*strp > '\0') && (*strp <= ' ')) strp ++;
-@@ -1227,7 +1227,7 @@
- 			JSString *_tmpStr;
- 
- 	                _tmpStr = JS_ValueToString(cx, mainElement);
--			strp = JS_GetStringBytes(_tmpStr);
-+			strp = JS_EncodeString(scriptContext, _tmpStr);
- 	                printf ("sub element %d is \"%s\" \n",i,strp);  
- 
- 			if (JSVAL_IS_OBJECT(mainElement)) printf ("sub element %d is an OBJECT\n",i);
-@@ -1329,7 +1329,7 @@
- 				JSString *strval;
- 	
- 	                        strval = JS_ValueToString(cx, mainElement);
--	                        strp = JS_GetStringBytes(strval);
-+	                        strp = JS_EncodeString(cx, strval);
- 	
- 				#ifdef SETFIELDVERBOSE
- 				printf ("getJSMultiNumType, got string %s\n",strp); 
-@@ -1441,7 +1441,7 @@
- 			return;
- 		}
- 		strval = JS_ValueToString(cx, _v);
--		valStr = JS_GetStringBytes(strval);
-+		valStr = JS_EncodeString(cx, strval);
- 
- 		/* printf ("new string %d is %s\n",i,valStr); */
- 
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsUtils.c freewrl-1.22.10.my/src/lib/world_script/jsUtils.c
---- freewrl-1.22.10/src/lib/world_script/jsUtils.c	2010-06-03 23:38:37.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsUtils.c	2011-07-04 20:21:44.000000000 +0400
-@@ -134,7 +134,7 @@
- 			nf = OBJECT_TO_JSVAL(me);
- 
- 			#ifdef JSVRMLCLASSESVERBOSE
--			printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf)));
-+			printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf)));
- 			#endif
- 
- 			if (!setSFNodeField (cx, par, pf, &nf)) {
-@@ -197,7 +197,7 @@
-         		char *_id_c;
- 
-         		_idStr = JS_ValueToString(cx, *newval);
--        		_id_c = JS_GetStringBytes(_idStr);
-+        		_id_c = JS_EncodeString(cx, _idStr);
- 
- 			oldS = (struct Uni_String *) *((uintptr_t *)Data);
- 
-@@ -305,12 +305,12 @@
- 
- 		case FIELDTYPE_SFFloat:	{
- 			memcpy ((void *) &fl, Data, datalen);
--			*newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)fl));
-+			*newval = JS_NewJSVal(cx,(double)fl);
- 			break;
- 		}
- 		case FIELDTYPE_SFTime:	{
- 			memcpy ((void *) &dl, Data, datalen);
--			*newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,dl));
-+			*newval = JS_NewJSVal(cx,dl);
- 			break;
- 		}
- 		case FIELDTYPE_SFBool:
-@@ -824,7 +824,7 @@
- 	struct X3D_Node *node;
- 
- 	_idStr = JS_ValueToString(context, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(context, _idStr);
- 	
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj);
-@@ -912,7 +912,7 @@
- 
- 	/* get the id field... */
- 
--	_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id));
-+	_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id));
- 	
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("\nsetSFNodeField called on name %s object %u, jsval %u\n",_id_c, obj, *vp);
-@@ -1131,10 +1131,10 @@
- 	char *_id_c = "(no value in string)";
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	/* printf ("hmmm...js_SetPropertyCheck called on string \"%s\" object %u, jsval %u\n",_id_c, obj, *vp); */
- 	} else if (JSVAL_IS_DOUBLE(id)) {
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyCheck called on double %s object %u, jsval %u\n",_id_c, obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1192,7 +1192,7 @@
- 	/* get the id field... */
- 
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_GetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1211,7 +1211,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1229,7 +1229,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug1 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1247,7 +1247,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); 
-         	printf ("...js_SetPropertyDebug2 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1265,7 +1265,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug3 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1283,7 +1283,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug4 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1301,7 +1301,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug5 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1319,7 +1319,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug6 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1337,7 +1337,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug7 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1355,7 +1355,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug8 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-@@ -1373,7 +1373,7 @@
- 
- 	/* get the id field... */
- 	if (JSVAL_IS_STRING(id)) { 
--		_id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); 
-+		_id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); 
-         	printf ("\n...js_SetPropertyDebug9 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp);
- 	} else if (JSVAL_IS_INT(id)) {
- 		num = JSVAL_TO_INT(id);
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c
---- freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c	2010-08-02 23:55:57.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c	2011-07-04 20:06:25.000000000 +0400
-@@ -336,7 +336,7 @@
- 			return JS_FALSE;
- 		}
- 		_str = JS_ValueToString(context, argv[0]);
--		_costr = JS_GetStringBytes(_str);
-+		_costr = JS_EncodeString(context, _str);
- 
- 		/* sanitize string, for the EAI_RW call (see EAI_RW code) */
- 		tptr = _costr;
-@@ -385,10 +385,10 @@
- 			return JS_FALSE;
- 		}
- 		_str[0] = JS_ValueToString(context, argv[0]);
--		_costr[0] = JS_GetStringBytes(_str[0]);
-+		_costr[0] = JS_EncodeString(context, _str[0]);
- 
- 		_str[1] = JS_ValueToString(context, argv[1]);
--		_costr[1] = JS_GetStringBytes(_str[1]);
-+		_costr[1] = JS_EncodeString(context, _str[1]);
- 
- 		/* we use the EAI code for this - so reformat this for the EAI format */
- 		{
-@@ -575,7 +575,7 @@
- 	/* third parameter should be a string */
- 	if (JSVAL_IS_STRING(argv[2])) {
- 		_str[1] = JSVAL_TO_STRING(argv[2]);
--		fieldStr = JS_GetStringBytes(_str[1]);
-+		fieldStr = JS_EncodeString(context, _str[1]);
- 		#ifdef JSVERBOSE
- 		printf ("field string is :%s:\n",fieldStr); 
- 		#endif
-@@ -590,7 +590,7 @@
- 
- 	/* get the URL listing as a string */
- 	_str[0] = JS_ValueToString(context, argv[0]);
--	_costr0 = JS_GetStringBytes(_str[0]);
-+	_costr0 = JS_EncodeString(context, _str[0]);
- 
- 
- 	#ifdef JSVERBOSE
-@@ -690,7 +690,7 @@
- 	for (count=0; count < argc; count++) {
- 		if (JSVAL_IS_STRING(argv[count])) {
- 			_str = JSVAL_TO_STRING(argv[count]);
--			_id_c = JS_GetStringBytes(_str);
-+			_id_c = JS_EncodeString(context, _str);
- 			#if defined(AQUA) || defined(_MSC_VER)
- 			BrowserPrintConsoleMessage(_id_c); /* statusbar hud */
- 			consMsgCount = 0; /* reset the "Maximum" count */
-@@ -850,7 +850,7 @@
- 
- 	/* parameter should be a string */
- 	if (JSVAL_IS_STRING(argv[0])) {
--		target = JS_GetStringBytes( JSVAL_TO_STRING(argv[0]));
-+		target = JS_EncodeString(context,  JSVAL_TO_STRING(argv[0]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",target); 
- 		#endif
-@@ -930,7 +930,7 @@
- 
- 	/* parameters should be a string */
- 	if (JSVAL_IS_STRING(argv[0])) {
--		targetDevice = JS_GetStringBytes( JSVAL_TO_STRING(argv[0]));
-+		targetDevice = JS_EncodeString(cx,  JSVAL_TO_STRING(argv[0]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",targetDevice); 
- 		#endif
-@@ -939,7 +939,7 @@
- 		return -1;
- 	}
- 	if (JSVAL_IS_STRING(argv[1])) {
--		targetController = JS_GetStringBytes( JSVAL_TO_STRING(argv[1]));
-+		targetController = JS_EncodeString(cx,  JSVAL_TO_STRING(argv[1]));
- 		#ifdef JSVERBOSE
- 		printf ("field string is %s\n",targetController); 
- 		#endif
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c	2010-09-22 23:40:48.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c	2011-07-04 20:08:03.000000000 +0400
-@@ -935,7 +935,7 @@
-                 		        printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd);
-                         		return JS_FALSE;
-                 		}
--                		val = DOUBLE_TO_JSVAL(dp);
-+                		val = DOUBLE_TO_JSVAL(*dp);
- 
- 			}
- 		}
-@@ -1108,7 +1108,7 @@
- 
- 		printf ("HAVE STRING HERE!\n");
- 		_str = JS_ValueToString(cx, id);
--		asciiStr = JS_GetStringBytes(_str);
-+		asciiStr = JS_EncodeString(context, _str);
- 		printf ("we have as a parameter :%s:\n",asciiStr);
- 		#endif
- 
-@@ -1185,7 +1185,7 @@
- 			if (_tmpStr==NULL) {
- 				_tmp_valStr = "NULL";
- 			} else {
--				_tmp_valStr = JS_GetStringBytes(_tmpStr);
-+				_tmp_valStr = JS_EncodeString(cx, _tmpStr);
- 			}
- 		}
- 
-@@ -1281,7 +1281,7 @@
- 	#endif
- 
- 	str = JS_ValueToString(cx, id);
--	p = JS_GetStringBytes(str);
-+	p = JS_EncodeString(cx, str);
- 	#ifdef JSVRMLCLASSESVERBOSE
- 		printf("\tid string  %s\n ",p);
- 	#endif
-@@ -1368,12 +1368,12 @@
- 	char * _c;
- 		printf ("doMFSetProperty, for object %u, vp %u\n", obj,*vp);
- 		_str = JS_ValueToString(cx, id);
--		_c = JS_GetStringBytes(_str);
-+		_c = JS_EncodeString(cx, _str);
- 		printf ("id is %s\n",_c);
- 
- 		_sstr = JS_ValueToString(cx, *vp);
- 		printf ("looking up value for %d %x object %p\n",*vp,*vp,obj);
--			_cc = JS_GetStringBytes(_sstr);
-+			_cc = JS_EncodeString(cx, _sstr);
- 			printf("\tdoMFSetProperty:%d: obj = %p, id = %s, vp = %s\n",type,
- 			   obj, _c, _cc);
- 		if (JSVAL_IS_OBJECT(*vp)) { printf ("doMFSet, vp is an OBJECT\n"); }
-@@ -1397,7 +1397,7 @@
- 
- 			if (!JS_ValueToInt32(cx, *vp, &i)) {
- 				_sstr = JS_ValueToString(cx, *vp);
--				_cc = JS_GetStringBytes(_sstr);
-+				_cc = JS_EncodeString(cx, _sstr);
- 				printf ("can not convert %s to an integer in doMFAddProperty for type %d\n",_cc,type);
- 				return JS_FALSE;
- 			}
-@@ -1408,7 +1408,7 @@
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		printf ("doMFSetProperty - ensure that this is a DOUBLE ");
- 				_sstr = JS_ValueToString(cx, *vp);
--				_cc = JS_GetStringBytes(_sstr);
-+				_cc = JS_EncodeString(cx, _sstr);
- 				printf ("value is  %s \n",_cc);
- 		#endif
- 
-@@ -1420,7 +1420,7 @@
-                		        printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd);
-                        		return JS_FALSE;
-                		}
--               		*vp = DOUBLE_TO_JSVAL(dp);
-+               		*vp = DOUBLE_TO_JSVAL(*dp);
- 
- 		}
- 	}
-@@ -1511,7 +1511,7 @@
- 			nf = OBJECT_TO_JSVAL(me);
- 
- 			#ifdef JSVRMLCLASSESVERBOSE
--			printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf)));
-+			printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf)));
- 			#endif
- 
- 			if (!setSFNodeField (cx, par, pf, &nf)) {
-@@ -1535,7 +1535,7 @@
- 	unsigned int i, j = 0;
- 
- 	_str = JS_ValueToString(cx, *vp);
--	_buff = JS_GetStringBytes(_str);
-+	_buff = JS_EncodeString(cx, _str);
- 	_buff_len = strlen(_buff) + 1;
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
-@@ -1719,14 +1719,14 @@
- 	size_t len = 0;
- 
- 	_idStr = JS_ValueToString(context, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(context, _idStr);
- 
-         /* "register" this ECMA value for routing changed flag stuff */
-        	setInECMATable(context, _id_c);
- 
- 	if (JSVAL_IS_STRING(*vp)) {
- 		_vpStr = JS_ValueToString(context, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(context, _vpStr);
- 
- 		len = strlen(_vp_c);
- 
-@@ -1752,7 +1752,7 @@
- 	} else {
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		_vpStr = JS_ValueToString(context, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(cx, _vpStr);
- 		printf("setECMANative: obj = %p, id = \"%s\", vp = %s\n",
- 			   obj, _id_c, _vp_c);
- 		#endif
-@@ -1770,9 +1770,9 @@
- 	JSString *_idStr, *_vpStr;
- 	char *_id_c, *_vp_c;
- 		_idStr = JS_ValueToString(cx, id);
--		_id_c = JS_GetStringBytes(_idStr);
-+		_id_c = JS_EncodeString(cx, _idStr);
- 		_vpStr = JS_ValueToString(cx, *vp);
--		_vp_c = JS_GetStringBytes(_vpStr);
-+		_vp_c = JS_EncodeString(cx, _vpStr);
- 		printf("getAssignProperty: obj = %p, id = \"%s\", vp = %s\n",
- 			   obj, _id_c, _vp_c);
- 	printf ("what is vp? \n");
-@@ -1803,7 +1803,7 @@
- 
- 	if (JSVAL_IS_STRING(id)) {
- 		_str = JSVAL_TO_STRING(id);
--		_id_c = JS_GetStringBytes(_str);
-+		_id_c = JS_EncodeString(cx, _str);
- 		if (!JS_ConvertValue(cx, *vp, JSTYPE_OBJECT, &newVal)) {
- 			printf( "JS_ConvertValue failed in setAssignProperty.\n");
- 			return JS_FALSE;
-@@ -1834,9 +1834,9 @@
-                 if (JSVAL_IS_DOUBLE(id)) printf ("id is an DOUBLE\n");
-                 if (JSVAL_IS_INT(id)) printf ("id is an INT\n");
- 
--		printf ("id is %s\n",JS_GetStringBytes(JS_ValueToString(cx,id)));
--		printf ("initVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,initVal)));
--		printf ("newVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,newVal)));
-+		printf ("id is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,id)));
-+		printf ("initVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,initVal)));
-+		printf ("newVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,newVal)));
- 
- 		#endif
- 
-@@ -1859,7 +1859,7 @@
- 	} else {
- 		#ifdef JSVRMLCLASSESVERBOSE
- 			_str = JS_ValueToString(cx, id);
--			_id_c = JS_GetStringBytes(_str);
-+			_id_c = JS_EncodeString(cx, _str);
- 			printf("setAssignProperty: obj = %p, id = \"%s\"\n",
- 				   obj, _id_c);
- 		#endif
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h
---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h	2010-10-13 23:45:26.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h	2011-07-04 20:24:53.000000000 +0400
-@@ -30,6 +30,21 @@
- #ifndef __FREEWRL_JS_VRML_CLASSES_H__
- #define __FREEWRL_JS_VRML_CLASSES_H__
- 
-+static inline jsval JS_NewJSVal(JSContext *cx, jsdouble d)
-+{
-+	jsval ret;
-+	JS_NewNumberValue(cx, d, &ret);
-+	return ret;
-+}
-+
-+static inline jsdouble * JS_NewDouble(JSContext *cx, jsdouble d)
-+{
-+	static jsdouble ret;
-+	jsval rv;
-+	JS_NewNumberValue(cx, d, &rv);
-+	ret = JSVAL_TO_DOUBLE(rv);
-+	return &ret;
-+}
- 
- #ifndef UNUSED
- #define UNUSED(v) ((void) v)
-@@ -80,14 +95,14 @@
- 
- 
- #define SET_JS_TICKTIME_FALSE(possibleRetVal) { jsval zimbo; \
--        zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime));  \
-+        zimbo = JS_NewJSVal(cx, TickTime);  \
-         if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) {  \
-                 printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \
-                 return possibleRetVal; \
-         }}
- 
- #define SET_JS_TICKTIME() { jsval zimbo; \
--        zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime));  \
-+        zimbo = JS_NewJSVal(cx, TickTime);  \
-         if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) {  \
-                 printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \
-                 return FALSE; \
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c	2010-09-22 23:40:48.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c	2011-07-04 20:08:44.000000000 +0400
-@@ -596,7 +596,7 @@
- 			return;
- 		}
- 
--		val = DOUBLE_TO_JSVAL(dp);
-+		val = DOUBLE_TO_JSVAL(*dp);
- 
- 		if (!JS_SetElement(cx, obj, (jsint) i, &val)) {
- 			printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i);
-@@ -1212,7 +1212,7 @@
- /*
-                 if (JSVAL_IS_STRING(id)==TRUE) {
-                 printf("        is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, id)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, id)));
-                 }
-                 if (JSVAL_IS_OBJECT(id)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1231,7 +1231,7 @@
- 		_index = JSVAL_TO_INT(id);
- 
- 		if (_index >= _length) {
--			*vp = DOUBLE_TO_JSVAL(&zerojsdouble);
-+			*vp = DOUBLE_TO_JSVAL(zerojsdouble);
- 			if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
- 				printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n");
- 				return JS_FALSE;
-@@ -1331,7 +1331,7 @@
- 	printf("MFStringAddProperty: vp = %p\n", obj);
-                 if (JSVAL_IS_STRING(*vp)==TRUE) {
- 		printf("	is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, *vp)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, *vp)));
-                 }
-                 if (JSVAL_IS_OBJECT(*vp)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1345,7 +1345,7 @@
- 		printf("MFStringAddProperty: id = %p\n", obj);
-                 if (JSVAL_IS_STRING(id)==TRUE) {
- 		printf("	is a common string :%s:\n",
--                        JS_GetStringBytes(JS_ValueToString(cx, id)));
-+                        JS_EncodeString(cx, JS_ValueToString(cx, id)));
-                 }
-                 if (JSVAL_IS_OBJECT(id)==TRUE) {
-                         printf ("       parameter is an object\n");
-@@ -1494,7 +1494,7 @@
- 		if (JSVAL_IS_STRING(argv[i])==TRUE) {
-         	        printf (" Common String, is");
- 			_str = JS_ValueToString(cx, argv[i]);
--			printf (JS_GetStringBytes(_str));
-+			printf (JS_EncodeString(cx, _str));
- 			printf ("..");
- 		
- 	        }                                          
-diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c
---- freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c	2010-09-25 00:22:05.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c	2011-07-04 20:09:01.000000000 +0400
-@@ -161,7 +161,7 @@
- 			printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]);
- 			return JS_FALSE;
- 		}
--		_v = DOUBLE_TO_JSVAL(dp);
-+		_v = DOUBLE_TO_JSVAL(*dp);
-         	JS_SetElement(cx, result, (jsint)i, &_v); 
-         } 
- 
-@@ -336,7 +336,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -346,7 +346,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -356,7 +356,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -387,13 +387,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 
- 		}
-@@ -422,18 +422,18 @@
- 	*rval = OBJECT_TO_JSVAL(_arrayObj);
- 
- 	/* construct new double before conversion? */
--	_v = DOUBLE_TO_JSVAL(&hue);
-+	_v = DOUBLE_TO_JSVAL(hue);
- 	if (!JS_SetElement(cx, _arrayObj, 0, &_v)) {
- 		printf( "JS_SetElement failed for hue in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
- 	}
--	_v = DOUBLE_TO_JSVAL(&saturation);
-+	_v = DOUBLE_TO_JSVAL(saturation);
- 	if (!JS_SetElement(cx, _arrayObj, 1, &_v)) {
- 		printf( "JS_SetElement failed for saturation in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
- 	}
- 
--	_v = DOUBLE_TO_JSVAL(&value);
-+	_v = DOUBLE_TO_JSVAL(value);
- 	if (!JS_SetElement(cx, _arrayObj, 2, &_v)) {
- 		printf( "JS_SetElement failed for value in SFColorRGBAGetHSV.\n");
- 		return JS_FALSE;
-@@ -601,7 +601,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -611,7 +611,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -621,7 +621,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -631,7 +631,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -662,16 +662,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(_val);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(_val);
- 			break;
- 
- 		}
-@@ -983,7 +983,7 @@
- 	} else if (argc == 1) {
- 		/* is this a string, or a number indicating a node? */
- 		myStr = JS_ValueToString(cx, argv[0]);
--		cString = JS_GetStringBytes(myStr);
-+		cString = JS_EncodeString(cx, myStr);
- 		#ifdef JSVRMLCLASSESVERBOSE
- 		printf ("SFNodeConstr, argc =1l string %s\n",cString);
- 		#endif
-@@ -1067,13 +1067,13 @@
-         		char *_id_c;
- 
- 			_idStr = JS_ValueToString(cx, argv[0]);
--			_id_c = JS_GetStringBytes(_idStr);
-+			_id_c = JS_EncodeString(cx, _idStr);
- 			/* printf ("first string :%s:\n",_id_c); */
- 
- 			cString = STRDUP(_id_c);
- 
- 			_idStr = JS_ValueToString(cx, argv[1]);
--			_id_c = JS_GetStringBytes(_idStr);
-+			_id_c = JS_EncodeString(cx, _idStr);
- 			/* printf ("second string :%s:\n",_id_c); */
- 
- 			if (sscanf (_id_c,"%p",&newHandle) != 1) {
-@@ -1190,7 +1190,7 @@
- 	jsval rval;
- 
-         _idStr = JS_ValueToString(cx, id);
--        _id_c = JS_GetStringBytes(_idStr);
-+        _id_c = JS_EncodeString(cx, _idStr);
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	printf ("start of SFNodeGetProperty... id is %s\n",_id_c);
-@@ -1264,10 +1264,10 @@
- 
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	_valStr = JS_ValueToString(cx, *vp);
--	_val_c = JS_GetStringBytes(_valStr);
-+	_val_c = JS_EncodeString(cx, _valStr);
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
- 		printf("SFNodeSetProperty: obj = %p, id = %s, vp = %s\n",
-@@ -1904,7 +1904,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -1914,7 +1914,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -1924,7 +1924,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -1934,7 +1934,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -1969,16 +1969,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2051,7 +2051,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf",
- 							&(pars[0]), &(pars[1])) != 2) {
-@@ -2143,7 +2143,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec2f.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 
- 	#ifdef JSVRMLCLASSESVERBOSE
-@@ -2332,7 +2332,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -2342,7 +2342,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	}
-@@ -2373,13 +2373,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2458,7 +2458,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf %lf",
- 							&(pars[0]), &(pars[1]), &(pars[2])) != 3) {
-@@ -2580,7 +2580,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec3f.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	if (retSFVec3f){
-@@ -2792,9 +2792,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -2813,7 +2813,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -2823,7 +2823,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -2833,7 +2833,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -2869,13 +2869,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -2949,7 +2949,7 @@
- 			 * it get created in javascript? */
- 			if (param_isString) {
- 				_str = JS_ValueToString(cx, *argv);
--				charString = JS_GetStringBytes(_str);
-+				charString = JS_EncodeString(cx, _str);
- 
- 				if (sscanf(charString, "%lf %lf %lf",
- 							&(pars[0]), &(pars[1]), &(pars[2])) != 3) {
-@@ -3071,7 +3071,7 @@
- 			printf( "JS_NewDouble failed for %f in SFVec3d.\n",d);
- 			return JS_FALSE;
- 		}
--		*rval = DOUBLE_TO_JSVAL(dp);
-+		*rval = DOUBLE_TO_JSVAL(*dp);
- 	}
- 	#ifdef JSVRMLCLASSESVERBOSE
- 	if (retSFVec3d){
-@@ -3282,9 +3282,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3303,7 +3303,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3313,7 +3313,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3323,7 +3323,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3359,13 +3359,13 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -3513,9 +3513,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3534,7 +3534,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3544,7 +3544,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3554,7 +3554,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -3564,7 +3564,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3600,16 +3600,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-@@ -3758,9 +3758,9 @@
- 	char *_id_c;
- 
- 	_idStr = JS_ValueToString(cx, id);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 	_idStr = JS_ValueToString(cx, *vp);
--	_id_c = JS_GetStringBytes(_idStr);
-+	_id_c = JS_EncodeString(cx, _idStr);
- 
- 	#endif
- 
-@@ -3779,7 +3779,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 1:
- 			d = (ptr->v).c[1];
-@@ -3789,7 +3789,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 2:
- 			d = (ptr->v).c[2];
-@@ -3799,7 +3799,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		case 3:
- 			d = (ptr->v).c[3];
-@@ -3809,7 +3809,7 @@
- 						d);
- 				return JS_FALSE;
- 			}
--			*vp = DOUBLE_TO_JSVAL(dp);
-+			*vp = DOUBLE_TO_JSVAL(*dp);
- 			break;
- 		}
- 	} else {
-@@ -3845,16 +3845,16 @@
- 	if (JSVAL_IS_INT(id)) {
- 		switch (JSVAL_TO_INT(id)) {
- 		case 0:
--			(ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 1:
--			(ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 2:
--			(ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		case 3:
--			(ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv);
-+			(ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv);
- 			break;
- 		}
- 	}
-diff -wbBur freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c
---- freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c	2010-09-22 20:54:59.000000000 +0400
-+++ freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c	2011-07-04 01:19:07.000000000 +0400
-@@ -54,7 +54,7 @@
- #include "X3DProtoScript.h"
- 
- #if HAVE_EXPAT_H
--# include <expat.h>
-+# include </usr/include/expat.h>
- #endif
- //#define X3DPARSERVERBOSE 1
- 
diff --git a/community-testing/fxdesktop/PKGBUILD b/community-testing/fxdesktop/PKGBUILD
deleted file mode 100644
index 95c24fd1b..000000000
--- a/community-testing/fxdesktop/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 63110 2012-01-30 18:56:31Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=fxdesktop
-pkgver=0.1.12
-pkgrel=5
-pkgdesc="Lightweight Desktop Environment"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/fxdesktop/"
-license=('GPL')
-depends=('fox>=1.6.0' )
-source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('9489e7369b5e052e0b6836a3b0670832')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Override default flags
-  export CFLAGS="-Wall -O2 -pipe"
-  export CXXFLAGS="-Wall -O2 -pipe"
-  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64)
-  # Compile
-  ./gb --prefix=/usr
-  ./gb --package-root=$pkgdir/usr install
-}
diff --git a/community-testing/fxprocessview/PKGBUILD b/community-testing/fxprocessview/PKGBUILD
deleted file mode 100644
index 65b1228b9..000000000
--- a/community-testing/fxprocessview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63112 2012-01-30 18:56:37Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=fxprocessview
-pkgver=0.5.0
-pkgrel=4
-pkgdesc="Process Viewer"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('fox>=1.4.0')
-url="http://code.google.com/p/fxdesktop/"
-source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \
-	build-fix.patch)
-md5sums=('5d3cc8d7aec770997c281a743ddfda5a'
-	 '2d2c3d54dcd2404149955f12cccb21a5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Override default flags
-  export CFLAGS="-Wall -O2 -pipe"
-  export CXXFLAGS="-Wall -O2 -pipe"
-  # Compile
-  patch -Np1 <../build-fix.patch
-  ./gb
-  # gb does not return valid error code
-  [ -f src/fxprocessview ]
-  # make sure destination exists
-  mkdir -p $pkgdir/usr/bin
-  # Install
-  ./gb install --package-root=$pkgdir/usr
-}
diff --git a/community-testing/fxprocessview/build-fix.patch b/community-testing/fxprocessview/build-fix.patch
deleted file mode 100644
index 7c883454c..000000000
--- a/community-testing/fxprocessview/build-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -wbBur fxprocessview-0.5.0/src/processlist.cpp fxprocessview-0.5.0.my/src/processlist.cpp
---- fxprocessview-0.5.0/src/processlist.cpp	2005-07-15 06:39:17.000000000 +0400
-+++ fxprocessview-0.5.0.my/src/processlist.cpp	2007-03-07 19:21:34.000000000 +0300
-@@ -696,7 +696,7 @@
- 
- long FXProcessList::onCmdUserMode(FXObject* sender,FXSelector,void* ){
-   if (userfilter.empty()){
--	userfilter=FXFile::getCurrentUserName();
-+	userfilter=FXSystem::currentUserName();
- 	}
-   else {
-  	userfilter="";
-@@ -942,12 +942,17 @@
- 
- 
- 
--  FXint num_processes = FXFile::listFiles(dirlist,"/proc","[0123456789]*",LIST_MATCH_ALL|LIST_NO_FILES|LIST_NO_PARENT);
-+  FXint num_processes = FXDir::listFiles(dirlist,"/proc","[0123456789]*",FXDir::MatchAll | FXDir::NoFiles | FXDir::NoParent);
-   task_total=num_processes;
-   for (FXint i=0;i<num_processes;i++){
- 
-     /// Check the Owner
--    owner = FXFile::owner("/proc/" + dirlist[i]);
-+    FXStat stat;
-+    FXStat::statFile("/proc/" + dirlist[i], stat);
-+    owner = FXSystem::userName(stat.user());
-+
-+//    owner = FXSystem::userName(FXStat::user("/proc/" + dirlist[i]));
-+
-     if (!userfilter.empty() && (owner!=userfilter)) continue;
- 
-     /// Read in Process Stat
-@@ -1027,7 +1032,7 @@
-       }
- 
-     filename = "/proc/" + dirlist[i] + "/cmdline";
--    if (FXFile::exists(filename)) {
-+    if (FXStat::exists(filename)) {
-       fp = fopen(filename.text(),"r");
-       if (fp) {
-         if (fgets(buffer,80,fp)!=NULL){
diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD
deleted file mode 100644
index ecdde1a68..000000000
--- a/community-testing/gambas2/PKGBUILD
+++ /dev/null
@@ -1,950 +0,0 @@
-# $Id: PKGBUILD 64069 2012-02-08 23:52:58Z allan $
-# 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=8
-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' '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-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch
deleted file mode 100644
index 0b6e68df3..000000000
--- a/community-testing/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-testing/gambas2/fix-gbi-gba-path.patch b/community-testing/gambas2/fix-gbi-gba-path.patch
deleted file mode 100644
index 9be8e921e..000000000
--- a/community-testing/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-testing/gambas2/gambas2-runtime.install b/community-testing/gambas2/gambas2-runtime.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-testing/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-testing/gambas2/gambas2-script.install b/community-testing/gambas2/gambas2-script.install
deleted file mode 100644
index 86558e434..000000000
--- a/community-testing/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-testing/gambas2/gambas2.install b/community-testing/gambas2/gambas2.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-testing/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-testing/gambas2/poppler-0.18.patch b/community-testing/gambas2/poppler-0.18.patch
deleted file mode 100644
index fbcc430bf..000000000
--- a/community-testing/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-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
deleted file mode 100644
index d83ae9fb9..000000000
--- a/community-testing/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1104 +0,0 @@
-# $Id: PKGBUILD 64071 2012-02-08 23:53:06Z allan $
-# 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=3.0.0
-pkgrel=5
-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'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
-         '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=('f2c51e18b67ae6b21065ea0aed9b588e'
-         '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}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/control
-  ##
-}
-
-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}/gb.gtk
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  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]*}
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[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-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-testing/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-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-testing/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-testing/gdal/PKGBUILD b/community-testing/gdal/PKGBUILD
deleted file mode 100644
index a8d88a8bb..000000000
--- a/community-testing/gdal/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 63118 2012-01-30 18:57:09Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gdal
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="A translator library for raster geospatial data formats"
-arch=('i686' 'x86_64')
-url="http://www.gdal.org/"
-license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite3' 'libmysqlclient' 'postgresql-libs')
-makedepends=('perl' 'swig')
-optdepends=('postgresql: postgresql database support'
-            'mysql: mysql database support'
-            'perl:  perl binding support'
-            'swig:  perl binding support')
-options=('!libtool')
-changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        gdal-1.5.1-python-install.patch)
-md5sums=('1853f3d8eb5232ae030abe007840cade'
-         '81afc1c26d29cee84aadb6924fe33861')
-
-build() {
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-  # bug 23654
-  export LDFLAGS="$LDFLAGS -Wl,--as-needed" 
-
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np0 -i ${srcdir}/gdal-1.5.1-python-install.patch
-
-# python2 fixes
-  sed -i 's_python python1.5_python2 python python1.5_' configure
-  for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
-      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
-
-  ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
-              --with-geotiff --with-mysql --with-python --without-libtool --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png
-
-# workaround for bug #13646
-  sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
-  sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
-  install -d ${pkgdir}/usr/lib/python2.7/site-packages/
-
-  make
-}
-
-package () {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-
-# install license
-  install -D -m644 LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-#FS15477 clean up junks
-  rm -f ${pkgdir}/usr/bin/*.dox
-}
diff --git a/community-testing/gdal/gdal-1.5.1-python-install.patch b/community-testing/gdal/gdal-1.5.1-python-install.patch
deleted file mode 100644
index 8ec414d37..000000000
--- a/community-testing/gdal/gdal-1.5.1-python-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- swig/python/GNUmakefile.orig	2010-04-24 01:22:07.000000000 +0200
-+++ swig/python/GNUmakefile	2010-05-05 19:14:58.000000000 +0200
-@@ -72,5 +72,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
diff --git a/community-testing/gdal/gdal.changelog b/community-testing/gdal/gdal.changelog
deleted file mode 100644
index c31121e1d..000000000
--- a/community-testing/gdal/gdal.changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* gdal 1.8.0-1
-
-2010-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.7.3
-
-2010-06-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#19946 fixed in 1.7.2-2
-
-2010-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.7.2
diff --git a/community-testing/gdk-pixbuf/PKGBUILD b/community-testing/gdk-pixbuf/PKGBUILD
deleted file mode 100644
index 47a8987c3..000000000
--- a/community-testing/gdk-pixbuf/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63120 2012-01-30 18:57:23Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=gdk-pixbuf
-pkgver=0.22.0
-pkgrel=9
-pkgdesc="Image loading and manipulation library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL' 'LGPL')
-depends=('gtk' 'libtiff' 'libpng')
-makedepends=('libxt')
-options=('!libtool')
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.24/${pkgname}-${pkgver}.tar.bz2
-	gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
-	gdk-pixbuf-0.22.0-bmp_secure.patch
-	gdk-pixbuf-0.22.0-loaders.patch
-	gdk-pixbuf-0.22.0.patch
-	libpng15.patch)
-md5sums=('05fcb68ceaa338614ab650c775efc2f2'
-         'd1fb93f1ae994875158a7e0c108c36f8'
-         '5f59d5772b1482d885a180dbc581cf84'
-         '3cf31ae0509747f72ac27a9fd96109c2'
-         'e0f5f301ce958b7cea0be631ed7b8e56'
-         '16db4dc83d507ebcf15d1beb753a77bc')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  export SED=/bin/sed
-  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
-  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch
-  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch
-  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch
-  patch -Np1 -i ${srcdir}/libpng15.patch
-  libtoolize --force --copy --automake
-  autoreconf --force --install
-  ./configure --prefix=/usr --disable-gtk-doc
-  make
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/share/gnome
-}
diff --git a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
deleted file mode 100644
index ffb4378aa..000000000
--- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c	2002-09-27 23:12:40.000000000 +0200
-+++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c	2005-03-30 01:33:06.000000000 +0200
-@@ -31,8 +31,6 @@
- #include "gdk-pixbuf-private.h"
- #include "gdk-pixbuf-io.h"
- 
--
--
- #if 0
- /* If these structures were unpacked, they would define the two headers of the
-  * BMP file.  After them comes the palette, and then the image data.
-@@ -206,7 +204,7 @@
- 
- 	if (State == NULL)
- 		return NULL;
--
-+ 	
- 	while (feof(f) == 0) {
- 		length = fread(membuf, 1, sizeof (membuf), f);
- 		if (length > 0)
-@@ -245,11 +243,26 @@
- static gboolean
- grow_buffer (struct bmp_progressive_state *State)
- {
--  guchar *tmp = realloc (State->buff, State->BufferSize);
-+  guchar *tmp;
-+
-+  if (State->BufferSize == 0) {
-+#if 0
-+    g_set_error (error,
-+		 GDK_PIXBUF_ERROR,
-+		 GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+		 _("BMP image has bogus header data"));
-+#endif
-+    State->read_state = READ_STATE_ERROR;
-+    return FALSE;
-+  }
-+
-+  tmp = realloc (State->buff, State->BufferSize);
-+
-   if (!tmp) {
-     State->read_state = READ_STATE_ERROR;
-     return FALSE;
-   }
-+
-   State->buff = tmp;
-   return TRUE;
- }
diff --git a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch
deleted file mode 100644
index 29471f147..000000000
--- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: io-bmp.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v
-retrieving revision 1.41
-diff -u -p -r1.41 io-bmp.c
---- gdk-pixbuf/io-bmp.c	13 Aug 2004 02:26:57 -0000	1.41
-+++ gdk-pixbuf/io-bmp.c	20 Aug 2004 00:18:14 -0000
-@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat
- 	guchar c;
- 	gint idx;
- 
--	if (context->compr.y >= context->Header.height)
-+	if (context->compr.y >= context->Header.height) {
-+		context->BufferDone = 0;
- 		return TRUE;
-+	}
- 
- 	y = context->compr.y;
- 
diff --git a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch
deleted file mode 100644
index 068653808..000000000
--- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c	2002-09-27 17:19:15.000000000 -0500
-+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c	2005-10-27 11:28:23.000000000 -0500
-@@ -330,6 +330,9 @@
- 
- 	State->HeaderSize+=I;
- 
-+ 	if (State->HeaderSize < 0)
-+ 		return FALSE;
-+ 
-  	if (State->HeaderSize>State->BytesInHeaderBuf) {
- 		guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize);
- 		if (!tmp)
-diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c	2001-03-01 15:16:28.000000000 -0500
-+++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c	2005-10-27 11:29:14.000000000 -0500
-@@ -243,8 +243,8 @@
- 			break;
- 		else {
- 			if (numnames > 0) {
--				space -= 1;
--				strcat (color, " ");
-+				strncat (color, " ", space);
-+				space -= MIN (space, 1);
- 			}
- 
- 			strncat (color, temp, space);
-@@ -281,7 +281,8 @@
- 		/* Fall through to the xpm_read_string. */
- 
- 	case op_body:
--		xpm_read_string (h->infile, &h->buffer, &h->buffer_size);
-+		if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size))
-+			return NULL;
- 		return h->buffer;
- 
- 	default:
-@@ -317,13 +318,6 @@
- 	return NULL;
- }
- 
--/* Destroy notification function for the pixbuf */
--static void
--free_buffer (guchar *pixels, gpointer data)
--{
--	free (pixels);
--}
--
- static gboolean
- xpm_color_parse (const char *spec, XColor *color)
- {
-@@ -342,7 +336,8 @@
- 	gchar pixel_str[32];
- 	GHashTable *color_hash;
- 	_XPMColor *colors, *color, *fallbackcolor;
--	guchar *pixels, *pixtmp;
-+	guchar *pixtmp;
-+	GdkPixbuf* pixbuf;
- 
- 	fallbackcolor = NULL;
- 
-@@ -352,16 +347,33 @@
- 		return NULL;
- 	}
- 	sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
--	if (cpp >= 32) {
--		g_warning ("XPM has more than 31 chars per pixel.");
-+	if (cpp <= 0 || cpp >= 32) {
-+		g_warning ("XPM has invalid number of chars per pixel.");
- 		return NULL;
- 	}
-+	if (n_col <= 0 ||
-+	    n_col >= G_MAXINT / (cpp + 1) ||
-+	    n_col >= G_MAXINT / sizeof (_XPMColor)) {
-+		g_warning ("XPM file has invalid number of colors");
-+  		return NULL;
-+  	}
- 
- 	/* The hash is used for fast lookups of color from chars */
- 	color_hash = g_hash_table_new (g_str_hash, g_str_equal);
- 
--	name_buf = g_new (gchar, n_col * (cpp + 1));
--	colors = g_new (_XPMColor, n_col);
-+ 	name_buf = g_new (gchar, n_col * (cpp + 1));
-+ 	if (!name_buf) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		return NULL;
-+ 	}
-+ 	colors = g_new (_XPMColor, n_col);
-+ 	if (!colors) {
-+		g_warning ("Cannot allocate memory for loading XPM image");
-+ 		g_hash_table_destroy (color_hash);
-+ 		g_free (name_buf);
-+ 		return NULL;
-+ 	}
- 
- 	for (cnt = 0; cnt < n_col; cnt++) {
- 		gchar *color_name;
-@@ -397,12 +409,8 @@
- 			fallbackcolor = color;
- 	}
- 
--	if (is_trans)
--		pixels = malloc (w * h * 4);
--	else
--		pixels = malloc (w * h * 3);
--
--	if (!pixels) {
-+	pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h);
-+	if (!pixbuf) {
- 		g_hash_table_destroy (color_hash);
- 		g_free (colors);
- 		g_free (name_buf);
-@@ -410,7 +418,7 @@
- 	}
- 
- 	wbytes = w * cpp;
--	pixtmp = pixels;
-+	pixtmp = pixbuf->pixels;
- 
- 	for (ycnt = 0; ycnt < h; ycnt++) {
- 		buffer = (*get_buf) (op_body, handle);
-@@ -443,9 +451,7 @@
- 	g_free (colors);
- 	g_free (name_buf);
- 
--	return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8,
--					 w, h, is_trans ? (w * 4) : (w * 3),
--					 free_buffer, NULL);
-+	return pixbuf;
- }
- 
- /* Shared library entry point for file loading */
diff --git a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0.patch b/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0.patch
deleted file mode 100644
index 8e0f55680..000000000
--- a/community-testing/gdk-pixbuf/gdk-pixbuf-0.22.0.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -21,6 +21,7 @@
- AC_PROG_CC
- AC_ISC_POSIX
- AM_PROG_CC_STDC
-+AM_PROG_AS
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-@@ -147,18 +148,18 @@
- dnl Test for libtiff
-   if test -z "$LIBTIFF"; then
-     AC_CHECK_LIB(tiff, TIFFReadScanline,
--      AC_CHECK_HEADER(tiffio.h,
-+      [AC_CHECK_HEADER(tiffio.h,
-         TIFF='tiff'; LIBTIFF='-ltiff',
--        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--      AC_CHECK_LIB(tiff, TIFFWriteScanline,
--        AC_CHECK_HEADER(tiffio.h,
-+        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+      [AC_CHECK_LIB(tiff, TIFFWriteScanline,
-+        [AC_CHECK_HEADER(tiffio.h,
-           TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
--          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--        AC_CHECK_LIB(tiff34, TIFFFlushData,
--          AC_CHECK_HEADER(tiffio.h,
-+          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+        [AC_CHECK_LIB(tiff34, TIFFFlushData,
-+          [AC_CHECK_HEADER(tiffio.h,
-             TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
--            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
--        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
-+            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
-+        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
-   fi
- 
- dnl Test for libjpeg
-@@ -191,9 +192,9 @@
- dnl Test for libpng
-   if test -z "$LIBPNG"; then
-     AC_CHECK_LIB(png, png_read_info,
--      AC_CHECK_HEADER(png.h,
-+      [AC_CHECK_HEADER(png.h,
-         png_ok=yes,
--        png_ok=no),
-+        png_ok=no)],
-       AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
-     if test "$png_ok" = yes; then
-       AC_MSG_CHECKING([for png_structp in png.h])
---- doc/Makefile.am
-+++ doc/Makefile.am
-@@ -156,7 +156,7 @@
- 	  done; \
- 	fi)
- #	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--#	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+#	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR);
- 
- #
- # Require gtk-doc when making dist
---- gdk-pixbuf.m4
-+++ gdk-pixbuf.m4
-@@ -9,7 +9,7 @@
- dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
- dnl
--AC_DEFUN(AM_PATH_GDK_PIXBUF,
-+AC_DEFUN([AM_PATH_GDK_PIXBUF],
- [dnl 
- dnl Get the cflags and libraries from the gdk-pixbuf-config script
- dnl
---- gdk-pixbuf/Makefile.am
-+++ gdk-pixbuf/Makefile.am
-@@ -18,7 +18,7 @@
- 
- libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
- 
--libexecdir = $(libdir)/gdk-pixbuf/loaders
-+loaderdir = $(libdir)/gdk-pixbuf/loaders
- 
- #
- # The PNG plugin.
-@@ -118,7 +118,7 @@
- 
- if BUILD_DYNAMIC_MODULES
- 
--libexec_LTLIBRARIES = 	\
-+loader_LTLIBRARIES = 	\
- 	$(PNG_LIB)	\
- 	$(JPEG_LIB)	\
- 	$(GIF_LIB)	\
-@@ -134,7 +134,7 @@
- extra_sources = 
- 
- else
--libexec_LTLIBRARIES = 
-+loader_LTLIBRARIES = 
- 
- extra_sources = $(libpixbufloader_png_la_SOURCES) 	\
- 		$(libpixbufloader_jpeg_la_SOURCES) 	\
-@@ -159,7 +159,7 @@
- 	-I$(top_builddir)/gdk-pixbuf \
- 	$(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
- 
--AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
-+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\""
- 
- LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- 
-@@ -211,7 +211,7 @@
- 	gdk-pixbuf-parse-color.c	\
- 	$(extra_sources)
- 
--libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
-+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS)
- libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
- 
- 
---- gdk-pixbuf/io-bmp.c
-+++ gdk-pixbuf/io-bmp.c
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#include <stdlib.h>
- #include "gdk-pixbuf-private.h"
- #include "gdk-pixbuf-io.h"
- 
diff --git a/community-testing/gdk-pixbuf/libpng15.patch b/community-testing/gdk-pixbuf/libpng15.patch
deleted file mode 100644
index e667288f8..000000000
--- a/community-testing/gdk-pixbuf/libpng15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c
---- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c	2001-01-24 23:59:23.000000000 +0300
-+++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c	2012-01-23 13:33:08.000000000 +0400
-@@ -175,7 +175,7 @@
- 		return NULL;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(png_ptr))) {
- 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
- 		return NULL;
- 	}
-@@ -311,7 +311,7 @@
-                 return NULL;
-         }
- 
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-@@ -366,7 +366,7 @@
-         lc->max_row_seen_in_chunk = -1;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
- 		return FALSE;
- 	} else {
- 		png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);
diff --git a/community-testing/geda-gaf/ChangeLog b/community-testing/geda-gaf/ChangeLog
deleted file mode 100644
index c8b902cc5..000000000
--- a/community-testing/geda-gaf/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-2012-01-19 Kyle Keen <keenerd@gmail.com>
-	* 1.6.2-2
-	- libpng15 rebuild
-
-2010-12-26 Stefan Husmann <stefan-husmann@t-online.de>
-	* 1.6.1-2
-	- adopted, moved to [community]
-	- added some optional dependencies
-	- added some sed-commands for python2 compatibility
-
-2010-02-14 Jared Casper <jaredcasper@gmail.com>
-	* 1.6.1-1
-	- Version bump
-
-2009-10-10 Jared Casper <jaredcasper@gmail.com>
-	* 1.6.0-2
-	- Fixed a bug causing icon problems
-
-2009-10-05 Jared Casper <jaredcasper@gmail.com>
-	* 1.6.0-1
-	- Merged with geda-libs and renamed to geda-gaf to match up with
-	the release tarball name
-
-2009-05-03 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.3-2
-	- Added gettext dep (noted by sergej)
-	- Added '|| return 1's to configure and make commands
-	- A bit of other random cleanup of deps
-
-2009-01-03 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.3-1
-	- Version bump
-	- Fix dependencies (s/=>/>=/)
-
-2008-12-20 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.2-1
-	- Version bump
-	- Update from comments
-
-2008-09-28 Jared Casper <jaredcasper@gmail.com>
-	* 1.4.1-1
-	- Version bump
-	- Added icon cache update
-	- Added icon cache and desktop update to post_update
-
-2008-05-07 Jared Casper <jaredcasper@gmail.com>
-
-	* 1.4.0-1
-	- adopted by Jared Casper
-	- Update PKGBUILD to current standards and latest version (1.4.0)
-	- add configure options and install script to handle desktop issues
-	- added ChangeLog
-
diff --git a/community-testing/geda-gaf/PKGBUILD b/community-testing/geda-gaf/PKGBUILD
deleted file mode 100644
index b3e6278b9..000000000
--- a/community-testing/geda-gaf/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Jared Casper <jaredcasper@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=geda-gaf
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project"
-arch=('i686' 'x86_64')
-url="http://www.gpleda.org"
-license=('GPL')
-depends=('gtk2' 'guile' 'libstroke' 'shared-mime-info' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'perlxml' 'flex' 'gawk')
-optdepends=('python2: for two of the commands (garchive, tragesym)'
-  'gawk: for sw2asc')
-replaces=('geda-suite' 'geda-libs')
-install=geda-gaf.install
-source=(http://geda.seul.org/release/v1.6/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('35ae86aebc174ec1fc03863fde4c843c')
-
-build ()
-{
-  cd "$srcdir/$pkgname-$pkgver/"
-  ./configure --prefix=/usr --disable-update-xdg-database 
-  make 
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/"
-  make DESTDIR="$pkgdir/" install 
-  sed -i 's+/usr/bin/env python+/usr/bin/env python2+' \
-    "$pkgdir/usr/bin/garchive"
-  sed -i 's+/usr/bin/python+/usr/bin/python2+' \
-    "$pkgdir/usr/bin/tragesym"
-  sed -i 's+/usr/bin/python+/usr/bin/python2+' \
-    "$pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom"
-}
-
diff --git a/community-testing/geda-gaf/geda-gaf.install b/community-testing/geda-gaf/geda-gaf.install
deleted file mode 100644
index ad5e587cc..000000000
--- a/community-testing/geda-gaf/geda-gaf.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-   echo Updating icon cache...
-   /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-fi
-if [ -x /usr/bin/update-desktop-database ]; then
-   echo Updating desktop database..
-   /usr/bin/update-desktop-database /usr/share/applications
-fi
-update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
\ No newline at end of file
diff --git a/community-testing/gimp-plugin-mathmap/PKGBUILD b/community-testing/gimp-plugin-mathmap/PKGBUILD
deleted file mode 100644
index 68505f070..000000000
--- a/community-testing/gimp-plugin-mathmap/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63124 2012-01-30 18:57:39Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Serge Gielkens <gielkens.serge@mumeli.org>
-pkgname=gimp-plugin-mathmap
-pkgver=1.3.5
-pkgrel=2
-pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae"
-arch=('i686' 'x86_64')
-url="http://www.complang.tuwien.ac.at/schani/mathmap/"
-license=('GPL')
-depends=('gimp' 'gsl' 'gtksourceview2' 'fftw' 'giflib')
-makedepends=('doxygen' 'unzip')
-provides=('gimp-mathmap')
-replaces=('gimp-mathmap')
-source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \
-        fix_libnoise_build.patch libpng15.patch)
-md5sums=('6ff66d070ea410dee1a27283d05b8beb'
-         'eca40de0ba0e6b8d34b7d1f904bc3d18'
-         '9780d6354b7380b772c4616253ecee54')
-
-build() {
-  cd "$srcdir/mathmap-$pkgver"
-
-  # fix problem with building libnoise
-  patch -Np1 < "$srcdir"/fix_libnoise_build.patch
-  # fix for libpng 1.5
-  patch -Np1 < "$srcdir"/libpng15.patch
-
-  make
-}
-
-package() {
-  cd "$srcdir/mathmap-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gimp-plugin-mathmap/fix_libnoise_build.patch b/community-testing/gimp-plugin-mathmap/fix_libnoise_build.patch
deleted file mode 100644
index fc81ba0d8..000000000
--- a/community-testing/gimp-plugin-mathmap/fix_libnoise_build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup mathmap-1.3.5/Makefile mathmap-1.3.5-fix//Makefile
---- mathmap-1.3.5/Makefile	2009-08-23 13:56:14.000000000 +0200
-+++ mathmap-1.3.5-fix//Makefile	2010-11-11 16:48:13.308941852 +0100
-@@ -178,7 +178,7 @@ backends/lazy_creator.o : backends/lazy_
- 	$(CXX) $(MATHMAP_CXXFLAGS) $(FORMATDEFS) -o $@ -c backends/lazy_creator.cpp
- 
- builtins/libnoise.o : builtins/libnoise.cpp builtins/libnoise.h
--	$(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -o $@ -c builtins/libnoise.cpp
-+	$(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -Ilibnoise/noise/src -o $@ -c builtins/libnoise.cpp
- 
- new_builtins.c opdefs.h opfuncs.h compiler_types.h llvm-ops.h : builtins.lisp ops.lisp
- 	clisp builtins.lisp
diff --git a/community-testing/gimp-plugin-mathmap/libpng15.patch b/community-testing/gimp-plugin-mathmap/libpng15.patch
deleted file mode 100644
index 3cf95387c..000000000
--- a/community-testing/gimp-plugin-mathmap/libpng15.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -rup mathmap-1.3.5/rwimg/rwpng.c mathmap-1.3.5.new/rwimg/rwpng.c
---- mathmap-1.3.5/rwimg/rwpng.c	2009-08-23 13:56:14.000000000 +0200
-+++ mathmap-1.3.5.new/rwimg/rwpng.c	2012-01-27 13:02:29.708023734 +0100
-@@ -58,34 +58,34 @@ open_png_file_reading (const char *filen
-     data->end_info = png_create_info_struct(data->png_ptr);
-     assert(data->end_info != 0);
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     png_init_io(data->png_ptr, data->file);
- 
-     png_read_info(data->png_ptr, data->info_ptr);
- 
--    *width = data->info_ptr->width;
--    *height = data->info_ptr->height;
-+    *width = png_get_image_width(data->png_ptr, data->info_ptr);
-+    *height = png_get_image_height(data->png_ptr, data->info_ptr);
- 
--    if (data->info_ptr->bit_depth != 8 && data->info_ptr->bit_depth != 16)
-+    if (png_get_bit_depth(data->png_ptr, data->info_ptr) != 8 && png_get_bit_depth(data->png_ptr, data->info_ptr) != 16)
-     {
- 	fprintf(stderr, "PNG files are only supported with bit depths 8 and 16.\n");
- 	/* FIXME: free stuff */
- 	return 0;
-     }
- 
--    if (data->info_ptr->color_type != PNG_COLOR_TYPE_RGB
--	&& data->info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA
--	&& data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY
--	&& data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB
-+	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA
-+	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY
-+	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
- 	fprintf(stderr, "PNG files are only supported in RGB and Gray, with or without alpha.\n");
- 	/* FIXME: free stuff */
- 	return 0;
-     }
- 
--    if (data->info_ptr->interlace_type != PNG_INTERLACE_NONE)
-+    if (png_get_interlace_type(data->png_ptr, data->info_ptr) != PNG_INTERLACE_NONE)
-     {
- 	fprintf(stderr, "Interlaced PNG files are not supported.\n");
- 	/* FIXME: free stuff */
-@@ -105,24 +105,24 @@ png_read_lines (void *_data, unsigned ch
-     int bps, spp;
-     unsigned char *row;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
--    if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+    if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY)
- 	spp = 1;
--    else if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
- 	spp = 2;
--    else if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
-+    else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
- 	spp = 3;
-     else
- 	spp = 4;
- 
--    if (data->info_ptr->bit_depth == 16)
-+    if (png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
- 	bps = 2;
-     else
- 	bps = 1;
- 
--    row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
-+    row = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * spp * bps);
- 
-     for (i = 0; i < num_lines; ++i)
-     {
-@@ -131,13 +131,13 @@ png_read_lines (void *_data, unsigned ch
- 	png_read_row(data->png_ptr, (png_bytep)row, 0);
- 
- 	if (spp <= 2)
--	    for (j = 0; j < data->info_ptr->width; ++j)
-+	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
- 		for (channel = 0; channel < 3; ++channel)
--		    lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps];
-+		    lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel] = row[j * spp * bps];
- 	else
--	    for (j = 0; j < data->info_ptr->width; ++j)
-+	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
- 		for (channel = 0; channel < 3; ++channel)
--		    lines[i * data->info_ptr->width * 3 + j * 3 + channel]
-+		    lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel]
- 			= row[j * spp * bps + channel * bps];
-     }
- 
-@@ -151,7 +151,7 @@ png_free_reader_data (void *_data)
- {
-     png_data_t *data = (png_data_t*)_data;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     if (data->have_read)
-@@ -180,7 +180,7 @@ open_png_file_writing (const char *filen
-     data->info_ptr = png_create_info_struct(data->png_ptr);
-     assert(data->info_ptr != 0);
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     if (pixel_stride == 4)
-@@ -188,18 +188,9 @@ open_png_file_writing (const char *filen
- 
-     png_init_io(data->png_ptr, data->file);
- 
--    data->info_ptr->width = width;
--    data->info_ptr->height = height;
--    data->info_ptr->valid = 0;
--    data->info_ptr->rowbytes = width * 3;
--    data->info_ptr->palette = 0;
--    data->info_ptr->num_palette = 0;
--    data->info_ptr->num_trans = 0;
--    data->info_ptr->bit_depth = 8;
--    data->info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--    data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
--    data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
--    data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+    png_set_IHDR(data->png_ptr, data->info_ptr, width, height,
-+    8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-+    PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- 
-     png_write_info(data->png_ptr, data->info_ptr);
- 
-@@ -216,12 +207,12 @@ png_write_lines (void *_data, unsigned c
-     unsigned char *packed_line;
-     int i;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     if (data->pixel_stride != 3)
-     {
--	packed_line = (unsigned char*)malloc(data->info_ptr->width * 3);
-+	packed_line = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * 3);
- 	assert(packed_line != 0);
-     }
-     else
-@@ -235,7 +226,7 @@ png_write_lines (void *_data, unsigned c
- 	{
- 	    int j;
- 
--	    for (j = 0; j < data->info_ptr->width; ++j)
-+	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
- 	    {
- 		packed_line[j * 3 + 0] = p[j * data->pixel_stride + 0];
- 		packed_line[j * 3 + 1] = p[j * data->pixel_stride + 1];
-@@ -257,7 +248,7 @@ png_free_writer_data (void *_data)
- {
-     png_data_t *data = (png_data_t*)_data;
- 
--    if (setjmp(data->png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(data->png_ptr)))
- 	assert(0);
- 
-     png_write_end(data->png_ptr, data->info_ptr);
-Only in mathmap-1.3.5.new/rwimg: rwpng.c.orig
diff --git a/community-testing/gimp-plugin-wavelet-decompose/PKGBUILD b/community-testing/gimp-plugin-wavelet-decompose/PKGBUILD
deleted file mode 100644
index 0cf0fc7f6..000000000
--- a/community-testing/gimp-plugin-wavelet-decompose/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 63126 2012-01-30 18:57:47Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Denis Kvist <denvist@ya.ru>
-
-pkgname=gimp-plugin-wavelet-decompose
-pkgver=0.1.2
-pkgrel=2
-pkgdesc="Wavelet decompose plugin for Gimp"
-arch=('i686' 'x86_64')
-url="http://registry.gimp.org/node/11742"
-license=('GPL')
-depends=('gimp')
-source=(http://registry.gimp.org/files/wavelet-decompose-$pkgver.tar.gz \
-	po_install.diff)
-md5sums=('e0cb8670a1c5506d08f57f2300caac24'
-         '4de9e41a535f200c2502f0dd8458c43e')
-
-build() {
-  cd "$srcdir/wavelet-decompose-$pkgver"
-  patch -Np1 < ../po_install.diff
-  make
-  install -Dvm755 src/wavelet-decompose \
-	"$pkgdir"/usr/lib/gimp/2.0/plug-ins/wavelet-decompose
-  cd po
-  make LOCALEDIR="$pkgdir"/usr/share/locale install
-}
diff --git a/community-testing/gimp-plugin-wavelet-decompose/po_install.diff b/community-testing/gimp-plugin-wavelet-decompose/po_install.diff
deleted file mode 100644
index 4b6d1a9fe..000000000
--- a/community-testing/gimp-plugin-wavelet-decompose/po_install.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -c -r wavelet-denoise-0.3/po/Makefile wavelet-denoise-0.3-new/po/Makefile
-*** wavelet-denoise-0.3/po/Makefile	2008-12-14 12:19:22.000000000 +0100
---- wavelet-denoise-0.3-new/po/Makefile	2008-12-20 14:57:51.000000000 +0100
-***************
-*** 24,30 ****
-  
-  install: $(LANGUAGES)
-  	for L in $(LANGUAGES); \
-! 	do install -v -m 0644 $$L.mo "$(LOCALEDIR)/$$L/LC_MESSAGES/gimp20-$(PLUGIN)-plug-in.mo"; \
-  done
-  
-  uninstall: $(LANGUAGES)
---- 24,31 ----
-  
-  install: $(LANGUAGES)
-  	for L in $(LANGUAGES); \
-! 	do mkdir -p "$(LOCALEDIR)/$$L/LC_MESSAGES"; \
-! 	install -v -m 0644 $$L.mo "$(LOCALEDIR)/$$L/LC_MESSAGES/gimp20-$(PLUGIN)-plug-in.mo"; \
-  done
-  
-  uninstall: $(LANGUAGES)
diff --git a/community-testing/gliv/PKGBUILD b/community-testing/gliv/PKGBUILD
deleted file mode 100644
index 157adabfb..000000000
--- a/community-testing/gliv/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com>
-
-pkgname=gliv
-pkgver=1.9.7
-pkgrel=2
-pkgdesc="OpenGL image viewer"
-arch=('i686' 'x86_64')
-url="http://guichaz.free.fr/gliv/"
-license=('GPL')
-depends=('gtkglext')
-changelog=$pkgname.changelog
-source=(http://guichaz.free.fr/gliv/files/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5f0fafaf41651da8882e88b3df062d02')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  sed -i 's:pixmaps |:pixmaps $(datadir)/applications |:;s:vendor=gnome:vendor=gnome --dir=$(datadir)/applications:' Makefile
-  make
-} 
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/gliv/gliv.changelog b/community-testing/gliv/gliv.changelog
deleted file mode 100644
index 9b37dd5a9..000000000
--- a/community-testing/gliv/gliv.changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* gliv-1.9.7-1
-
-2010-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#21710 fixed in gliv-1.9.6-3
diff --git a/community-testing/glpng/Makefile b/community-testing/glpng/Makefile
deleted file mode 100644
index d6772798f..000000000
--- a/community-testing/glpng/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-CFLAGS+=-fPIC -Iinclude
-LDFLAGS+=-lpng -lGL
-SHAREDLIBFLAGS=-shared
-DESTDIR=/usr/local
-LIB=lib
-
-all: libglpng.a libglpng.so.1.45
-
-libglpng.a: glpng.o
-	ar rv $@ $<
-
-libglpng.so.1.45: glpng.o
-	gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@
-
-glpng.o: src/glpng.c
-	gcc $(CFLAGS) -c $<
-
-clean:
-	rm glpng.o libglpng.*
-
-install:
-	for i in include include/GL $(LIB); do \
-		install -m 755 -d $(DESTDIR)/$$i; \
-	done
-	install -p -m 644 include/GL/glpng.h $(DESTDIR)/include/GL
-	install -m 755 libglpng.* $(DESTDIR)/$(LIB)
-	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1
-	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so
-
-.PHONY: clean install
diff --git a/community-testing/glpng/PKGBUILD b/community-testing/glpng/PKGBUILD
deleted file mode 100644
index a460a1860..000000000
--- a/community-testing/glpng/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 63130 2012-01-30 18:58:08Z ibiru $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=glpng
-pkgver=1.45
-pkgrel=5
-pkgdesc="Toolkit for loading PNG images as OpenGL textures"
-arch=('i686' 'x86_64')
-url="http://www.fifi.org/doc/libglpng-dev/glpng.html"
-license=('custom')
-depends=('libpng' 'libgl')
-makedepends=('mesa')
-source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz
-        Makefile
-        libpng15.patch
-        license)
-build() {
-  cd "$srcdir/libglpng-1.45.orig"
-
-  patch -Np1 -i "$srcdir/libpng15.patch"
-
-  cp "$srcdir/Makefile" .
-  make libglpng.so.1.45
-}
-
-package() {
-  cd "$srcdir/libglpng-1.45.orig"
-  make DESTDIR="$pkgdir/usr" install
-  install -Dm644 "$srcdir/license" \
-    "$pkgdir/usr/share/licenses/glpng/license"
-}
-md5sums=('9e0daad8e39fbf3179c73c0d3f74f104'
-         '0b24e9cb527d4ed1c43dd743d49d2b54'
-         'f3f0c0a3f867c5856d922c18677ef2a2'
-         'cd066652a6e5dbd7c1fc303b8e03417a')
diff --git a/community-testing/glpng/libpng15.patch b/community-testing/glpng/libpng15.patch
deleted file mode 100644
index 89e9bf67e..000000000
--- a/community-testing/glpng/libpng15.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -aur libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45.new/include/GL/glpng.h
---- libglpng-1.45.orig/include/GL/glpng.h	2000-07-10 21:27:00.000000000 +0200
-+++ libglpng-1.45.new/include/GL/glpng.h	2012-01-19 19:34:43.994280259 +0100
-@@ -57,7 +57,7 @@
- #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS

- 
- /* Transparency parameters */

--#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
-+#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
- #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
- #define PNG_SOLID     -1 /* No transparency                                */
- #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
-diff -aur libglpng-1.45.orig/src/glpng.c libglpng-1.45.new/src/glpng.c
---- libglpng-1.45.orig/src/glpng.c	2000-07-10 21:27:10.000000000 +0200
-+++ libglpng-1.45.new/src/glpng.c	2012-01-19 19:39:37.379311651 +0100
-@@ -29,7 +29,7 @@
- #include <GL/gl.h>

- #include <stdlib.h>
- #include <math.h>
--#include "png/png.h"
-+#include <png.h>
- 

- /* Used to decide if GL/gl.h supports the paletted extension */

- #ifdef GL_COLOR_INDEX1_EXT

-@@ -113,6 +113,7 @@
- 	}
- }
- 

-+#ifdef _WIN32
- static int ExtSupported(const char *x) {
- 	static const GLubyte *ext = NULL;
- 	const char *c;
-@@ -129,6 +130,7 @@
- 
- 	return 0;
- }
-+#endif
- 

- #define GET(o) ((int)*(data + (o)))

- 

-@@ -269,14 +271,14 @@
- 	if (pinfo == NULL) return 0;
- 
- 	fread(header, 1, 8, fp);
--	if (!png_check_sig(header, 8)) return 0;
-+	if (!png_sig_cmp(header, 0, 8)) return 0;
- 
- 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	info = png_create_info_struct(png);
- 	endinfo = png_create_info_struct(png);
- 
- 	// DH: added following lines

--	if (setjmp(png->jmpbuf))

-+	if (setjmp(png_jmpbuf(png)))

- 	{

- 		png_destroy_read_struct(&png, &info, &endinfo);

- 		return 0;

-@@ -373,14 +375,14 @@
- 	png_uint_32 i;
- 
- 	fread(header, 1, 8, fp);
--	if (!png_check_sig(header, 8)) return 0;
-+	if (png_sig_cmp(header, 0, 8)) return 0;
- 
- 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	info = png_create_info_struct(png);
- 	endinfo = png_create_info_struct(png);
- 
- 	// DH: added following lines

--	if (setjmp(png->jmpbuf))

-+	if (setjmp(png_jmpbuf(png)))

- 	{

- 		png_destroy_read_struct(&png, &info, &endinfo);

- 		return 0;

-@@ -559,7 +561,7 @@
- 			#define ALPHA *q
- 
- 			switch (trans) {
--				case PNG_CALLBACK:
-+				case PNG_CALLBACKT:
- 					FORSTART
- 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
- 					FOREND
diff --git a/community-testing/glpng/license b/community-testing/glpng/license
deleted file mode 100644
index a526262b5..000000000
--- a/community-testing/glpng/license
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * PNG loader library for OpenGL v1.45 (10/07/00)
- * by Ben Wyatt ben@wyatt100.freeserve.co.uk
- * Using LibPNG 1.0.2 and ZLib 1.1.3
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the author be held liable for any damages arising from the
- * use of this software.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject to
- * the following restrictions:
- *
- * 1. The origin of this source code must not be misrepresented. You must not
- *    claim that you wrote the original software. If you use this software in
- *    a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered versions must be plainly marked as such and must not be
- *    misrepresented as being the original source.
- * 3. This notice must not be removed or altered from any source distribution.
- */
diff --git a/community-testing/gmerlin-avdecoder/PKGBUILD b/community-testing/gmerlin-avdecoder/PKGBUILD
deleted file mode 100644
index 8363d2d2e..000000000
--- a/community-testing/gmerlin-avdecoder/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 63134 2012-01-30 18:58:22Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin-avdecoder
-pkgver=1.1.0
-pkgrel=4
-pkgdesc="Media decoding library"
-arch=('i686' 'x86_64')
-url="http://gmerlin.sourceforge.net/avdec_frame.html"
-license=('GPL')
-depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex'
-         'libdca' 'libmpeg2' 'a52dec')
-source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz)
-md5sums=('c1ea663e9da631453eec4ac79138b6c5')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  rm -f cpuinfo.sh
-  ./configure --prefix=/usr --without-doxygen
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gmerlin/PKGBUILD b/community-testing/gmerlin/PKGBUILD
deleted file mode 100644
index 7ae8fb0d4..000000000
--- a/community-testing/gmerlin/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 63132 2012-01-30 18:58:16Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin
-pkgver=1.0.0
-pkgrel=5
-pkgdesc="Multimedia architecture for Linux"
-arch=('i686' 'x86_64')
-url="http://openmovieeditor.sourceforge.net/HomePage"
-license=('GPL')
-depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
-makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa')
-optdepends=('alsa-lib: for ALSA support'
-	    'jack: for JACK support'
-	    'libquicktime: for movie encoding'
-	    'pulseaudio: for PulseAudio support'
-	    'v4l-utils: for video conversion')
-options=('!libtool' '!makeflags')
-install=gmerlin.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	libpng.patch)
-md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6'
-         'c262023434246705296d97bc7337a212')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  rm -rf cpuinfo.sh
-
-  patch -p1 -i "$srcdir/libpng.patch"
-  ./configure --prefix=/usr --without-doxygen
-  sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile
-  sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gmerlin/gmerlin.install b/community-testing/gmerlin/gmerlin.install
deleted file mode 100644
index c7625c2f1..000000000
--- a/community-testing/gmerlin/gmerlin.install
+++ /dev/null
@@ -1,25 +0,0 @@
-infodir=usr/share/info
-filelist=(gmerlin.info)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  [[ -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
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/gmerlin/libpng.patch b/community-testing/gmerlin/libpng.patch
deleted file mode 100644
index c01105e63..000000000
--- a/community-testing/gmerlin/libpng.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c
---- gmerlin-1.0.0/plugins/png/ir_png.c	2011-01-07 18:37:06.000000000 +0300
-+++ gmerlin-1.0.0.my/plugins/png/ir_png.c	2011-11-07 14:46:25.000000000 +0400
-@@ -127,13 +127,8 @@
-         bits = 16;
-         }
-       if(bit_depth < 8)
--#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9)
--        png_set_gray_1_2_4_to_8(png->png_ptr);
--#else
-       png_set_expand_gray_1_2_4_to_8(png->png_ptr);
--#endif
- 
--        png_set_gray_1_2_4_to_8(png->png_ptr);
-       if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
-         {
-         png_set_tRNS_to_alpha(png->png_ptr);
diff --git a/community-testing/gmic/PKGBUILD b/community-testing/gmic/PKGBUILD
deleted file mode 100644
index e127da742..000000000
--- a/community-testing/gmic/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 63136 2012-01-30 18:58:28Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <Mymaud@gmail.com>
-
-pkgbase=gmic
-pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.0.8
-pkgrel=2
-pkgdesc="image procession framework"
-arch=('i686' 'x86_64')
-license=('custom:CeCILL')
-url="http://gmic.sourceforge.net"
-makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick')
-options=('docs' '!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
-	opencv-buildfix.patch)
-md5sums=('530e733b81e3c1cca7f17bfad4a56821'
-         'f135182ced743c296e08ddd560fa6be9')
-
-build() {
-  cd "$srcdir/gmic-$pkgver"
-  CFLAGS+=" -Dcimg_use_lapack"
-  LDFLAGS="-llapack"
-  sed -i "s#-lhighgui#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  sed -i "s#-lcv#-lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann#" configure
-  ./configure --prefix=/usr
-  sed -i 's|OPENCV_CFLAGS = .*|OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`|' src/Makefile
-  sed -i 's|OPENCV_LDFLAGS = .*|OPENCV_LDFLAGS = `pkg-config --libs opencv`|' src/Makefile
-  sed -i 's|cp -f gmic_gimp.*||' src/Makefile
-  sed -i 's|ln -s $(DESTDIR)$(USR)|ln -s $(USR)|' src/Makefile
-  patch -p1 <$srcdir/opencv-buildfix.patch
-  make -C src all
-}
-
-package_gmic() {
-  depends=('fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr')
-  replaces=('greycstoration')
-
-  cd "$srcdir/gmic-$pkgver"
-  make -C src install DESTDIR="$pkgdir" USR=/usr
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE"
-}
-
-package_gimp-plugin-gmic() {
-  pkgdesc="Gimp plugin for the GMIC image procession framework"
-  depends=('gimp' 'fftw' 'lapack')
-  replaces=('gimp-plugin-greycstoration' 'gimp-plugin-gmic4gimp')
-
-  cd "$srcdir/gmic-$pkgver"
-  install -Dm755 src/gmic_gimp "$pkgdir/usr/lib/gimp/2.0/plug-ins/gmic_gimp"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/gimp-plugin-gmic/LICENSE"
-}
diff --git a/community-testing/gmic/opencv-buildfix.patch b/community-testing/gmic/opencv-buildfix.patch
deleted file mode 100644
index 7fda2ea54..000000000
--- a/community-testing/gmic/opencv-buildfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -wbBur gmic-1.5.0.3.org/src/CImg.h gmic-1.5.0.3/src/CImg.h
---- gmic-1.5.0.3.org/src/CImg.h	2011-09-22 18:37:54.000000000 +0400
-+++ gmic-1.5.0.3/src/CImg.h	2011-10-05 18:03:25.000000000 +0400
-@@ -234,7 +234,11 @@
- // Using OpenCV is not mandatory.
- #ifdef cimg_use_opencv
- #include <cstddef>
-+#undef True
-+#undef False
- #include "cv.h"
-+#define True 1
-+#define False 0
- #include "highgui.h"
- #endif
- 
diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD
deleted file mode 100644
index 348db3561..000000000
--- a/community-testing/gnash/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.9
-pkgrel=9
-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 xul8.patch nodebug.patch)
-sha256sums=('f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd'
-            '5e6b9c2ccb0f6dda70745712dddf302d2b42895feda850f2ed126bf53d8815ca'
-            'd484f1c21ef71847a2d4b3dd254d1fa93a58719d45bc9df8b8deabee388ce4e9'
-            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
-
-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"
-
-  # Patch for compatibility with newer xulrunner headers
-  patch -Np1 -i "$srcdir/xul8.patch"
-
-  # Disable very, very verbose debugging (gigabytes of logs)
-  patch -Np1 -i "$srcdir/nodebug.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
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_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/gnash/nodebug.patch b/community-testing/gnash/nodebug.patch
deleted file mode 100644
index ca160b898..000000000
--- a/community-testing/gnash/nodebug.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h
---- gnash-0.8.9/libbase/log.h	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-nodebug/libbase/log.h	2012-01-18 09:39:02.004103494 +0100
-@@ -331,27 +331,27 @@
- 
- // Define to 0 to completely remove parse debugging at compile-time
- #ifndef VERBOSE_PARSE
--#define VERBOSE_PARSE 1
-+#define VERBOSE_PARSE 0
- #endif
- 
- // Define to 0 to completely remove action debugging at compile-time
- #ifndef VERBOSE_ACTION
--#define VERBOSE_ACTION 1
-+#define VERBOSE_ACTION 0
- #endif
- 
- // Define to 0 to remove ActionScript errors verbosity at compile-time
- #ifndef VERBOSE_ASCODING_ERRORS
--#define VERBOSE_ASCODING_ERRORS  1
-+#define VERBOSE_ASCODING_ERRORS  0
- #endif
- 
- // Define to 0 this to remove invalid SWF verbosity at compile-time
- #ifndef VERBOSE_MALFORMED_SWF
--#define VERBOSE_MALFORMED_SWF 1
-+#define VERBOSE_MALFORMED_SWF 0
- #endif
- 
- // Define to 0 this to remove Networking verbosity at compile-time
- #ifndef VERBOSE_NETWORKING
--#define VERBOSE_NETWORKING 1
-+#define VERBOSE_NETWORKING 0
- #endif
- 
- #if VERBOSE_PARSE
-diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp
---- gnash-0.8.9/libcore/vm/ActionExec.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp	2012-01-18 09:40:25.653458508 +0100
-@@ -46,7 +46,7 @@
- // too much information for my tastes. I really want just
- // to see how stack changes while executing actions...
- // --strk Fri Jun 30 02:28:46 CEST 2006
--# define DEBUG_STACK 1
-+//# define DEBUG_STACK 1
- 
- // Max number of stack item to dump. 0 for unlimited.
- # define STACK_DUMP_LIMIT 32
diff --git a/community-testing/gnash/xul8.patch b/community-testing/gnash/xul8.patch
deleted file mode 100644
index 7bd708b2d..000000000
--- a/community-testing/gnash/xul8.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp
---- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp	2011-11-18 16:25:55.198007371 +0100
-@@ -238,7 +238,7 @@
-     return NS_PluginInitialize();
- }
- 
--char *
-+const char *
- NP_GetMIMEDescription(void)
- {
-     return NPP_GetMIMEDescription();
-diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp
---- gnash-0.8.9/plugin/npapi/plugin.cpp	2011-03-18 14:44:30.000000000 +0100
-+++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp	2011-11-18 16:35:42.496794816 +0100
-@@ -128,10 +128,10 @@
- }
- 
- /// \brief Return the MIME Type description for this plugin.
--char*
-+const char*
- NPP_GetMIMEDescription(void)
- {
--    return const_cast<char *>(MIME_TYPES_DESCRIPTION);
-+    return MIME_TYPES_DESCRIPTION;
- }
- 
- static bool waitforgdb = false;
-diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp
---- gnash-0.8.9/plugin/npapi/test.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-xul/plugin/npapi/test.cpp	2011-11-18 16:37:06.997539299 +0100
-@@ -408,10 +408,10 @@
- {
- }
- 
--char*
-+const char*
- NPP_GetMIMEDescription(void)
- {
--    char *x = 0;
-+    const char *x = 0;
-     return x;
- }
- 
diff --git a/community-testing/gnote/PKGBUILD b/community-testing/gnote/PKGBUILD
deleted file mode 100644
index 4631e4813..000000000
--- a/community-testing/gnote/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 64073 2012-02-08 23:53:13Z allan $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: uastasi <uastasi@archlinux.us>
-pkgname=gnote
-pkgver=0.8.2
-pkgrel=2
-pkgdesc="A note taking application."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Gnote"
-license=('GPL3')
-depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'boost')
-options=('!libtool')
-install=gnote.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.xz)
-sha256sums=('7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/usr/lib/gnote \
-        --disable-scrollkeeper \
-        --disable-schemas-compile \
-        --disable-static
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gnote/gnote.install b/community-testing/gnote/gnote.install
deleted file mode 100644
index 0f8eb1012..000000000
--- a/community-testing/gnote/gnote.install
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=gnote
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-testing/gnubiff-gtk/PKGBUILD b/community-testing/gnubiff-gtk/PKGBUILD
deleted file mode 100644
index 4ec2ed6c2..000000000
--- a/community-testing/gnubiff-gtk/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 63140 2012-01-30 18:58:46Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Tom K <tomk@runbox.com>
-# Contributor: Todd Musall <tmusall@gmail.com>
-
-pkgname=gnubiff-gtk
-pkgver=2.2.14
-pkgrel=1
-pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived. GTK version."
-arch=('i686' 'x86_64')
-url="http://gnubiff.sourceforge.net/"
-license=("GPL")
-depends=('libglade' 'gtk3' 'openssl' 'popt')
-makedepends=('intltool')
-conflicts=('gnubiff')
-source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz
-	build.patch)
-md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24'
-         '96fde605eb69e300f6014546d4339beb')
-
-build() {
-  cd $srcdir/gnubiff-$pkgver
-#  patch -p1 <../build.patch
-  export LDFLAGS=-lX11
-  ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271"
-  make
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/lib
-  rm -rf $pkgdir/usr/share/gnome-2.0
-  rm -rf ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-testing/gnubiff-gtk/build.patch b/community-testing/gnubiff-gtk/build.patch
deleted file mode 100644
index 523b0557e..000000000
--- a/community-testing/gnubiff-gtk/build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -wbBur gnubiff-2.2.10/src/support.h gnubiff-2.2.10.my/src/support.h
---- gnubiff-2.2.10/src/support.h	2008-03-22 05:08:51.000000000 +0300
-+++ gnubiff-2.2.10.my/src/support.h	2008-04-22 14:21:58.000000000 +0400
-@@ -35,6 +35,9 @@
- #endif
- #include "nls.h"
- 
-+#include <stdlib.h>
-+#define EXIT_SUCCESS 0
-+#define EXIT_FAILURE 1
- 
- #include <glib.h>
- #include <sstream>
-@@ -131,6 +134,9 @@
- 		if ((pos == end) && (last < num))
- 			result << sep << num;
- 
-+		if ((pos == end) && (last != num))
-+		  result << sep << num;
-+	
- 		// Save new number
- 		inf_bound = last = num;
- 	}
diff --git a/community-testing/gnubiff/PKGBUILD b/community-testing/gnubiff/PKGBUILD
deleted file mode 100644
index cf964e9c7..000000000
--- a/community-testing/gnubiff/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63401 2012-02-01 22:53:12Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Tom K <tomk@runbox.com>
-# Contributor: Todd Musall <tmusall@gmail.com>
-
-pkgname=gnubiff
-pkgver=2.2.14
-pkgrel=1
-pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived"
-arch=('i686' 'x86_64')
-url="http://gnubiff.sourceforge.net/"
-license=("GPL")
-depends=('libglade' 'gtk3' 'popt')
-makedepends=('perlxml' 'intltool')
-conflicts=(gnubiff-gtk)
-source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24')
-
-build() {
-  [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr
-  cd $srcdir/gnubiff-$pkgver
-
-  ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \
-	--disable-fam --disable-gnome
-  make
-  make DESTDIR=$pkgdir install
-
-  rm -rf ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-testing/gnustep-gui/ChangeLog b/community-testing/gnustep-gui/ChangeLog
deleted file mode 100644
index 15622ab88..000000000
--- a/community-testing/gnustep-gui/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* version upgrade
diff --git a/community-testing/gnustep-gui/PKGBUILD b/community-testing/gnustep-gui/PKGBUILD
deleted file mode 100644
index 21716cd72..000000000
--- a/community-testing/gnustep-gui/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63142 2012-01-30 18:58:52Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Sebastian Sareyko <public@nooms.de>
-
-pkgname=gnustep-gui
-pkgver=0.20.0
-pkgrel=3
-pkgdesc="The GNUstep GUI class library"
-arch=('i686' 'x86_64')
-url="http://www.gnustep.org/"
-license=('LGPL')
-depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao')
-makedepends=('gcc-objc')
-conflicts=('gnustep-gui-svn')
-groups=('gnustep-core')
-options=('!makeflags')
-source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz)
-md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  . /etc/profile.d/GNUstep.sh
-  ./configure --prefix=/usr --sysconfdir=/etc/GNUstep
-  sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/gource/PKGBUILD b/community-testing/gource/PKGBUILD
deleted file mode 100644
index 5b7f8bbd6..000000000
--- a/community-testing/gource/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 64075 2012-02-08 23:53:20Z allan $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
-# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
-pkgname=gource
-pkgver=0.37
-pkgrel=2
-pkgdesc="software version control visualization"
-license=(GPL3)
-arch=(i686 x86_64)
-url=http://code.google.com/p/gource/
-depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew')
-source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('9c023429a8a495e6473d4c166788278a')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR=$pkgdir install
-}
-# vim: ts=2:sw=2 et:
diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD
deleted file mode 100644
index c206a7ece..000000000
--- a/community-testing/gpac/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63144 2012-01-30 18:58:57Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=3824
-pkgrel=2
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-license=('LGPL')
-depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa')
-makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad')
-optdepends=('jack: for jack support' 'a52dec: for A52 support'
-            'faad2: for AAC support' 'libmad: for mp3 support')
-options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('bf7039c2585d539475babc7996851627efd7ec59')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=$pkgver
-  _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  echo "#define GPAC_SVN_REVISION	\"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/community-testing/gpsim/PKGBUILD b/community-testing/gpsim/PKGBUILD
deleted file mode 100644
index 9fff64acd..000000000
--- a/community-testing/gpsim/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 63146 2012-01-30 18:59:04Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: mickael9 <mickael9 at gmail dot com>
-
-pkgname=gpsim
-pkgver=0.26.1
-pkgrel=2
-pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers"
-arch=(i686 x86_64)
-url="http://gpsim.sourceforge.net/"
-license=(GPL)
-depends=('gtk2+extra' 'popt')
-makedepends=('gtk2+extra')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c994c23d2d75056dbefcf5d1d63596d7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/grace/PKGBUILD b/community-testing/grace/PKGBUILD
deleted file mode 100644
index 6ea657640..000000000
--- a/community-testing/grace/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63148 2012-01-30 18:59:09Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=grace
-pkgver=5.1.22
-pkgrel=6
-pkgdesc="2D plotting tool"
-arch=(i686 x86_64)
-url="http://plasma-gate.weizmann.ac.il/Grace/"
-depends=('libjpeg' 'libpng' 'lesstif' 't1lib' 'netcdf')
-makedepends=('netcdf' 'fftw')
-license=('GPL')
-source=(ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/$pkgname-$pkgver.tar.gz)
-md5sums=('672356466f18fe59ed21a8fb44f9851d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i '1,1i#include <zlib.h>' src/rstdrv.c
-  sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|g' src/rstdrv.c
-  ./configure   --prefix=/usr --exec-prefix=/usr \
-		--enable-grace-home=/usr/share/grace \
-		--includedir=/usr/include --libdir=/usr/lib \
-		-with-helpviewer="firefox %s"
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  cd $pkgdir/usr/share/grace && mv bin lib include ../../
-}
diff --git a/community-testing/grafx2/PKGBUILD b/community-testing/grafx2/PKGBUILD
deleted file mode 100644
index b1f2083dd..000000000
--- a/community-testing/grafx2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63150 2012-01-30 18:59:19Z ibiru $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Simon Parzer <simon.parzer@gmail.com>
-pkgname=grafx2
-pkgver=2.3
-pkgrel=3
-pkgdesc="Pixelart-oriented painting program"
-arch=('x86_64' 'i686')
-url="http://code.google.com/p/grafx2/"
-license=('GPL2')
-install=grafx2.install
-depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils')
-source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz"
-        "grafx2.desktop")
-md5sums=('916a35c4762e85b4210a1041fbbfd830'
-         '9b3ecb5c2d44b987d65257184f46e6c4')
-
-build() {
-  cd "$srcdir/$pkgname/src"
-
-  msg2 "Compiling..."
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname/src"
-
-  msg2 "Packaging files..."
-  make prefix="/usr" DESTDIR="$pkgdir" install
-  msg2 "Packaging shortcut..."
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  msg2 "Packaging documentation..."
-  install -Dm644 "$srcdir/$pkgname/doc/README.txt" \
-    "$pkgdir/usr/share/doc/$pkgname/readme.txt"
-  msg2 "Packaging license..."
-  install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  msg2 "Cleaning up..."
-  rmdir "$pkgdir/usr/share/grafx2/scripts/libs"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/grafx2/grafx2.desktop b/community-testing/grafx2/grafx2.desktop
deleted file mode 100644
index d58bc5ed3..000000000
--- a/community-testing/grafx2/grafx2.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=GrafX2
-Name=GrafX2
-Comment=Pixelart-oriented painting program
-Exec=grafx2 %U
-TryExec=grafx2
-Icon=grafx2
-Terminal=false
-Type=Application
-Categories=Graphics;2DGraphics;RasterGraphics
-MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff
diff --git a/community-testing/grafx2/grafx2.install b/community-testing/grafx2/grafx2.install
deleted file mode 100644
index 12589796c..000000000
--- a/community-testing/grafx2/grafx2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=grafx2
-
-post_upgrade() {
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gsmartcontrol/PKGBUILD b/community-testing/gsmartcontrol/PKGBUILD
deleted file mode 100644
index 87325e3d5..000000000
--- a/community-testing/gsmartcontrol/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-pkgname=gsmartcontrol
-pkgver=0.8.6
-pkgrel=3
-pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
-arch=('i686' 'x86_64')
-url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
-license=('GPL3')
-depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage')
-optdepends=('gnomesu: for gsmartcontrol-root' 
-            'gksu: for gsmartcontrol-root')
-install=${pkgname}.install
-source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d2ac685e2e73b05f7ba74c93623af739')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./configure --prefix=/usr
-	make 
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/gsmartcontrol/gsmartcontrol.install b/community-testing/gsmartcontrol/gsmartcontrol.install
deleted file mode 100644
index b95cc069d..000000000
--- a/community-testing/gsmartcontrol/gsmartcontrol.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community-testing/gsql/PKGBUILD b/community-testing/gsql/PKGBUILD
deleted file mode 100644
index e5cc0b0eb..000000000
--- a/community-testing/gsql/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63152 2012-01-30 18:59:26Z ibiru $
-# Contributor: Michael Kanis <mkanis@gmx.de>
-
-pkgname=gsql
-pkgver=0.2.2
-pkgrel=4
-pkgdesc="Integrated database development tool for GNOME"
-url="http://gsql.org/"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf'
-	 'desktop-file-utils' 'libnotify')
-makedepends=('libmysqlclient' 'postgresql-libs' 'libssh')
-optdepends=('libmysqlclient' 'postgresql-libs' 'libssh')
-install=gsql.install
-options=(!libtool)
-source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8f3322a75390584729e84a8570e08bea')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/notify_notification_new (subj, message, NULL, NULL);/notify_notification_new (subj, message, NULL);/' libgsql/notify.c
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/community-testing/gsql/gsql.install b/community-testing/gsql/gsql.install
deleted file mode 100644
index e069ea8fc..000000000
--- a/community-testing/gsql/gsql.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gsql
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/gtk-chtheme/PKGBUILD b/community-testing/gtk-chtheme/PKGBUILD
deleted file mode 100644
index e7901bf97..000000000
--- a/community-testing/gtk-chtheme/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63154 2012-01-30 18:59:32Z ibiru $
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=gtk-chtheme
-pkgver=0.3.1
-pkgrel=7
-pkgdesc="This little program lets you change your Gtk+ 2.0 theme. A better alternative to switch2"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://plasmasturm.org/programs/gtk-chtheme/"
-depends=('gtk2')
-source=("http://plasmasturm.org/programs/gtk-chtheme/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f688053bf26dd6c4f1cd0bf2ee33de2a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Fix xdg compliancy
-  sed -i 's|-DGTK.*||' Makefile
-  sed -i 's|theme_list(g_.*|&\n\tread_theme_list(g_strconcat(g_get_user_data_dir(), "/themes", NULL));|' main.c
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme
-}
diff --git a/community-testing/gtk-engine-murrine/PKGBUILD b/community-testing/gtk-engine-murrine/PKGBUILD
deleted file mode 100644
index 8a6a6afcd..000000000
--- a/community-testing/gtk-engine-murrine/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63156 2012-01-30 18:59:40Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: detto <detto-brumm@freenet.de>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=gtk-engine-murrine
-pkgver=0.98.1.1
-pkgrel=3
-pkgdesc="GTK2 engine to make your desktop look like a 'murrina', an italian word meaning the art glass works done by Venicians glass blowers."
-arch=('i686' 'x86_64')
-url="http://cimitan.com/murrine/project/murrine"
-license=('LGPL3')
-depends=('gtk2')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.bz2)
-sha256sums=('e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912')
-
-build() {
-  cd murrine-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --enable-animation \
-    --enable-animationrtl
-  make
-}
-
-package() {
-  cd murrine-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/guake/0001-Retrieve-port-as-int.2.patch b/community-testing/guake/0001-Retrieve-port-as-int.2.patch
deleted file mode 100644
index 3fde26dc2..000000000
--- a/community-testing/guake/0001-Retrieve-port-as-int.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001
-From: pingou <pingou@pingoured.fr>
-Date: Mon, 23 Aug 2010 09:54:35 +0200
-Subject: [PATCH] Retrieve port as int
-
----
- src/guake.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/guake.py b/src/guake.py
-index 6214fb2..40e688f 100644
---- a/src/guake.py
-+++ b/src/guake.py
-@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp):
-                 ssl_port = port
-             else:
-                 ssl_host = self.client.get_string('/system/proxy/secure_host')
--                ssl_port = self.client.get_string('/system/proxy/secure_port')
-+                ssl_port = self.client.get_int('/system/proxy/secure_port')
- 
-             if self.client.get_bool(proxy + 'use_authentication'):
-                 auth_user = self.client.get_string(
--- 
-1.7.2.1
-
diff --git a/community-testing/guake/PKGBUILD b/community-testing/guake/PKGBUILD
deleted file mode 100644
index a7d4d7117..000000000
--- a/community-testing/guake/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 63158 2012-01-30 18:59:52Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
-pkgname=guake
-pkgver=0.4.2
-pkgrel=5
-pkgdesc='is a drop-down terminal for Gnome Desktop Environment'
-arch=('i686' 'x86_64')
-url='http://guake.org'
-license=('GPL')
-depends=('python-notify' 'vte' 'gconf' 'python2-gconf' 'dbus-python' 'notification-daemon')
-makedepends=('libx11' 'pkgconfig' 'perlxml' 'intltool')
-install=guake.install
-source=(http://guake.org/files/guake-$pkgver.tar.gz
-        http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch)
-md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e'
-         '9aca6ba8e46ae1b69958cda0e03320ff')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Point Python scripts to the python2 binary
-  sed -i 's|bin/python"|bin/python2"|' src/guake{,-prefs}.in
-
-  # Patch to import proxy port setting as int (http://guake.org/ticket/246)
-  patch -Np1 -i "$srcdir/0001-Retrieve-port-as-int.2.patch"
-
-  ./configure --sysconfdir=/usr/share --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/guake/guake.install b/community-testing/guake/guake.install
deleted file mode 100644
index 1e828c86b..000000000
--- a/community-testing/guake/guake.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=guake
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/community-testing/hatari/PKGBUILD b/community-testing/hatari/PKGBUILD
deleted file mode 100644
index c9de15c29..000000000
--- a/community-testing/hatari/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63164 2012-01-30 19:00:24Z ibiru $
-# Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-
-pkgname=hatari
-pkgver=1.5.0
-pkgrel=2
-pkgdesc='An Atari ST and STE emulator'
-arch=('i686' 'x86_64')
-url='http://hatari.sourceforge.net/'
-license=('GPL')
-depends=('sdl' 'libpng')
-makedepends=('cmake')
-source=("http://download.berlios.de/hatari/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('16277cff73ec3a342b87b7b7ea3932f4')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/htmldoc/PKGBUILD b/community-testing/htmldoc/PKGBUILD
deleted file mode 100644
index 6130d34ff..000000000
--- a/community-testing/htmldoc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 63166 2012-01-30 19:00:30Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch>
-
-pkgname=htmldoc
-pkgver=1.8.27
-pkgrel=7
-pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices"
-arch=(i686 x86_64)
-url="http://www.htmldoc.org"
-license=('GPL')
-depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc-libs' 'libxft' 'libxpm')
-source=(ftp://ftp.easysw.com/pub/${pkgname}/${pkgver}/${pkgname}-$pkgver-source.tar.bz2)
-md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-
-  make install \
-	prefix=${pkgdir}/usr \
-	bindir=$pkgdir/usr/bin \
-	datadir=$pkgdir/usr/share \
-	datarootdir=$pkgdir/usr/share \
-	docdir=$pkgdir/usr/share/doc/htmldoc \
-	exec_prefix=$pkgdir/usr \
-	mandir=$pkgdir/usr/share/man \
-	prefix=$pkgdir/usr \
-	sysconfdir=$pkgdir/etc
-
-  # freedesktop stuff
-  install -Dm 644 desktop/htmldoc-128.png \
-    $pkgdir/usr/share/pixmaps/htmldoc.png
-  echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop
-  sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop
-  install -Dm 644 desktop/htmldoc.desktop \
-    $pkgdir/usr/share/applications/htmldoc.desktop
-}
diff --git a/community-testing/i3-wm/PKGBUILD b/community-testing/i3-wm/PKGBUILD
deleted file mode 100644
index 84f51d242..000000000
--- a/community-testing/i3-wm/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 64079 2012-02-08 23:53:31Z allan $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-
-pkgname=i3-wm
-_pkgsourcename=i3
-pkgver=4.1.2
-pkgrel=4
-pkgdesc="An improved dynamic tiling window manager"
-arch=('i686' 'x86_64')
-url="http://i3wm.org/"
-license=('BSD')
-replaces=("i3" "i3bar")
-groups=("i3")
-depends=('libxcursor' 'xcb-util-wm' 'xcb-util-keysyms' 'libev' 'yajl' 'startup-notification' 'pcre')
-makedepends=('bison' 'flex')
-optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
-            'dmenu: As menu.'
-            'i3lock: For locking your screen.'
-            'i3status: To display systeminformation with a bar.'
-            'perl: To migrate your configuration to v4 format.')
-options=('docs' '!strip')
-source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2")
-md5sums=('0e81c381f9bf3ebf155aaa394e71834f')
-
-build() {
-  cd "$srcdir/$_pkgsourcename-$pkgver"
-  
-  # In order to avoid problems with bison use only a single process
-  MAKEFLAGS="-j1"
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgsourcename-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  
-  install -Dm644 man/i3.1 \
-    ${pkgdir}/usr/share/man/man1/i3.1
-  install -Dm644 i3bar/doc/i3bar.1 \
-    ${pkgdir}/usr/share/man/man1/i3bar.1
-  install -Dm644 man/i3-config-wizard.1 \
-    ${pkgdir}/usr/share/man/man1/i3-config-wizard.1
-  install -Dm644 man/i3-input.1 \
-    ${pkgdir}/usr/share/man/man1/i3-input.1
-  install -Dm644 man/i3-msg.1 \
-    ${pkgdir}/usr/share/man/man1/i3-msg.1
-  install -Dm644 man/i3-migrate-config-to-v4.1 \
-    ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1
-  install -Dm644 man/i3-nagbar.1 \
-    ${pkgdir}/usr/share/man/man1/i3-nagbar.1
-  install -Dm644 LICENSE \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  
-  make clean
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/icoutils/PKGBUILD b/community-testing/icoutils/PKGBUILD
deleted file mode 100644
index 8f8813cbd..000000000
--- a/community-testing/icoutils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: neodreams <yanbrodeur@videotron.ca>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=icoutils
-pkgver=0.29.1
-pkgrel=2
-pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.nongnu.org/icoutils/'
-depends=('libpng>=1.0.0' 'perl-libwww>=5.64')
-source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b58f375e0f8731595e8d0ecdc3a0acb9')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/irrlicht/PKGBUILD b/community-testing/irrlicht/PKGBUILD
deleted file mode 100644
index f03341c87..000000000
--- a/community-testing/irrlicht/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 63170 2012-01-30 19:00:42Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com>
-# Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
-# Contributor: Paolo Fagni <paolo.fagni AT mail DOT com>
-# Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com>
-
-pkgname=irrlicht
-pkgver=1.7.2
-pkgrel=4
-pkgdesc="An open source high performance realtime 3D graphics engine."
-arch=('i686' 'x86_64')
-url="http://irrlicht.sourceforge.net/"
-license=('ZLIB')
-depends=('libgl' 'libjpeg' 'bzip2' 'libpng')
-makedepends=('mesa' 'unzip')
-source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip"
-        "irrlicht-1.7.2-libpng15.patch")
-md5sums=('eb627d4c432bf73f12bc6d9ddc700b07'
-         'a7f8d4aa1bc2880bbeaf3449e09f69a5')
-noextract=($pkgname-$pkgver.zip)
-
-build() {
-  unzip $pkgname-$pkgver.zip
-
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -Np0 < $srcdir/irrlicht-1.7.2-libpng15.patch
-
-  sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \
-         -e '/^#.*NON_SYSTEM_JPEG/d' \
-         -e '/^#.*NON_SYSTEM_LIB_PNG/d' \
-         -e '/^#.*NON_SYSTEM_BZLIB/d' \
-         include/IrrCompileConfig.h
-
-  cd source/Irrlicht
-  sed -i -e '/^CXXFLAGS/s:-g.*::' \
-	 -e '/^CXXFLAGS/s:-Wall::' \
-	 -e '/^CFLAGS/s/:= -O3 -fexpensive-optimizations/+=/' \
-	 -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
-	 -e '/^ZLIBOBJ/d' \
-	 -e '/^JPEGLIBOBJ/d' \
-	 -e '/^BZIP2OBJ/d' \
-	 -e '/^LIBPNGOBJ/d' \
-	 -e '/.o=.d/d' \
-	 -e '/^staticlib sharedlib: LDFLAGS/s:+=.*:+= -lGL -lXxf86vm -lpng -ljpeg -lbz2 -lz:' \
-	 -e "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \
-	 -e 's/0-SVN/1/' \
-	 -e 's/.$(VERSION_MINOR) -o/ -o/' \
-	 Makefile
-
-  sed -i "s/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/" \
-      CImageLoaderPNG.cpp
-
-  make sharedlib
-
-  make
-
-  install -d $pkgdir/usr/lib \
-             $pkgdir/usr/share/licenses/$pkgname \
-             $pkgdir/usr/share/$pkgname/examples/bin \
-             $pkgdir/usr/share/doc/$pkgname
-
-  make install
-
-  cd $srcdir/$pkgname-$pkgver/
-  install -m644 readme.txt $pkgdir/usr/share/licenses/$pkgname
-
-  # Install static library and fix headers permissions
-  install -m644 lib/Linux/libIrrlicht.a $pkgdir/usr/lib
-  chmod 644 $pkgdir/usr/include/$pkgname/*
-
-  # Install media files for examples
-  cp -r media $pkgdir/usr/share/$pkgname
-
-  # Install documentation
-  cp -r doc/* $pkgdir/usr/share/doc/$pkgname
-  rm -f $pkgdir/usr/share/doc/$pkgname/*.txt
-
-  cd $pkgdir/usr/lib
-  ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1
-
-  # Just a helper for examples compilation
-  ln -s libIrrlicht.so.$pkgver $srcdir/$pkgname-$pkgver/lib/Linux/libIrrlicht.so
-
-  # Edit, build and install the examples
-  cd $srcdir/$pkgname-$pkgver/examples
-  sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h
-  sed -i '/^CXXFLAGS/d' $(grep -Rl "^CXXFLAGS =" *)
-
-  make
-
-  install -m755  ../bin/Linux/* /$pkgdir/usr/share/$pkgname/examples/bin/
-}
diff --git a/community-testing/irrlicht/irrlicht-1.7.2-libpng15.patch b/community-testing/irrlicht/irrlicht-1.7.2-libpng15.patch
deleted file mode 100644
index a1426bf29..000000000
--- a/community-testing/irrlicht/irrlicht-1.7.2-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- source/Irrlicht/CImageLoaderPNG.cpp
-+++ source/Irrlicht/CImageLoaderPNG.cpp
-@@ -28,7 +28,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)

- {

- 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);

--	longjmp(png_ptr->jmpbuf, 1);

-+	longjmp(png_jmpbuf(png_ptr), 1);

- }

- 

- // PNG function for file reading

-@@ -37,7 +37,7 @@
- 	png_size_t check;

- 

- 	// changed by zola {

--	io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;

-+	io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);

- 	check=(png_size_t) file->read((void*)data,(u32)length);

- 	// }

- 

---- source/Irrlicht/CImageWriterPNG.cpp
-+++ source/Irrlicht/CImageWriterPNG.cpp
-@@ -35,7 +35,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)

- {

- 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);

--	longjmp(png_ptr->jmpbuf, 1);

-+	longjmp(png_jmpbuf(png_ptr), 1);

- }

- 

- // PNG function for file writing

-@@ -43,7 +43,7 @@
- {

- 	png_size_t check;

- 

--	io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;

-+	io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);

- 	check=(png_size_t) file->write((const void*)data,(u32)length);

- 

- 	if (check != length)

diff --git a/community-testing/jwm/PKGBUILD b/community-testing/jwm/PKGBUILD
deleted file mode 100644
index d994cdd01..000000000
--- a/community-testing/jwm/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 63172 2012-01-30 19:00:48Z ibiru $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=jwm
-pkgver=2.1.0
-pkgrel=2
-pkgdesc="A lightweight window manager for the X11 Window System"
-arch=('i686' 'x86_64')
-url="http://joewing.net/programs/jwm/"
-license=('GPL2')
-depends=('libx11' 'libxft' 'libjpeg>=7' 'libxpm' 'libxinerama' 'libpng')
-backup=('etc/system.jwmrc')
-source=(http://joewing.net/programs/jwm/releases/jwm-$pkgver.tar.bz2)
-md5sums=('e8fab21b2410eb82032b7c3472af642c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-fribidi 
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" \
-       SYSCONF="$pkgdir/etc" install
-}
diff --git a/community-testing/kovpn/ChangeLog b/community-testing/kovpn/ChangeLog
deleted file mode 100644
index d8e35c402..000000000
--- a/community-testing/kovpn/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-25 Georg Grabler (STiAT) <ggrabler@gmail.com>
-* Added libtool option
diff --git a/community-testing/kovpn/PKGBUILD b/community-testing/kovpn/PKGBUILD
deleted file mode 100644
index 7730837b0..000000000
--- a/community-testing/kovpn/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 63174 2012-01-30 19:01:01Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=kovpn
-pkgver=0.3pre7
-_pkgver=0.3.pre7
-pkgrel=6
-pkgdesc="An OpenVPN client management interface for KDE"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php?content=37043"
-license=('GPL')
-depends=('openvpn' 'kdelibs3' 'xdg-utils')
-makedepends=('automake' 'autoconf')
-options=('libtool')
-install=kovpn.install
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
-          'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
-          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
-source=("https://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2"
-	"kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173")
-md5sums=('19b61cf9f84088baffbd5bb0a287422c'
-         '21171b74f76289daea1cc61eedaa4dba')
-
-build() {
-  cd $srcdir/$pkgname-$_pkgver
-
-  unset LDFLAGS
-  . /etc/profile.d/qt3.sh
-  export PATH=$QTDIR/bin:$PATH
-  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-
-  patch -Np1 -i ../kovpn-disable-dcop.patch
-  sed -i 's#automake\*1.10\*#automake*1.10* | automake*1.11*#' admin/cvs.sh
-  make -f admin/Makefile.common cvs
-  ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt
-  make
-  make prefix=$pkgdir/usr install
-}
diff --git a/community-testing/kovpn/kovpn.install b/community-testing/kovpn/kovpn.install
deleted file mode 100644
index b4ee8556f..000000000
--- a/community-testing/kovpn/kovpn.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
diff --git a/community-testing/leafnode/PKGBUILD b/community-testing/leafnode/PKGBUILD
deleted file mode 100644
index f808c3cb0..000000000
--- a/community-testing/leafnode/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 64081 2012-02-08 23:53:40Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=leafnode
-pkgver=1.11.8
-pkgrel=5
-pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://leafnode.sourceforge.net/"
-depends=('pcre' 'xinetd')
-license=('GPL')
-install=leafnode.install
-options=(!emptydirs)
-backup=('etc/xinetd.d/leafnode')
-source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	leafnode.xinetd)
-md5sums=('a3edafeb854efaa3fbb0f7951d02160f'
-         'db3c6ad1ff9fc03442949456d1d21304')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \
-	--with-user=9 \
-	--with-group=13
-  sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h
-  sed -i 's|#define NEWS_GROUP .*|#define NEWS_GROUP "news"|' config.h
-  make
-}
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  chown -R root.root $pkgdir
-  install -D -m0644 $srcdir/leafnode.xinetd $pkgdir/etc/xinetd.d/leafnode
-}
diff --git a/community-testing/leafnode/leafnode.install b/community-testing/leafnode/leafnode.install
deleted file mode 100644
index 5f8a74c04..000000000
--- a/community-testing/leafnode/leafnode.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  echo "-- Adding user 'news' and group 'news', chowning /var/spool/news"
-  grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&-
-  grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&-
-  chown -R root:news etc/leafnode
-  # create dir if necessary
-  if [ ! -d var/spool/news ]; then
-    install -d -m 770 -o news -g news var/spool/news
-  fi
-}
-
-post_remove() {
-  echo "-- Don't forget to remove /var/spool/news directory"
-}
diff --git a/community-testing/leafnode/leafnode.xinetd b/community-testing/leafnode/leafnode.xinetd
deleted file mode 100644
index 94c7c6ca7..000000000
--- a/community-testing/leafnode/leafnode.xinetd
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# /etc/xinetd.d/leafnode
-#
-
-service nntp
-{
-	socket_type		= stream
-	wait			= no
-	user			= news
-	server			= /usr/sbin/leafnode
-	log_type		= SYSLOG news
-	log_on_success		+= USERID
-	log_on_failure		+= USERID
-	port			= 119
-	disable			= yes
-	groups			= yes
-}
-
diff --git a/community-testing/leptonica/PKGBUILD b/community-testing/leptonica/PKGBUILD
deleted file mode 100644
index b82c8369d..000000000
--- a/community-testing/leptonica/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63176 2012-01-30 19:01:05Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Christoph Drexler <chrdr at gmx dot at>
-
-pkgname=leptonica
-pkgver=1.68
-pkgrel=3
-pkgdesc="Software that is broadly useful for image processing and image analysis applications"
-arch=('i686' 'x86_64')
-url="http://www.leptonica.com/"
-license=('custom')
-depends=('glibc')
-makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib')
-# 'webp'
-optdepends=('giflib:  for supporting gif files'
-	    'gnuplot: gnuplot support'
-	    'libjpeg: for supporting jpeg files'
-	    'libpng:  for supporting png files'
-	    'libtiff: for supporting tiff files'
-	    'zlib:    for supporting compressed files')
-#	    'webp:    for supporting webp files'
-source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz)
-md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403')
-
-build() {
-  cd ${srcdir}/leptonica-${pkgver}
-  sed -i '1,1i#include <zlib.h>' src/pngio.c
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/leptonica-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt
-}
diff --git a/community-testing/libgeotiff/PKGBUILD b/community-testing/libgeotiff/PKGBUILD
deleted file mode 100644
index a5a7ef4b8..000000000
--- a/community-testing/libgeotiff/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63178 2012-01-30 19:01:12Z ibiru $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgeotiff
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="A TIFF based interchange format for georeferenced raster imagery"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.remotesensing.org/geotiff"
-depends=('libtiff' 'proj' 'libjpeg>=7')
-options=('!makeflags' '!libtool')
-source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz)
-md5sums=('6ac3c22e44711e9a3add9044e40b9527')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
- 	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -D -m644 LICENSE "$pkgdir/usr/share/licenses/libgeotiff/LICENSE"
-}
diff --git a/community-testing/libgtksourceviewmm2/PKGBUILD b/community-testing/libgtksourceviewmm2/PKGBUILD
deleted file mode 100644
index 78db5843c..000000000
--- a/community-testing/libgtksourceviewmm2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 63180 2012-01-30 19:01:20Z ibiru $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=libgtksourceviewmm2
-pkgver=2.10.1
-pkgrel=2
-pkgdesc='A C++ API for gtksourceview2'
-arch=('i686' 'x86_64')
-url='http://projects.gnome.org/gtksourceviewmm/'
-license=('LGPL')
-depends=('gtkmm' 'gtksourceview2')
-makedepends=('doxygen' 'glibmm-docs')
-options=('!libtool' '!emptydirs')
-source=("http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.bz2")
-md5sums=('83d1b3dc061f02f4ff1766b37302058e')
-
-build() {
-  cd gtksourceviewmm-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd gtksourceviewmm-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/libharu/PKGBUILD b/community-testing/libharu/PKGBUILD
deleted file mode 100644
index 336bfb3f0..000000000
--- a/community-testing/libharu/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63182 2012-01-30 19:01:29Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : SpepS <dreamspepser at yahoo dot it>
-# Contributor: Auguste <auguste@gmail.com>
-# Contributor: Jose Negron <josenj.arch@mailnull.com>
-
-pkgname=libharu
-pkgver=2.2.1
-pkgrel=2
-pkgdesc="C/C++ library for generating PDF documents"
-url="http://libharu.org/wiki/Main_Page"
-arch=('i686' 'x86_64')
-license=('custom:ZLIB')
-depends=('libpng' 'gcc-libs')
-options=(!libtool)
-source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz"
-	libpng15.patch)
-md5sums=('63da8e087744f1d6cf16f9501b1cb766'
-         '3793dd30017474bcd277af3b419bc0f6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-  # license
-  install -d "$pkgdir/usr/share/licenses/$pkgname"
-  sed -n '102,120p' README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-testing/libharu/libpng15.patch b/community-testing/libharu/libpng15.patch
deleted file mode 100644
index 05a8d39fc..000000000
--- a/community-testing/libharu/libpng15.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff -wbBur libharu-2.2.1/src/hpdf_image_png.c libharu-2.2.1.my/src/hpdf_image_png.c
---- libharu-2.2.1/src/hpdf_image_png.c	2010-02-08 12:27:51.000000000 +0300
-+++ libharu-2.2.1.my/src/hpdf_image_png.c	2012-01-23 12:53:05.000000000 +0400
-@@ -110,13 +110,13 @@
- {
-     png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
-     png_bytep* row_pointers = HPDF_GetMem (image->mmgr,
--                info_ptr->height * sizeof (png_bytep));
-+                png_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
- 
-     if (row_pointers) {
-         HPDF_UINT i;
- 
--        HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep));
--        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+        HPDF_MemSet (row_pointers, 0, png_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
-+        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-             row_pointers[i] = HPDF_GetMem (image->mmgr, len);
- 
-             if (image->error->error_no != HPDF_OK)
-@@ -126,7 +126,7 @@
-         if (image->error->error_no == HPDF_OK) {
-             png_read_image(png_ptr, row_pointers);
-             if (image->error->error_no == HPDF_OK) {       /* add this line */
--                for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+                for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-                     if (HPDF_Stream_Write (image->stream, row_pointers[i], len) !=
-                             HPDF_OK)
-                         break;
-@@ -135,7 +135,7 @@
-         }
- 
-         /* clean up */
--        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-             HPDF_FreeMem (image->mmgr, row_pointers[i]);
-         }
- 
-@@ -156,7 +156,7 @@
-     if (buf_ptr) {
-         HPDF_UINT i;
- 
--        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
-             png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1);
-             if (image->error->error_no != HPDF_OK)
-                 break;
-@@ -183,13 +183,13 @@
- 	HPDF_UINT i, j;
- 	png_bytep *row_ptr;
- 
--	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
-+	row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
- 	if (!row_ptr) {
- 		return HPDF_FAILD_TO_ALLOC_MEM;
- 	} else {
- 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
- 
--		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+		for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
- 			if (!row_ptr[i]) {
- 				for (; i >= 0; i--) {
-@@ -207,19 +207,19 @@
- 		goto Error;
- 	}
- 
--	for (j = 0; j < info_ptr->height; j++) {
--		for (i = 0; i < info_ptr->width; i++) {
--			smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
-+	for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
-+		for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
-+			smask_data[png_image_width(png_ptr, info_ptr) * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
- 		}
- 
--		if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) {
-+		if (HPDF_Stream_Write (image->stream, row_ptr[j], png_image_width(png_ptr, info_ptr)) != HPDF_OK) {
- 			ret = HPDF_FILE_IO_ERROR;
- 			goto Error;
- 		}
- 	}
- 
- Error:
--	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+	for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
- 	}
- 
-@@ -245,13 +245,13 @@
- 		return HPDF_INVALID_PNG_IMAGE;
- 	}
- 
--	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
-+	row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
- 	if (!row_ptr) {
- 		return HPDF_FAILD_TO_ALLOC_MEM;
- 	} else {
- 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
- 
--		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+		for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
- 			if (!row_ptr[i]) {
- 				for (; i >= 0; i--) {
-@@ -271,12 +271,12 @@
- 
- 	switch (color_type) {
- 		case PNG_COLOR_TYPE_RGB_ALPHA:
--			row_len = 3 * info_ptr->width * sizeof(png_byte);
--			for (j = 0; j < info_ptr->height; j++) {
--				for (i = 0; i < info_ptr->width; i++) {
-+			row_len = 3 * png_image_width(png_ptr, info_ptr) * sizeof(png_byte);
-+			for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
-+				for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
- 					row = row_ptr[j];
- 					memmove(row + (3 * i), row + (4*i), 3);
--					smask_data[info_ptr->width * j + i] = row[4 * i + 3];
-+					smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[4 * i + 3];
- 				}
- 
- 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
-@@ -286,12 +286,12 @@
- 			}
- 			break;
- 		case PNG_COLOR_TYPE_GRAY_ALPHA:
--			row_len = info_ptr->width * sizeof(png_byte);
--			for (j = 0; j < info_ptr->height; j++) {
--				for (i = 0; i < info_ptr->width; i++) {
-+			row_len = png_image_width(png_ptr, info_ptr) * sizeof(png_byte);
-+			for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
-+				for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
- 					row = row_ptr[j];
- 					row[i] = row[2 * i];
--					smask_data[info_ptr->width * j + i] = row[2 * i + 1];
-+					smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[2 * i + 1];
- 				}
- 
- 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
-@@ -306,7 +306,7 @@
- 	}
- 
- Error:
--	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
-+	for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
- 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
- 	}
- 
-@@ -448,7 +448,7 @@
- 	}
- 
- 	/* 16bit images are not supported. */
--	if (info_ptr->bit_depth == 16) {
-+	if (png_get_bit_depth(png_ptr, info_ptr) == 16) {
- 		png_set_strip_16(png_ptr);
- 	}
- 
-@@ -458,7 +458,7 @@
- 	}
- 
- 	/* check palette-based images for transparent areas and load them immediately if found */
--	if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) {
-+	if (xref && PNG_COLOR_TYPE_PALETTE & png_get_color_type(png_ptr, info_ptr)) {
- 		png_bytep trans;
- 		int num_trans;
- 		HPDF_Dict smask;
-@@ -478,10 +478,10 @@
- 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
- 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
- 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
--		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
-+		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
- 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
--		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 
- 		if (ret != HPDF_OK) {
- 			HPDF_Dict_Free(smask);
-@@ -489,7 +489,7 @@
- 			goto Exit;
- 		}
- 
--		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
-+		smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr));
- 		if (!smask_data) {
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FAILD_TO_ALLOC_MEM;
-@@ -503,7 +503,7 @@
- 			goto Exit;
- 		}
- 
--		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
-+		if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) {
- 			HPDF_FreeMem(image->mmgr, smask_data);
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FILE_IO_ERROR;
-@@ -513,9 +513,9 @@
- 
- 
- 		ret += CreatePallet(image, png_ptr, info_ptr);
--		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
--		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 		ret += HPDF_Dict_Add (image, "SMask", smask);
- 
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -526,7 +526,7 @@
- 
- 	/* read images with alpha channel right away 
- 	   we have to do this because image transparent mask must be added to the Xref */
--	if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) {
-+	if (xref && PNG_COLOR_MASK_ALPHA & png_get_color_type(png_ptr, info_ptr)) {
- 		HPDF_Dict smask;
- 		png_bytep smask_data;
- 
-@@ -539,10 +539,10 @@
- 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
- 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
- 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
--		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
-+		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
- 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
--		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 
- 		if (ret != HPDF_OK) {
- 			HPDF_Dict_Free(smask);
-@@ -550,7 +550,7 @@
- 			goto Exit;
- 		}
- 
--		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
-+		smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr));
- 		if (!smask_data) {
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FAILD_TO_ALLOC_MEM;
-@@ -564,7 +564,7 @@
- 			goto Exit;
- 		}
- 
--		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
-+		if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) {
- 			HPDF_FreeMem(image->mmgr, smask_data);
- 			HPDF_Dict_Free(smask);
- 			ret = HPDF_FILE_IO_ERROR;
-@@ -572,14 +572,14 @@
- 		}
- 		HPDF_FreeMem(image->mmgr, smask_data);
- 
--		if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-+		if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) {
- 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
- 		} else {
- 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
- 		}
--		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
--		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
--		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
-+		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
-+		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
- 		ret += HPDF_Dict_Add (image, "SMask", smask);
- 
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -589,9 +589,9 @@
- 	/* if the image has color palette, copy the pallet of the image to
- 	 * create color map.
- 	 */
--	if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
- 		ret = CreatePallet(image, png_ptr, info_ptr);
--	else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+	else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
- 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
- 	else
- 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
-@@ -617,16 +617,16 @@
- 	}
- 
- 	/* setting the info of the image. */
--	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width)
-+	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr))
- 			!= HPDF_OK)
- 		goto Exit;
- 
--	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height)
-+	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr))
- 			!= HPDF_OK)
- 		goto Exit;
- 
- 	if (HPDF_Dict_AddNumber (image, "BitsPerComponent",
--				(HPDF_UINT)info_ptr->bit_depth) != HPDF_OK)
-+				(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)) != HPDF_OK)
- 		goto Exit;
- 
- 	/* clean up */
diff --git a/community-testing/libinfinity/PKGBUILD b/community-testing/libinfinity/PKGBUILD
deleted file mode 100644
index 2d645fb70..000000000
--- a/community-testing/libinfinity/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 63184 2012-01-30 19:01:33Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Gregory Haynes <greg@greghaynes.net>
-
-pkgname=libinfinity
-pkgver=0.5.1
-pkgrel=3
-pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
-arch=('i686' 'x86_64')
-url="http://gobby.0x539.de"
-license=('GPL')
-depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2')
-makedepends=('gtk-doc' 'pkgconfig')
-optdepends=('avahi: zeroconf support'
-            'gtk2: gtk support')
-options=('!libtool')
-source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('85e6d75e101fe25503653d2202054eff')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --localstatedir=/var
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  rm -rf $pkgdir/var
-}
diff --git a/community-testing/libmatchbox/PKGBUILD b/community-testing/libmatchbox/PKGBUILD
deleted file mode 100644
index 3add96f1e..000000000
--- a/community-testing/libmatchbox/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 63186 2012-01-30 19:01:39Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com>
-
-pkgname=libmatchbox
-pkgver=1.9
-pkgrel=5
-pkgdesc="Base library for Matchbox WM"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext')
-options=('!libtool')
-url="http://matchbox-project.org/"
-source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
-	libpng15.patch)
-md5sums=('9f73e7515cc4679171a5db180dc1343b'
-         '09f782c76fe313efd0e87fabb276e2fe')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c
-  patch -Rp1 <$srcdir/libpng15.patch
-  LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/libmatchbox/libpng15.patch b/community-testing/libmatchbox/libpng15.patch
deleted file mode 100644
index 6c4ddef4d..000000000
--- a/community-testing/libmatchbox/libpng15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -wbBur libmatchbox-1.9/libmb/mbpixbuf.c libmatchbox-1.9.org/libmb/mbpixbuf.c
---- libmatchbox-1.9/libmb/mbpixbuf.c	2012-01-19 21:57:56.000000000 +0400
-+++ libmatchbox-1.9.org/libmb/mbpixbuf.c	2006-07-26 23:12:25.000000000 +0400
-@@ -247,7 +247,7 @@
-     return NULL;
-   }
- 
--  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
-+  if ( setjmp( png_ptr->jmpbuf ) ) {
-     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
-     fclose(fd);
-     return NULL;
-@@ -269,8 +269,8 @@
-       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
-     png_set_gray_to_rgb(png_ptr);
-  
--  if ( png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA 
--       || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA
-+  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
-+       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
-        )
-     *has_alpha = 1;
-   else
diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD
deleted file mode 100644
index 509a1c439..000000000
--- a/community-testing/lightspark/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 64083 2012-02-08 23:53:49Z allan $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=lightspark
-pkgver=0.5.4.1
-pkgrel=1
-pkgdesc='An alternative Flash Player for Linux.'
-arch=('i686' 'x86_64')
-url='http://lightspark.sourceforge.net'
-license=('LGPL3')
-conflicts=('lightspark-git')
-depends=('ftgl' 'ffmpeg' 'glew' 'curl' 'boost-libs' 'gtkglext' 'libxml++' 'desktop-file-utils' 'hicolor-icon-theme')
-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{,.asc})
-md5sums=('cf24336e42ad356f1026b7071b110a88'
-         '9bd295cd6d56bfee6370bbaeef034d4c')
-
-build() {
-  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/luakit/PKGBUILD b/community-testing/luakit/PKGBUILD
deleted file mode 100644
index e92f5a99f..000000000
--- a/community-testing/luakit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
-
-pkgname=luakit
-pkgver=2011.07.22
-pkgrel=3
-pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.'
-arch=('i686' 'x86_64')
-url='http://www.luakit.org/projects/luakit'
-license=('GPL3')
-depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils')
-makedepends=('git' 'help2man')
-options=(!makeflags)
-conflicts=('luakit-git' 'luakit-develop-git')
-install='luakit.install'
-source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1")
-md5sums=('4937deb6bc81416e2deb037f4a5763e4')
-
-build() {
-  cd mason-larobina-luakit-*
-
-  # Add missing library to PKGS in config.mk
-  sed -i 's|PKGS := .*|& javascriptcoregtk-1.0|' config.mk
-
-  make PREFIX=/usr DESTDIR=${pkgdir} all
-}
-
-package() {
-  cd mason-larobina-luakit-*
-
-  make PREFIX=/usr DESTDIR=${pkgdir} install 
-}
diff --git a/community-testing/luakit/luakit.install b/community-testing/luakit/luakit.install
deleted file mode 100644
index 2c37d0597..000000000
--- a/community-testing/luakit/luakit.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  echo 'Configs are located in /etc/xdg/luakit/*.lua'
-  echo 'Copy to ~/.config/luakit/ (this folder is created on 1st start of Luakit) for local config.'
-  echo 'Or edit in place for global changes.'
-  echo 'You NEED to replace local configs after each update'
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  post_upgrade
-}
diff --git a/community-testing/luminancehdr/PKGBUILD b/community-testing/luminancehdr/PKGBUILD
deleted file mode 100644
index 97c4e0e07..000000000
--- a/community-testing/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 63192 2012-01-30 19:02:01Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=7
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz
-        luminance-hdr-2.1.0-libraw.patch)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac'
-            'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c')
-
-build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  # stolen from gentoo
-  patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch
-
-  if [ ${CARCH} = i686 ]; then
-    sed -i 's/ -msse2//' project.pro
-  fi
-
-  lrelease project.pro
-  qmake PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch
deleted file mode 100644
index 8472a7422..000000000
--- a/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
-+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
-@@ -94,7 +94,6 @@
-   RawProcessor.set_progress_handler(cb, callback_data);
-   int ret;
- 
--  OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
-   OUT.output_bps = 16;
- 
-   //OUT.gamm[0] = 1/2.4;   //sRGB
diff --git a/community-testing/luminancehdr/luminancehdr.changelog b/community-testing/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index 807541292..000000000
--- a/community-testing/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,36 +0,0 @@
-2012-01-27  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-
-2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package renamed to LuminanceHDR
-	* Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea@archlinux.org>
-	* exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut@archlinux.ro>
-	* add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community]
diff --git a/community-testing/luminancehdr/luminancehdr.install b/community-testing/luminancehdr/luminancehdr.install
deleted file mode 100644
index 279762804..000000000
--- a/community-testing/luminancehdr/luminancehdr.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/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD
deleted file mode 100644
index 092d96156..000000000
--- a/community-testing/luxrender/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 63194 2012-01-30 19:02:05Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Initial contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-pkgname=luxrender
-pkgver=0.8
-_pkgver=45d3e13eb94c
-pkgrel=12
-pkgdesc="Rendering system for physically correct, unbiased image synthesis"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
-            'python: Python interface (pylux)'
-            'nvidia-utils: OpenCL support for nVidia GPUs' \
-            'amdstream: OpenCL support for AMD GPUs' \
-            'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers')
-source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
-md5sums=('0f2d856385db72131f51e44a7ee527fa')
-
-build() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-
-  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/mapnik/PKGBUILD b/community-testing/mapnik/PKGBUILD
deleted file mode 100644
index acda29554..000000000
--- a/community-testing/mapnik/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 63196 2012-01-30 19:02:11Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: David Dent <thewinch@gmail.com>
-# Contributor: orbisvicis <orbisvicis@gmail.com>
-
-pkgname=mapnik
-pkgver=0.7.1
-pkgrel=13
-pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
-arch=('i686' 'x86_64')
-url="http://mapnik.org/"
-license=('LGPL')
-depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
-	 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo'
-	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool')
-	# already in core ('zlib' 'sqlite3')
-optdepends=('libxslt:         Web Map Service'
-            'python-lxml:     Web Map Service'
-            'python-imaging:  Web Map Service'
-            'python-nose:     Web Map Service'
-            'apache:          Web Map Service'
-            'mod_fastcgi:     Web Map Service - or:'
-            'mod_fcgid:       Web Map Service - or:'
-            'mod_wsgi:        Web Map Service'
-           )
-makedepends=('scons' 'boost') # already in core ('pkg-config')
-conflicts=('mapnik-svn')
-install="mapnik.install"
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8f65fda2a792518d6f6be8a85f62fc73')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64
-  sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct
-  sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp
-  sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct
-
-  scons configure \
-    PREFIX="/usr" \
-    INPUT_PLUGINS=all \
-    DESTDIR="$pkgdir"
-  scons
-}
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-  scons install
-  # fix permissions on SCons-autogenerated files
-  chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py"
-}
diff --git a/community-testing/mapnik/mapnik.install b/community-testing/mapnik/mapnik.install
deleted file mode 100644
index 46f265d5b..000000000
--- a/community-testing/mapnik/mapnik.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/megaglest/PKGBUILD b/community-testing/megaglest/PKGBUILD
deleted file mode 100644
index b0c5226ed..000000000
--- a/community-testing/megaglest/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 63198 2012-01-30 19:02:17Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
- 
-pkgname=megaglest
-pkgver=3.6.0.2
-pkgrel=2
-pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/megaglest/"
-license=('GPL3')
-depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew'
-         'libircclient' 'miniupnpc' 'wxgtk')
-makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('9d840a04b41aef2cba503de7bf433b8d')
-
-build() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-  cmake .. \
-   -DWANT_SVN_STAMP=OFF \
- 	 -DCMAKE_INSTALL_PREFIX=/usr \
-   -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-  make
-}
-
-package() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
-  cd build
-  make DESTDIR="$pkgdir" install
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/megaglest/megaglest.sh b/community-testing/megaglest/megaglest.sh
deleted file mode 100644
index 571a01be7..000000000
--- a/community-testing/megaglest/megaglest.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
- # Wrapper script for Megaglest.
- 
- MAINDIR=/usr/share/megaglest
- BASEDIR="$HOME/.config"
- DIR="$BASEDIR/megaglest"
- if [ ! -d "$DIR" ]; then
- mkdir -p $DIR
- fi
- cd $DIR
- [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini .
- [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest .
- [ -f servers.ini ] || cp $MAINDIR/servers.ini .
- [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini .
- for i in data scenarios techs tilesets tutorials; do
- [ -h $i ] || ln -s $MAINDIR/$i .
- done
- [ -d maps ] || mkdir maps
- [ -d screens ] || mkdir screens
- cd maps
- for i in $MAINDIR/maps/*; do
- [ -h `basename $i` ] || ln -s $i .
- done
- cd ..
- 
- exec ./megaglest
\ No newline at end of file
diff --git a/community-testing/metapixel/PKGBUILD b/community-testing/metapixel/PKGBUILD
deleted file mode 100644
index a0bc182cc..000000000
--- a/community-testing/metapixel/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63200 2012-01-30 19:02:23Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
-
-pkgname=metapixel
-pkgver=1.0.2
-pkgrel=3
-pkgdesc='A program for generating photomosaics.'
-arch=('i686' 'x86_64')
-url='http://www.complang.tuwien.ac.at/schani/metapixel/'
-license=('GPL')
-depends=('giflib' 'libjpeg' 'libpng' 'perl')
-source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz"
-        'metapixel-1.0.2-libpng-1.5.patch')
-md5sums=('af5d77d38826756af213a08e3ada9941'
-         '1832a79790b07402735bfeb9f71f36e9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  install -dm0755 "${pkgdir}/usr/share/man/man1"
-
-  make PREFIX="${pkgdir}/usr" install
-}
diff --git a/community-testing/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community-testing/metapixel/metapixel-1.0.2-libpng-1.5.patch
deleted file mode 100644
index ed787452f..000000000
--- a/community-testing/metapixel/metapixel-1.0.2-libpng-1.5.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- metapixel-1.0.2.orig/rwimg/rwpng.c
-+++ metapixel-1.0.2/rwimg/rwpng.c
-@@ -57,19 +57,39 @@
-     data->end_info = png_create_info_struct(data->png_ptr);
-     assert(data->end_info != 0);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
--    png_init_io(data->png_ptr, data->file);
--
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	png_init_io(data->png_ptr, data->file);
-+    png_read_info(data->png_ptr, data->info_ptr);
-+#else
-+	png_init_io(data->png_ptr, data->file);
-     png_read_info(data->png_ptr, data->info_ptr);
-+#endif
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	*width = png_get_image_width(data->png_ptr, data->info_ptr);
-+	*height = png_get_image_height(data->png_ptr, data->info_ptr);
-+	{
-+		png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr);
-+    	assert(value == 8 || value == 16);
-+		value = png_get_color_type(data->png_ptr, data->info_ptr);
-+    	assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA);
-+    	value = png_get_interlace_type(data->png_ptr, data->info_ptr);
-+    	assert(value == PNG_INTERLACE_NONE);
-+	}
-+#else
-     *width = data->info_ptr->width;
-     *height = data->info_ptr->height;
--
-     assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16);
-     assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA);
-     assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE);
-+#endif
- 
-     data->have_read = 0;
- 
-@@ -81,32 +101,51 @@
- {
-     png_data_t *data = (png_data_t*)_data;
-     int i;
--    int bps, spp;
-+    int bps, spp, width;
-     unsigned char *row;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
-+#else
-     if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
-+#endif
- 	spp = 3;
-     else
- 	spp = 4;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
-+#else
-     if (data->info_ptr->bit_depth == 16)
-+#endif
- 	bps = 2;
-     else
- 	bps = 1;
- 
--    row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	width = png_get_image_width(data->png_ptr, data->info_ptr);
-+#else
-+    width = data->info_ptr->width:
-+#endif
-+
-+    row = (unsigned char*)malloc(width * spp * bps);
- 
-     for (i = 0; i < num_lines; ++i)
-     {
- 	int j, channel;
- 
- 	png_read_row(data->png_ptr, (png_bytep)row, 0);
--	for (j = 0; j < data->info_ptr->width; ++j)
-+	for (j = 0; j < width; ++j)
- 	    for (channel = 0; channel < 3; ++channel)
--		lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
-+		lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps];
-     }
- 
-     free(row);
-@@ -119,7 +158,11 @@
- {
-     png_data_t *data = (png_data_t*)_data;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     if (data->have_read)
-@@ -148,7 +191,11 @@
-     data->info_ptr = png_create_info_struct(data->png_ptr);
-     assert(data->info_ptr != 0);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     if (pixel_stride == 4)
-@@ -156,6 +203,16 @@
- 
-     png_init_io(data->png_ptr, data->file);
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	png_set_IHDR(data->png_ptr, data->info_ptr,
-+		width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-+		PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-+
-+	/* Maybe does not need following. */
-+	png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL);
-+	png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0);
-+	png_set_invalid(data->png_ptr, data->info_ptr, 0);
-+#else
-     data->info_ptr->width = width;
-     data->info_ptr->height = height;
-     data->info_ptr->valid = 0;
-@@ -168,6 +225,7 @@
-     data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
-     data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
-     data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+#endif
- 
-     png_write_info(data->png_ptr, data->info_ptr);
- 
-@@ -182,7 +240,11 @@
-     png_data_t *data = (png_data_t*)_data;
-     int i;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     for (i = 0; i < num_lines; ++i)
-@@ -194,7 +256,11 @@
- {
-     png_data_t *data = (png_data_t*)_data;
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+	if (setjmp(png_jmpbuf((data->png_ptr))))
-+#else
-     if (setjmp(data->png_ptr->jmpbuf))
-+#endif
- 	assert(0);
- 
-     png_write_end(data->png_ptr, data->info_ptr);
diff --git a/community-testing/mldonkey/PKGBUILD b/community-testing/mldonkey/PKGBUILD
deleted file mode 100644
index 3a5104927..000000000
--- a/community-testing/mldonkey/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 63202 2012-01-30 19:02:35Z ibiru $
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
-
-pkgname=mldonkey
-pkgver=3.1.0
-pkgrel=2
-pkgdesc="A multi-network P2P client"
-arch=('i686' 'x86_64')
-url="http://mldonkey.sourceforge.net/"
-license=('GPL')
-depends=('desktop-file-utils' 'file' 'gd' 'bzip2')
-makedepends=('lablgtk2' 'librsvg' 'ocaml')
-optdepends=('librsvg: GUI support'
-            'libx11: GUI support')
-backup=('etc/conf.d/mldonkey')
-install=mldonkey.install
-source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
-        mldonkeyd
-        mldonkey.conf
-        mldonkey.desktop)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --enable-gui=newgui2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \
-    "$pkgdir/usr/share/icons/mldonkey.svg"
-  install -Dm644 "$srcdir/mldonkey.desktop" \
-    "$pkgdir/usr/share/applications/mldonkey.desktop"
-
-  install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey"
-  install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey"
-}
-md5sums=('072726d158ba1e936c554be341e7ceff'
-         '75e4b6c7fb282f7de15a8d5478f3bd70'
-         '1f86d92db51c62cded0e6f3833057dee'
-         '1de3266caa49f82bee73ba891eea12cf')
diff --git a/community-testing/mldonkey/mldonkey.conf b/community-testing/mldonkey/mldonkey.conf
deleted file mode 100644
index 24a25af74..000000000
--- a/community-testing/mldonkey/mldonkey.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Username under which the daemon will run (mandatory)
-MLDUSER=""
-
-# Parameters to be passed to the daemon (default is empty)
-PARAMS=""
diff --git a/community-testing/mldonkey/mldonkey.desktop b/community-testing/mldonkey/mldonkey.desktop
deleted file mode 100644
index b307261e1..000000000
--- a/community-testing/mldonkey/mldonkey.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MLDonkey GUI
-Comment=multi-protocol P2P program
-Exec=mldonkey_gui
-Icon=mldonkey
-Terminal=false
-Type=Application
-Categories=Network;P2P;
diff --git a/community-testing/mldonkey/mldonkey.install b/community-testing/mldonkey/mldonkey.install
deleted file mode 100644
index dd8ea0407..000000000
--- a/community-testing/mldonkey/mldonkey.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  if [ -f /etc/mldonkey.conf ]; then
-    mv /etc/mldonkey.conf /etc/conf.d/mldonkey
-    cat << EOM
-
-==> mldonkey post upgrade message:
-==> /etc/mldonkey.conf has been moved in /etc/conf.d/mldonkey
-
-EOM
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/mldonkey/mldonkeyd b/community-testing/mldonkey/mldonkeyd
deleted file mode 100644
index 6a458d68e..000000000
--- a/community-testing/mldonkey/mldonkeyd
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/mldonkey
-. /etc/rc.d/functions
-
-if [ -z $MLDUSER ] ; then
-	echo "Unable to run MLDonkey. You must set a user in /etc/conf.d/mldonkey ."
-	exit 2
-fi
-
-if [ -z "$(getent passwd "$MLDUSER")" ]; then
-	# Perhaps we should create the account for the user?
-	echo "You must create the account $MLDUSER in order to run mldonkey."
-	echo "Please create the account manually, and try again."
-	exit 2
-fi
-
-MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4)
-MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1)
-USERDIR=$(getent passwd $MLDUSER | cut -d: -f6)
-
-if [ ! -d $USERDIR ]; then
-	echo "Unable to run MLDonkey. Home directory for ${MLDUSER} does not exist."
-	exit 2
-fi
-
-PIDDIR="/var/run/mldonkey"
-PIDFILE="$PIDDIR/mlnet.pid"
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-    	start)
-        	stat_busy "Starting MLDonkey"
-		if [ ! -d $PIDDIR ]; then
-			install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR
-		fi
-		if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then
-			chown -R "$MLDUSER:$MLDGROUP" $PIDDIR
-		fi
-		[ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR  $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &"
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon mldonkey
-			stat_done
-		fi
-	;;
-    	stop)
-        	stat_busy "Stopping MLDonkey"
-		[ ! -z $PID ] && kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon mldonkey
-			stat_done
-		fi
-	;;
-    	restart)
-        	$0 stop
-		sleep 1
-        	$0 start
-        ;;
-    	*)
-        	echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/mtpaint/PKGBUILD b/community-testing/mtpaint/PKGBUILD
deleted file mode 100644
index de75fbc17..000000000
--- a/community-testing/mtpaint/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63382 2012-01-31 23:18:34Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: yosh64 <yosh64.at.gmail.dot.com>
-pkgname=mtpaint
-pkgver=3.40
-pkgrel=2
-pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
-arch=('x86_64' 'i686')
-url="http://mtpaint.sourceforge.net/"
-license=('GPL3')
-depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2')
-install=mtpaint.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "libpng15.patch")
-sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
-            'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	patch -Np1 -i "$srcdir/libpng15.patch"
-	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
-  sed -i 's:-lpng:-lpng -lgif:' _conf.txt
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/community-testing/mtpaint/libpng15.patch b/community-testing/mtpaint/libpng15.patch
deleted file mode 100644
index 7df3b2127..000000000
--- a/community-testing/mtpaint/libpng15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c
---- mtpaint-3.31.orig/src/png.c	2010-01-25 00:43:07.000000000 +0200
-+++ mtpaint-3.31/src/png.c	2010-01-25 00:43:39.000000000 +0200
-@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_
- 	if (settings->bpp == 3)
- 	{
- 		png_set_strip_16(png_ptr);
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		png_set_palette_to_rgb(png_ptr);
- 		png_set_gray_to_rgb(png_ptr);
- 
-@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_
- 		png_set_strip_alpha(png_ptr);
- 		png_set_packing(png_ptr);
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		for (i = 0; i < height; i++)
- 		{
- 			row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
diff --git a/community-testing/mtpaint/mtpaint.install b/community-testing/mtpaint/mtpaint.install
deleted file mode 100644
index 99a538dea..000000000
--- a/community-testing/mtpaint/mtpaint.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-	update-desktop-database -q
-}
-
-post_install() {
-	post_upgrade
-}
-
-post_remove() {
-	post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/mypaint/PKGBUILD b/community-testing/mypaint/PKGBUILD
deleted file mode 100644
index 8c955c594..000000000
--- a/community-testing/mypaint/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63210 2012-01-30 19:03:06Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jon Nordby <jononor@gmail.com>
-
-pkgname=mypaint
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="A fast and easy painting application for digital painters, with brush dynamics"
-arch=('i686' 'x86_64')
-url="http://mypaint.intilinux.com/"
-license=('GPL' 'LGPL')
-depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2')
-makedepends=('scons>=0.97' 'swig>=1.3.39')
-install=mypaint.install
-source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('dcd43933746a4579e7994f506e097823')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # python2 fix
-  sed -i 's_python generate.py_python2 generate.py_' brushlib/SConscript
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-  scons
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  scons prefix="$pkgdir"/usr install
-}
diff --git a/community-testing/mypaint/mypaint.install b/community-testing/mypaint/mypaint.install
deleted file mode 100644
index 5f0358791..000000000
--- a/community-testing/mypaint/mypaint.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
-	[ -x `which gtk-update-icon-cache` ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	/bin/true
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-post_remove() {
-	post_install $1
-}
diff --git a/community-testing/naev/PKGBUILD b/community-testing/naev/PKGBUILD
deleted file mode 100644
index c4d753cf9..000000000
--- a/community-testing/naev/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 63212 2012-01-30 19:03:10Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Johan Rehnberg <cleanrock@gmail.com>
-
-pkgname=naev
-pkgver=0.5.0
-pkgrel=2
-pkgdesc='2D action/rpg space game'
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/naev/"
-license=('GPL3')
-depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data')
-makedepends=('freeglut')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f7d754a17ace87aac540d0d6d48313d6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i "41 i #include <zlib.h>" src/opengl.c
-
-  ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${pkgver}
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/nestopia/ChangeLog b/community-testing/nestopia/ChangeLog
deleted file mode 100644
index 5077d00b2..000000000
--- a/community-testing/nestopia/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2008-12-16  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD: Minor corrections.
-
-2008-12-04  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD (source): Package adopted.
-	Variable/version cleanup.
-	Patch to remove bogus error messages on program exit.
-	New dependency: mesa.
-	Renamed executable to nestopia.
-
diff --git a/community-testing/nestopia/PKGBUILD b/community-testing/nestopia/PKGBUILD
deleted file mode 100644
index 11e7db6a3..000000000
--- a/community-testing/nestopia/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 63214 2012-01-30 19:03:20Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
-# Contributor: robb_force <robb_force@holybuffalo.net>
-
-pkgname=nestopia
-pkgver=1.40h
-pkgrel=5
-pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
-url='http://rbelmont.mameworld.info/?page_id=200'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa')
-makedepends=('unzip')
-# rbelmont.mameworld.info blocks some user-agents
-DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u'
-	  'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u')
-source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip"
-	"http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip"
-	"nestopia"
-	"nestopia_bogus_error_on_save_settings.patch")
-md5sums=('526c99a06d2b257135e7047b0ed95ae0'
-         'f9a9a905bada67e11dac1364612d0b35'
-         'abc2f030dd291f58d65c9095ef024225'
-         '0160078c9afcbb1a6ac389c3989929f7')
-
-build() {
-  cd ${srcdir}
-  # remove a bogus error message on exit
-  patch -p0 < nestopia_bogus_error_on_save_settings.patch
-  make -j1
-
-  # Install the nestopia script that copies required files to ~/.nestopia
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
-
-  # Older releases used a .sh file. Make a symlink to make everyone happy
-  cd ${pkgdir}/usr/bin
-  ln -s ${pkgname} ${pkgname}.sh
-
-  # Install the required files and executable in /usr/share
-  cd ${srcdir}
-  install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin
-  install -dm775 ${pkgdir}/usr/share/${pkgname}/
-  install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/
-  install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/
-}
diff --git a/community-testing/nestopia/nestopia b/community-testing/nestopia/nestopia
deleted file mode 100644
index 52bd2b2b3..000000000
--- a/community-testing/nestopia/nestopia
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ ! -e $HOME/.nestopia ]; then
-  echo "Running NEStopia for the first time..."
-  echo "Copying required files to ~/.nestopia..."
-  mkdir $HOME/.nestopia
-  cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/
-fi
-
-nestopia-bin "$@"
diff --git a/community-testing/nestopia/nestopia_bogus_error_on_save_settings.patch b/community-testing/nestopia/nestopia_bogus_error_on_save_settings.patch
deleted file mode 100644
index 63f33bc72..000000000
--- a/community-testing/nestopia/nestopia_bogus_error_on_save_settings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/linux/settings.cpp.old	2008-10-23 05:45:58.000000000 +0200
-+++ source/linux/settings.cpp	2008-12-04 23:17:59.000000000 +0100
-@@ -16,7 +16,7 @@
- using namespace LinuxNst;
- 
- #define READ_SETTING(x) fread(&x, sizeof(x), 1, f)
--#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n"
-+#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n"
- 
- static int rates[4] = { 11025, 22050, 44100, 48000 };
- 
diff --git a/community-testing/netsurf/PKGBUILD b/community-testing/netsurf/PKGBUILD
deleted file mode 100644
index a6e14560b..000000000
--- a/community-testing/netsurf/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 63216 2012-01-30 19:03:31Z ibiru $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Georgij Kondratjev <smpuj@bk.ru>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=netsurf
-pkgver=2.8
-pkgrel=3
-pkgdesc="Lightweight and fast web browser"
-arch=('x86_64' 'i686')
-url="http://www.netsurf-browser.org/"
-license=('GPL')
-depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub')
-makedepends=('re2c' 'lcms')
-provides=('netsurf')
-conflicts=('netsurf')
-install=netsurf.install
-source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
-        "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz"
-        "$pkgname.desktop")
-md5sums=('4f28912e5df4b826b819e175265bcc9c'
-         '49c41f281f3e9ca28a24da505fad2e3a'
-         '85e0af265e77607596fd90db9ac707ad')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  sed 's:libpng:libpng15:' -i gtk/Makefile.target
-  sed 's:libpng:libpng15:' -i monkey/Makefile.target
-  make PREFIX=/usr TARGET=gtk
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-
-  make install PREFIX=/usr DESTDIR="$pkgdir"
-  install -Dm644 "../$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "../$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/netsurf/PKGBUILD.wip b/community-testing/netsurf/PKGBUILD.wip
deleted file mode 100644
index 592ca0268..000000000
--- a/community-testing/netsurf/PKGBUILD.wip
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 62434 2012-01-20 02:23:51Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Georgij Kondratjev <smpuj@bk.ru>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=netsurf
-pkgver=2.8
-pkgrel=3
-pkgdesc="Lightweight and fast web browser"
-arch=('x86_64' 'i686')
-url="http://www.netsurf-browser.org/"
-license=('GPL')
-depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub' 'libpng')
-makedepends=('re2c' 'lcms' 'setconf')
-provides=('netsurf')
-conflicts=('netsurf')
-install=netsurf.install
-source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
-        "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz"
-        "$pkgname.desktop")
-md5sums=('4f28912e5df4b826b819e175265bcc9c'
-         '49c41f281f3e9ca28a24da505fad2e3a'
-         '85e0af265e77607596fd90db9ac707ad')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  #sed 's:libpng:libpng15:' -i gtk/Makefile.target
-  #setconf Makefile.defaults NETSURF_USE_PNG NO
-  #setconf Makefile.defaults NETSURF_USE_RSVG NO
-  #setconf Makefile.defaults NETSURF_USE_MNG NO
-  #setconf Makefile.defaults NETSURF_USE_BMP NO
-  #setconf Makefile.defaults NETSURF_USE_GIF NO
-  #setconf Makefile.defaults NETSURF_USE_JPEG NO
-
-  #setconf gtk/Makefile.target NETSURF_FEATURE_RSVG_CFLAGS "-DWITH_RSVG -pthread -lrsvg-2 -lgio-2.0 -lgdk_pixbuf-2.0 -lcairo -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -I/usr/include/librsvg-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/cairo -I/usr/include/libpng -I/usr/include/pixman-1 -I/usr/include/freetype2"
-  #sed 's:$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG)):#:' -i gtk/Makefile.target
-
-  setconf Makefile.defaults CFLAGS "-lm"
-
-  #sed 's:$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):echo $(LDFLAGS)\n\t$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):' -i Makefile
-
-  #LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk
-  LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-
-  make install PREFIX=/usr DESTDIR="$pkgdir"
-  install -Dm644 "../$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "../$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/netsurf/netsurf.desktop b/community-testing/netsurf/netsurf.desktop
deleted file mode 100644
index aca4deefc..000000000
--- a/community-testing/netsurf/netsurf.desktop
+++ /dev/null
@@ -1,127 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Netsurf
-Name[ar]=صا�ي تص�ح
-Name[ast]=Netsurf
-Name[ca]=Netsurf
-Name[cs]=Netsurf
-Name[da]=Netsurf
-Name[de]=Netsurf
-Name[el]=καθα�ο� σε�φ
-Name[en_GB]=Netsurf
-Name[es]=Netsurf
-Name[et]=Netsurf
-Name[fi]=Netsurf
-Name[fr]=Netsurf
-Name[gl]=Netsurf
-Name[he]=Netsurf
-Name[hr]=Netsurf
-Name[hu]=Netsurf
-Name[id]=Netsurf
-Name[it]=Netsurf
-Name[ja]=Netsurf
-Name[ko]=�터넷 서핑
-Name[lt]=Netsurf
-Name[nl]=Netsurf
-Name[no]=Netsurf
-Name[pl]=Netsurf
-Name[pt]=Netsurf
-Name[pt_BR]=Netsurf
-Name[ro]=Netsurf
-Name[ru]=Netsurf
-Name[sk]=Netsurf
-Name[sr]=нет�урф
-Name[sr@latin]=Netsurf
-Name[sv]=Netsurf
-Name[tr]=Netsurf
-Name[ug]=Netsurf
-Name[uk]=Інтернет �ерфінгу
-Name[zh_CN]=Netsurf 网冲浪
-Name[zh_TW]=Netsurf 網�浪
-GenericName=Web Browser
-GenericName[ar]=متص�ح الوب
-GenericName[ast]=Restolador
-GenericName[ca]=Navegador web
-GenericName[cs]=Internetový prohlíže�
-GenericName[da]=Webbrowser
-GenericName[de]=Internetbetrachter
-GenericName[el]=Πε�ιηγητής Ιστο�
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=Verkkoselain
-GenericName[fr]=Navigateur Internet
-GenericName[gl]=Navegador web
-GenericName[he]=דפדפן
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[id]=Peramban Web
-GenericName[it]=Browser web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브�우저
-GenericName[lt]=Interneto naršyklė
-GenericName[nl]=Webbrowser
-GenericName[no]=Nettleser
-GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-GenericName[pl]=PrzeglÄ…darka internetowa
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador web
-GenericName[ro]=Navigator web
-GenericName[ru]=Интернет-обозреватель
-GenericName[sk]=Internetový prehliada�
-GenericName[sr]=Интернет прегледник
-GenericName[sr@latin]=Internet preglednik
-GenericName[sv]=Webbläsare
-GenericName[tr]=Web Tarayıcı
-GenericName[ug]=توركۆرگۈ
-GenericName[uk]=Перегл�дач Веб
-GenericName[zh_CN]=网页�览器
-GenericName[zh_TW]=網��覽器
-Comment=Lightweight web browser
-Comment[ar]=منص�ح الوب الخ�ي�
-Comment[ast]=Restolador llixeru
-Comment[ca]=Navegador web lleuger
-Comment[cs]=Odleh�ený prohlíže�
-Comment[da]=Letvægtig webbrowser
-Comment[de]=Schlanker Internetbetrachter
-Comment[el]=Ελαφ��ς πε�ιηγητής ιστο�
-Comment[en_GB]=Lightweight web browser
-Comment[es]=Navegador web ligero
-Comment[et]=Kergekaaluline veebibrauser
-Comment[fi]=Kevyt verkkoselain
-Comment[fr]=Navigateur Internet léger
-Comment[gl]=Navegador web lixeiro
-Comment[he]=דפדפן קל משקל
-Comment[hr]=Lagani web preglednik
-Comment[hu]=Könnyűsúlyú webböngésző
-Comment[id]=Peramban web ringan
-Comment[it]=Browser web leggero
-Comment[ja]=軽�級ウェブブラウザ
-Comment[ko]=가벼운 웹 브�우저
-Comment[lt]=Paprasta interneto naršyklė
-Comment[nl]=Lichtgewicht webbrowser
-Comment[no]=Lettvektig nettleser
-Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej
-Comment[pt]=Navegador Web rápido
-Comment[pt_BR]=Navegador web leve
-Comment[ro]=Mic navigator web
-Comment[ru]=Легкове�ный Интернет-обозреватель
-Comment[sk]=Ľahký internetový prehliada�
-Comment[sr]=Једно�таван Интернет прегледник
-Comment[sr@latin]=Jednostavan Internet preglednik
-Comment[sv]=Resurssnål webbläsare
-Comment[tr]=Hafif web tarayıcı 
-Comment[ug]=ي�نىك توركۆرگۈ
-Comment[uk]=Легкий перегл�дач Веб
-Comment[zh_CN]=轻�级网页�览器
-Comment[zh_TW]=輕�級網��覽器
-Categories=GTK;Network;WebBrowser;
-MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;
-Exec=netsurf %U
-Icon=netsurf
-Terminal=false
-StartupNotify=true
-X-Osso-Type=application/x-executable
-X-Osso-Service=netsurf
diff --git a/community-testing/netsurf/netsurf.install b/community-testing/netsurf/netsurf.install
deleted file mode 100644
index 966f361ea..000000000
--- a/community-testing/netsurf/netsurf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_upgrade() {
-  echo "Updating icon cache"
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  echo "Updating mime entries"
-  update-desktop-database -q
-}
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/nginx/PKGBUILD b/community-testing/nginx/PKGBUILD
deleted file mode 100644
index ae974f0c4..000000000
--- a/community-testing/nginx/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 64085 2012-02-08 23:53:59Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
-# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
-
-pkgname=nginx
-pkgver=1.0.11
-pkgrel=2
-pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl')
-makedepends=('passenger')
-optdepends=('passenger')
-url="http://nginx.org"
-license=('custom')
-backup=("etc/nginx/conf/fastcgi.conf"
-        "etc/nginx/conf/fastcgi_params"
-        "etc/nginx/conf/koi-win"
-        "etc/nginx/conf/koi-utf"
-        "etc/nginx/conf/mime.types"
-        "etc/nginx/conf/nginx.conf"
-        "etc/nginx/conf/scgi_params"
-        "etc/nginx/conf/uwsgi_params"
-        "etc/nginx/conf/win-utf"
-        "etc/logrotate.d/nginx"
-        "etc/conf.d/nginx")
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-        nginx)
-md5sums=('a41a01d7cd46e13ea926d7c9ca283a95'
-         '0e8032d3ba26c3276e8c7c30588d375f')
-
-_doc_root=/usr/share/nginx/http
-_server_root=/etc/nginx
-_conf_path=${_server_root}/conf
-_tmp_path=/var/spool/nginx
-_log_path=/var/log/nginx
-_user=http
-_group=http
-
-build() {
-	cd "$srcdir/nginx-${pkgver}"
-
-	./configure \
-        --prefix=${_server_root} \
-        --sbin-path=/usr/sbin/nginx \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/lock/nginx.lock \
-        --http-client-body-temp-path=${_tmp_path}/client_body_temp \
-        --http-proxy-temp-path=${_tmp_path}/proxy_temp \
-        --http-fastcgi-temp-path=${_tmp_path}/fastcgi_temp \
-        --http-log-path=${_log_path}/access.log \
-        --error-log-path=${_log_path}/error.log \
-        --user=${_user} --group=${_group} \
-        --with-imap --with-imap_ssl_module --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --with-http_dav_module \
-        --with-http_gzip_static_module \
-        --with-ipv6 \
-        --add-module=/usr/lib/passenger/ext/nginx \
-        --http-scgi-temp-path=${_tmp_path} \
-        --http-uwsgi-temp-path=${_tmp_path}
-        #--with-http_mp4_module \
-        #--with-http_realip_module \
-        #--with-http_addition_module \
-        #--with-http_xslt_module \
-        #--with-http_image_filter_module \
-        #--with-http_geoip_module \
-        #--with-http_sub_module \
-        #--with-http_flv_module \
-        #--with-http_random_index_module \
-        #--with-http_secure_link_module \
-        #--with-http_degradation_module \
-        #--with-http_perl_module \
-
-	make
-}
-
-package() {
-	cd "$srcdir/nginx-${pkgver}"
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir"/etc/logrotate.d/
-	cat <<EOF > $pkgdir/etc/logrotate.d/nginx
-	$_log_path/*log {
-		create 640 http log
-		compress
-		postrotate
-			/bin/kill -USR1 \`cat /var/run/nginx.pid 2>/dev/null\` 2> /dev/null || true
-		endscript
-	}
-EOF
-
-	sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf
-
-	install -d $pkgdir/$_tmp_path
-
-	# move default document root outside server root
-	install -d $pkgdir/$_doc_root
-	mv $pkgdir/$_server_root/html/* $pkgdir/$_doc_root/
-	rm -rf $pkgdir/$_server_root/html
-	rm -f $pkgdir/$_doc_root/index.html
-
-	# let's create links for relative paths in config file
-	ln -s $_log_path $pkgdir/$_server_root/logs
-	ln -s $_doc_root $pkgdir/$_server_root/html
-
-	install -D -m755 $srcdir/nginx $pkgdir/etc/rc.d/nginx
-	install -D -m644 LICENSE $pkgdir/usr/share/licenses/nginx/LICENSE
-	mkdir -p $pkgdir/etc/conf.d
-	echo "NGINX_CONFIG=/etc/nginx/conf/nginx.conf" >$pkgdir/etc/conf.d/nginx
-	rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/nginx/nginx b/community-testing/nginx/nginx
deleted file mode 100644
index 9de10e99a..000000000
--- a/community-testing/nginx/nginx
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# general config
-
-NGINX_CONFIG="/etc/nginx/conf/nginx.conf"
-
-. /etc/conf.d/nginx
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking configuration"
-  /usr/sbin/nginx -t -q -c "$NGINX_CONFIG"
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting Nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c "$NGINX_CONFIG" &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Nginx"
-    NGINX_PID=`cat /var/run/nginx.pid 2>/dev/null`
-    kill -QUIT $NGINX_PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in `seq 1 10`; do
-        [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading Nginx Configuration" kill -HUP `cat /var/run/nginx.pid`
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community-testing/ngrep/PKGBUILD b/community-testing/ngrep/PKGBUILD
deleted file mode 100644
index ecf5da55b..000000000
--- a/community-testing/ngrep/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 64087 2012-02-08 23:54:06Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=ngrep
-pkgver=1.45
-pkgrel=8
-pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
-arch=('i686' 'x86_64')
-url='http://ngrep.sourceforge.net/'
-license=('custom')
-depends=('libpcap>=1.0.0')
-# Fix build failure when using "-j" (FS#27091).
-options=(!makeflags)
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ngrep-fix-ipv6-support.patch")
-md5sums=('bc8150331601f3b869549c94866b4f1c' '90e6dfb335bccf12615d3c468ceeb60f')
-# Added patch for broken ipv6 support (FS#27225)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/ngrep-fix-ipv6-support.patch
-
-  ./configure --prefix=/usr --with-pcap-includes=/usr/include/pcap --enable-ipv6
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -Dm0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-}
diff --git a/community-testing/ngrep/ngrep-fix-ipv6-support.patch b/community-testing/ngrep/ngrep-fix-ipv6-support.patch
deleted file mode 100644
index 9a07d7d38..000000000
--- a/community-testing/ngrep/ngrep-fix-ipv6-support.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -rupN trunk/ngrep-fix-ipv6-support.patch trunk.notarch/ngrep-fix-ipv6-support.patch
---- trunk/ngrep-fix-ipv6-support.patch	1970-01-01 01:00:00.000000000 +0100
-+++ trunk.notarch/ngrep-fix-ipv6-support.patch	2011-11-30 05:12:48.068790633 +0100
-@@ -0,0 +1,40 @@
-+--- ngrep-1.45.ds2/ngrep.c	2010-04-21 12:16:52.000000000 +0200
-++++ ngrep-1.45.ds2-ipv6-patch/ngrep.c	2010-04-21 12:11:49.581088102 +0200
-+@@ -711,10 +711,12 @@ void process(u_char *d, struct pcap_pkth
-+             data = (unsigned char *)(tcp_pkt) + tcphdr_offset;
-+             len -= link_offset + ip_hl + tcphdr_offset;
-+ 
-++/* 
-+ #if USE_IPv6
-+             if (ip_ver == 6)
-+                 len -= ntohs(ip6_pkt->ip6_plen);
-+-#endif
-++#endif 
-++*/
-+ 
-+             if ((int32_t)len < 0)
-+                 len = 0;
-+@@ -731,11 +733,12 @@ void process(u_char *d, struct pcap_pkth
-+             data = (unsigned char *)(udp_pkt) + udphdr_offset;
-+             len -= link_offset + ip_hl + udphdr_offset;
-+ 
-++/*
-+ #if USE_IPv6
-+             if (ip_ver == 6)
-+                 len -= ntohs(ip6_pkt->ip6_plen);
-+ #endif
-+-
-++*/
-+             if ((int32_t)len < 0)
-+                 len = 0;
-+ 
-+@@ -769,7 +772,7 @@ void process(u_char *d, struct pcap_pkth
-+             uint16_t icmp6hdr_offset    = (frag_offset) ? 0 : 4;
-+ 
-+             data = (unsigned char *)(icmp6_pkt) + icmp6hdr_offset;
-+-            len -= link_offset + ip_hl + ntohs(ip6_pkt->ip6_plen) + icmp6hdr_offset;
-++            len -= link_offset + ip_hl + icmp6hdr_offset;
-+ 
-+             if ((int32_t)len < 0)
-+                 len = 0;
-+
-diff -rupN trunk/ngrep-system-pcre.patch trunk.notarch/ngrep-system-pcre.patch
---- trunk/ngrep-system-pcre.patch	1970-01-01 01:00:00.000000000 +0100
-+++ trunk.notarch/ngrep-system-pcre.patch	2011-11-30 05:12:48.068790633 +0100
-@@ -0,0 +1,59 @@
-+diff -urN ngrep-1.45/configure.in ngrep-1.45-patched/configure.in
-+--- ngrep-1.45/configure.in	2006-11-14 21:43:56.000000000 -0600
-++++ ngrep-1.45-patched/configure.in	2006-11-29 10:34:48.000000000 -0600
-+@@ -28,8 +28,8 @@
-+ dnl
-+ 
-+ EXTRA_DEFINES=""
-+-EXTRA_INCLUDES=""
-+-EXTRA_LIBS=""
-++EXTRA_INCLUDES="$EXTRA_INCLUDES"
-++EXTRA_LIBS="$EXTRA_LIBS"
-+ 
-+ 
-+ dnl
-+@@ -130,8 +130,8 @@
-+   echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
-+   echo 
-+ 
-+-  REGEX_DIR='pcre-5.0'
-+-  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
-++#  REGEX_DIR='pcre-5.0'
-++#  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
-+   USE_PCRE="1"
-+ 
-+ else
-+@@ -146,7 +146,7 @@
-+ 
-+ fi
-+ 
-+-( cd $REGEX_DIR && ./configure )
-++#( cd $REGEX_DIR && ./configure )
-+ 
-+ AC_SUBST(REGEX_DIR)
-+ AC_SUBST(REGEX_OBJS)
-+diff -urN ngrep-1.45/Makefile.in ngrep-1.45-patched/Makefile.in
-+--- ngrep-1.45/Makefile.in	2006-11-28 07:35:37.000000000 -0600
-++++ ngrep-1.45-patched/Makefile.in	2006-11-29 08:20:32.000000000 -0600
-+@@ -38,7 +38,7 @@
-+ 
-+ all: $(TARGET) 
-+ 
-+-$(TARGET): $(REGEX_OBJS) $(OBJS) 
-++$(TARGET): $(OBJS) 
-+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+ 
-+ debug: $(REGEX_OBJS) $(OBJS)
-+diff -urN ngrep-1.45/ngrep.c ngrep-1.45-patched/ngrep.c
-+--- ngrep-1.45/ngrep.c	2006-11-28 07:38:43.000000000 -0600
-++++ ngrep-1.45-patched/ngrep.c	2006-11-29 08:10:48.000000000 -0600
-+@@ -92,7 +92,7 @@
-+ #endif
-+ 
-+ #if USE_PCRE
-+-#include "pcre-5.0/pcre.h"
-++#include "pcre.h"
-+ #else
-+ #include "regex-0.12/regex.h"
-+ #endif
-+
diff --git a/community-testing/nvclock/PKGBUILD b/community-testing/nvclock/PKGBUILD
deleted file mode 100644
index 28cde7638..000000000
--- a/community-testing/nvclock/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 63218 2012-01-30 19:03:47Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Markus Meissner <markus@meissna.de>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nvclock
-pkgver=0.8b4
-pkgrel=3
-pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.'
-arch=('i686' 'x86_64')
-url='http://www.linuxhardware.org/nvclock/'
-license=('GPL')
-depends=('gtk2')
-optdepends=('gksu: to start nvclock via the desktop menu entry')
-install='nvclock.install'
-options=('!makeflags')
-source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz"
-        'nvclock-0.8b4-buildfix.patch'
-        'nvclock-0.8b4-linkfix.patch'
-        'nvclock.desktop-use-gksu.patch')
-md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11'
-         '1da24b50dd6a8c4704fa550a3e1a8b53'
-         'b812646787ea44e693fd2288612f25ad'
-         '98fc1995721d0b0e8ff6d448869eee6d')
-
-build(){
-  cd "${srcdir}/${pkgname}${pkgver}"
-
-  # build and link fixes from Fedora
-  patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch"
-  patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch"
-
-  # Make ".desktop" file use gksu(1).
-  patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch"
-
-  sed -i 's:${prefix}/man:${prefix}\/share\/man:' "${srcdir}/${pkgname}${pkgver}/Makefile.in"
-
-  ./configure --prefix=/usr --bindir=/usr/bin
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/nvclock/nvclock-0.8b4-buildfix.patch b/community-testing/nvclock/nvclock-0.8b4-buildfix.patch
deleted file mode 100644
index cdc9f5c88..000000000
--- a/community-testing/nvclock/nvclock-0.8b4-buildfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in
---- nvclock0.8b4.orign/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
-+++ nvclock0.8b4/src/Makefile.in	2009-01-07 11:37:39.000000000 +0100
-@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app
- install: install-recursive install-app
- install-app:
- 	mkdir -p $(bindir)
--	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
--	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
-+	$(INSTALL) -c nvclock $(bindir)/nvclock
-+	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
- 
- 
- uninstall: uninstall-recursive uninstall-app
-
-
diff --git a/community-testing/nvclock/nvclock-0.8b4-linkfix.patch b/community-testing/nvclock/nvclock-0.8b4-linkfix.patch
deleted file mode 100644
index 0029d1c74..000000000
--- a/community-testing/nvclock/nvclock-0.8b4-linkfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
---- nvclock0.8b4.orign/src/gtk/Makefile.in	2008-05-11 12:25:46.000000000 +0200
-+++ nvclock0.8b4/src/gtk/Makefile.in	2010-02-13 19:56:24.204078277 +0100
-@@ -20,12 +20,12 @@ endif
- ifeq ($(HAVE_NVCONTROL), yes)
-     DEPS=$(libbackend) $(libnvcontrol)
-     INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../..
--    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
-+    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl
-     OBJECTS=banner.o gl.o hw.o main.o settings.o
- else
-     DEPS=$(libbackend)
-     INCLUDES=-I./backend -I./nvcontrol -I.. -I../..
--    LIBS=@GTK_LIBS@ -L../backend -lbackend
-+    LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl
-     OBJECTS=banner.o hw.o main.o settings.o
- endif
- 
diff --git a/community-testing/nvclock/nvclock.desktop-use-gksu.patch b/community-testing/nvclock/nvclock.desktop-use-gksu.patch
deleted file mode 100644
index a372f5de8..000000000
--- a/community-testing/nvclock/nvclock.desktop-use-gksu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvclock.desktop.orig	2011-01-16 15:15:55.764977836 +0100
-+++ nvclock.desktop	2011-01-16 15:16:07.827408839 +0100
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=NVCLOCK
- Comment=Overclock and Monitor NVIDIA cards
--Exec=nvclock_gtk
-+Exec=gksu nvclock_gtk
- Icon=nvclock.png
- Terminal=false
- Type=Application
diff --git a/community-testing/nvclock/nvclock.install b/community-testing/nvclock/nvclock.install
deleted file mode 100644
index d59dca6e8..000000000
--- a/community-testing/nvclock/nvclock.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/ogmrip/PKGBUILD b/community-testing/ogmrip/PKGBUILD
deleted file mode 100644
index 05e8095a8..000000000
--- a/community-testing/ogmrip/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63220 2012-01-30 19:03:56Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Daenyth
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-
-pkgname=ogmrip
-pkgver=0.13.7
-pkgrel=3
-pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder"
-arch=('i686' 'x86_64')
-url="http://ogmrip.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
-makedepends=('patch' 'intltool' 'perl-xml-parser' 'faac' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
-optdepends=('faac: support for the AAC audio codec'
-            'lame: support for the MP3 audio codec'
-            'mkvtoolnix: create, alter, and inspect Matroska files'
-            'libtheora: decode and encode Ogg Theora files'
-            'ogmtools: support for the Ogg Media container'
-            'gpac: support for the MP4 container'
-            'vorbis-tools: support for the Ogg Vorbis audio codec'
-            'gocr: support for the SRT subtitle format'
-            'ocrad: support for the SRT subtitle format'
-            'tesseract: support for the SRT subtitle format')
-options=('!libtool' '!makeflags')
-changelog=$pkgname.changelog
-install=ogmrip.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/usr/share
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/ogmrip/ogmrip.changelog b/community-testing/ogmrip/ogmrip.changelog
deleted file mode 100644
index 1bd5c70ae..000000000
--- a/community-testing/ogmrip/ogmrip.changelog
+++ /dev/null
@@ -1,21 +0,0 @@
-2012-01-26  Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-	* Add .install file
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.7-1
-
-2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* ogmrip O.13.6-1
-
-2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.5
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.4
-
-2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#17517 fixed in minor release O.13.3-2
-
-2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release O.13.3
diff --git a/community-testing/ogmrip/ogmrip.install b/community-testing/ogmrip/ogmrip.install
deleted file mode 100644
index 660593cf5..000000000
--- a/community-testing/ogmrip/ogmrip.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-testing/opencollada/PKGBUILD b/community-testing/opencollada/PKGBUILD
deleted file mode 100644
index 2e08bdaba..000000000
--- a/community-testing/opencollada/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Liganic <liganic-aur@gmx.net>
-pkgname=opencollada
-pkgver=867
-pkgrel=1
-pkgdesc="Stream based reader and writer library for COLLADA files"
-arch=(i686 x86_64)
-url="https://code.google.com/p/opencollada/"
-license=('GPL')
-depends=('libxml2')
-makedepends=('subversion' 'ruby' 'cmake')
-options=(!libtool !strip)
-
-_svntrunk=http://opencollada.googlecode.com/svn/trunk/
-_svnmod=opencollada
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to SVN server...."
-
-  if [[ -d "$_svnmod/.svn" ]]; then
-    (cd "$_svnmod" && svn up -r "$pkgver")
-  else
-    svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting build..."
-
-  _builddir="$srcdir/$_svnmod-build"
-
-  rm -rf $_builddir
-  cp -r "$srcdir/$_svnmod" $_builddir
-  cd $_builddir
-
-  mkdir cmake
-  cd cmake
-  cmake ../ 
-  cd $_builddir/cmake
-  make
-
-#  cd scripts/
-#  chmod +x unixbuild.sh
-#  ./unixbuild.sh $pkgdir/usr/
-}
-
-package() {
-  _builddir="$srcdir/$_svnmod-build"
-#  sed -i "s/libdir='.*'/libdir=\'\/usr\/lib\'/" $pkgdir/usr/lib/*.la*
-
-# Headers
-  rm -rf `find $_builddir -type d -name .svn`
-  mkdir -p $pkgdir/usr/include/opencollada/
-  cd $_builddir
-  _include_dirs=$(find . -type d -name include -and -not -path '*Externals*' -print)
-  for dir in $_include_dirs;do
-    mkdir -p $pkgdir/usr/include/opencollada/${dir}
-    cp -r ${dir}/* $pkgdir/usr/include/opencollada/${dir}/..
-   done
-
-  rm -rf $pkgdir/usr/include/opencollada/generated*
-
-  cp -r $_builddir/cmake/lib/ $pkgdir/usr/
-  cp -r $_builddir/cmake/bin/ $pkgdir/usr/
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/openimageio/PKGBUILD b/community-testing/openimageio/PKGBUILD
deleted file mode 100644
index dd91ef261..000000000
--- a/community-testing/openimageio/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-_pkg=OpenImageIO
-pkgname=openimageio
-pkgver=0.10.4
-pkgrel=5
-pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
-arch=(i686 x86_64)
-url="http://www.openimageio.org/"
-license=('custom')
-depends=('openexr' 'boost-libs' 'jasper' 'glew')
-makedepends=('cmake' 'qt' 'python2' 'boost')
-optdepends=('qt: iv image viewer' 'python2: bindings support')
-options=(!buildflags)
-source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}"
-        "openimageio-0.10.2-libpng15.patch")
-md5sums=('08a1bc2b82862ad5547bba569f4f633f'
-         'd12829808610a54b6bc3350dc5419db3')
-
-build() {
-  cd "$srcdir"/$_pkg*
-
-  # remove insecure rpath
-  sed -i "/RPATH/d" src/CMakeLists.txt
-
-  patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch
-
-  # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204
-  [[ $CARCH == "i686" ]] && make debug || make
-}
-
-package() {
-  cd "$srcdir"/$_pkg*/dist/*
-
-  # prepare dirs
-  install -d "$pkgdir"/usr/{share/doc/$_pkg,lib/python2.7/site-packages}
-
-  # bin
-  cp -r bin include lib "$pkgdir/usr"
-
-  # docs
-  cp -r doc/* "$pkgdir/usr/share/doc/$_pkg"
-
-  # python module
-  cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages"
-
-  # license
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-testing/openimageio/openimageio-0.10.2-libpng15.patch b/community-testing/openimageio/openimageio-0.10.2-libpng15.patch
deleted file mode 100644
index 97375d5fb..000000000
--- a/community-testing/openimageio/openimageio-0.10.2-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ico.imageio/icooutput.cpp
-+++ ico.imageio/icooutput.cpp
-@@ -32,6 +32,8 @@
- #include <cstdlib>
- #include <cmath>
- 
-+#include <zlib.h> /* Z_BEST_COMPRESSION */
-+
- #include "ico.h"
- #include "../png.imageio/png_pvt.h"
- 
diff --git a/community-testing/openmotif/PKGBUILD b/community-testing/openmotif/PKGBUILD
deleted file mode 100644
index 7dc75a085..000000000
--- a/community-testing/openmotif/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 63224 2012-01-30 19:04:08Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Enrico Morelli <morelli@cerm.unifi.it>
-
-pkgname=openmotif
-pkgver=2.3.3
-pkgrel=2
-pkgdesc="Open Motif"
-arch=('i686' 'x86_64')
-url="http://www.motifzone.org/"
-license=('GPL')
-depends=(libxext libxp libxft libxt libxmu libpng libjpeg)
-makedepends=(xbitmaps xproto printproto xextproto automake)
-conflicts=(lesstif)
-options=('!libtool')
-source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz)
-md5sums=('fd27cd3369d6c7d5ef79eccba524f7be')
-
-build() {
-  _automakever=1.11
-
-  cd $srcdir/openmotif-$pkgver
-
-  sed -i 's|.*demos.*||g' Makefile.in Makefile.am
-  sed -i 's|doc \\|doc|g' Makefile.in Makefile.am
-  sed -i 's#if (!png_check_sig(sig, 8))#if (png_sig_cmp(sig, 0, 8))#' lib/Xm/Png.c
-
-  ln -s -f /usr/share/automake-${_automakever}/compile compile
-  ln -s -f /usr/share/libtool/config/config.guess config.guess
-  ln -s -f /usr/share/libtool/config/config.sub config.sub
-  ln -s -f /usr/share/automake-${_automakever}/depcomp depcomp
-  ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh
-  ln -s -f /usr/share/automake-${_automakever}/missing missing
-  ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh
-  touch NEWS AUTHORS
-
-  [ $NOEXTRACT -eq 1 ] || autoreconf -i
-  [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-  [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr
-  make -j1
-
-  make DESTDIR=$pkgdir install
-  # cleanup
-  (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3)
-}
diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD
deleted file mode 100644
index 43c0144be..000000000
--- a/community-testing/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 63226 2012-01-30 19:04:15Z 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=4
-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
-	osg-xine-1.2.patch)
-#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('c43a25d023e635c3566b2083d8e6d956'
-         'b05a486fdc2aaf06b29efb5e0714672e')
-
-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
-  patch -p1 <$srcdir/osg-xine-1.2.patch
-  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/openscenegraph/osg-xine-1.2.patch b/community-testing/openscenegraph/osg-xine-1.2.patch
deleted file mode 100644
index c73b588dc..000000000
--- a/community-testing/openscenegraph/osg-xine-1.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c	2009-11-20 14:46:20.000000000 +0300
-+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c	2012-01-05 02:15:38.000000000 +0400
-@@ -2769,8 +2769,8 @@
- 	clear(rgb_class, sizeof(rgbout_class_t));
- 
- 	rgb_class->driver_class.open_plugin     = open_plugin;
--	rgb_class->driver_class.get_identifier  = get_identifier;
--	rgb_class->driver_class.get_description = get_description;
-+	rgb_class->driver_class.identifier  = get_identifier(NULL);
-+	rgb_class->driver_class.description = get_description(NULL);
- 	rgb_class->driver_class.dispose         = dispose_class;
- 
- 	return(rgb_class);
diff --git a/community-testing/openttd/PKGBUILD b/community-testing/openttd/PKGBUILD
deleted file mode 100644
index f9a440522..000000000
--- a/community-testing/openttd/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 63228 2012-01-30 19:04:23Z ibiru $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-
-pkgname=openttd
-pkgver=1.1.5
-pkgrel=1
-pkgdesc='An engine for running Transport Tycoon Deluxe.'
-arch=('i686' 'x86_64')
-url='http://www.openttd.org'
-license=('GPL')
-depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop-file-utils')
-install=openttd.install
-optdepends=('openttd-opengfx: free graphics' 
-            'openttd-opensfx: free soundset')
-source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-md5sums=('aea731c9f87c53955269446d580ee19e')
-
-build() {
-  cd ${pkgname}-${pkgver} 
-
- ./configure \
-    --prefix-dir=/usr \
-    --binary-name=${pkgname} \
-    --binary-dir=bin \
-    --data-dir=share/${pkgname} \
-    --install-dir=${pkgdir} \
-    --doc-dir=share/doc/${pkgname} \
-    --menu-name="OpenTTD" \
-    --personal-dir=.${pkgname}    
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver} 
-
-  make install
-}
diff --git a/community-testing/openttd/openttd.install b/community-testing/openttd/openttd.install
deleted file mode 100644
index 85b22a1c5..000000000
--- a/community-testing/openttd/openttd.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
-  update-desktop-database > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  update-desktop-database > /dev/null 2>&1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1     
-  update-desktop-database > /dev/null 2>&1
-}
diff --git a/community-testing/p3scan/PKGBUILD b/community-testing/p3scan/PKGBUILD
deleted file mode 100644
index 47a104dfa..000000000
--- a/community-testing/p3scan/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 64091 2012-02-08 23:54:21Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: v01d <phreakuencies@gmail.com>
-
-pkgname=p3scan
-pkgver=2.3.2
-pkgrel=6
-pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection"
-arch=('i686' 'x86_64')
-url="http://p3scan.sourceforge.net/"
-depends=('pcre' 'openssl')
-license=('GPL')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "rc.p3scan")
-md5sums=('9f8decc7d4701228788e3c8717096ca0' 'f6e3450c3a932477c49082559b7abef8')
-install=p3scan.install
-md5sums=('9f8decc7d4701228788e3c8717096ca0'
-         '482a783e699b6532cbc478977f429eb5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # Fix CFLAGS and other options hardcoded in Makefiles
-  unset CFLAGS
-  sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile
-  sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile
-  sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # Create base dirs, the Makefile assumes they're there
-  install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8
-
-  # install with root set on $pkgdir
-  make DESTDIR=$pkgdir install
-
-  # delete init script provided and use an arch compatible one
-  rm -f $pkgdir/etc/rc.d/rc.p3scan
-  install -D -m755 -g root -o root $srcdir/rc.p3scan $pkgdir/etc/rc.d/p3scan
-
-  # BUG?: make absolute link a relative one
-  (
-    cd $pkgdir/etc/p3scan
-    ln -sf p3scan-en.mail p3scan.mail
-  )
-
-  # BUG: fix .conf file (the license has C style comments, they should be conf-style comments)
-  sed -ri 's|^[/ ]\*/?|# |g' $pkgdir/etc/p3scan/p3scan.conf
-
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-  mv $pkgdir/usr/doc $pkgdir/usr/share/
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/p3scan/p3scan.install b/community-testing/p3scan/p3scan.install
deleted file mode 100644
index 0f139dd28..000000000
--- a/community-testing/p3scan/p3scan.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "==> You may want an Anti-Virus program to use with p3scan. Installing clamav is recommended."
-}
-
-post_upgrade() {
-  post_install $1 $2
-}
diff --git a/community-testing/p3scan/rc.p3scan b/community-testing/p3scan/rc.p3scan
deleted file mode 100644
index fc8b79b22..000000000
--- a/community-testing/p3scan/rc.p3scan
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting p3scan"
-    [ -d /var/run/p3scan ] || mkdir -p /var/run/p3scan
-    if [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi
-
-    # Start p3scan
-    /usr/sbin/p3scan    
-    if ! [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi
-    add_daemon p3scan
-    stat_done
-  ;;
-  stop)
-    stat_busy "Stopping p3scan"
-
-    # Stop p3scan
-    if [ -a /var/run/p3scan/p3scan.pid ]; then
-      kill `cat /var/run/p3scan/p3scan.pid` &>/dev/null || stat_die
-      rm -f /var/run/p3scan/p3scan.pid
-      rm_daemon p3scan
-      stat_done
-    else
-      stat_fail
-    fi
-  ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-  ;;
-  *)
-    echo "Usage: $0 { start | stop | restart }"
-esac
-exit 0
diff --git a/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff b/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff
deleted file mode 100644
index 1901d0146..000000000
--- a/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit c69690edb180b96081f3e75d0c23bbd5abcb3d65
-Author: Robert Maynard <robert.maynard@kitware.com>
-Date:   Mon Jan 9 12:50:32 2012 -0500
-
-    Corrected build issues when using system tiff library.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b2ee9e..a83beb7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -216,6 +216,9 @@ VISIT_VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include)
- #setup png
- VISIT_VTK_THIRD_PARTY_INCLUDE(PNG vtkpng)
- 
-+#setup tiff
-+VISIT_VTK_THIRD_PARTY_INCLUDE(TIFF vtktiff)
-+
- 
- #-----------------------------------------------------------------------------
- # Detect packages here. We could probably write macros that we can include from
-diff --git a/visit_vtk/full/CMakeLists.txt b/visit_vtk/full/CMakeLists.txt
-index e83e041..532dc62 100644
---- a/visit_vtk/full/CMakeLists.txt
-+++ b/visit_vtk/full/CMakeLists.txt
-@@ -115,6 +115,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
-   "${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}")
- 
- VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
--TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging vtktiff)
-+TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging ${VTK_TIFF_LIBRARIES})
- 
- VISIT_INSTALL_TARGETS(visit_vtk)
diff --git a/community-testing/paraview/PKGBUILD b/community-testing/paraview/PKGBUILD
deleted file mode 100644
index 32fce25f2..000000000
--- a/community-testing/paraview/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-
-pkgname=paraview
-pkgver=3.12.0
-pkgrel=3
-pkgdesc='Parallel Visualization Application using VTK'
-arch=('i686' 'x86_64')
-url='http://www.paraview.org'
-license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora')
-makedepends=('cmake' 'desktop-file-utils' 'boost')
-source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
-        'paraview.png'
-        'paraview.desktop'
-        'fix-boost-graph-api-changes.diff'
-        '12859-VisItBrige-external-tiff-support.diff')
-md5sums=('8feabc6261e2060648eaac593d85b1de'
-         'db623002bc71a257ddfdd0c9c7b14c3f'
-         '4e4b7172ed18171c37446fd7c4f1e8f5'
-         '2aa5b98288cadd201ffbd057f18929b0'
-         '9321279c8fc6f289a7cf228648edcb5f')
-
-build() {
-  cd ParaView-${pkgver}/VTK
-  # fix http://www.vtk.org/Bug/view.php?id=12772 remove on next pkgver bump
-  patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
-
-
-  cd ${srcdir}/ParaView-${pkgver}/Utilities/VisItBridge
-  # fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump
-  patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff
-
-  mkdir ${srcdir}/build
-  cd ${srcdir}/build
-
-  # flags to enable using system libs
-  local cmake_system_flags=""
-  for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2 OGGTHEORA; do
-    cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
-  done
-
-  # flags to use python2 instead of python which is 3.x.x on archlinux
-  local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
-
-  # enable when http://paraview.org/Bug/view.php?id=12718 gets fixed
-  #-DCMAKE_SKIP_RPATH:BOOL=YES \
-  # the following flags enable the feature request at https://bugs.archlinux.org/task/27525
-  # -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON -DVISIT_BUILD_READER_CGNS:BOOL=ON
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DPARAVIEW_USE_MPI:BOOL=ON \
-    -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-    -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
-    -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
-    -DVISIT_BUILD_READER_CGNS:BOOL=ON \
-    ${cmake_system_flags} \
-    ${cmake_system_python_flags} \
-    ../ParaView-${pkgver}
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # Install license
-  install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE
-
-  # Install desktop shortcuts
-  install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png
-  desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop
-}
diff --git a/community-testing/paraview/fix-boost-graph-api-changes.diff b/community-testing/paraview/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 37d78665b..000000000
--- a/community-testing/paraview/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date:   Tue Dec 13 15:36:06 2011 -0500
-
-    BUG: 12772 fixes for change in Boost graph API
-
-    This fixes bug 12772, where an API change in Boost was causing
-    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
-    reporting the issue and posting the patch.
-
-    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,15 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
-
-
-+namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+    return e.Id;
-+  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+    return e.underlying_desc.Id;
-+  }
-+}
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +104,8 @@ public:
-
-     // Copy the vertex and edge data from the graph to the tree.
-     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
--    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+                                  unwrap_edge_id(e), tree_e.Id);
-   }
-
- private:
diff --git a/community-testing/paraview/paraview.desktop b/community-testing/paraview/paraview.desktop
deleted file mode 100644
index 2f5b8ec69..000000000
--- a/community-testing/paraview/paraview.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/community-testing/paraview/paraview.png b/community-testing/paraview/paraview.png
deleted file mode 100644
index 6e39f3d4f..000000000
--- a/community-testing/paraview/paraview.png
+++ /dev/null
diff --git a/community-testing/patchage/PKGBUILD b/community-testing/patchage/PKGBUILD
deleted file mode 100644
index 805cc211c..000000000
--- a/community-testing/patchage/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63232 2012-01-30 19:04:43Z ibiru $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Max Pray a.k.a. Synthead <synthead@gmail.com>
-# Contributor: clarence <catchfire at gmail dot com>
-pkgname=patchage
-pkgver=0.5.0
-pkgrel=3
-pkgdesc="A modular patch bay for audio and MIDI systems"
-arch=('i686' 'x86_64')
-url="http://drobilla.net/software/patchage"
-license=('GPL')
-depends=('dbus-glib' 'libglademm' 'hicolor-icon-theme'
-         'raul' 'flowcanvas<1.0.0' 'jack')
-makedepends=('boost' 'python2')
-install=$pkgname.install
-source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-sha256sums=('9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf --destdir="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/patchage/patchage.install b/community-testing/patchage/patchage.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/community-testing/patchage/patchage.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD
deleted file mode 100644
index 3f7b9871e..000000000
--- a/community-testing/performous/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 63234 2012-01-30 19:04:51Z ibiru $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=performous
-pkgver=0.6.1
-pkgrel=12
-pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
-arch=('i686' 'x86_64')
-url="http://performous.org/"
-license=('GPL')
-depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
-#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \
-#         'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48')
-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"
-	png15.patch)
-md5sums=('451a759de77984b5a699e91107fe52e2'
-         '42a8c825d80b0de16bd5752d2a80e585'
-         'ff0ffa681dfaa09c4f42133a65309bf0'
-         '89157d5e21b0efd09fcbeee299d23c7e')
-
-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
-  # fix for libpng 1.5
-  patch -Np1 -i ../png15.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/performous/png15.patch b/community-testing/performous/png15.patch
deleted file mode 100644
index b6fb8fb14..000000000
--- a/community-testing/performous/png15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake
---- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake	2010-10-31 17:05:44.000000000 +0100
-+++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake	2012-01-29 01:07:56.339648832 +0100
-@@ -10,7 +10,7 @@
- 
- include(LibFindMacros)
- 
--libfind_pkg_check_modules(Png_PKGCONF Png)
-+libfind_pkg_check_modules(Png_PKGCONF libpng)
- 
- find_path(Png_INCLUDE_DIR
-   NAMES pngconf.h
-@@ -18,7 +18,7 @@
- )
- 
- find_library(Png_LIBRARY
--  NAMES png png12 png14
-+  NAMES png png12 png14 png15
-   PATHS ${Png_PKGCONF_LIBRARY_DIRS}
- )
- 
-diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh
---- Performous-0.6.1-Source/game/image.hh	2010-10-31 17:05:43.000000000 +0100
-+++ Performous-0.6.1a-Source/game/image.hh	2012-01-29 01:44:16.050575186 +0100
-@@ -26,7 +26,7 @@
- 	}
- 	void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) {
- 		if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed");
--		png_set_read_fn(pngPtr,(voidp)&file, readPngHelper);
-+		png_set_read_fn(pngPtr, &file, readPngHelper);
- 		png_read_info(pngPtr, infoPtr);
- 		png_set_expand(pngPtr);  // Expand everything to RGB(A)
- 		png_set_strip_16(pngPtr);  // Strip everything down to 8 bit/component
diff --git a/community-testing/perl-gnome2-wnck/PKGBUILD b/community-testing/perl-gnome2-wnck/PKGBUILD
deleted file mode 100644
index a77422f29..000000000
--- a/community-testing/perl-gnome2-wnck/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63236 2012-01-30 19:04:55Z ibiru $
-# Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-pkgname=perl-gnome2-wnck
-pkgver=0.16
-pkgrel=5
-pkgdesc="Perl interface to the Window Navigator Construction Kit"
-arch=('i686' 'x86_64')
-license=("GPL" "Artistic")
-url="http://search.cpan.org/dist/Gnome2-Wnck"
-depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck')
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz")
-md5sums=('439f4569ffd7af96ef1d3feaab23760e')
-
-build() {
-  cd Gnome2-Wnck-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd Gnome2-Wnck-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-testing/perl-gtk2-sexy/PKGBUILD b/community-testing/perl-gtk2-sexy/PKGBUILD
deleted file mode 100644
index fde5853fb..000000000
--- a/community-testing/perl-gtk2-sexy/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 63238 2012-01-30 19:05:02Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Charles Mauch <cmauch@gmail.com>
-# Creator: Florian Ragwitz <http://search.cpan.org/~/>
-
-pkgname=perl-gtk2-sexy
-pkgver=0.05
-pkgrel=6
-pkgdesc="Perl/CPAN Module Gtk2::Sexy"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Gtk2-Sexy"
-license=('GPL' 'PerlArtistic')
-depends=('gtk2' 'libsexy')
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends' 'gtk2-perl')
-options=(docs !emptydirs)
-source=("http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-Sexy-${pkgver}.tar.gz")
-md5sums=('3e291808250d7b956ba8443013a1b461')
-
-build() {
-  cd Gtk2-Sexy-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd Gtk2-Sexy-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-testing/perl-gtk2-trayicon/PKGBUILD b/community-testing/perl-gtk2-trayicon/PKGBUILD
deleted file mode 100644
index f8c1cbf17..000000000
--- a/community-testing/perl-gtk2-trayicon/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63240 2012-01-30 19:05:07Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Tom K <tomk@runbox.com>
-
-pkgname=perl-gtk2-trayicon
-pkgver=0.06
-pkgrel=8
-pkgdesc="Perl interface to the EggTrayIcon library"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Gtk2-TrayIcon/"
-depends=('gtk2-perl')
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-license=("GPL")
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-TrayIcon-${pkgver}.tar.gz")
-md5sums=('522c328f14681a25d76eeaf317e05049')
-
-build() {
-  cd  Gtk2-TrayIcon-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd  Gtk2-TrayIcon-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-testing/perl-gtk2-webkit/PKGBUILD b/community-testing/perl-gtk2-webkit/PKGBUILD
deleted file mode 100644
index 551b9af92..000000000
--- a/community-testing/perl-gtk2-webkit/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63242 2012-01-30 19:05:13Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-
-pkgname=perl-gtk2-webkit
-pkgver=0.09
-pkgrel=2
-pkgdesc="Gtk2::WebKit"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Gtk2-WebKit"
-license=('GPL' 'PerlArtistic')
-depends=('perl' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-${pkgver}.tar.gz)
-md5sums=('e696fc2b15d6189370e19bce9a9e56f3')
-
-build() {
-  cd Gtk2-WebKit-${pkgver}
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd Gtk2-WebKit-${pkgver}
-  make install DESTDIR=${pkgdir}
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-testing/pidgin-libnotify/PKGBUILD b/community-testing/pidgin-libnotify/PKGBUILD
deleted file mode 100644
index 500f5d532..000000000
--- a/community-testing/pidgin-libnotify/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com>
-# Contributor: Hugo Doria <hugodoria@gmail.com>
-# Contributor pidgin-libnotify: 3ED <kas1987@o2.pl>
-
-pkgname=pidgin-libnotify
-pkgver=0.14
-pkgrel=5
-arch=('i686' 'x86_64')
-pkgdesc="pidgin plugin that enables popups when someone logs in or messages you."
-url="http://gaim-libnotify.sourceforge.net/"
-license=('GPL')
-depends=('pidgin' 'libnotify' 'perlxml' 'gettext' 'notification-daemon')
-makedepends=('libtool' 'intltool')
-replaces=('gaim-libnotify')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch
-        pidgin-libnotify-0.14-libnotify-0.7.patch)
-md5sums=('bfb5368b69c02d429b2b17c00a6673c0'
-         'e9bdbb3c7faa61f062fc64277457b6c0'
-         '05538625f14d9f2c12adae5fa6a1fa26')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/language_fixes.patch"
-  patch -p0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch"
-  ./configure --prefix=/usr --disable-deprecated  --disable-static
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/pidgin-libnotify/language_fixes.patch b/community-testing/pidgin-libnotify/language_fixes.patch
deleted file mode 100644
index 6898b0483..000000000
--- a/community-testing/pidgin-libnotify/language_fixes.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-diff -Naur pidgin-libnotify-0.14/po/de.po pidgin-libnotify-0.14/po-new/de.po
---- pidgin-libnotify-0.14/po/de.po	2010-03-09 18:20:47.365124617 +0100
-+++ pidgin-libnotify-0.14/po-new/de.po	2010-03-09 18:02:40.715216935 +0100
-@@ -48,7 +48,7 @@
- #: src/pidgin-libnotify.c:379
- #, c-format
- msgid "%s signed off"
--msgstr "%s hat sich angemeldet"
-+msgstr "%s hat sich abgemeldet"
- 
- #: src/pidgin-libnotify.c:406
- #, c-format
-diff -Naur pidgin-libnotify-0.14/po/et.po pidgin-libnotify-0.14/po-new/et.po
---- pidgin-libnotify-0.14/po/et.po	1970-01-01 01:00:00.000000000 +0100
-+++ pidgin-libnotify-0.14/po-new/et.po	2010-03-09 18:14:58.831811232 +0100
-@@ -0,0 +1,80 @@
-+# Pidgin-libnotify translation to Estonian language.
-+# Copyright (C) 2009 The Gnome Translation Team.
-+# This file is distributed under the same license as the pidgin-libnotify package.
-+# Mattias Põldaru <mahfiaz gmail com>, 2009.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: Pdgin Libnotify\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2009-03-23 11:04+0200\n"
-+"PO-Revision-Date: 2009-03-23 11:09+0300\n"
-+"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
-+"Language-Team: Gnome Estonian Translation Team <gnome-et@linux.ee>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural = n!=1;\n"
-+"X-Poedit-Language: Estonian\n"
-+
-+#: ../src/pidgin-libnotify.c:57
-+msgid "New messages"
-+msgstr "Uutele sõnumitele"
-+
-+#: ../src/pidgin-libnotify.c:62
-+msgid "Only new conversations"
-+msgstr "Ainult uutele vestlustele"
-+
-+#: ../src/pidgin-libnotify.c:67
-+msgid "Ignore events from blocked users"
-+msgstr "Blokitud kasutajaid eiratakse"
-+
-+#: ../src/pidgin-libnotify.c:72
-+msgid "Buddy signs on"
-+msgstr "Sõber logib sisse"
-+
-+#: ../src/pidgin-libnotify.c:77
-+msgid "Buddy signs off"
-+msgstr "Sõber logib välja"
-+
-+#: ../src/pidgin-libnotify.c:82
-+msgid "Only when available"
-+msgstr "Ainult siis, kui olekuks on saadaval"
-+
-+#: ../src/pidgin-libnotify.c:320
-+msgid "Show"
-+msgstr "Näita"
-+
-+#: ../src/pidgin-libnotify.c:352
-+#, c-format
-+msgid "%s signed on"
-+msgstr "%s logis sisse"
-+
-+#: ../src/pidgin-libnotify.c:384
-+#, c-format
-+msgid "%s signed off"
-+msgstr "%s logis välja"
-+
-+#: ../src/pidgin-libnotify.c:411
-+#, c-format
-+msgid "%s says:"
-+msgstr "%s ütleb:"
-+
-+#: ../src/pidgin-libnotify.c:577
-+msgid "Libnotify Popups"
-+msgstr "Libnotify hüpikaknad"
-+
-+#: ../src/pidgin-libnotify.c:578
-+msgid "Displays popups via libnotify."
-+msgstr "Kuvab hüpikaknaid kasutades libnotify'd."
-+
-+#: ../src/pidgin-libnotify.c:579
-+msgid ""
-+"Pidgin-libnotify:\n"
-+"Displays popups via libnotify."
-+msgstr ""
-+"Pidgin-libnotify:\n"
-+"Kuvab hüpikaknaid kasutades libnotify'd."
-+
-+
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/hu.po pidgin-libnotify-0.14/po-new/hu.po
---- pidgin-libnotify-0.14/po/hu.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/hu.po	2010-03-09 18:13:38.721834227 +0100
-@@ -1,8 +1,7 @@
- msgid ""
- msgstr ""
--"Project-Id-Version: \n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
-+"Project-Id-Version: pidgin-libnotify\n"
-+"POT-Creation-Date: \n"
- "PO-Revision-Date: 2006-11-01 18:33+0100\n"
- "Last-Translator: Peter Avramucz <muczy@freestart.hu>\n"
- "Language-Team: \n"
-@@ -11,58 +10,58 @@
- "Content-Transfer-Encoding: 8bit\n"
- "X-Poedit-Country: HUNGARY\n"
- 
--#: src/pidgin-libnotify.c:57
-+#: src/gaim-libnotify.c:57
- msgid "New messages"
- msgstr "Új üzenetek"
- 
--#: src/pidgin-libnotify.c:62
-+#: src/gaim-libnotify.c:62
- msgid "Only new conversations"
- msgstr "Csak az új beszélgetéseknél"
- 
--#: src/pidgin-libnotify.c:67
-+#: src/gaim-libnotify.c:67
- msgid "Ignore events from blocked users"
- msgstr "Hagyja figyelmen kívűl a blokkolt felhasználókat"
- 
--#: src/pidgin-libnotify.c:72
-+#: src/gaim-libnotify.c:72
- msgid "Buddy signs on"
- msgstr "Partner bejelentkezett"
- 
--#: src/pidgin-libnotify.c:77
-+#: src/gaim-libnotify.c:77
- msgid "Buddy signs off"
- msgstr "Partner kijelentkezett"
- 
--#: src/pidgin-libnotify.c:315
-+#: src/gaim-libnotify.c:295
- msgid "Show"
- msgstr "Mutasd"
- 
--#: src/pidgin-libnotify.c:347
-+#: src/gaim-libnotify.c:324
- #, c-format
- msgid "%s signed on"
- msgstr "%s bejelentkezett"
- 
--#: src/pidgin-libnotify.c:379
-+#: src/gaim-libnotify.c:353
- #, c-format
- msgid "%s signed off"
- msgstr "%s kijelentkezett"
- 
--#: src/pidgin-libnotify.c:406
-+#: src/gaim-libnotify.c:380
- #, c-format
- msgid "%s says:"
- msgstr "%s mondja:"
- 
--#: src/pidgin-libnotify.c:572
-+#: src/gaim-libnotify.c:543
- msgid "Libnotify Popups"
- msgstr "Libnotify buborékok"
- 
--#: src/pidgin-libnotify.c:573
-+#: src/gaim-libnotify.c:544
- msgid "Displays popups via libnotify."
- msgstr "Mutassa a buborékokat libnotify segítségével."
- 
--#: src/pidgin-libnotify.c:574
--#, fuzzy
-+#: src/gaim-libnotify.c:545
- msgid ""
--"Pidgin-libnotify:\n"
-+"Gaim-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
- "Gaim-libnotify:\n"
- "Mutassa a buborékokat libnotify segítségével."
-+
-diff -Naur pidgin-libnotify-0.14/po/it.po pidgin-libnotify-0.14/po-new/it.po
---- pidgin-libnotify-0.14/po/it.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/it.po	2010-03-09 18:03:34.565229551 +0100
-@@ -1,79 +1,78 @@
- # Italian (it) translation of gaim-libnotify.
--# Copyright (C) 2006, Marco Cabizza <marco87@gmail.com>
--#
- # This file is distributed under the same license as gaim-libnotify.
-+# Copyright (C) 2006, Marco Cabizza <marco87@gmail.com>
-+# Copyright (C) 2009, The Free Software Foundation, Inc.
-+# Gruppo traduzione italiano di Ubuntu, <gruppo-traduzione@ubuntu-it.org>
-+# Milo Casagrande <milo@ubuntu.com>
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: gaim-libnotify\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
--"PO-Revision-Date: 2007-05-25 12:30-0300\n"
--"Last-Translator: Marco Cabizza <marco87@gmail.com>\n"
-+"POT-Creation-Date: 2009-09-29 16:23+0000\n"
-+"PO-Revision-Date: 2009-11-04 15:15+0000\n"
-+"Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
- "Language-Team: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=2; plural=n != 1;\n"
-+"X-Launchpad-Export-Date: 2009-11-11 17:20+0000\n"
-+"X-Generator: Launchpad (build Unknown)\n"
- 
--#: src/pidgin-libnotify.c:57
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:95
- msgid "New messages"
- msgstr "Nuovi messaggi"
- 
--#: src/pidgin-libnotify.c:62
-+#: ../src/pidgin-libnotify.c:100
- msgid "Only new conversations"
--msgstr "Solo le nuove finestre"
-+msgstr "Solo nuove conversazioni"
- 
--#: src/pidgin-libnotify.c:67
-+#: ../src/pidgin-libnotify.c:105
- msgid "Ignore events from blocked users"
--msgstr "Ignora gli utenti bloccati"
-+msgstr "Ignora eventi da utenti bloccati"
- 
--#: src/pidgin-libnotify.c:72
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:110
- msgid "Buddy signs on"
--msgstr "%s entra"
-+msgstr "Il conoscente si connette"
- 
--#: src/pidgin-libnotify.c:77
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:115
- msgid "Buddy signs off"
--msgstr "%s entra"
-+msgstr "Il conoscente si disconnette"
- 
--#: src/pidgin-libnotify.c:315
-+#: ../src/pidgin-libnotify.c:120
-+msgid "Only when available"
-+msgstr "Solo quando disponibile"
-+
-+#: ../src/pidgin-libnotify.c:125
-+msgid "Names to remove notifications for"
-+msgstr "Nomi per cui rimuovere le notifiche"
-+
-+#: ../src/pidgin-libnotify.c:505
- msgid "Show"
- msgstr "Mostra"
- 
--#: src/pidgin-libnotify.c:347
--#, c-format
--msgid "%s signed on"
--msgstr "%s è entrato"
--
--#: src/pidgin-libnotify.c:379
--#, fuzzy, c-format
--msgid "%s signed off"
--msgstr "%s è entrato"
--
--#: src/pidgin-libnotify.c:406
--#, c-format
--msgid "%s says:"
--msgstr "%s dice:"
-+#: ../src/pidgin-libnotify.c:538
-+msgid "is online"
-+msgstr "è in linea"
-+
-+#: ../src/pidgin-libnotify.c:567
-+msgid "is offline"
-+msgstr "non è in linea"
- 
--#: src/pidgin-libnotify.c:572
-+#: ../src/pidgin-libnotify.c:1399
- msgid "Libnotify Popups"
--msgstr "Popups di libnotify"
-+msgstr "Notifiche di libnotify"
- 
--#: src/pidgin-libnotify.c:573
-+#: ../src/pidgin-libnotify.c:1400
- msgid "Displays popups via libnotify."
--msgstr "Mostra avvisi mediante libnotify."
-+msgstr "Visualizza le notifiche mediante libnotify."
- 
--#: src/pidgin-libnotify.c:574
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:1401
- msgid ""
- "Pidgin-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
--"Gaim-libnotify:\n"
--"Mostra avvisi mediante libnotify."
-+"Pidgin-libnotify:\n"
-+"Visualizza le notifiche mediante libnotify."
- 
--#~ msgid "Libnotify Interface"
--#~ msgstr "Interfaccia libnotify"
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/nl.po pidgin-libnotify-0.14/po-new/nl.po
---- pidgin-libnotify-0.14/po/nl.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/nl.po	2010-03-09 18:17:48.188461774 +0100
-@@ -31,12 +31,12 @@
- 
- #: src/pidgin-libnotify.c:72
- msgid "Buddy signs on"
--msgstr "Contactpersoon heeft zich aangemeld"
-+msgstr "Contactpersoon meldt zich aan"
- 
- #: src/pidgin-libnotify.c:77
- #, fuzzy
- msgid "Buddy signs off"
--msgstr "Contactpersoon heeft zich aangemeld"
-+msgstr "Contactpersoon meldt zich af"
- 
- #: src/pidgin-libnotify.c:315
- msgid "Show"
-@@ -50,7 +50,7 @@
- #: src/pidgin-libnotify.c:379
- #, fuzzy, c-format
- msgid "%s signed off"
--msgstr "%s heeft zich aangemeld"
-+msgstr "%s heeft zich afgemeld"
- 
- #: src/pidgin-libnotify.c:406
- #, c-format
-@@ -59,7 +59,7 @@
- 
- #: src/pidgin-libnotify.c:572
- msgid "Libnotify Popups"
--msgstr ""
-+msgstr "Libnotify Popups"
- 
- #: src/pidgin-libnotify.c:573
- msgid "Displays popups via libnotify."
-@@ -71,7 +71,7 @@
- "Pidgin-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
--"Gaim-libnotify:\n"
-+"Pidgin-libnotify:\n"
- "Toont popups via libnotify."
- 
- #~ msgid "Libnotify Interface"
-diff -Naur pidgin-libnotify-0.14/po/pl.po pidgin-libnotify-0.14/po-new/pl.po
---- pidgin-libnotify-0.14/po/pl.po	2008-12-14 18:03:42.000000000 +0100
-+++ pidgin-libnotify-0.14/po-new/pl.po	2010-03-09 18:09:47.555190702 +0100
-@@ -1,22 +1,18 @@
--# Polish (pl) translation of gaim-libnotify
--# Copyright (C) 2006, Krzysztof Rosiński <kr@post.pl>
--# This file is distributed under the same license as the gaim-libnotify package.
-+# translation of pl.po to Polish
- # Krzysztof Rosiński <kr@post.pl>, 2006.
- # Piotr DrÄ…g <raven@pmail.pl>, 2007.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: gaim-libnotify\n"
-+"Project-Id-Version: pl\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-06-30 19:58+0000\n"
--"PO-Revision-Date: 2006-03-13 19:39+ZONE\n"
-+"PO-Revision-Date: 2007-06-09 19:00+0200\n"
- "Last-Translator: Piotr DrÄ…g <raven@pmail.pl>\n"
- "Language-Team: Polish <pl@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
--"|| n%100>=20) ? 1 : 2);\n"
- 
- #: src/pidgin-libnotify.c:57
- msgid "New messages"
-@@ -73,3 +69,5 @@
- "Pidgin-libnotify:\n"
- "Wyświetla powiadomienia przez libnotify."
- 
-+
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/ro.po pidgin-libnotify-0.14/po-new/ro.po
---- pidgin-libnotify-0.14/po/ro.po	2007-06-30 20:53:22.000000000 +0200
-+++ pidgin-libnotify-0.14/po-new/ro.po	2010-03-09 18:14:01.732650658 +0100
-@@ -8,69 +8,66 @@
- msgstr ""
- "Project-Id-Version: ro\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
--"PO-Revision-Date: 2007-01-25 22:00+0200\n"
--"Last-Translator: Ion Alin <alyn3d@gmail.com>\n"
--"Language-Team:  <ro@li.org>\n"
-+"POT-Creation-Date: 2009-04-24 10:15+0000\n"
-+"PO-Revision-Date: 2009-09-10 13:40+0000\n"
-+"Last-Translator: Adi Roiban <adi@roiban.ro>\n"
-+"Language-Team: <ro@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.11.4\n"
--"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
--"20)) ? 1 : 2;\n"
-+"X-Launchpad-Export-Date: 2009-09-10 16:28+0000\n"
-+"X-Generator: Launchpad (build Unknown)\n"
- 
--#: src/pidgin-libnotify.c:57
-+#: ../src/pidgin-libnotify.c:75
- msgid "New messages"
- msgstr "Mesaje noi"
- 
--#: src/pidgin-libnotify.c:62
-+#: ../src/pidgin-libnotify.c:80
- msgid "Only new conversations"
--msgstr "Numai conversatii noi"
-+msgstr "Doar conversațiile noi"
- 
--#: src/pidgin-libnotify.c:67
-+#: ../src/pidgin-libnotify.c:85
- msgid "Ignore events from blocked users"
--msgstr "Ignora evenimentele de la utilizatorii blocati"
-+msgstr "Ignoră evenimentele de la utilizatorii blocați"
- 
--#: src/pidgin-libnotify.c:72
-+#: ../src/pidgin-libnotify.c:90
- msgid "Buddy signs on"
--msgstr "Userul este online"
-+msgstr "Contact conectat"
- 
--#: src/pidgin-libnotify.c:77
-+#: ../src/pidgin-libnotify.c:95
- msgid "Buddy signs off"
--msgstr "Userul este offline"
-+msgstr "Contact deconectat"
- 
--#: src/pidgin-libnotify.c:315
-+#: ../src/pidgin-libnotify.c:100
-+msgid "Only when available"
-+msgstr "Doar când sunt disponibil(ă)"
-+
-+#: ../src/pidgin-libnotify.c:454
- msgid "Show"
--msgstr "Arata"
-+msgstr "Afișează"
-+
-+#: ../src/pidgin-libnotify.c:487
-+msgid "is online"
-+msgstr "s-a conectat"
- 
--#: src/pidgin-libnotify.c:347
--#, c-format
--msgid "%s signed on"
--msgstr "%s este online"
--
--#: src/pidgin-libnotify.c:379
--#, c-format
--msgid "%s signed off"
--msgstr "%s este offline"
--
--#: src/pidgin-libnotify.c:406
--#, c-format
--msgid "%s says:"
--msgstr "%s spune:"
-+#: ../src/pidgin-libnotify.c:516
-+msgid "is offline"
-+msgstr "s-a deconectat"
- 
--#: src/pidgin-libnotify.c:572
-+#: ../src/pidgin-libnotify.c:1200
- msgid "Libnotify Popups"
--msgstr "Pop-up Libnotify"
-+msgstr "Notificări libnotify"
- 
--#: src/pidgin-libnotify.c:573
-+#: ../src/pidgin-libnotify.c:1201
- msgid "Displays popups via libnotify."
--msgstr "Arata popup-uri via libnotify."
-+msgstr "Afișează notificări via libnotify."
- 
--#: src/pidgin-libnotify.c:574
--#, fuzzy
-+#: ../src/pidgin-libnotify.c:1202
- msgid ""
- "Pidgin-libnotify:\n"
- "Displays popups via libnotify."
- msgstr ""
--"Gaim-libnotify:\n"
--"Arata popup-uri via libnotify."
-+"Pidgin-libnotify:\n"
-+"Afișează notificări via libnotify."
-+
-+ 	  	 
-diff -Naur pidgin-libnotify-0.14/po/ru.po pidgin-libnotify-0.14/po-new/ru.po
---- pidgin-libnotify-0.14/po/ru.po	2008-12-14 18:09:59.000000000 +0100
-+++ pidgin-libnotify-0.14/po-new/ru.po	2010-03-09 18:08:58.941861562 +0100
-@@ -7,11 +7,11 @@
- msgstr ""
- "Project-Id-Version: gaim-libnotify\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-06-30 19:58+0000\n"
-+"POT-Creation-Date: 2009-08-07 18:45+0000\n"
- "PO-Revision-Date: 2007-11-29 12:30-0300\n"
- "Last-Translator: Dmitry Egorkin <egorkin@gmail.com>\n"
- "Language-Team: Russian\n"
--"MIME-Version: 1.0\n"
-+"MIME-Version: 1.1\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=2; plural=n != 1;\n"
-@@ -43,12 +43,12 @@
- #: src/pidgin-libnotify.c:347
- #, c-format
- msgid "%s signed on"
--msgstr "%s пришёл"
-+msgstr "%s в �ети"
- 
- #: src/pidgin-libnotify.c:379
- #, c-format
- msgid "%s signed off"
--msgstr "%s ушёл"
-+msgstr "%s не в �ети"
- 
- #: src/pidgin-libnotify.c:406
- #, c-format
-@@ -73,3 +73,5 @@
- 
- #~ msgid "Libnotify Interface"
- #~ msgstr "�а�тройки libnotify"
-+
-+ 	  	 
diff --git a/community-testing/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch b/community-testing/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch
deleted file mode 100644
index 40e6c02b8..000000000
--- a/community-testing/pidgin-libnotify/pidgin-libnotify-0.14-libnotify-0.7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/pidgin-libnotify.c
-+++ src/pidgin-libnotify.c
-@@ -286,7 +286,15 @@
- 		g_free (tr_body);
- 		return;
- 	}
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	notification = notify_notification_new (title, tr_body, NULL);
-+#else
- 	notification = notify_notification_new (title, tr_body, NULL, NULL);
-+#endif
-+#else
-+	notification = notify_notification_new (title, tr_body, NULL, NULL);
-+#endif
- 	purple_debug_info (PLUGIN_ID, "notify(), new: "
- 					 "title: '%s', body: '%s', buddy: '%s'\n",
- 					 title, tr_body, best_name (buddy));
diff --git a/community-testing/pidgin-musictracker/PKGBUILD b/community-testing/pidgin-musictracker/PKGBUILD
deleted file mode 100644
index 3232ba8a8..000000000
--- a/community-testing/pidgin-musictracker/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 64093 2012-02-08 23:54:25Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Ionut Biru <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=pidgin-musictracker
-pkgver=0.4.22
-pkgrel=3
-pkgdesc="A plugin for Pidgin which displays the music track currently playing."
-url='http://code.google.com/p/pidgin-musictracker'
-license=('GPL2')
-depends=('pidgin' 'gtk2' 'dbus-glib')
-makedepends=('xmms2')
-arch=('i686' 'x86_64')
-source=("http://pidgin-musictracker.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-options=('!libtool')
-md5sums=('8d7225c705484db86b864cab5a536423')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/pingus/ChangeLog b/community-testing/pingus/ChangeLog
deleted file mode 100644
index c182f92eb..000000000
--- a/community-testing/pingus/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2010-03-18  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-        * pingus 0.7.2-8
-        * Rebuilt against boost 1.41.0
-
-2010-02-23  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-7
-	* Rebuilt against boost 1.42.0
-
-2010-01-20  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-6
-	* Rebuilt against libpng 1.4/libjpeg 8
-
-2009-07-13  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-2
-	* Rebuilt against boost 1.39
-	* Added gcc 4.4 patch
-	* Added ChangeLog
diff --git a/community-testing/pingus/PKGBUILD b/community-testing/pingus/PKGBUILD
deleted file mode 100644
index 708e7ce40..000000000
--- a/community-testing/pingus/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63246 2012-01-30 19:05:32Z ibiru $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=pingus
-pkgver=0.7.6
-pkgrel=2
-pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
-arch=('i686' 'x86_64')
-url="http://pingus.seul.org"
-license=('GPL')
-depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48')
-makedepends=('scons' 'boost>=1.48' 'mesa')
-source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
-	pingus.desktop)
-md5sums=('561798686f34d3fa4e69135d655f47ac'
-         '9eec34047bdcff49e08f41e81764e20c')
-sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487'
-          '579a1144f161ce89e6e024cea37210149b89c0c0')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  scons prefix=/usr
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make install DESTDIR="${pkgdir}" PREFIX="/usr"
-
-  install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
-}
diff --git a/community-testing/pingus/pingus.desktop b/community-testing/pingus/pingus.desktop
deleted file mode 100644
index 276db36a4..000000000
--- a/community-testing/pingus/pingus.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pingus
-Comment=A free Lemmings[tm] clone
-Exec=pingus
-Terminal=false
-Type=Application
-Categories=Application;Game;LogicGame
-Icon=/usr/share/pingus/images/core/editor/actions.png
diff --git a/community-testing/pkgtools/PKGBUILD b/community-testing/pkgtools/PKGBUILD
deleted file mode 100644
index e38f71649..000000000
--- a/community-testing/pkgtools/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
-pkgname=pkgtools
-pkgver=23
-pkgrel=4
-pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
-url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
-license=('GPL')
-source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
-backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
-install=pkgtools.install
-provides=(newpkg pkgfile)
-depends=('bash>=4' 'pcre' 'libarchive' 'python')
-optdepends=('cron: For pkgfile --update entry'
-            'abs: Provides proto packaging files for newpkg'
-            'python-yaml: for gem2arch'
-            'python2: for pkgconflict')
-md5sums=('5361111e31741f8d7ff8ca45c7996b6b')
-
-build() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make
-}
-
-package() {
-  cd "$srcdir/Daenyth-$pkgname"-*
-
-  make DESTDIR="$pkgdir" install
-
-  # fix infinite loop in autotools configure scripts
-  sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/pkgtools/pkgtools.install b/community-testing/pkgtools/pkgtools.install
deleted file mode 100644
index bcbf2f85c..000000000
--- a/community-testing/pkgtools/pkgtools.install
+++ /dev/null
@@ -1,66 +0,0 @@
-_MSG_UPDATE=" - Make sure to run pkgfile --update before use"
-_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update
-   If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf"
-_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash.
-   This will automatically run pkgfile whenever you run
-   a command which the shell cannot find. If you want
-   this functionality, set CMD_SEARCH_ENABLED to 1 in
-   /etc/pkgtools/pkgfile.conf (or per-user by copying
-   that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then
-   in your current shell run:
-     source /etc/profile"
-
-is_update_from() {
-  res="`vercmp $1 $2`"
-  case $res in
-    '-1'|'0') return 0;;
-    '1') return 1;;
-  esac
-}
-
-## arg 1:  the new package version
-post_install() {
-  echo "$_MSG_UPDATE"
-  echo "$_MSG_HOOK"
-  echo "$_MSG_CRON"
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if is_update_from $2 11-1; then
-    echo " - All bugs related to pkgfile -b should be fixed in this update."
-  fi
-  if is_update_from $2 12-1; then
-    echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed."
-    echo "   Please remove any old symlinks relating to it."
-    echo "$_MSG_HOOK"
-  fi
-  if is_update_from $2 15-1; then
-    echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration."
-    echo "   run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»"
-  fi
-  if is_update_from $2 18-1; then
-    echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197"
-  fi
-  if is_update_from $2 19-1; then
-    echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to"
-    echo "   regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0"
-    echo "   in /etc/pkgtools/pkgfile.conf"
-    echo " - This version of pkgtools contains a new tool called 'maintpkg'"
-    echo "   It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors"
-  fi
-  if is_update_from $2 22-1; then
-    echo " - This is the largest release in a long time. This updates all python scripts to py3k."
-    echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging"
-  fi
-}
-
-## arg 1:  the old package version
-post_remove() {
-  cat << _EOM
- - You may want to clean /var/cache/pkgtools/lists
-_EOM
-}
-
-# vim:set ts=2 sw=2 et filetype=sh:
diff --git a/community-testing/png2ico/PKGBUILD b/community-testing/png2ico/PKGBUILD
deleted file mode 100644
index 9436ad54b..000000000
--- a/community-testing/png2ico/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 63248 2012-01-30 19:05:37Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=png2ico
-pkgver=20021208
-pkgrel=5
-arch=('i686' 'x86_64')
-pkgdesc="Converts PNG files to Windows icon resource files"
-url="http://www.winterdrache.de/freeware/png2ico/"
-license=("GPL2")
-depends=('libpng' 'gcc')
-source=(http://www.winterdrache.de/freeware/png2ico/data/$pkgname-src-2002-12-08.tar.gz)
-md5sums=('9b663df81c826cd564638cba2e6bc75b')
-
-build() {
-  cd ${srcdir}/${pkgname}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}
-  install -D -m755 png2ico ${pkgdir}/usr/bin/png2ico
-  install -D -m644 doc/png2ico.1 ${pkgdir}/usr/share/man/man1/png2ico.1
-}
diff --git a/community-testing/podofo/PKGBUILD b/community-testing/podofo/PKGBUILD
deleted file mode 100644
index 8545ec3dd..000000000
--- a/community-testing/podofo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63250 2012-01-30 19:05:45Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-# Contributor: Preecha Patumchareonpol <yumyai at gmail.com> 
-
-pkgname=podofo
-pkgver=0.9.1
-pkgrel=3
-pkgdesc="A C++ library to work with the PDF file format"
-arch=('i686' 'x86_64')
-url="http://podofo.sourceforge.net"
-license=('GPL')
-depends=( 'gcc-libs' 'fontconfig' 'libpng' 'libtiff')
-makedepends=('cmake')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cec586ab69f92bc88d38b5d4b8eee5a0')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-        -DPODOFO_BUILD_SHARED=1 \
-        -DPODOFO_HAVE_JPEG_LIB=1 \
-        -DPODOFO_HAVE_PNG_LIB=1 \
-        -DPODOFO_HAVE_TIFF_LIB=1
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}/build
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/pound/ChangeLog b/community-testing/pound/ChangeLog
deleted file mode 100644
index 1a9677113..000000000
--- a/community-testing/pound/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-
-2009-03-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.4.4
-	* Fixed an issue with the rc.d pound script
-
-2008-06-22  Mateusz Herych <heniekk@gmail.com>
-
-	* Adding for x86_64 community - 2.4.3
-
-2008-06-22  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Adding for i686 community - 2.4.3
-
-2008-05-22  Mateusz Herych <heniekk@gmail.com>
-
-	* Adding to community for x86_64
-
-2008-05-21  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Adding to community for i686
-
diff --git a/community-testing/pound/PKGBUILD b/community-testing/pound/PKGBUILD
deleted file mode 100644
index a2ce6b17e..000000000
--- a/community-testing/pound/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 64097 2012-02-08 23:54:47Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=pound
-pkgver=2.6
-pkgrel=1
-pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
-arch=('i686' 'x86_64')
-url="http://www.apsis.ch/pound/index_html"
-license=('GPL')
-depends=('pcre' 'openssl')
-backup=(etc/pound/pound.cfg)
-source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz
-	pound.init
-	pound.runit
-	pound.cfg
-	pound-2.5-openssl.patch)
-md5sums=('8c913b527332694943c4c67c8f152071'
-         '4df8548f106fca08323e8e4071beaa43'
-         '716cc0bf334b594751bece24c7d1df2d'
-         '8937808acd22c6391ebe4340af8df854'
-         'c2c48dc395ffc045f9d35394992292d0')
-
-build() {
-    cd $srcdir/Pound-$pkgver
-    # Patch to build against OpenSSL 1.0.0 (Thanks Fedora!)
-#    patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1
-    ./configure --prefix=/usr --sysconfdir=/etc/pound
-    make 
-}
-package() {
-    cd $srcdir/Pound-$pkgver
-    install -d $pkgdir/usr/sbin
-    make DESTDIR=$pkgdir install 
-    chown root.root -R $pkgdir/usr
-    install -d $pkgdir/etc/rc.d
-    install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound
-    install -d $pkgdir/etc/sv
-    install -d $pkgdir/etc/sv/pound
-    install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run
-    install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg
-}
diff --git a/community-testing/pound/pound-2.5-openssl.patch b/community-testing/pound/pound-2.5-openssl.patch
deleted file mode 100644
index efefd5487..000000000
--- a/community-testing/pound/pound-2.5-openssl.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-diff -up Pound-2.5/config.c.openssl Pound-2.5/config.c
---- Pound-2.5/config.c.openssl	2010-02-10 12:23:09.000000000 +0100
-+++ Pound-2.5/config.c	2010-02-10 12:23:07.000000000 +0100
-@@ -431,14 +431,22 @@ t_hash(const TABNODE *e)
-         res = (res ^ *k++) * 16777619;
-     return res;
- }
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
-+#endif
- 
- static int
- t_cmp(const TABNODE *d1, const TABNODE *d2)
- {
-     return strcmp(d1->key, d2->key);
- }
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
-+#endif
- 
- /*
-  * parse a service
-@@ -460,7 +468,11 @@ parse_service(const char *svc_name)
-     pthread_mutex_init(&res->mut, NULL);
-     if(svc_name)
-         strncpy(res->name, svc_name, KEY_SIZE);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL)
-+#else
-     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL)
-+#endif
-         conf_err("lh_new failed - aborted");
-     ign_case = ignore_case;
-     while(conf_fgets(lin, MAXBUF)) {
-diff -up Pound-2.5/pound.h.openssl Pound-2.5/pound.h
---- Pound-2.5/pound.h.openssl	2010-02-02 12:49:02.000000000 +0100
-+++ Pound-2.5/pound.h	2010-02-10 12:15:18.000000000 +0100
-@@ -322,6 +322,10 @@ typedef struct _tn {
- /* maximal session key size */
- #define KEY_SIZE    127
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+DECLARE_LHASH_OF(TABNODE);
-+#endif
-+
- /* service definition */
- typedef struct _service {
-     char                name[KEY_SIZE + 1]; /* symbolic name */
-@@ -337,7 +341,11 @@ typedef struct _service {
-     int                 sess_ttl;   /* session time-to-live */
-     regex_t             sess_start; /* pattern to identify the session data */
-     regex_t             sess_pat;   /* pattern to match the session data */
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
-+#else
-     LHASH               *sessions;  /* currently active sessions */
-+#endif
-     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
-     int                 disabled;   /* true if the service is disabled */
-     struct _service     *next;
-diff -up Pound-2.5/svc.c.openssl Pound-2.5/svc.c
---- Pound-2.5/svc.c.openssl	2010-02-02 12:49:02.000000000 +0100
-+++ Pound-2.5/svc.c	2010-02-10 12:13:29.000000000 +0100
-@@ -27,12 +27,17 @@
- 
- #include    "pound.h"
- 
-+#ifndef LHASH_OF
-+#define LHASH_OF(x) LHASH
-+#define CHECKED_LHASH_OF(type, h) h
-+#endif
-+
- /*
-  * Add a new key/content pair to a hash table
-  * the table should be already locked
-  */
- static void
--t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
-+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
- {
-     TABNODE *t, *old;
- 
-@@ -53,7 +58,11 @@ t_add(LHASH *const tab, const char *key,
-     }
-     memcpy(t->content, content, cont_len);
-     t->last_acc = time(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
-+#else
-     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
-+#endif
-         free(old->key);
-         free(old->content);
-         free(old);
-@@ -68,12 +77,16 @@ t_add(LHASH *const tab, const char *key,
-  * side-effect: update the time of last access
-  */
- static void *
--t_find(LHASH *const tab, char *const key)
-+t_find(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
-+#endif
-         res->last_acc = time(NULL);
-         return res->content;
-     }
-@@ -84,12 +97,16 @@ t_find(LHASH *const tab, char *const key
-  * Delete a key
-  */
- static void
--t_remove(LHASH *const tab, char *const key)
-+t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
-+#endif
-         free(res->key);
-         free(res->content);
-         free(res);
-@@ -98,59 +115,75 @@ t_remove(LHASH *const tab, char *const k
- }
- 
- typedef struct  {
--    LHASH   *tab;
-+    LHASH_OF(TABNODE) *tab;
-     time_t  lim;
-     void    *content;
-     int     cont_len;
- }   ALL_ARG;
- 
- static void
--t_old(TABNODE *t, void *arg)
-+t_old_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
--
--    a = (ALL_ARG *)arg;
-     if(t->last_acc < a->lim)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
-+#else
-+#define t_old t_old_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Expire all old nodes
-  */
- static void
--t_expire(LHASH *const tab, const time_t lim)
-+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
- {
-     ALL_ARG a;
-     int down_load;
- 
-     a.tab = tab;
-     a.lim = lim;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
- static void
--t_cont(TABNODE *t, void *arg)
-+t_cont_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
--
--    a = (ALL_ARG *)arg;
-     if(memcmp(t->content, a->content, a->cont_len) == 0)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
-+#else
-+#define t_cont t_cont_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Remove all nodes with the given content
-  */
- static void
--t_clean(LHASH *const tab, void *const content, const size_t cont_len)
-+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
- {
-     ALL_ARG a;
-     int down_load;
-@@ -158,10 +191,14 @@ t_clean(LHASH *const tab, void *const co
-     a.tab = tab;
-     a.content = content;
-     a.cont_len = cont_len;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
-@@ -1410,13 +1447,11 @@ typedef struct  {
- }   DUMP_ARG;
- 
- static void
--t_dump(TABNODE *t, void *arg)
-+t_dump_doall_arg(TABNODE *t, DUMP_ARG *a)
- {
--    DUMP_ARG    *a;
-     BACKEND     *be, *bep;
-     int         n_be, sz;
- 
--    a = (DUMP_ARG *)arg;
-     memcpy(&bep, t->content, sizeof(bep));
-     for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
-         if(be == bep)
-@@ -1432,19 +1467,28 @@ t_dump(TABNODE *t, void *arg)
-     return;
- }
- 
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
-+#else
-+#define t_dump t_dump_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
-+#endif
- 
- /*
-  * write sessions to the control socket
-  */
- static void
--dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
-+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
- {
-     DUMP_ARG a;
- 
-     a.control_sock = control_sock;
-     a.backends = backends;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
-+#else
-     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
-+#endif
-     return;
- }
- 
diff --git a/community-testing/pound/pound.cfg b/community-testing/pound/pound.cfg
deleted file mode 100644
index fda8a07f4..000000000
--- a/community-testing/pound/pound.cfg
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-## Pound configration file
-###############################################################################
-##
-##
-## GLOBAL SETTINGS
-##
-## Specify the user and group Pound will run as.
-#User         "http"
-#Group        "http"
-##
-## Specify the directory that Pound will chroot to at runtime.
-#RootJail     "/"
-##
-## Have Pound run in the foreground (if 0) or as a daemon (if 1).
-#Daemon       1
-##
-## Specify the log facility to use.
-#LogFacility  daemon
-##
-## Specify the logging level.
-#LogLevel     1
-##
-## Ignore case when matching URLs.
-#IgnoreCase   0
-##
-## Enable or disable the dynamic rescaling code.
-#DynScale     0
-##
-## Specify how often Pound will check for resurected back-end hosts.
-#Alive        30
-##
-## Specify for how long Pound will wait for a client request.
-#Client       10
-##
-## How long should Pound wait for a response from the back-end.
-#TimeOut      15
-##
-## How long should Pound wait for a connection to the back-end.
-#ConnTO       15
-##
-## How long should Pound continue to answer interrupted connections.
-#Grace        30
-##
-## Use an OpenSSL hardware acceleration card.
-#SSLEngine    "name"
-##
-## Set the control socket path.
-#Control      "/tmp/poundctl.socket"
-##
-##
-## LISTENERS
-##
-## Configure services and backends for the HTTP reverse proxy.
-#ListenHTTP
-#    Address  10.0.0.1
-#    Port     80
-#    Service
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8080
-#        End
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8081
-#        End
-#    End
-#End
-##
-## Configure services and backends for the HTTPS reverse proxy.
-#ListenHTTPS
-#    Address  10.0.0.1
-#    Port     443
-#    Cert     "/etc/ssl/certs/pound.pem"
-#    Service
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8080
-#        End
-#        BackEnd
-#            Address 127.0.0.1
-#            Port    8081
-#        End
-#    End
-#End
diff --git a/community-testing/pound/pound.init b/community-testing/pound/pound.init
deleted file mode 100644
index 369d6626d..000000000
--- a/community-testing/pound/pound.init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting Pound"
-        /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon pound
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Pound"
-	[ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid`
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/pound.pid
-            rm_daemon pound
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community-testing/pound/pound.runit b/community-testing/pound/pound.runit
deleted file mode 100644
index 2e0be991e..000000000
--- a/community-testing/pound/pound.runit
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-exec 2>&1
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-BIN=/usr/sbin/pound
-OPTS="-f /etc/pound/pound.cfg -p /var/run/pound.pid"
-SVC=pound
-
-PID=`pidof $BIN`
-if [ -z "$PID" ]
-then
-	if [ -f /var/run/$SVC.pid ] 
-	then
-		rm /var/run/$SVC.pid
-		rm_daemon $SVC
-	fi
-	echo "Starting $SVC daemon"
-	$BIN $OPTS
-else
-	[ -z $PID ] || exec watchpid $PID
-fi
-
diff --git a/community-testing/prboom/PKGBUILD b/community-testing/prboom/PKGBUILD
deleted file mode 100644
index d1b17fb7a..000000000
--- a/community-testing/prboom/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63252 2012-01-30 19:05:52Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: dale <dale@archlinux.org>
-
-pkgname=prboom
-pkgver=2.5.0
-pkgrel=6
-pkgdesc='A game engine which provides a program to play Doom levels.'
-url='http://prboom.sourceforge.net/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net')
-source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
-        'libpng-1.4.patch')
-md5sums=('a8a15f61fa2626ab98051ab2703378c4'
-         'ba53474db8e747035ca2320a445e4ae0')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 < ../libpng-1.4.patch
-
-	./configure --prefix=/usr --disable-i386-asm
-	sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile"
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
-
diff --git a/community-testing/prboom/libpng-1.4.patch b/community-testing/prboom/libpng-1.4.patch
deleted file mode 100644
index a2215e37b..000000000
--- a/community-testing/prboom/libpng-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
---- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
-+++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
-@@ -231,7 +231,7 @@
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
- 
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }
diff --git a/community-testing/privoxy/PKGBUILD b/community-testing/privoxy/PKGBUILD
deleted file mode 100644
index dfd2469da..000000000
--- a/community-testing/privoxy/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 64099 2012-02-08 23:54:59Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Juergen Hoetzel <juergen@hoetzel.info>
-# Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
-
-pkgname=privoxy
-pkgver=3.0.19
-pkgrel=2
-pkgdesc='A web proxy with advanced filtering capabilities.'
-arch=('i686' 'x86_64')
-url='http://www.privoxy.org'
-license=('GPL')
-depends=('pcre' 'zlib')
-makedepends=('autoconf')
-backup=('etc/conf.d/privoxy'
-        'etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
-        'etc/privoxy/'{match-all,user}.action
-        'etc/logrotate.d/privoxy')
-install='privoxy.install'
-source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
-        'privoxy'
-        'privoxy.logrotate.d'
-        'privoxy.conf.d')
-md5sums=('57acc79059565cc42eda67982842785d'
-         '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
-         '79480f311313cc43974f6cbe6b672927'
-         '27830ef79418e277b90c1c1fa933f876')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
-  autoheader
-  autoconf
-  ./configure --prefix=/usr --sysconfdir=/etc/privoxy
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
-  make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
-    CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
-
-  # Don't overwrite existing log files!
-  rm "${pkgdir}/var/log/privoxy/"*
-
-  install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
-
-  # Fix config paths.
-  sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \
-    -e '/^user-manual/s#.*#\#user-manual /usr/share/doc/privoxy/user-manual/#' \
-    "${pkgdir}/etc/privoxy/config"
-
-  # Fix group ownership and permissions.
-  chgrp -R 42 "${pkgdir}/etc/privoxy/"
-  chgrp -R 42 "${pkgdir}/var/log/privoxy/"
-
-  find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
-  find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
-  chmod 0700 "${pkgdir}/var/log/privoxy"
-}
diff --git a/community-testing/privoxy/privoxy b/community-testing/privoxy/privoxy
deleted file mode 100644
index 754453de5..000000000
--- a/community-testing/privoxy/privoxy
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
-# read logdir and logfile from privoxy config
-prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prld" ] || prld=/var/log/privoxy
-prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prlf" ] || prlf=logfile
-
-PID=`pidof -o %PPID /usr/sbin/privoxy`
-
-case "$1" in
-  start)
-    stat_busy "Starting Privoxy"
-    # create missing logdir and logfile
-    [ -d "$prld" ] || mkdir -p "$prld"
-    if [ ! -f "$prlf" ]; then
-      touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
-        chmod 0660 "$prld/$prlf"
-    fi
-    [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
-                                       ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon privoxy
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Privoxy"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon privoxy
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/privoxy/privoxy.conf.d b/community-testing/privoxy/privoxy.conf.d
deleted file mode 100644
index 9aa11cd67..000000000
--- a/community-testing/privoxy/privoxy.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# Location of the config file.
-PRIVOXY_CONF='/etc/privoxy/config'
-
-# User and group that privoxy will be run as.
-PRIVOXY_USER='privoxy'
-PRIVOXY_GROUP='privoxy'
-
-# Additional arguments.
-PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
-
diff --git a/community-testing/privoxy/privoxy.install b/community-testing/privoxy/privoxy.install
deleted file mode 100644
index c3ed75111..000000000
--- a/community-testing/privoxy/privoxy.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  groupadd -g 42 privoxy &>/dev/null
-  useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null
-  chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy
-
-  if [ ! -d /var/spool/privoxy ]; then
-    install -dm0770 -o privoxy -g privoxy /var/spool/privoxy
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  userdel privoxy &>/dev/null
-  groupdel privoxy &>/dev/null
-  rm -rf var/spool/privoxy
-}
diff --git a/community-testing/privoxy/privoxy.logrotate.d b/community-testing/privoxy/privoxy.logrotate.d
deleted file mode 100644
index 386766c3e..000000000
--- a/community-testing/privoxy/privoxy.logrotate.d
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/privoxy/* {
-   create 660 root privoxy
-   notifempty
-   compress
-   postrotate
-     /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
-   endscript
-}
diff --git a/community-testing/pyqt3/PKGBUILD b/community-testing/pyqt3/PKGBUILD
deleted file mode 100644
index 95437c443..000000000
--- a/community-testing/pyqt3/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63254 2012-01-30 19:05:57Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgname=pyqt3
-pkgver=3.18.1
-pkgrel=10
-pkgdesc="A set of Python bindings for the Qt3 toolkit"
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/pyqt/intro"
-depends=('python2-sip' 'qscintilla-qt3')
-license=('GPL')
-source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
-
-build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  . /etc/profile.d/qt3.sh
-  echo yes | python2 configure.py -b /usr/bin \
-    -d /usr/lib/python2.7/site-packages \
-    -v /usr/share/sip
-  make
-}
-
-package() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/python-galago-gtk/PKGBUILD b/community-testing/python-galago-gtk/PKGBUILD
deleted file mode 100644
index 1ea5a8c24..000000000
--- a/community-testing/python-galago-gtk/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 63258 2012-01-30 19:06:12Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python-galago-gtk
-pkgver=0.5.0
-pkgrel=6
-pkgdesc="A library of simple functions that are optimized for various CPUs"
-arch=('i686' 'x86_64')
-url="http://galago-project.org"
-options=('!libtool')
-license=('LGPL')
-depends=('libgalago-gtk' 'pygtk' 'python-galago')
-source=(http://galago-project.org/files/releases/source/galago-gtk-python/galago-gtk-python-$pkgver.tar.bz2)
-md5sums=('3eb752eaa87d986bf272cf1266528c43')
-
-build() {
-  cd $srcdir/galago-gtk-python-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/python2-matplotlib/PKGBUILD b/community-testing/python2-matplotlib/PKGBUILD
deleted file mode 100644
index 7680b6272..000000000
--- a/community-testing/python2-matplotlib/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 63256 2012-01-30 19:06:05Z ibiru $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgname=python2-matplotlib
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="A python plotting library, making publication quality plots"
-arch=('i686' 'x86_64')
-url="http://matplotlib.sourceforge.net/"
-backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
-depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-qt')
-optdepends=('pygtk: for use with the GTK or GTKAgg backend'
-            'tk: used by the TkAgg backend'
-            'wxpython: for use with the WXAgg backend')
-makedepends=('pygtk' 'tk' 'wxpython')
-provides=('matplotlib' "python-matplotlib=${pkgver}")
-replaces=('python-matplotlib')
-conflicts=('python-matplotlib')
-source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz"
-         setup.cfg)
-sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae'
-          'bcb5a83db9d95c96a57ca518fa6bd1897b23558f')
-license=('custom')
-
-build() {
-   cd "${srcdir}/matplotlib-${pkgver}"
-
-   cp ../setup.cfg .
-
-   # remove internal copy of pyparsing
-   rm lib/matplotlib/pyparsing.py
-   sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py
-
-   # python2 fix
-   for file in $(find . -name '*.py' -print); do
-      sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
-             -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
-   done
-
-   python2 setup.py build
-}
-
-package() {
-   cd "${srcdir}/matplotlib-${pkgver}"
-   python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
-    
-   install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-   install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}"
-}
diff --git a/community-testing/python2-matplotlib/setup.cfg b/community-testing/python2-matplotlib/setup.cfg
deleted file mode 100644
index 4b82986e9..000000000
--- a/community-testing/python2-matplotlib/setup.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-# Rename this file to setup.cfg to modify matplotlib's
-# build options.
-
-[egg_info]
-tag_svn_revision = 1
-
-[directories]
-# Uncomment to override the default basedir in setupext.py.
-# This can be a single directory or a space-delimited list of directories.
-#basedirlist = /usr
-
-[status]
-# To suppress display of the dependencies and their versions
-# at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-#dateutil = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
-# these toolkits requires AGG, the Anti-Grain Geometry library,
-# which is provided by matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
-#
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
-#     True: build the extension. Exits with a warning if the
-#           required dependencies are not available
-#     False: do not build the extension
-#     auto: build if the required dependencies are available,
-#           otherwise skip silently. This is the default
-#           behavior
-#
-gtk = True
-gtkagg = True
-tkagg = True
-wxagg = True
-macosx = False
-
-[rc_options]
-# User-configurable options
-#
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
-# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-#
-# The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
-# if you have disabled the relevent extension modules.  Agg will be used
-# by default.
-#
-backend = Qt4Agg
-#
-# The numerix module was historically used to provide
-# compatibility between the Numeric, numarray, and NumPy array
-# packages. Now that NumPy has emerge as the universal array
-# package for python, numerix is not really necessary and is
-# maintained to provide backward compatibility. Do not change
-# this unless you have a compelling reason to do so.
-numerix = numpy
diff --git a/community-testing/qcad/PKGBUILD b/community-testing/qcad/PKGBUILD
deleted file mode 100644
index a1f498364..000000000
--- a/community-testing/qcad/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 63260 2012-01-30 19:06:27Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Giovanni Scafora <linuxmania@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=qcad
-pkgver=2.0.5.0
-pkgrel=9
-pkgdesc="A 2D CAD package based upon Qt"
-arch=('i686' 'x86_64')
-url="http://www.ribbonsoft.com/qcad.html"
-license=('GPL2')
-depends=('qt3')
-options=(libtool)
-source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
-        qcad.xpm
-        QCad.desktop
-        qcad-intptr.patch
-        qcad.patch)
-       # http://ghost1227.com/files/misc/qm.tar.gz)
-md5sums=('96b6a56027782aec953c9c4e64c5998c'
-         'da32fec0d2fb85d96126bf28bb0ab9ff'
-         'b4d1eb6724b4b41f191f1ab6fd859c39'
-         '92f900fe1fd3a8f841232b587b49c7da'
-         '7e6779b1e3b10da1eb4daf36d93f8479')
-
-build() {
-  export PATH="/opt/qt/bin:$PATH"
-  export QTDIR=/opt/qt
-
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src
-
-  #Arch64 fix - gentoo patch
-  [ "$CARCH" = "x86_64" ] && patch -p1 < ../qcad-intptr.patch
-  patch -p1 < ../qcad.patch
-  sed -i "s:"-pedantic"::g" mkspecs/defs.pro
-
-  cd scripts
-  ./build_qcad.sh notrans
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
-
-  install -D -m755 qcad ${pkgdir}/usr/bin/qcad
-  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
-  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
-  install -m644 ../../QCad.desktop \
-    ${pkgdir}/usr/share/applications/QCad.desktop
-  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
-  #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
-}
diff --git a/community-testing/qcad/QCad.desktop b/community-testing/qcad/QCad.desktop
deleted file mode 100644
index a55f5940f..000000000
--- a/community-testing/qcad/QCad.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qcad
-Icon=/usr/share/pixmaps/qcad.xpm
-Name=QCad
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Application;Office;
diff --git a/community-testing/qcad/qcad-intptr.patch b/community-testing/qcad/qcad-intptr.patch
deleted file mode 100644
index 6d8b6acca..000000000
--- a/community-testing/qcad/qcad-intptr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -0500
-@@ -849,7 +849,7 @@
-         os << " layer: NULL ";
-     } else {
-         os << " layer: " << e.layer->getName().latin1() << " ";
--        os << " layer address: " << (int)(e.layer) << " ";
-+        os << " layer address: " << (intptr_t)(e.layer) << " ";
-     }
- 
-     os << e.pen << "\n";
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -0500
-@@ -57,7 +57,7 @@
-     os << " name: " << l.getName().latin1()
-     << " pen: " << l.getPen()
- 	<< " frozen: " << (int)l.isFrozen()
--	<< " address: " << (int)(&l)
-+	<< " address: " << (intptr_t)(&l)
-     << std::endl;
-     return os;
- }
diff --git a/community-testing/qcad/qcad.patch b/community-testing/qcad/qcad.patch
deleted file mode 100644
index f051f29af..000000000
--- a/community-testing/qcad/qcad.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h	2008-12-11 22:29:51.000000000 +0100
-@@ -37,6 +37,7 @@
- #endif
- 
- #include <iostream>
-+#include <cstring>
- 
- #include "dl_attributes.h"
- #include "dl_codes.h"
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:29:51.000000000 +0100
-@@ -23,7 +23,7 @@
- ** not clear to you.
- **
- **********************************************************************/
--
-+#include <cstdlib>
- #include "rs_actionzoompan.h"
- #include "rs_snapper.h"
- #include "rs_point.h"
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp	2008-12-11 22:30:18.000000000 +0100
-@@ -25,7 +25,7 @@
- **********************************************************************/
- 
- #include "rs_information.h"
--
-+#include <cstdlib>
- #include "rs_constructionline.h"
- 
- 
-diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh	2008-12-11 22:31:37.000000000 +0100
-@@ -16,9 +16,6 @@
- echo "  distcc      use distcc for distributed compilation. DISTCC_HOSTS must be set."
- echo
- 
--echo "QTDIR is: $QTDIR"
--echo "QMAKESPEC is: $QMAKESPEC"
--
- # detect system:
- if [ "x$OS" == "xWindows_NT" ]
- then
diff --git a/community-testing/qcad/qcad.xpm b/community-testing/qcad/qcad.xpm
deleted file mode 100644
index e747fa984..000000000
--- a/community-testing/qcad/qcad.xpm
+++ /dev/null
@@ -1,132 +0,0 @@
-/* XPM */
-static const char * qcad_xpm[] = {
-"32 32 97 2",
-"  	c None",
-". 	c #3F3F3F",
-"+ 	c #010180",
-"@ 	c #FFFFFF",
-"# 	c #E0E0EF",
-"$ 	c #41419F",
-"% 	c #4545A1",
-"& 	c #4949A3",
-"* 	c #4D4DA5",
-"= 	c #5151A7",
-"- 	c #5555A9",
-"; 	c #5959AB",
-"> 	c #4444A2",
-", 	c #3C3C9D",
-"' 	c #40409F",
-") 	c #4444A1",
-"! 	c #4848A3",
-"~ 	c #4C4CA5",
-"{ 	c #5050A7",
-"] 	c #5454A9",
-"^ 	c #5858AB",
-"/ 	c #5D5DAD",
-"( 	c #6161AF",
-"_ 	c #6565B1",
-": 	c #5C5CAD",
-"< 	c #6060AF",
-"[ 	c #6464B1",
-"} 	c #6868B3",
-"| 	c #6C6CB5",
-"1 	c #7070B7",
-"2 	c #7474B9",
-"3 	c #7878BB",
-"4 	c #3F3F9E",
-"5 	c #4343A0",
-"6 	c #4747A3",
-"7 	c #4B4BA5",
-"8 	c #000000",
-"9 	c #7C7CBD",
-"0 	c #8080BF",
-"a 	c #4747A2",
-"b 	c #4B4BA4",
-"c 	c #4F4FA6",
-"d 	c #7B7BBD",
-"e 	c #7F7FBF",
-"f 	c #8383C1",
-"g 	c #5353A8",
-"h 	c #8787C3",
-"i 	c #5757AA",
-"j 	c #8B8BC5",
-"k 	c #4E4EA6",
-"l 	c #5252A8",
-"m 	c #5656AA",
-"n 	c #5A5AAC",
-"o 	c #8787C2",
-"p 	c #8F8FC7",
-"q 	c #5E5EAE",
-"r 	c #8B8BC4",
-"s 	c #8F8FC6",
-"t 	c #9393C8",
-"u 	c #6262B0",
-"v 	c #8E8EC6",
-"w 	c #9292C8",
-"x 	c #9696CA",
-"y 	c #6666B2",
-"z 	c #9A9ACC",
-"A 	c #6A6AB4",
-"B 	c #9E9ECE",
-"C 	c #6565B2",
-"D 	c #6969B4",
-"E 	c #6D6DB6",
-"F 	c #7171B8",
-"G 	c #7575BA",
-"H 	c #9D9DCE",
-"I 	c #A1A1D0",
-"J 	c #7171B7",
-"K 	c #7575B9",
-"L 	c #7979BC",
-"M 	c #7D7DBE",
-"N 	c #8181C0",
-"O 	c #8585C2",
-"P 	c #8989C4",
-"Q 	c #8D8DC6",
-"R 	c #9191C8",
-"S 	c #9595CA",
-"T 	c #9999CC",
-"U 	c #A5A5D2",
-"V 	c #7979BB",
-"W 	c #7D7DBD",
-"X 	c #8181BF",
-"Y 	c #8585C1",
-"Z 	c #8989C3",
-"` 	c #A9A9D4",
-" .	c #8D8DC5",
-"..	c #9191C7",
-"+.	c #9595C9",
-"@.	c #9999CB",
-"#.	c #ADADD6",
-"                                                                ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"    .       .       .       .       .       .       .       .   ",
-"    .       .       .   + + + + + + +       .       .       .   ",
-"    .     @ .     @ + + # # # # # # # + + @ .     @ .     @ .   ",
-"    . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . .   ",
-"    .       .   + # , ' ) ! ~ { ] ^ / ( _ > +       .       .   ",
-"    .       . + # , ' ) ! ~ { ] ^ : < [ } | > +     .       .   ",
-"    .     @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ .     @ .   ",
-"    . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . .   ",
-"    .     + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + .       .   ",
-"    .     + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + .       .   ",
-"    .     + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + .     @ .   ",
-"    . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . .   ",
-"    .     + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + .       .   ",
-"    .     + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + .       .   ",
-"    .     + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + .     @ .   ",
-"    . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . .   ",
-"    .     + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + .       .   ",
-"    .       + > C D E . . . . . . . . . 8 z B > +   .       .   ",
-"    .     @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ .     @ .   ",
-"    . . . . . + > J K L M N O P Q R S T H I U + . . . . . . .   ",
-"    .       .   + > V W X Y Z Q R S T H I U ` > +   .       .   ",
-"    .       .     + > > Y Z  ...+.@.H > U ` #.#.> + .       .   ",
-"    .     @ .     @ + + > > > > > > > + > #.#.#.> + .     @ .   ",
-"    . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . .   ",
-"    .       .       .       .       .     + > > +   .       .   ",
-"    .       .       .       .       .       + +     .       .   ",
-"    .     @ .     @ .     @ .     @ .     @ .     @ .     @ .   ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"                                                                ",
-"                                                                "};
diff --git a/community-testing/qpxtool/PKGBUILD b/community-testing/qpxtool/PKGBUILD
deleted file mode 100644
index 8d1cf584c..000000000
--- a/community-testing/qpxtool/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 63262 2012-01-30 19:06:37Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
-
-pkgname=qpxtool
-pkgver=0.7.1_002
-pkgrel=3
-pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
-arch=('i686' 'x86_64')
-url="http://qpxtool.sourceforge.net/"
-license=('GPL')
-depends=('qt')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	libpng15.patch)
-md5sums=('755321a0196b16d06857550aac74ff50'
-         'ab9af7610277652c77c6d114422b2266')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Fix strict aliasing warnings
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  sed -i 's|lib64|lib|' configure
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
-  make
-  mkdir -p $pkgdir/usr/bin
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/qpxtool/libpng15.patch b/community-testing/qpxtool/libpng15.patch
deleted file mode 100644
index 05e6f49d2..000000000
--- a/community-testing/qpxtool/libpng15.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
---- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp	2009-11-25 10:55:44.000000000 +0300
-+++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp	2012-01-23 13:53:37.000000000 +0400
-@@ -129,28 +129,28 @@
- 
- 	png_read_info(png_ptr, info_ptr);
- 
--	printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
-+	printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr));
- 
--	if (info_ptr->width != 3744U || info_ptr->height != rows ) {
-+	if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) {
- 		printf("Image should be 3744 x %d", rows);
- 		return 1;
- 	}
- 
--//	width = info_ptr->width;
--//	height = info_ptr->height;
--//	bit_depth = info_ptr->bit_depth;
-+//	width = png_get_image_width(png_ptr, info_ptr);
-+//	height = png_get_image_height(png_ptr, info_ptr);
-+//	bit_depth = png_get_bit_depth(png_ptr, info_ptr);
- 
- 	number_of_passes = png_set_interlace_handling(png_ptr);
- 	png_read_update_info(png_ptr, info_ptr);
- 
--	printf("Color type: [%d] ", info_ptr->color_type);
--	switch (info_ptr->color_type) {
-+	printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
-+	switch (png_get_color_type(png_ptr, info_ptr)) {
- 	    case PNG_COLOR_TYPE_GRAY:
- 			printf("PNG_COLOR_TYPE_GRAY\n");
- 			break;
- 	    case PNG_COLOR_TYPE_PALETTE:
- 			printf("PNG_COLOR_TYPE_PALETTE\n");
--			if (!(info_ptr->valid & PNG_INFO_PLTE)) {
-+			if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE))) {
- 				printf("PNG color type is indexed, but no palette found!");
- 				goto err_read_png;
- 			}
-@@ -168,49 +168,53 @@
- 			printf("unlnown PNG color type!\n");
- 			goto err_read_png;
- 	}
--	printf("Bit depth : %d\n", info_ptr->bit_depth);
--	if (info_ptr->bit_depth != 8) {
-+	printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
-+	if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
- 		printf("Unsupported bit depth!\n");
- 		goto err_read_png;
- 	}
--	if (info_ptr->valid & PNG_INFO_PLTE) {
--		printf("Palette   : %d colors\n", info_ptr->num_palette);
-+
-+	int num_palette;
-+	png_colorp plte;
-+	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
-+
-+	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+		printf("Palette   : %d colors\n", num_palette);
- 	} else {
- 		printf("Palette   : NO\n");
- 	}
--	printf("ROW bytes : %ld\n", info_ptr->rowbytes);
--
-+	printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
- 
- 	raw_row_pointer = buf;
--	png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
-+	png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr));
- 	for (row=0; row<rows; row++) {
- 		if (setjmp(png_jmpbuf(png_ptr))) {
- 			printf("png_jmpbuf failed!\n");
- 			goto err_read_png;
- 		}
- 		png_read_row(png_ptr, png_row_pointer, NULL);
--		if (info_ptr->width < 3744U)
-+		if (png_get_image_width(png_ptr, info_ptr) < 3744U)
- 			memset(raw_row_pointer, 0, 3744);
- 
--		switch (info_ptr->color_type) {
-+		switch (png_get_color_type(png_ptr, info_ptr)) {
- 		    case PNG_COLOR_TYPE_GRAY:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col] ^ 0xFF;
- //					memcpy(raw_row_pointer, png_row_pointer, 3744);
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_PALETTE:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					c = png_row_pointer[col];
--					r = info_ptr->palette[c].red;
--					g = info_ptr->palette[c].green;
--					b = info_ptr->palette[c].blue;
-+					r = plte[c].red;
-+					g = plte[c].green;
-+					b = plte[c].blue;
- 					c = (r*11 + g*16 + b*5) / 32;
- 					raw_row_pointer[col] = c ^ 0xFF;
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*3];
- 					g = png_row_pointer[col*3+1];
- 					b = png_row_pointer[col*3+2];
-@@ -219,7 +223,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_RGB_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					r = png_row_pointer[col*4];
- 					g = png_row_pointer[col*4+1];
- 					b = png_row_pointer[col*4+2];
-@@ -228,7 +232,7 @@
- 				}
- 				break;
- 		    case PNG_COLOR_TYPE_GRAY_ALPHA:
--				for (col=0; col<info_ptr->width; col++) {
-+				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
- 					raw_row_pointer[col] = png_row_pointer[col*2] ^ 0xFF;
- 				}
- 				break;
diff --git a/community-testing/rawstudio/PKGBUILD b/community-testing/rawstudio/PKGBUILD
deleted file mode 100644
index 77ed76702..000000000
--- a/community-testing/rawstudio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63264 2012-01-30 19:06:46Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: cdhotfire <cdhotfire@gmail.com>
-
-pkgname=rawstudio
-pkgver=2.0
-pkgrel=5
-pkgdesc="An open source raw-image converter written in GTK+"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://rawstudio.org/"
-depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun'
-	 'raptor1' 'lcms' 'gtk2')
-install=${pkgname}.install
-options=('!libtool')
-source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz
-	libpng15.patch)
-md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b'
-         '2f8b7acbe10d8096ce613cbea7986fd3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install
-  mkdir $pkgdir/usr/lib/rawstudio
-  mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio
-  ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins
-}
diff --git a/community-testing/rawstudio/libpng15.patch b/community-testing/rawstudio/libpng15.patch
deleted file mode 100644
index 6d3b85968..000000000
--- a/community-testing/rawstudio/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp
---- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp	2011-02-24 01:35:18.000000000 +0300
-+++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp	2012-01-23 15:03:22.000000000 +0400
-@@ -102,8 +102,8 @@
- 	{
- 		*linear_guess = FALSE;
- 		RSColorSpace* profile = NULL;
--		const gchar *icc_profile_title;
--		const gchar *icc_profile;
-+		png_charp icc_profile_title;
-+		png_bytep icc_profile;
- 		guint icc_profile_size;
- 		png_structp png_ptr = png_create_read_struct(
- 				PNG_LIBPNG_VER_STRING,
-@@ -125,11 +125,11 @@
- 
- 					int compression_type;
- 					/* Extract embedded ICC profile */
--					if (info_ptr->valid & PNG_INFO_iCCP)
-+					if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP))
- 					{
- 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
--													(png_charpp) &icc_profile_title, &compression_type,
--													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-+													&icc_profile_title, &compression_type,
-+													&icc_profile, (png_uint_32*) &icc_profile_size);
- 						if (retval != 0)
- 						{
- 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
-diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c
---- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c	2011-03-26 04:52:29.000000000 +0300
-+++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c	2012-01-23 15:04:59.000000000 +0400
-@@ -23,6 +23,7 @@
- #include <gettext.h>
- #include "config.h"
- #include <png.h>
-+#include <zlib.h>
- 
- #define RS_TYPE_PNGFILE (rs_pngfile_type)
- #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
diff --git a/community-testing/rawstudio/rawstudio.install b/community-testing/rawstudio/rawstudio.install
deleted file mode 100644
index 261adb7b4..000000000
--- a/community-testing/rawstudio/rawstudio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q || true
-}
-
-post_upgrade() {
-  update-desktop-database -q || true
-}
-
-post_remove() {
-  update-desktop-database -q || true
-}
diff --git a/community-testing/rawtherapee/PKGBUILD b/community-testing/rawtherapee/PKGBUILD
deleted file mode 100644
index c189b5d62..000000000
--- a/community-testing/rawtherapee/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 63357 2012-01-31 10:21:09Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
-# Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
-# Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
-# Contributor: Archie <mymaud@gmail.com>
-
-pkgname=rawtherapee
-pkgver=4.0.7
-pkgrel=1
-pkgdesc="RAW photo editor"
-arch=('i686' 'x86_64')
-url="http://www.rawtherapee.com/"
-license=('GPL3')
-depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('mercurial' 'cmake')
-install=rawtherapee.install
-source=()
-md5sums=()
-
-_root="https://rawtherapee.googlecode.com/hg/"
-_repo="rawtherapee"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Mercurial server...."
-
-  if [ -d $_repo ] ; then
-    cd $_repo
-    hg pull
-    hg up "$pkgver"
-    msg "The local files are updated."
-  else
-    hg clone -u "$pkgver" $_root $_repo
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-  msg "Starting make..."
-
-  if [ -e "$srcdir/$_repo-build" ]; then
-    rm -rf "$srcdir/$_repo-build"
-  fi
-  mkdir "$srcdir/$_repo-build"
-  cd "$srcdir/$_repo-build"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-     ../$_repo
-  make
-}
-
-package() {
-  cd "$srcdir/$_repo-build"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/rawtherapee/rawtherapee.install b/community-testing/rawtherapee/rawtherapee.install
deleted file mode 100644
index 385eec8f4..000000000
--- a/community-testing/rawtherapee/rawtherapee.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo "update desktop mime database..."
-  update-desktop-database -q
-  update-mime-database usr/share/mime 1>&2 > /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-
-  if [ ${2%%_*} == "3.0a1" ]; then
-    echo "There were lots of changes to the behavior of the majority of tools."
-    echo "This may cause your files to look differently than before."
-  fi
-}
-
-post_remove() {
-  post_install $1
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/remmina-plugins/PKGBUILD b/community-testing/remmina-plugins/PKGBUILD
deleted file mode 100644
index e80a0efbe..000000000
--- a/community-testing/remmina-plugins/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63268 2012-01-30 19:07:02Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=remmina-plugins
-pkgver=0.9.2
-pkgrel=3
-pkgdesc="Remina plugins"
-#"Remmina supports multiple network protocols in an integrated and consistant user interface.
-# Currently RDP, VNC, XDMCP and SSH are supported."
-arch=(i686 x86_64)
-url="http://sourceforge.net/projects/remmina/"
-license=('GPL')
-conflicts=(remmina-plugins-svn)
-depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib)
-makedepends=(intltool pkgconfig gettext perl avahi)
-install=remmina-plugins.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz)
-md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ssh --enable-rdp \
-	--enable-vnc --enable-xdmcp --enable-nx \
-	--enable-telepathy
-  make
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/remmina-plugins/remmina-plugins.install b/community-testing/remmina-plugins/remmina-plugins.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-testing/remmina-plugins/remmina-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/root/PKGBUILD b/community-testing/root/PKGBUILD
deleted file mode 100644
index e0084d40d..000000000
--- a/community-testing/root/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.32.00
-pkgrel=4
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
-makedepends=('fftw')
-install='root.install'
-options=('!emptydirs')
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
-        'root.sh'
-        'rootd'
-        'root.xml'
-        'fix-mathcore-generation-r42566.diff')
-md5sums=('1c30e4e6eeae62ff1ad5118cd1309679'
-         '0e883ad44f99da9bc7c23bc102800b62'
-         'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7'
-         '12877cabd620284f50ea16ef97a54aac')
-
-build() {
-  cd root
-
-  # temporary workaround: remove on next patch release after 5.32.00
-  # bug reported at: https://savannah.cern.ch/bugs/?90906
-  patch -Np0 -i ${srcdir}/fix-mathcore-generation-r42566.diff
-
-  if [ ${CARCH} == 'i686' ]; then
-    TARGET=linux;
-  else
-    TARGET=linuxx8664gcc;
-  fi
-
-  msg 'python2 switch'
-  find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
-                           -e 's/python -O/python2 -O/g' \
-                           -e 's/python -c/python2 -c/g' -i {} \;
-  sed \
-    -e 's/python 2/python2 2/g' \
-    -i configure
-  sed \
-    -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
-    -i cint/reflex/python/genreflex/Makefile.am
-  sed \
-    -e 's/python /python2 /' \
-    -i config/genreflex.in config/genreflex-rootcint.in
-
-  local sys_libs=""
-  for sys_lib in ftgl freetype glew pcre zlib lzma; do
-    sys_libs+="--disable-builtin-${sys_lib} "
-  done
-  # move from aur if possible
-  #--disable-builtin-afterimage \
-
-  ./configure \
-    ${TARGET} \
-    --prefix=/usr \
-    --enable-gdml \
-    --enable-gsl-shared \
-    --enable-minuit2 \
-    --enable-soversion \
-    --enable-roofit \
-    --enable-python \
-    --with-python-incdir=/usr/include/python2.7 \
-    --with-python-libdir=/usr/lib \
-    ${sys_libs}
-
-  make
-}
-
-package() {
-  cd root
-
-  make DESTDIR=${pkgdir} install
-
-  install -D ${srcdir}/root.sh \
-    ${pkgdir}/etc/profile.d/root.sh
-  install -D ${srcdir}/rootd \
-    ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.xml \
-    ${pkgdir}/usr/share/mime/packages/root.xml
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
-    ${pkgdir}/usr/share/applications/root-system-bin.desktop
-  # replace @prefix@ with /usr for the desktop
-  sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
-    ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
-
-  # use a file that pacman can track instead of adding directly to ld.so.conf
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
-
-  rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community-testing/root/fix-mathcore-generation-r42566.diff b/community-testing/root/fix-mathcore-generation-r42566.diff
deleted file mode 100644
index ae22c23c0..000000000
--- a/community-testing/root/fix-mathcore-generation-r42566.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: cint/cint/src/typedef.cxx
-===================================================================
---- cint/cint/src/typedef.cxx	(revision 42564)
-+++ cint/cint/src/typedef.cxx	(revision 42566)
-@@ -297,18 +297,27 @@
-       }
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strcmp(type1, "::")) {  // FIXME: This makes no sense, there cannot be typedef ::{...};
-+   if (!strcmp(type1, "::")) {
-       // skip a :: without a namespace in front of it (i.e. global namespace!)
-       c = G__fgetspace(); // skip the next ':'
-       c = G__fgetname_template(type1, 0, "{");
-    }
--   if (!strncmp(type1, "::", 2)) { // Strip a leading :: (global namespace operator)
--      // A leading '::' causes other typename matching functions to fail so
--      // we remove it. This is not the ideal solution (neither was the one
--      // above since it does not allow for distinction between global
--      // namespace and local namespace) ... but at least it is an improvement
--      // over the current behavior.
--      strcpy((char*)type1, type1 + 2);  // Okay since we reduce the size ...
-+   if (!strncmp(type1, "::", 2)) {
-+      // Strip a leading :: (global namespace operator).
-+      // A leading '::' causes other typename matching
-+      // functions to fail so we remove it. This is not
-+      // the ideal solution (neither is the one above)
-+      // since it does not allow for decriminating between
-+      // global namespace and local namespace, but at
-+      // least it is an improvement over the current
-+      // behavior.
-+      //
-+      // Note: We must use memmove because the source
-+      //       and destination strings overlap!
-+      //
-+      int t1len = strlen(type1);
-+      memmove(type1, type1 + 2, t1len - 2);
-+      type1.Set(t1len - 2, '\0');
-    }
-    while (isspace(c)) {
-       len = strlen(type1);
diff --git a/community-testing/root/root.install b/community-testing/root/root.install
deleted file mode 100644
index afabb7aea..000000000
--- a/community-testing/root/root.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-  update-desktop-database >/dev/null
-
-  update-mime-database /usr/share/mime >/dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
-  # leave for pre 5.30.03-3
-  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
-    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-    mv /tmp/.pacroot etc/ld.so.conf
-    chmod 644 etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/root/root.sh b/community-testing/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community-testing/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
-    export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
-    export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community-testing/root/root.xml b/community-testing/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community-testing/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-root">
-    <comment>ROOT file</comment>
-    <comment xml:lang="de">ROOT-Datei</comment>
-    <glob pattern="*.root"/>
-    <magic priority="80">
-      <match value="root" type="string" offset="0:64"/>
-    </magic>
-  </mime-type>
-</mime-info>
diff --git a/community-testing/root/rootd b/community-testing/root/rootd
deleted file mode 100644
index fb2c3388c..000000000
--- a/community-testing/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
-  start)
-  stat_busy "Starting ROOT file server daemon"
-    [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/rootd`
-      echo $PID >/var/run/rootd.pid
-      add_daemon rootd
-      stat_done
-    fi
-    ;;
-  stop)
-  stat_busy "Stopping ROOT file server daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rootd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD
deleted file mode 100644
index 4b4dff9ad..000000000
--- a/community-testing/sage-mathematics/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Osman Ugus <ugus11@yahoo.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
-
-pkgname=sage-mathematics
-pkgver=4.7.2
-pkgrel=3
-pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
-url='http://www.sagemath.org'
-arch=('i686' 'x86_64')
-license=('GPL')
-#depends=('readline')
-depends=('ppl')
-makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core')
-optdepends=('imagemagick: some plotting functionality benefits from it'
-            'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
-            'sage-mathematics-spkgs: original packages used to build additional packages')
-options=('!makeflags')
-install="${pkgname}.install"
-source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        'SAGE-notebook.desktop')
-md5sums=('b3073997e6c7ec00a269f84ff2e54973'
-         'dc391f12b7d17dd37326343ec0e99bbd')
-
-build() {
-  cd sage-${pkgver}
-
-  # modularization of sage, sort of :)
-  # fixes the following error:
-  # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook
-  # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash
-  # this is for people who have custom kernels (sage works this around by checking uname -r)
-  #mkdir -p spkg/installed
-  #touch spkg/installed/readline-6.1
-  mkdir -p spkg/installed
-  touch spkg/installed/ppl-0.11.2
-
-  # fix "missing sage.all error" during build
-  unset CFLAGS
-  unset CXXFLAGS
-
-  # fix build errors
-  unset LDFLAGS
-
-  # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
-  export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
-  export MAKE="make -j${SAGE_BUILD_THREADS}"
-
-  # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
-  export SAGE_FORTRAN='/usr/bin/gfortran'
-  export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so'
-
-  # disable building with debugging support
-  export SAGE_DEBUG='no'
-
-  # enable fat binaries (disables processor specific optimizations)
-  # comment out if you're only building it for yourself
-  export SAGE_FAT_BINARY='yes'
-
-  # can't write to root in a clean chroot
-  export DOT_SAGE='/build/src/'
-
-  # only build sage, no documents
-  #make build
-  make
-}
-
-<< COMMENT
-check() {
-  cd sage-${pkgver}
-
-  # uncomment if we want to run all the tests (warning: very long)
-  #make ptestlong
-}
-COMMENT
-
-package() {
-  cd sage-${pkgver}
-
-  # cp because make install is experimental and will corrupt the install
-  install -d ${pkgdir}/opt/sage
-  cp -r * ${pkgdir}/opt/sage
-
-  # move SageTeX files to more appropriate directory
-  install -d ${pkgdir}/usr/share
-  mv ${pkgdir}/opt/sage/local/share/texmf \
-    ${pkgdir}/usr/share
-
-  desktop-file-install ${srcdir}/SAGE-notebook.desktop \
-    --dir ${pkgdir}/usr/share/applications 
-
-  # create link to main binary
-  install -d ${pkgdir}/usr/bin
-  ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
-
-  # remove build logs
-  rm -f ${pkgdir}/opt/sage/install.log
-  rm -rf ${pkgdir}/opt/sage/spkg/logs
-
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
-  # no need to package them together, put into sage-mathematics-spkgs
-  rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
-  rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
-}
diff --git a/community-testing/sage-mathematics/SAGE-notebook.desktop b/community-testing/sage-mathematics/SAGE-notebook.desktop
deleted file mode 100644
index 26a35d3ac..000000000
--- a/community-testing/sage-mathematics/SAGE-notebook.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=SAGE
-Comment=SAGE NOTEBOOK
-Comment[en_US]=SAGE NOTEBOOK
-Exec=/opt/sage/sage -notebook
-GenericName=
-GenericName[de]=
-Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
-MimeType=
-Name[de]=SAGE
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Science;Math;
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-GenericName[en_US]=
diff --git a/community-testing/sage-mathematics/sage-mathematics.install b/community-testing/sage-mathematics/sage-mathematics.install
deleted file mode 100644
index 6caa5299e..000000000
--- a/community-testing/sage-mathematics/sage-mathematics.install
+++ /dev/null
@@ -1,56 +0,0 @@
-post_install() {
-  cd /opt/sage
-
-  # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership
-  # the files it writes to ~/.sage can be safely ignored
-  HOME=/tmp ./sage -c
-
-  # add sagemath user for the daemon
-  useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
-
-  # Update LaTeX db to point to SageTeX
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  else
-    echo 'Warning: could not find /usr/bin/texhash'
-    echo 'SageTeX has been installed but you need to run:'
-    echo '# texhash /usr/share/texmf'
-    echo 'So that LaTeX will be able to find it.'
-  fi
-
-echo '
- ___                       
-/ (_)        o            |
-\__   _  _      __        |
-/    / |/ |  | /  \_|   | |
-\___/  |  |_/|/\__/  \_/|/o
-            /|         /|  
-            \|         \|  
- ________________________________ 
-< sage-mathematics, I mean, MOO! >
- -------------------------------- 
-        \   ^__^
-         \  (oo)\_______
-            (__)\       )\/\
-                ||----w |
-                ||     ||
-'
-
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  # Update LaTeX db to remove SageTeX entries
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  fi
-
-  # remove the sagemath daemon user
-  userdel sagemath
-
-  # clean up left overs
-  rm -rf /opt/sage
-}
diff --git a/community-testing/scantailor/PKGBUILD b/community-testing/scantailor/PKGBUILD
deleted file mode 100644
index dee23fb7c..000000000
--- a/community-testing/scantailor/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 63274 2012-01-30 19:07:34Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com>
-
-pkgname=scantailor
-pkgver=0.9.10
-pkgrel=2
-pkgdesc="Interactive post-processing tool for scanned pages"
-arch=(i686 x86_64)
-url="http://scantailor.sourceforge.net"
-license="GPL"
-depends=('qt')
-makedepends=('cmake' 'boost')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('f962c93a2d63b449fa3f6612ade3b028'
-         '0aeb1bae724b5cae208ae8af95e8ed9b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  unset CFLAGS
-  unset CPPFLAGS
-  unset CXXFLAGS
-  patch -p1 <$srcdir/build-fix.patch
-  cmake  .
-  cmake \
-	-DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
-	-DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
-	-DCMAKE_CXX_FLAGS_RELEASE="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_BUILD_TYPE=Release .
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/scantailor/build-fix.patch b/community-testing/scantailor/build-fix.patch
deleted file mode 100644
index 85b620020..000000000
--- a/community-testing/scantailor/build-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -wbBur scantailor-0.9.10/zones/EditableZoneSet.h scantailor-0.9.10.my/zones/EditableZoneSet.h
---- scantailor-0.9.10/zones/EditableZoneSet.h	2011-07-31 00:47:25.000000000 +0400
-+++ scantailor-0.9.10.my/zones/EditableZoneSet.h	2011-08-03 01:59:40.000000000 +0400
-@@ -76,6 +77,12 @@
- 
- 	EditableZoneSet();
- 
-+	EditableZoneSet(const EditableZoneSet& zs)
-+	{
-+		m_splineMap = zs.m_splineMap;
-+		m_defaultProps = zs.m_defaultProps;
-+	}
-+
- 	const_iterator begin() const { return iterator(m_splineMap.begin()); }
- 
- 	const_iterator end() const { return iterator(m_splineMap.end()); }
diff --git a/community-testing/scorched3d/PKGBUILD b/community-testing/scorched3d/PKGBUILD
deleted file mode 100644
index 8a481c910..000000000
--- a/community-testing/scorched3d/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Contributor: Seppo Porspakka <sporspak@paju.oulu.fi>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
- 
-pkgname=scorched3d
-pkgver=43.2a
-pkgrel=2
-pkgdesc="A 3d artillery combat game"
-arch=('i686' 'x86_64')
-url="http://www.scorched3d.co.uk/"
-license=('GPL')
-depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils')
-makedepends=('sharutils')
-install=scorched3d.install
-source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${pkgver}-src.tar.gz"
-        'scorched3d.desktop'
-        'scorched3d.png.uu'
-        'scorched3d-42.1-gcc43.patch'
-        'scorched3d-42.1-fixups.patch'
-        'scorched3d-libpng1.5.patch'
-        'libpng14.patch')
-md5sums=('876de173218fd83a2b0a30255ba694fa'
-         'b951f2150004e10fdff3e6226f1a3939'
-         '178a281333006c6a5a92919865c1d7af'
-         '053769f77a38c252eef1d967b18e93e6'
-         'dfde556559d95bca07c4a390c60790b4'
-         'ec6958191751b5a2c44aa15abfc75269'
-         'c8c03855fd3693122fd39427fa3638c1')
-
-build() {
-  cd scorched
-
-#  patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch
-  patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch
-  patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch
-#  patch -Np0 -i ${srcdir}/libpng14.patch
-
-  WANT_WXGTK=gtk2
-  sh autogen.sh \
-    --prefix=/usr \
-    --datadir=/usr/share/scorched3d \
-    --disable-openaltest \
-    --with-wx-config=wx-config
-
-  #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1
-  #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1
-
-  make
-}
-
-package() {
-  cd scorched
-
-  make DESTDIR=${pkgdir} install
- 
-  # freedesktop stuff - png and desktop file ganked from debian
-  cd ${srcdir}
-
-  uudecode --output-file=scorched3d.png scorched3d.png.uu
-
-  install -D -m644 scorched3d.png \
-      ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png
-  install -D -m644 scorched3d.desktop \
-      ${pkgdir}/usr/share/applications/${pkgname}.desktop
-}
diff --git a/community-testing/scorched3d/libpng14.patch b/community-testing/scorched3d/libpng14.patch
deleted file mode 100644
index 7a5a9434c..000000000
--- a/community-testing/scorched3d/libpng14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/common/image/ImagePng.cpp	2009-02-23 04:14:20.000000000 +0100
-+++ src/common/image/ImagePng.cpp_patched	2010-01-24 22:01:04.000000000 +0100
-@@ -189,7 +189,7 @@
- 	info_ptr = png_create_info_struct(png_ptr);

- 	if (info_ptr == NULL)

- 	{

--	  png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);

-+	  png_destroy_read_struct(&png_ptr, NULL, NULL);

- 	  return false;

- 	}

- 

-@@ -200,7 +200,7 @@
- 	if (setjmp(png_jmpbuf(png_ptr)))

- 	{

- 	  /* Free all of the memory associated with the png_ptr and info_ptr */

--	  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);

-+	  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);

- 	  /* If we get here, we had a problem reading the file */

- 	  return false;

- 	}

-@@ -258,7 +258,7 @@
- 	}

- 	else

- 	{

--		png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);

-+		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);

- 

- 		Logger::log(S3D::formatStringBuffer(

- 			"Invalid PNG format.\n"

-@@ -272,7 +272,7 @@
- 	// END NEW CODE

- 

- 	/* clean up after the read, and free any memory allocated - REQUIRED */

--	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);

-+	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);

- 

- 	/* that's it */

- 	return true;

diff --git a/community-testing/scorched3d/scorched3d-42.1-fixups.patch b/community-testing/scorched3d/scorched3d-42.1-fixups.patch
deleted file mode 100644
index 36a027cb6..000000000
--- a/community-testing/scorched3d/scorched3d-42.1-fixups.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
---- scorched.orig/configure-al.m4	2008-03-03 16:17:18.000000000 -0500
-+++ scorched/configure-al.m4	2009-02-15 20:43:35.000000000 -0500
-@@ -7,25 +7,9 @@
- 	[  --disable-openaltest    Do not try to compile and run a test OpenAL program],
- 		    , enable_openaltest=yes)
- AC_MSG_CHECKING(for OpenAL support)
--AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
--if test x$OPENAL_CONFIG = xno; then
--	echo "*** The openal-config script installed by OpenAL could not be found"
--	echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG"
--	echo "*** environment variable to the full path to openal-config."
--
--	AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
--else
--
--	if test x"$use_static_openal" = x"yes"; then
--		AL_LIBS="/usr/local/lib/libopenal.a"
--	else
--		AL_LIBS="`$OPENAL_CONFIG --libs`"
--	fi
--	
--	AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
--
--	AC_MSG_RESULT(yes)
--fi
-+AL_LIBS="-lopenal"
-+AL_CFLAGS="-I/usr/include/AL"
-+AC_MSG_RESULT(yes)
- 
- AC_MSG_CHECKING(for Freealut support)
- AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
-diff -ru scorched.orig/configure.ac scorched/configure.ac
---- scorched.orig/configure.ac	2008-03-03 16:17:18.000000000 -0500
-+++ scorched/configure.ac	2009-02-15 20:40:30.000000000 -0500
-@@ -13,22 +13,6 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- 
--LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
--CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
--
--if test `uname` == Darwin; then
--LDFLAGS="$LDFLAGS -lmx"
--CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
--else
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--fi
--
--AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
--	echo "Warning: No beer found in fridge!";
--	echo "We highly suggest that you rectify this situation immediately."
--])
--
- AC_ARG_ENABLE(serveronly, 
- 	[  --enable-serveronly Enable server only compilation],
- 		    , enable_serveronly=no,
diff --git a/community-testing/scorched3d/scorched3d-42.1-gcc43.patch b/community-testing/scorched3d/scorched3d-42.1-gcc43.patch
deleted file mode 100644
index b235f07c5..000000000
--- a/community-testing/scorched3d/scorched3d-42.1-gcc43.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
---- scorched.old/src/common/common/main.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/common/main.h	2009-02-18 20:07:18.000000000 +0200
-@@ -40,7 +40,7 @@
- void _no_storage()

- {

- 	printf("Failed to allocate memory!!");

--	std::exit(1);

-+	exit(1);

- }

- 

- void run_main(int argc, char *argv[], OptionsParameters &params)

-diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
---- scorched.old/src/common/porting/windows.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/porting/windows.h	2009-02-18 20:06:46.000000000 +0200
-@@ -20,7 +20,7 @@
- typedef unsigned short  WORD;

- typedef unsigned char   BYTE;

- 

--typedef int 	HWND;

-+// typedef int 	HWND;

- typedef void * 	HINSTANCE;

- typedef int 	WPARAM;

- typedef int 	LPARAM;

diff --git a/community-testing/scorched3d/scorched3d-libpng1.5.patch b/community-testing/scorched3d/scorched3d-libpng1.5.patch
deleted file mode 100644
index 4e8f003b8..000000000
--- a/community-testing/scorched3d/scorched3d-libpng1.5.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- ./src/common/image/ImagePngFactory.cpp.old	2011-09-12 12:34:30.114461019 +0200
-+++ ./src/common/image/ImagePngFactory.cpp	2011-09-12 12:39:28.566425593 +0200
-@@ -104,7 +104,7 @@
- 

- static void user_png_error(png_structp png_ptr, png_const_charp msg) 

- {

--	longjmp(png_ptr->jmpbuf,1);

-+	longjmp(png_jmpbuf(png_ptr),1);

- }

- 

- static void user_png_warning(png_structp png_ptr, png_const_charp msg) 

---- ./src/client/client/LoadPNG.cpp.old	2011-09-12 12:45:49.167380419 +0200
-+++ ./src/client/client/LoadPNG.cpp	2011-09-12 14:11:14.961772024 +0200
-@@ -28,6 +28,8 @@
- 	int row, i;
- 	volatile int ckey = -1;
- 	png_color_16 *transv;
-+	png_colorp  png_palette;
-+	int         num_palette;
- 
- 	if ( !src ) {
- 		/* The error message has been set in SDL_RWFromFile */
-@@ -58,7 +60,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		error = "Error reading the PNG file.";
- 		goto done;
- 	}
-@@ -127,9 +129,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -137,7 +139,7 @@
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		error = "Out of memory";
- 		goto done;
-@@ -185,12 +187,15 @@
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else {
-+	    	png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+	    	if (num_palette > 0 ) {
-+			palette->ncolors = num_palette; 
-+			for( i=0; i<num_palette; ++i ) {
-+			    palette->colors[i].b = png_palette[i].blue;
-+			    palette->colors[i].g = png_palette[i].green;
-+			    palette->colors[i].r = png_palette[i].red;
-+			}
- 		}
- 	    }
- 	}
diff --git a/community-testing/scorched3d/scorched3d.desktop b/community-testing/scorched3d/scorched3d.desktop
deleted file mode 100644
index b18d86581..000000000
--- a/community-testing/scorched3d/scorched3d.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Exec=/usr/bin/scorched3d
-Icon=scorched3d.png
-Terminal=false
-Name=Scorched 3D
-Name[lt_LT]=Scorched 3D
-Comment=3D artillery game similar to Scorched Earth
-Comment[de_DE]=3D Reimplementation des Klassikers Scorched Earth
-Comment[fr_FR]=un jeu d'artillerie en 3 proche de Scorched Earth
-Comment[lt_LT]=Nuotaikingas 3D taktinis-artilerinis žaidimas, panašus į Scorched Earth
-Comment[pl_PL]=Artyleryjska gra 3D podobna do Scorched Earth
-Comment[ro_RO]=Un joc 3D cu artilerie similar cu Scorched Earth
-Categories=Game;ArcadeGame;
-StartupNotify=true
diff --git a/community-testing/scorched3d/scorched3d.install b/community-testing/scorched3d/scorched3d.install
deleted file mode 100644
index c5571196e..000000000
--- a/community-testing/scorched3d/scorched3d.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community-testing/scorched3d/scorched3d.png.uu b/community-testing/scorched3d/scorched3d.png.uu
deleted file mode 100644
index 4fb7e50db..000000000
--- a/community-testing/scorched3d/scorched3d.png.uu
+++ /dev/null
@@ -1,105 +0,0 @@
-begin 600 scorched3d.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_
-M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````!W1)344'TP@#%`([XJF@
-M!```$5Q)1$%4>-IEFNER9$>.I3_`W>\2$0PFF5*VI.HJ]58]2\\\W#S/O,*\
-M35LO9FU5U:62E,H4DUM$W+B+.S`__`:3.4.S(!D+G0XX<`"<X_)__O?_<EQ0
-M4R0(D@1M%$3`'35##,1!J:^[.#D;RY)9<@9`4*(H3=.0VH;4)&+3(!IPE-F4
-M;)E<9G(I+'EAR3.S%<P<UO4C2D!0P''<"U@!G\$S:@"*J**J1$0``:T_G/H0
-M'-:W$%Z^1`1$J#\$%<'7CSK@[OBZ(=SK<]8W5U/QZA"0S\NO[SOU\[;^_OE+
-M$;3N;=T#"!%M>%E1``7#7O:LNKY\>5L4$46BH0[!A&(%6RVW[)A:?6`0%2YK
-M7'SLCI9"S`JF%#.*.RZ0<<H7&[_\922@J`*BB`10):I62U0_>]P13.J.RNI>
-M\6JT**@(JG7!((&\+"S%,*_^*Z6P+`N(5+\%K2'AH":H"V%UD;O@)K@[1C7"
-M^"(H$`25@$A`D.K`]1'U$D$JH`(")EJ/4JH7Q1T10500$8(J(20\@,7"HHHL
-MF:64NA$WBF6D*$D4UNW6DW2T1@2H4$Q1##=>@L;7]X-`6/TOJA#J&<H:4((0
-M]8L8D^IAA>*">3U[4\>I[H\2""$14T,0Q=V)*:'SC,PSMAHAHC6DS!&QEVA0
-M<50+N.%:(PRM)VSV*G"L[D/EQ=;Z_!*/4LV-U>2:C+IZ^7)\944<=P=WS)6"
-MDET)*(1(%%!=CQ1A67)%%2`$)28(T590DW630K:P[BJO8`"F@E\,74,UB"`H
-M&@4)6G,7J>'FA8A51`EK=M>-U.R-"*;4V#;'33&4[$*T&L<2`DD5<4$<8A!L
-M=65J'8V@T8G!<0/+PE*$>0DLLR+FB!;4'!.P=3,:(8BNP5?#0M?C,*=^\T*\
-MQ!0&8H*8HC'4.%^-<;P:DF6%6'U!'05B4+2)A`@Q&*(9C87-KE`,<E'ZKCK<
-M#4S@>!2>'H7C(>$.^`(X&@5-]0A4:CU`P"ZG9]6A9H8!<<V=NHB!NN!>$R2(
-M$+7B+\Z*$(*+$E5I4Z!-2A.@:2$V`0V1)<.\*,L26):`E8CDZD$-H(W2=L[U
-MC='VQN%9.1TCF*&QADN%O!6:J;7,N(3R)=F%6%[5*<$1JT>-"BI*#"M<ND(`
-MUYK,0964E*81^@9V^T*W=7*.'`=E6HSC,^1%P0(3B@9!D]/T@=@4NDVFVP%)
-M*2HL4\5J"6L=7C=?S"E2/7XICK:&5OPB]0U$5YA#<6+%6JEP^)(CHDB,A*BT
-MC;#?9YJM8QIX>@Z<#LXX&%(*458(6=N0;$X^*8R*)*7=&+M]H=_!XWU@FI1<
-M!#"L&%B%<A-J&*.X644Z@YA\K7JE(H6JD41H@M)$I0G5@(H4*PY+P`BDY/1]
-M(23C/,!Q"`P'9YX-*]587YL"P0`A6,5`%\6+D*>.%`N;WI$;Y7A23L,*!%JP
-M4M"2U[XH5_A]`14G-E*K8#$C3\Z2'9%(U(@$1UP@:(6PM38Z%5YC*K3=0B[.
-MTX/R\""8%\!>"IJ9X6XKEE=@4%5<:IW)4T..1I.<JRO#$9:L+%EP@Z!>6P>L
-MPO":!W5]B*W68C2;\O[^Q"]/$[NK*Z[W6V[V6][>7K'?);8Q$3#<*RHU<:9I
-M,N[&W9UP.!CC7"MP[2"]'OUZW*I"4"&J$&)$".`!`XX'9YJ,K]_---%IDF(%
-MT$+0@FFI38)'4'`K&`7#B#5?!(F1?=<P+@:>F8:!3WGA<!I(*9%BI$F!)B7Z
-M+G)S#;$7/"GG'%B\QJE?DLXR!J@&0)A+1LQ0@5`J]H-2J+`8)J-I9V)RND8H
-MDZ(.B&.J2-0:B*:89\K:[;XT<R$J7]\HNVW+,&:F;$QYXNE\9ER,;$+3-/1]
-MS_6^PV/"FT@S1QX&R/.E1=;:2VE$-!";%@V1:3Q32J:8,2\%]Z6BC%2T"=$(
-MSX7]WNA:F#0B5F<)%<5"((IBQ2C4&B%`),::H!K8]BU7JB_]M@.+%<[CPG#.
-M#%-A*E#*PFB9/[V?>7A<.#XE^G[+?K^A2Y&NV=!WB7[;TVXVI)0HR\PTCIR'
-M,X?G`]-T)N<9UT((D%R8BX,**0EHPB0"L9Z`2VWL&JM-GH!BQ*YI$8$8(Q)J
-M@K$F]6*&B-'UB7Z[XYONBBRU"]W?9H[#3&H6NL98EL+3X<Q_?+RCY$R*@=W5
-MCNUN0]]W-*&V&FZ.F3-.QFD8&<Y';FYZWGV]HW@M5AZ@2*`00`*N^C*;!(6H
-MBJMB"'';M?4$0FVNBCMYSLQ+8<R9C-%N-ER]N>7FJ^\(38L$H]^>&2?C]@8>
-M[T=^?O\K?_CC#_SSO_X'#P_/F#G]IF.WW;#;;=AO.KJVI>LZ=KLM<\X<CD?N
-M/]WS=_(5[][=@$1$"Q(<-.$2L,M4L#:A(=0V0Z2B86S;ME8_58IY+1X8(DK3
-M=%R_N66SOZ'=7)$-IF%"-=,T`^)*TH:^ZYCGS*]W#WRZ>^+A\8EY69B73(R)
-MON^XOM[1Q$@,@;9-A)1`A.D\<7.S9YH:;F[?L-TY_::PW22PPCS/Y)()XH10
-M>R\3(XH3)!!I4^TWO-8#1`A-H&EZ9@+/H_/+TZ^<AI\XG4=4A>TF\NUWT'4=
-ML"7/&VZNKOAOO_];MEW'X],3A].)^\<#3\\GSN/,D@OC.%.6"K.I;>C[CDW7
-M`PFC(<:.%`,BA7DVAK,Q34Z,@IHCJ>9+$"?%.IM$"^O@D2&;D;,S%6?RP'')
-M_/CA$S_]_)$/'SYQGB:ZKN7F9LOW'UO>OMVQV>[QY0U-ZOB;WW[';[[]FF$<
-M:W@\///^PR<^WCTPG$>.AX'#X<0PG"C+@K>)_7[+]9LW['8W;+:WI#;@S#P?
-M'_CT,#%/$U>;!%V=RV-R0@()0A`EEIPKG!D,T\3=_9%_^_,=[^^>^7C_Q(>/
-M=QP.)Y:<Z=J6INOH?TG\_![>WD:VFX['QQU]=\6;-UNNMCW;7<]NN^'W?_<[
-M_LO??\^2"Z?AS/W]$[]^NN?CW0/G822&P&^__VO^Z;__(__T/_XGUV^_I6V=
-MP^%7'I_>\_[GCYS/`U]]=<N;ZXZ=)'I;$#=B,E0A+N?I90X=AH%?'Q[Y]S_^
-MP(>[9TZG,\=A8)XSYHZ&B$\S9H5E<8H)U_LSQ^/`I\<G?OJEI>NJ4=MMSWZW
-MH>M:FB;1Q$A*@6_^ZBN^_NH6`5*,7%WMN;W>$.5$TA^Y^S#PGW_ZP,/])Z9I
-M).?,\^&XSI4]NNG0:&A9R,M$'`]CG2_%.9T&'IX.O/]PQ]/S@`!=DP@Q4@Q"
-M#&BHY78<A6%PNKX0NY'#_<C#IPJ#(0@I**E)M&W#MN^X?;/G]LV>FYL]-]=7
-M;'<;NK:MU;:<.#[_F9AF_O*G1_[M7QXX'L]`(47E/$W(40DA$%,/ZDQS85YF
-MXO/3<VU&W7@^C8SGJ<96C!6V5`GF9*O]#-0FS0W&T3B=X/9MY&H'TRB<S[(2
-M4,*2"Z6,G,\3]T\'XH^_$&.@:Q)-T]+W+5^_W?&/_[#'PXY?'S?<?RJH))QQ
-MG4F$B)*7S.%P1*/R^&3,XYEE?B(^'0XU!XHQC#-YFHCJJ$#.1EXR2UF+&J_H
-M%73-'2%%IVV$OWJG/#XIX]E9%BB7YFBE$30(JL()Z+K`DB,I/?*'/[=\^-0Q
-MCALVW1NNMGMN;ZY9ELPT+XQSQLV9Y\S=W0,/#\\<#@?>W2;BTVFH\V1VQCE#
-MSEQU$2N%\Y0Y#3/C-'.><QWY@A""$C0PC<HX"%C@W3ME?ZVXURE[,*&XKD8(
-M(01"K".EN-$T1MLNY#+PPX_.\03G4\/O_OHW_/[O$^_>WM!WPC@OR'DB+POS
-M-//IXSU_^<M[#H<#5]TWQ-D,'$JNA.*V;_FOO_V*XL8P+?SQIWO^\Y<'GHY#
-M'3M+S2>7.GHJPFF(W#TH^^O`M]\$=E>![29@IDRSDK.2&EM[+MANG1AK-1U'
-MY7!0#@<P,W[X\0/'X\`_?/\=W__N.[YY=TLV>'X^\O/[C_ST\Z_<W3\B7LCC
-M3-1X804*%".XT,?*S*4F\NU7UPQSYCQGAO-<*_7:WQM0W+$Y,Q?A/"TL<Z!K
-M`TU2N@YP!8^D%'$32A&F43@599Z$G(5I$J:YLGXY9^9YP;)QGA:^GQ?^]F]^
-MP]PFBM7^:9XS;81ESL38=+4"ATQ>,B67VG"Y(P%NWNSX=BG,Q;B[/S%-"VY.
-M4&$Q8RX%S"C%&$[.<#2:F.EZX?K:2#'4ZJJ)4I1Y%MR5\ZA,XTJ=K+FANB;_
-MLO##./-\''@^#ESO-PSCS-/SB6G)B$`*0LZ%V&S:RJ0MB@D4@&R44LA6F>#;
-MZRTI!6ZN=QQ/(^-8Q\AA'!G.4^5ZO!+!>5DP<X;!&0;08*@:*C/%:F*+*#$$
-M8HBDF.C:1*.ALH%4DM<\\_C\Q/D/`Z?SB7DN/#T-Y#FSZ1*[7A"\AI!8_:/@
-MCKD`I?:`7CG*E!+;+4A0=IN6>2[D8LS+PC3/S'.IW>N<.9U&2JD$^9*-I13*
-M4GOXRE`Z3J$$)ZLQ+IEIF9F;R*9OB1>F3VMOEJ>9GW[^6!$Q&UT3V/21W2Y"
-M$*(2,'5$`R$X'E^Q7^Z4XH@Z(00V?4O7-!1SW&SUE#&."^<Q<SK//+>)G(UB
-MQI07AO/,.&52N-#ISIP+[E8I^>Q,,TQS1,3INY96$U$J+6_NG,\CI3@A*&VC
-M;#?*9I-`A;B"T$42X44L62EWC8JZ(U[YF(Q3IUTJ>Q8"_2[0]<Y^W_'UVQTY
-M&U/.#,/$\7CF-,RX5*1;E@SC1"DK*@4A%Z<8/)TFIL78M(5MW]$VL0HL"DF$
-MO@F\O>G8;!*ZTMIQ\4J'9RN4]6%8A<D+'Q650*!(C>E@QDH\X.*KW%1;B)`@
-MF1-SI$V13=^PS+ERI-E8EH5AG%B6\D*YG*?,>39$E9@:NKYCLVE0$8H9082^
-MB[RYZMCU+3&N6AU2#<"=[%:%":P.VJN'-2A10%01C^B*.!5\:JBLN@SF==!&
-MI`I^*;+9M)7/S%"*D4MF7!:6N9"7VL^<QIEA*D!DN^VXWK7LNE!/<BJH*M=7
-M#;?7'6U*5.G!7Y&[%_5!0A4X*E6-F%<!8I6!"I=-&-E6AMB,[%`L5RIEG7O=
-M#,OE)1Z5VL-'E&Z3UC7!<F$I1BZ5J&I2H&N4)@AF3C80=YHHI*B5`O)5Z`-B
-M2DT=XD4H6A!3I!AJ!<>1U0!<JEY0?%W8<;>7WW.)%,_5J%)'TZPU67&'^#F_
-M*O$LE6>W"X-WD5J=L(9E")!6-2JL%&NEBFJ3!T+LNPYW(^=:&'(NF&3<9>7;
-M/U/OH+A66348+SQE-J.40+:`6<:+48JS6*@<Y\J_OBQS>;*"1JC'ACI5HBJE
-MDF(X0==18'T`*R>T)O%^+633HLS+PJ(+12^48)W4[.6?VPM-:PJR2DEZT6*+
-M5_980(*!*69RV?]GA*L#R.?7W/%2_^>*"%32I"JD]H5:#*]-BGV;,#/$"V(%
-M<2&[D!%RJ8N;5;$NNU&\4H>.UUCTSYLP').:U'43CE"5%7^M=2,O^@54`UT"
-ME`H"KK7*5CG%7B1L6?6!U^Z(30R8"::*ARH!N=22CJ_)N,;Y;)EL3G%J;%?M
-MLDY5Z^+FSJNMO4C5_D74^"L1>\6/VK54[<'7JP9NM2NX2/W.NL%7!JRD5Q7C
-MRN<XN\1/A<I"MK*BSF>-BE>W%'3UV/^SM?__KL(7*2#82W)X#9MU"E,#\:I\
-M:CW;SU</UIQQA^A>U@0J-6FH@&$B>!!LI?N*5W2HWO*UT-466%]YV\)%<UL_
-MJZOZN?96_OI.A=L7]R1>3E16+<U7]5JK(7[)!G<PIY@3W3)NAE@AK)ML%`C5
-M=J$FEB`448HXQ5=5'WFY3E"/=I6"ULVY7&*\>KIVK:MH9Q7WY8M(NNC5*P^Z
-M$KK$]?4+CEDMNFI&).=U54/<JI>3U.9.A$:5%)0EE/4^Q.OCKWY7>Y7,:^R:
-MKW<GW&N..36??*TCE_!YC3#VZCZ&U@L*0:HX&%;9%;<J<'AM>?XO+.\[U&WH
-.P#``````245.1*Y"8((`
-`
-end
diff --git a/community-testing/scummvm-tools/PKGBUILD b/community-testing/scummvm-tools/PKGBUILD
deleted file mode 100644
index 57a545833..000000000
--- a/community-testing/scummvm-tools/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63278 2012-01-30 19:08:00Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jérémie Dimino <jeremie@dimino.org>
-# Contributor: Sebastian Hase <sebastian_hase@gmx.de>
-# Contributor: Joe Davison <joe@thosedamnpeanuts.com>
-pkgname=scummvm-tools
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM"
-url="http://www.scummvm.org/"
-license=('GPL')
-depends=('libpng' 'wxgtk' 'flac' 'libvorbis')
-arch=('i686' 'x86_64')
-source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz)
-md5sums=('43cbf9f5c4939876cf4149dd59e68044')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  install -d ${pkgdir}/usr/bin
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -Dm 644 README ${pkgdir}/usr/share/doc/scummvm-tools/README
-  install -Dm 644 convert_dxa.sh ${pkgdir}/usr/share/doc/scummvm-tools/samples/convert_dxa.sh
-}
-#vim: sw=2 ts=2 et:
diff --git a/community-testing/setconf/PKGBUILD b/community-testing/setconf/PKGBUILD
deleted file mode 100644
index 75567f02d..000000000
--- a/community-testing/setconf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 64103 2012-02-08 23:55:20Z allan $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-pkgname=setconf
-pkgver=0.3.2
-pkgrel=4
-pkgdesc="Utility to easily change settings in Makefiles and configuration files"
-arch=('x86_64' 'i686')
-url="http://setconf.roboticoverlords.org/"
-license=('GPL')
-depends=('pcre' 'gc')
-makedepends=('shedskin>=0.9.1')
-source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2")
-sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  shedskin "$pkgname.py"
-  make CPPFLAGS="-march=native -fomit-frame-pointer"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/silly/PKGBUILD b/community-testing/silly/PKGBUILD
deleted file mode 100644
index 642de82ca..000000000
--- a/community-testing/silly/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 63280 2012-01-30 19:08:06Z ibiru $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
-
-pkgname=silly
-pkgver=0.1.0
-pkgrel=5
-pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project"
-arch=('i686' 'x86_64')
-url="http://www.cegui.org.uk/wiki/index.php/SILLY"
-license=('MIT')
-depends=('libjpeg' 'libpng' 'gcc-libs')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz
-        silly-libpng1.5.patch)
-md5sums=('c3721547fced7792a36ffc9ce6ec23fd'
-         '530551c2942aea6fa20f10d06f1e604f')
-
-build() {
-  cd "${srcdir}/SILLY-${pkgver}"
-  patch -Np1 < $srcdir/silly-libpng1.5.patch
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/community-testing/silly/silly-libpng1.5.patch b/community-testing/silly/silly-libpng1.5.patch
deleted file mode 100644
index 0b2d27252..000000000
--- a/community-testing/silly/silly-libpng1.5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-ILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp
---- SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~    2006-06-19 00:42:12.000000000 +0200
-+++ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp 2011-12-06 14:38:31.738251526 +0100
-@@ -64,10 +64,7 @@ void PNG_error_function(png_structp png_
-                         png_const_charp error)
- {
-     //  printf("PNG Error: %s\n", error);
--    // copied from libpng's pngerror.cpp
--    jmp_buf buf;
--    memcpy(buf, png_ptr->jmpbuf, sizeof(jmp_buf));
--    longjmp(buf, 1);
-+    png_longjmp(png_ptr, 1);
- }
-
diff --git a/community-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD
deleted file mode 100644
index 2f60020b0..000000000
--- a/community-testing/smc/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 63282 2012-01-30 19:08:17Z ibiru $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=14
-pkgdesc="Secret Maryo Chronicles"
-arch=('i686' 'x86_64')
-url="http://www.secretmaryo.org/"
-license=('GPL3')
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
-makedepends=('autoconf' 'automake' 'boost')
-source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
-        smc-for-cegui-v0-7.diff
-        smc.desktop
-        smc.png)
-md5sums=('75ab7826303c49aec25b052a8b90287f'
-         '51dfea21b741ad19df14e738df52f1cf'
-         '80fe208132ff41dd7677a53ee429ecdb'
-         'efca7580e28748625eb676c9d24ee122')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # to remove when smc will be compatible with cegui-0.7.x
-  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
-  # fix for boost-1.46
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  ./autogen.sh
-  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make install DESTDIR="$pkgdir"
-  # install some freedesktop.org compatibility
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  rm -rf "$pkgdir/usr/share/smc/"
-}
diff --git a/community-testing/smc/smc-for-cegui-v0-7.diff b/community-testing/smc/smc-for-cegui-v0-7.diff
deleted file mode 100644
index a99cbce6c..000000000
--- a/community-testing/smc/smc-for-cegui-v0-7.diff
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
---- smc-1.9/configure.ac	2009-08-17 15:59:00.000000000 +0200
-+++ smc-1.9-b/configure.ac	2011-01-19 00:43:37.809884881 +0100
-@@ -53,7 +53,7 @@
- 	AC_MSG_ERROR([SDL_ttf library not found]))
- 
- # Check for the CEGUI library
--PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
-+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
- CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
- LIBS="$LIBS $CEGUI_LIBS"
- 
-diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
---- smc-1.9/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
-+++ smc-1.9-b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
-@@ -118,16 +118,10 @@
- 	return tmp;

- }

- 

--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const

-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const

- {

- 	// draw text

--	list_text->draw( position, alpha, clipper );

--}

--

--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const

--{

--	// draw text

--	list_text->draw( cache, targetRect, zBase, alpha, clipper );

-+	list_text->draw( buffer, targetRect, alpha, clipper );

- }

- 

- void cEditor_Item_Object :: Draw_Image( void )

-@@ -533,12 +527,12 @@
- 	if( editor_window->getXPosition().asRelative( 1 ) >= 0 )

- 	{

- 		// Listbox dimension

--		float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;

--		float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;

-+		float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;

-+		float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;

- 		// Vertical ScrollBar Position

- 		float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;

- 		// font height

--		float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;

-+		float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;

- 

- 		// draw items

- 		for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )

-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h
---- smc-1.9/src/core/editor.h	2009-02-18 05:21:30.000000000 +0100
-+++ smc-1.9-b/src/core/editor.h	2011-01-19 00:43:37.809884881 +0100
-@@ -62,8 +62,7 @@
- 	*/

- 	virtual	CEGUI::Size getPixelSize( void ) const;

- 	// draw

--	void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;

--	void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;

-+	void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;

- 	// draw image

- 	void Draw_Image( void );

- 

-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp
---- smc-1.9/src/core/game_core.cpp	2009-08-16 18:44:42.000000000 +0200
-+++ smc-1.9-b/src/core/game_core.cpp	2011-01-19 00:59:02.668958883 +0100
-@@ -265,7 +265,7 @@
- 

- 

- 	// align text

--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );

-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );

- 	// fixme : Can't handle multiple lines of text

- 	float text_width = font->getTextExtent( text ) * global_downscalex;

- 

-@@ -1182,7 +1182,7 @@
- 	text_default->setText( gui_text );

- 

- 	// align text

--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );

-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );

- 	float text_width = font->getTextExtent( gui_text ) * global_downscalex;

- 

- 	text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );

-@@ -1190,7 +1190,7 @@
- 	text_default->moveToFront();

- 

- 	// set window height

--	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );

-+	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );

- 

- 	while( draw )

- 	{

-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp
---- smc-1.9/src/core/main.cpp	2009-05-12 10:36:04.000000000 +0200
-+++ smc-1.9-b/src/core/main.cpp	2011-01-19 00:43:37.809884881 +0100
-@@ -444,13 +444,15 @@
- 
- 	if( pGuiSystem )
- 	{
--		delete pGuiSystem;
-+		CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider();
-+		pGuiSystem->destroy();
- 		pGuiSystem = NULL;
-+		delete rp;
- 	}
- 
- 	if( pGuiRenderer )
- 	{
--		delete pGuiRenderer;
-+		pGuiRenderer->destroy( *pGuiRenderer );
- 		pGuiRenderer = NULL;
- 	}
- 
-@@ -507,7 +509,7 @@
- 		}
- 		case SDL_VIDEORESIZE:
- 		{
--			pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
-+			pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
- 			break;
- 		}
- 		case SDL_KEYDOWN:
-diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp
---- smc-1.9/src/gui/hud.cpp	2009-05-01 15:00:16.000000000 +0200
-+++ smc-1.9-b/src/gui/hud.cpp	2011-01-19 00:43:37.816550365 +0100
-@@ -946,7 +946,7 @@
- 		m_text_debug_text->setVisible( 1 );

- 

- 		// update position

--		CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );

-+		CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );

- 		float text_width = font->getTextExtent( gui_text ) * global_downscalex;

- 

- 		if( text_width > 800.0f )

-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp
---- smc-1.9/src/input/mouse.cpp	2009-04-24 21:16:58.000000000 +0200
-+++ smc-1.9-b/src/input/mouse.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -432,17 +432,12 @@
- 

- void cMouseCursor :: Render( void ) const

- {

--	if( !m_active )

--	{

-+	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();

-+

-+	if ( m_active == mouse->isVisible() )

- 		return;

--	}

- 

--	// Render CEGUI Mouse

--	pGuiRenderer->setQueueingEnabled( 0 );

--	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();

--	mouse->setVisible( 1 );

--	mouse->draw();

--	mouse->setVisible( 0 );

-+	mouse->setVisible( m_active );

- }

- 

- void cMouseCursor :: Update_Position( void )

-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp
---- smc-1.9/src/level/level_settings.cpp	2009-08-07 03:04:28.000000000 +0200
-+++ smc-1.9-b/src/level/level_settings.cpp	2011-01-19 01:06:59.064259070 +0100
-@@ -163,8 +163,8 @@
- 	editbox->setText( int_to_string( bg_color_2.blue ).c_str() );

- 	// preview window

- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );

--	background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );

--	background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );

-+	background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );

-+	background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );

- 

- 	Update_BG_Colors( CEGUI::EventArgs() );

- 

-@@ -555,8 +555,8 @@
- 

- 	// set default rect

- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );

--	background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;

--	background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;

-+	background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;

-+	background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;

- 

- 	if( !File_Exists( filename ) )

- 	{

-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp
---- smc-1.9/src/objects/sprite.cpp	2009-04-18 09:55:06.000000000 +0200
-+++ smc-1.9-b/src/objects/sprite.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -1663,7 +1663,7 @@
- 	window_name->setText( name );

- 	window_name->setTooltipText( tooltip );

- 	// get text width

--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );

-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );

- 	float text_width = 12 + font->getTextExtent( name ) * global_downscalex;

- 	// all names should have the same width

- 	if( text_width > m_editor_window_name_width )

-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp
---- smc-1.9/src/video/video.cpp	2009-07-04 11:46:56.000000000 +0200
-+++ smc-1.9-b/src/video/video.cpp	2011-01-19 01:22:45.338524592 +0100
-@@ -103,15 +103,15 @@
- 

- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */

- 

--cFake_Renderer :: cFake_Renderer( void )

--{

--	d_identifierString = "Fake Renderer";

--}

-+//cFake_Renderer :: cFake_Renderer( void )

-+//{

-+//	d_identifierString = "Fake Renderer";

-+//}

- 

--cFake_Renderer :: ~cFake_Renderer( void )

--{

-+//cFake_Renderer :: ~cFake_Renderer( void )

-+//{

- 

--}

-+//}

- 

- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */

- 

-@@ -158,7 +158,7 @@
- 	std::string log_dump_dir = "/dev/null";

- #endif

- 	// create fake system and renderer

--	pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );

-+	pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );

- }

- 

- void cVideo :: Delete_CEGUI_Fake( void ) const

-@@ -166,7 +166,7 @@
- 	CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();

- 	CEGUI::Renderer *renderer = pGuiSystem->getRenderer();

- 

--	delete pGuiSystem;

-+	pGuiSystem->destroy();

- 	pGuiSystem = NULL;

- 	delete renderer;

- 	delete rp;

-@@ -177,7 +177,7 @@
- 	// create renderer

- 	try

- 	{

--		pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );

-+		pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

-@@ -186,10 +186,10 @@
- 		exit( EXIT_FAILURE );

- 	}

- 

--	/* create Resource Provider

--	 * no need to destroy it later since it is handled by the CEGUI renderer

--	*/

--	CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());

-+	pGuiRenderer->enableExtraStateSettings(true);

-+

-+	// create Resource Provider

-+	CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;

- 

- 	// set Resource Provider directories

- 	rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );

-@@ -215,7 +215,7 @@
- 	// create system

- 	try

- 	{

--		pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );

-+		pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

-@@ -242,7 +242,7 @@
- 	// load the scheme file, which auto-loads the imageset

- 	try

- 	{

--		CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );

-+		CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

-@@ -254,9 +254,7 @@
- 	// default mouse cursor

- 	pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );

- 	// force new mouse image

--	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );

--	// hide CEGUI mouse always because we render it manually

--	CEGUI::MouseCursor::getSingleton().hide();

-+	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );

- 	// default tooltip

- 	pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );

- 	// create default root window

-@@ -553,7 +551,7 @@
- 		pFont->Restore_Textures();

- 

- 		// send new size to CEGUI

--		pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );

-+		pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );

- 

- 		// check if CEGUI is initialized

- 		bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;

-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h
---- smc-1.9/src/video/video.h	2009-07-04 10:49:50.000000000 +0200
-+++ smc-1.9-b/src/video/video.h	2011-01-19 01:16:42.791283379 +0100
-@@ -23,7 +23,7 @@
- #include "SDL_opengl.h"

- // CEGUI

- #include "CEGUI.h"

--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"

-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>

- 

- namespace SMC

- {

-@@ -129,31 +129,100 @@
- 	EFFECT_IN_AMOUNT

- };

- 

--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */

-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */

-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...

-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer

-+{

-+	void draw() const {}

-+	void setTranslation(const CEGUI::Vector3&) {}

-+	void setRotation(const CEGUI::Vector3&) {}

-+	void setPivot(const CEGUI::Vector3&) {}

-+	void setClippingRegion(const CEGUI::Rect&) {}

-+	void appendVertex(const CEGUI::Vertex&) {}

-+	void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}

-+	void setActiveTexture(CEGUI::Texture*) {}

-+	void reset() {}

-+	CEGUI::Texture* getActiveTexture() const { return 0; }

-+	CEGUI::uint getVertexCount() const { return 0; }

-+	CEGUI::uint getBatchCount() const { return 0; }

-+	void setRenderEffect(CEGUI::RenderEffect*) {}

-+	CEGUI::RenderEffect* getRenderEffect() { return 0; }

-+};

- 

--class cFake_Renderer : public CEGUI::Renderer

-+class cFake_Texture : public CEGUI::Texture

-+{

-+public:

-+	cFake_Texture() :

-+	  m_size(1, 1),

-+	  m_scaling(1, 1) {}

-+

-+	const CEGUI::Size& getSize() const { return m_size; }

-+	const CEGUI::Size& getOriginalDataSize() const { return m_size; }

-+	const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }

-+	void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}

-+	void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}

-+	void saveToMemory(void*) {}

-+

-+private:

-+	CEGUI::Size m_size;

-+	CEGUI::Vector2 m_scaling;

-+};

-+

-+class cFake_RenderTarget : public CEGUI::RenderTarget

- {

- public:

--	cFake_Renderer( void );

--	virtual ~cFake_Renderer( void );

-+	cFake_RenderTarget() : m_area(0, 0, 0, 0) {}

-+	void draw(const CEGUI::GeometryBuffer&) {}

-+	void draw(const CEGUI::RenderQueue&) {}

-+	void setArea(const CEGUI::Rect&) {}

-+	const CEGUI::Rect& getArea() const { return m_area; }

-+	bool isImageryCache() const { return false; }

-+	void activate() {}

-+	void deactivate() {}

-+	void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}

-+

-+private:

-+	CEGUI::Rect m_area;

-+};

- 

--	virtual	void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};

--	virtual	void doRender(void) {};

--	virtual	void clearRenderList(void) {};

--	virtual void setQueueingEnabled(bool setting) {};

--	virtual	CEGUI::Texture *createTexture(void) { return NULL; };

--	virtual	CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };

--	virtual	CEGUI::Texture *createTexture(float size) { return NULL; };

--	virtual	void destroyTexture(CEGUI::Texture* texture) {};

--	virtual void destroyAllTextures(void) {};

--	virtual bool isQueueingEnabled(void) const { return 0; };

--	virtual float getWidth(void) const { return 0; };

--	virtual float getHeight(void) const { return 0; };

--	virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};

--	virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};

--	virtual	unsigned int getMaxTextureSize(void) const { return 0; };

--	virtual	unsigned int getHorzScreenDPI(void) const { return 0; };

--	virtual	unsigned int getVertScreenDPI(void) const { return 0; };

-+class cFake_Renderer : public CEGUI::Renderer

-+{

-+public:

-+	cFake_Renderer( void ) :

-+	  m_size(0, 0),

-+	  m_dpi(0, 0),

-+	  m_identifierString("Fake Renderer"),

-+	  m_root(m_target) {}

-+	~cFake_Renderer( void ) {}

-+

-+	CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }

-+	CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }

-+	void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}

-+	void destroyAllGeometryBuffers() {}

-+	CEGUI::TextureTarget* createTextureTarget() { return 0; }

-+	void destroyTextureTarget(CEGUI::TextureTarget*) {}

-+	void destroyAllTextureTargets() {}

-+	CEGUI::Texture& createTexture() { return m_texture; }

-+	CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }

-+	CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }

-+	void destroyTexture(CEGUI::Texture&) {}

-+	void destroyAllTextures() {}

-+	void beginRendering() {}

-+	void endRendering() {}

-+	void setDisplaySize(const CEGUI::Size&) {}

-+	const CEGUI::Size& getDisplaySize() const { return m_size; }

-+	const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }

-+	CEGUI::uint getMaxTextureSize() const { return 0; }

-+	const CEGUI::String& getIdentifierString() const { return m_identifierString; }

-+

-+private:

-+	CEGUI::Size m_size;

-+	CEGUI::Vector2 m_dpi;

-+	CEGUI::String m_identifierString;

-+	cFake_GeometryBuffer m_geometry;

-+	cFake_Texture m_texture;

-+	cFake_RenderTarget m_target;

-+	CEGUI::RenderingRoot m_root;

- };

- 

- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */

diff --git a/community-testing/smc/smc.desktop b/community-testing/smc/smc.desktop
deleted file mode 100644
index 6cfe5b018..000000000
--- a/community-testing/smc/smc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]

-Name=Secret Maryo Chronicles

-GenericName=Arcade Game

-Exec=smc

-Icon=smc.png

-Terminal=false

-Type=Application

-Categories=Game;ArcadeGame;KidsGame;

-StartupNotify=false
\ No newline at end of file
diff --git a/community-testing/smc/smc.png b/community-testing/smc/smc.png
deleted file mode 100644
index f02af1bfc..000000000
--- a/community-testing/smc/smc.png
+++ /dev/null
diff --git a/community-testing/snort/PKGBUILD b/community-testing/snort/PKGBUILD
deleted file mode 100644
index 6221b4feb..000000000
--- a/community-testing/snort/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 64105 2012-02-08 23:55:33Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-
-pkgname=snort
-pkgver=2.9.2.1
-pkgrel=2
-pkgdesc='A lightweight network intrusion detection system.'
-arch=('i686' 'x86_64')
-url='http://www.snort.org'
-license=('GPL')
-depends=('libdaq' 'libdnet' 'libpcap' 'pcre' 'zlib')
-makedepends=('ca-certificates')
-backup=('etc/conf.d/snort'
-        'etc/snort/snort.conf'
-        'etc/snort/threshold.conf'
-        'etc/snort/confreference.config'
-        'etc/snort/classification.config')
-options=('!makeflags' '!libtool')
-install='snort.install'
-source=('http://www.snort.org/downloads/1416'
-        'snort'
-        'snort.conf.d')
-md5sums=('2f3e2b6ee72adbdfac73cb1c6c14bd61'
-         '361b8b9e40b9af0164f6b3e3da2e8277'
-         'b4fb8a68490589cd34df93de7609bfac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc/snort --with-libpcap-includes=/usr/include/pcap \
-              --without-mysql --without-postgresql --without-oracle --without-odbc --enable-zlib \
-              --enable-ipv6
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  mkdir -p "${pkgdir}/"{etc/rc.d,etc/snort/rules}
-
-  install -d -m755 "${pkgdir}/var/log/snort"
-  install -D -m644 etc/{*.conf*,*.map} "${pkgdir}/etc/snort/"
-  install -D -m644 "${srcdir}/snort.conf.d" "${pkgdir}/etc/conf.d/snort"
-  install -D -m755 "${srcdir}/snort" "${pkgdir}/etc/rc.d/snort"
-
-  sed -i 's#/usr/local/lib/#/usr/lib/#' "${pkgdir}/etc/snort/snort.conf"
-}
diff --git a/community-testing/snort/snort b/community-testing/snort/snort
deleted file mode 100644
index 5dfa72fbf..000000000
--- a/community-testing/snort/snort
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/snort ] && . /etc/conf.d/snort
-
-PID=`pidof -o %PPID /usr/bin/snort`
-case "$1" in
-  start)
-    stat_busy "Starting Intrusion Database System: SNORT"
-    [ -z "$PID" ] && /usr/bin/snort ${SNORT_OPTIONS} -u ${USER} -g ${GROUP} \
-                    -i ${INTERFACE} -c ${SNORT_CONF}
-	 if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon snort
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Intrusion Database System: SNORT"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon snort
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/snort/snort.conf.d b/community-testing/snort/snort.conf.d
deleted file mode 100644
index 86b566abc..000000000
--- a/community-testing/snort/snort.conf.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Parameters to be passed to snort
-#
-
-# options taken from Fedora
-# http://cvs.fedoraproject.org/viewcvs/devel/snort/sysconfig.snort?rev=1.2&view=markup
-
-# Where is the snort.conf file.
-SNORT_CONF="/etc/snort/snort.conf"
-
-# What user account should we run under.
-USER="snort"
-
-# What group account should we run under. 
-GROUP="snort"
-
-# define the interface we listen on
-INTERFACE="eth0"
-
-# If you are using prelude, delete the '-A fast' option
-SNORT_OPTIONS="-A fast -b -l /var/log/snort -D -p"
diff --git a/community-testing/snort/snort.install b/community-testing/snort/snort.install
deleted file mode 100644
index 673f22c6c..000000000
--- a/community-testing/snort/snort.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  getent group snort >/dev/null || usr/sbin/groupadd -g 29 snort
-  getent passwd snort >/dev/null || usr/sbin/useradd -c 'Snort user' -u 29 -g snort -d /var/log/snort -s /bin/false snort
-  usr/bin/passwd -l snort &>/dev/null
-
-  [ -f var/log/snort/alert ] || : >var/log/snort/alert
-  chown snort.snort var/log/snort/ -R
-
-cat << _EOF  
-
->>> You have to edit the HOME_NET variable in the /etc/snort/snort.conf file to reflect your local network.
->>> If you do not change it, snort may not work.
-
-_EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel snort &>/dev/null
-  usr/sbin/groupdel snort &>/dev/null
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/speed-dreams/PKGBUILD b/community-testing/speed-dreams/PKGBUILD
deleted file mode 100644
index db818e3be..000000000
--- a/community-testing/speed-dreams/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 63286 2012-01-30 19:08:35Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com>
-# Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD)
-pkgname=speed-dreams
-pkgver=2.0.0b1
-_pkgver=2.0.0-b1-r3937
-pkgrel=2
-pkgdesc="A racing simulator with rich graphics and physics"
-arch=('i686' 'x86_64')
-url="http://speed-dreams.sourceforge.net/"
-license=('GPL2')
-depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data')
-makedepends=('cmake' 'p7zip')
-noextract=(${pkgname}-${_pkgver}-src.tar.7z)
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z"
-        "${pkgname}.desktop")
-md5sums=('5299fe23aec3641827039ae3c69de460'
-         '6b45e9c40984ebb79a1dfaddbfabde92')
-
-build() {
-  7z x ${pkgname}-${_pkgver}-src.tar.7z
-  tar xf ${pkgname}-${_pkgver}-src.tar
-
-  cd "${pkgname}-${_pkgver}-src"
-
-  cmake . \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSD_BINDIR=/usr/bin \
-    -DSD_DATADIR=/usr/share/speed-dreams-2 \
-    -DSD_LIBDIR=/usr/lib/speed-dreams-2 \
-    -DOPTION_OFFICIAL_ONLY:BOOL=ON
-
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${_pkgver}-src"
-  
-  make DESTDIR="${pkgdir}/" install
-
-  rm -r "${pkgdir}/usr/share"
-
-  install -Dm644 "data/data/icons/icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png"
-  install -Dm644 "data/data/icons/icon.svg" "${pkgdir}/usr/share/pixmaps/speed-dreams.svg"
-  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop"
-
-  mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
-  cp -r doc/* "${pkgdir}/usr/share/doc/${pkgname}/"
-  rm -r "${pkgdir}/usr/share/doc/${pkgname}/man"
-
-  mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}"
-  cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}"
-
-  # Symlink for backwards compatibility
-  cd "${pkgdir}/usr/bin"
-  ln -s speed-dreams-2 speed-dreams
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/speed-dreams/speed-dreams.desktop b/community-testing/speed-dreams/speed-dreams.desktop
deleted file mode 100644
index f04b71791..000000000
--- a/community-testing/speed-dreams/speed-dreams.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Speed Dreams
-Comment=The Open Racing Car Simulator Fork
-Exec=speed-dreams-2
-Icon=speed-dreams.svg
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
diff --git a/community-testing/synfig/PKGBUILD b/community-testing/synfig/PKGBUILD
deleted file mode 100644
index 16b7885ad..000000000
--- a/community-testing/synfig/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 63288 2012-01-30 19:08:44Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Franco Iacomella <yaco@gnu.org>
-
-pkgname=synfig
-pkgver=0.63.03
-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=('9bd77cd2fc2381adfbd50a7b9c1c6e7c'
-         'b5568b06fae1a7ee465b5380b1139b83'
-         'ebf41046097cfd778dee9a9854561dae')
-
-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
-}
diff --git a/community-testing/synfig/build-fix.patch b/community-testing/synfig/build-fix.patch
deleted file mode 100644
index be45fdc68..000000000
--- a/community-testing/synfig/build-fix.patch
+++ /dev/null
@@ -1,31 +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 --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/ted/PKGBUILD b/community-testing/ted/PKGBUILD
deleted file mode 100644
index 08c756159..000000000
--- a/community-testing/ted/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 64107 2012-02-08 23:55:42Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=ted
-pkgver=2.21
-pkgrel=5
-pkgdesc="An easy rich text processor (with footnote support)"
-arch=('i686' 'x86_64')
-url="http://www.nllgg.nl/Ted/"
-depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
-license=('GPL')
-source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz 
-        ted-2.21-libpng15.patch)
-md5sums=('34ae855938a3b364eb587cca504ba356'
-         '0c339b0fa7aec6b150e07e9027cd360c')
-
-build() {
-  cd "$srcdir/Ted-$pkgver"
-  sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile
-  patch -p0 -i ../ted-2.21-libpng15.patch
-  make compile.shared
-  make package.shared
-}
-
-package() {
-  cd "$srcdir/Ted-$pkgver"
-  mkdir -p "$pkgdir/usr/share/"
-  cd "$pkgdir/usr/share/"
-  tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz"
-  mv bin ../
-  mkdir -p "$pkgdir/usr/share/man/man1"
-  cd "$pkgdir/usr/share/Ted/"
-  mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/
-  sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh
-  mv *.sh "$pkgdir/usr/bin/"
-}
diff --git a/community-testing/ted/ted-2.21-libpng15.patch b/community-testing/ted/ted-2.21-libpng15.patch
deleted file mode 100644
index afd30f9a4..000000000
--- a/community-testing/ted/ted-2.21-libpng15.patch
+++ /dev/null
@@ -1,423 +0,0 @@
-This patch is from netbsd pkgsrc
-
-ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/
-
---- bitmap/bmpng.c
-+++ bitmap/bmpng.c
-@@ -20,23 +20,32 @@
- /*									*/
- /************************************************************************/
- 
--static int bpPngiToBitmap(	const png_info *		pngi,
-+static int bpPngiToBitmap(	const png_structp		pngp,
-+				png_info *			pngi,
- 				BitmapDescription *		bd )
-     {
-     unsigned int	col;
-+    png_uint_32		res_x, res_y;
-+    int			unit_type= 0;
- 
--    bd->bdPixelsWide= pngi->width;
--    bd->bdPixelsHigh= pngi->height;
-+    bd->bdPixelsWide= png_get_image_width( pngp, pngi );
-+    bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
-     bd->bdHasAlpha= 0;
- 
--    switch( pngi->color_type )
-+    switch( png_get_color_type( pngp, pngi ) )
- 	{
- 	case PNG_COLOR_TYPE_PALETTE:
-+	    {
-+	    int		num_palette;
-+	    png_colorp	palette;
-+
-+	    png_get_PLTE( pngp, pngi, &palette, &num_palette );
-+
- 	    bd->bdColorEncoding= BMcoRGB8PALETTE;
--	    bd->bdColorCount= pngi->num_palette;
-+	    bd->bdColorCount= num_palette;
- 	    bd->bdBitsPerSample= 8;
- 	    bd->bdSamplesPerPixel= 3;
--	    bd->bdBitsPerPixel= pngi->bit_depth;
-+	    bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
- 
- 	    bd->bdRGB8Palette= (RGB8Color *)
- 				malloc( bd->bdColorCount* sizeof(RGB8Color) );
-@@ -46,47 +55,51 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	    for ( col= 0; col < bd->bdColorCount; col++ )
- 		{
--		bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
--		bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
--		bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
-+		bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
-+		bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
-+		bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
- 		bd->bdRGB8Palette[col].rgb8Alpha= 0;
- 		}
-+	    }
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB:
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY:
- 	    bd->bdColorEncoding= BMcoWHITEBLACK;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_RGB_ALPHA:
- 	    bd->bdHasAlpha= 1;
- 	    bd->bdColorEncoding= BMcoRGB;
--	    bd->bdBitsPerSample= pngi->bit_depth;
--	    bd->bdSamplesPerPixel= pngi->channels;
--	    bd->bdBitsPerPixel= pngi->pixel_depth;
-+	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- 	    break;
- 
- 	case PNG_COLOR_TYPE_GRAY_ALPHA:
- 	    bd->bdHasAlpha= 1;
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 
- 	default:
--	    LDEB(pngi->color_type); return -1;
-+	    LDEB(png_get_color_type( pngp, pngi )); return -1;
- 	}
- 
--    bd->bdBytesPerRow= pngi->rowbytes;
-+    bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
-     bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
- 
--    switch( pngi->phys_unit_type )
-+    if  ( !  png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
-+	{ unit_type= PNG_RESOLUTION_UNKNOWN;	}
-+
-+    switch( unit_type )
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
- 	    bd->bdUnit= BMunPIXEL;
-@@ -96,12 +109,12 @@ static int bpPngiToBitmap(	const png_inf
- 
- 	case PNG_RESOLUTION_METER:
- 	    bd->bdUnit= BMunM;
--	    bd->bdXResolution= pngi->x_pixels_per_unit;
--	    bd->bdYResolution= pngi->y_pixels_per_unit;
-+	    bd->bdXResolution= res_x;
-+	    bd->bdYResolution= res_y;
- 	    break;
- 
- 	default:
--	    LDEB(pngi->phys_unit_type);
-+	    LDEB(unit_type);
- 	    return -1;
- 	}
- 
-@@ -119,11 +132,11 @@ static int bmPngReadContents(	png_info *
-     unsigned char *		buffer;
- 
-     numberOfPasses= 1;
--    if  ( pngi->interlace_type )
-+    if  ( png_get_interlace_type( png, pngi ) )
- 	{ numberOfPasses= png_set_interlace_handling( png ); }
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  pngi->bit_depth == 16				)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  png_get_bit_depth( png, pngi ) == 16			)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -133,9 +146,6 @@ static int bmPngReadContents(	png_info *
- 	}
- 
-     png_start_read_image( png );
--    /*
--    png_read_update_info( png, pngi );
--    */
- 
-     buffer= (unsigned char *)malloc( bd->bdBufferLength );
-     if  ( ! buffer )
-@@ -236,9 +246,9 @@ int bmPngReadPng(	BitmapDescription *	bd
- 
-     png_read_info( pngp, pngip );
- 
--    if  ( bpPngiToBitmap( pngip, bd ) )
-+    if  ( bpPngiToBitmap( pngp, pngip, bd ) )
- 	{
--	LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette); 
-+	LLDEB(bd->bdColorCount,bd->bdRGB8Palette); 
- 	png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
- 	return -1;
- 	}
-@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
- 
- static int bpPngiFromBitmap(	png_structp			png,
- 				png_info *			pngi,
-+				png_colorp *			pPalette,
- 				const BitmapDescription *       bd )
-     {
--    png_info_init( pngi );
--    pngi->width= bd->bdPixelsWide;
--    pngi->height= bd->bdPixelsHigh;
-+    int			bit_depth;
-+    int			color_type;
-+    png_color_8		sig_bit;
- 
-     switch( bd->bdUnit )
- 	{
- 	case BMunM:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= bd->bdXResolution;
--	    pngi->y_pixels_per_unit= bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    bd->bdXResolution,
-+			    bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunINCH:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
--	    pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    (int)( 39.37* bd->bdXResolution ),
-+			    (int)( 39.37* bd->bdYResolution ),
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPOINT:
--	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
--	    pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
--	    pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
--	    pngi->valid |= PNG_INFO_pHYs;
-+	    png_set_pHYs( png, pngi,
-+			    POINTS_PER_M* bd->bdXResolution,
-+			    POINTS_PER_M* bd->bdYResolution,
-+			    PNG_RESOLUTION_METER);
- 	    break;
- 
- 	case BMunPIXEL:
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
--	    pngi->x_pixels_per_unit= 1;
--	    pngi->y_pixels_per_unit= 1;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 
- 	default:
- 	    LDEB(bd->bdUnit);
--	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
-+	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- 	    break;
- 	}
- 
-@@ -329,41 +338,48 @@ static int bpPngiFromBitmap(	png_structp
- 
- 	case BMcoBLACKWHITE:
- 	case BMcoWHITEBLACK:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
-+	    bit_depth= bd->bdBitsPerPixel;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_GRAY;	}
--	    pngi->sig_bit.gray= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_GRAY;		}
-+	    sig_bit.gray= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB:
--	    pngi->bit_depth= bd->bdBitsPerSample;
-+	    bit_depth= bd->bdBitsPerSample;
- 	    if  ( bd->bdHasAlpha )
--		{ pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
--	    else{ pngi->color_type= PNG_COLOR_TYPE_RGB;		}
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
-+		{ color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
-+	    else{ color_type= PNG_COLOR_TYPE_RGB;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
- 	    break;
- 
- 	case BMcoRGB8PALETTE:
--	    pngi->bit_depth= bd->bdBitsPerPixel;
--	    pngi->color_type= PNG_COLOR_TYPE_PALETTE;
-+	    bit_depth= bd->bdBitsPerPixel;
-+	    color_type= PNG_COLOR_TYPE_PALETTE;
- 
--	    pngi->valid |= PNG_INFO_PLTE;
--	    pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
--	    if  ( ! pngi->palette )
--		{ XDEB(pngi->palette); return -1;	}
--	    pngi->num_palette= bd->bdColorCount;
--	    pngi->sig_bit.red= bd->bdBitsPerSample;
--	    pngi->sig_bit.green= bd->bdBitsPerSample;
--	    pngi->sig_bit.blue= bd->bdBitsPerSample;
--	    for ( i= 0; i < pngi->num_palette; i++ )
-+	    if  ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
- 		{
--		pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
--		pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
--		pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
-+		return -1;
- 		}
-+
-+	    *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
-+						    sizeof( png_color ) );
-+	    if  ( ! *pPalette )
-+		{ XDEB(*pPalette); return -1;	}
-+	    sig_bit.red= bd->bdBitsPerSample;
-+	    sig_bit.green= bd->bdBitsPerSample;
-+	    sig_bit.blue= bd->bdBitsPerSample;
-+	    for ( i= 0; i < bd->bdColorCount; i++ )
-+		{
-+		(*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
-+		(*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
-+		(*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+		}
-+
-+	    png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
- 	    break;
- 
- 	default:
-@@ -371,7 +387,13 @@ static int bpPngiFromBitmap(	png_structp
- 	    return -1;
- 	}
- 
--    pngi->interlace_type= 0;
-+    png_set_sBIT( png, pngi, &sig_bit );
-+    png_set_IHDR( png, pngi,
-+			bd->bdPixelsWide, bd->bdPixelsHigh,
-+			bit_depth, color_type,
-+			PNG_INTERLACE_NONE,
-+			PNG_COMPRESSION_TYPE_BASE,
-+			PNG_FILTER_TYPE_BASE );
- 
-     return 0;
-     }
-@@ -395,8 +417,8 @@ static void bmPngWriteContents(	png_stru
- 	    }
- 	}
- 
--    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	  bd->bdBitsPerSample == 16			)
-+    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	  bd->bdBitsPerSample == 16				)
- 	{
- 	const unsigned short	one= 1;
- 	const unsigned char *	testEndian= (const unsigned char *)&one;
-@@ -431,9 +453,9 @@ static void bmPngWriteContents(	png_stru
- 	    from= scratch;
- 	    }
- 
--	if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
--	      bd->bdBitsPerSample == 16			&&
--	      scratch					)
-+	if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
-+	      bd->bdBitsPerSample == 16					&&
-+	      scratch							)
- 	    {
- 	    int			col;
- 	    const BmUint16 *	fr= (const BmUint16 *)from;
-@@ -453,10 +475,6 @@ static void bmPngWriteContents(	png_stru
- 
-     png_write_end( png, pngi );
- 
--    if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	  pngi->palette					)
--	{ free( pngi->palette );	}
--
-     if  ( scratch )
- 	{ free( scratch );	}
- 
-@@ -510,50 +528,43 @@ int bmPngWritePng(		const BitmapDescript
- 				const unsigned char *		buffer,
- 				SimpleOutputStream *		sos )
-     {
-+    int			rval= 0;
-     png_structp		pngp= (png_structp)0;
-     png_infop		pngip= (png_infop)0;
-+    png_colorp		palette= (png_colorp)0;
- 
-     pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
- 				    (png_error_ptr)0, (png_error_ptr)0 );
-     if  ( ! pngp )
--	{ LDEB(1); return -1;	}
-+	{ XDEB(pngp); rval= -1; goto ready;	}
- 
-     pngip = png_create_info_struct( pngp );
-     if  ( ! pngip )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, (png_infop *)0 );
--	return -1;
--	}
-+	{ XDEB(pngip); rval= -1; goto ready;	}
-+
-+    /*
-+    As the info struct is built by libpng this is not needed:
-+    (The call will disappear from libpng in version 1.4)
-+    png_info_init( pngi ); 
-+    */
- 
-     if  ( setjmp( png_jmpbuf( pngp ) ) )
--	{
--	LDEB(1);
--	png_destroy_write_struct( &pngp, &pngip );
--	/*  Crashes:
--	if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
--	      pngip->palette				)
--	    { free( pngip->palette );	}
--	*/
--	return -1;
--	}
-+	{ LDEB(1); rval= -1; goto ready;	}
- 
-     png_init_io( pngp, (FILE *)0 );
-     png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
- 
--    if  ( bpPngiFromBitmap( pngp, pngip, bd ) )
--	{
--	LDEB(bd->bdColorEncoding);
--	png_destroy_write_struct( &pngp, &pngip );
--	return -1;
--	}
--
--    /*
--    png_write_info( pngp, pngip );
--    */
-+    if  ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
-+	{ LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
- 
-     bmPngWriteContents( pngp, pngip, buffer, bd );
- 
-+  ready:
-+
-+    if  ( palette )
-+	{ free( palette );	}
-+
-     png_destroy_write_struct( &pngp, &pngip );
--    return 0;
-+
-+    return rval;
-     }
diff --git a/community-testing/tmw/PKGBUILD b/community-testing/tmw/PKGBUILD
deleted file mode 100644
index bc7dba665..000000000
--- a/community-testing/tmw/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 63292 2012-01-30 19:09:03Z ibiru $
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=tmw
-pkgver=0.5.2
-pkgrel=2
-pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
-arch=('i686' 'x86_64')
-url="http://themanaworld.org"
-license=('GPL')
-depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' 
-'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf')
-makedepends=('cmake' 'mesa')
-source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2)
-md5sums=('c843ef420aced82db1e51fa14e80174a')
-
-build() {
-    cd "$srcdir"
-    cmake . -DCMAKE_INSTALL_PREFIX=/usr
-    make
-}
-
-package() {
-    cd "$srcdir"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/torcs/PKGBUILD b/community-testing/torcs/PKGBUILD
deleted file mode 100644
index 7f8a7c16a..000000000
--- a/community-testing/torcs/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63294 2012-01-30 19:09:14Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-
-pkgname=torcs
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="A 3D racing cars simulator using OpenGL"
-url="http://torcs.sourceforge.net"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis')
-makedepends=('plib')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2
-        torcs.desktop
-        torcs-gcc.patch)
-md5sums=('254b8f4c14d067dd63da8d54d3cfdba8'
-         '328e419e9f985c3e7b69924fe299330d'
-         '5ae7e903df37300d3b8744328c756bff')
-
-build() {
-  cd $srcdir/$pkgname-${pkgver/_/-}
-  unset LDFLAGS
-  ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib
-  make
-}
-
-package() {
-  depends=(${depends[@]} "torcs-data=$pkgver")
-  cd $srcdir/$pkgname-${pkgver/_/-}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png
-  install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop
-  find ${pkgdir} -type d -exec chmod 755 {} \;
-}
diff --git a/community-testing/torcs/torcs-gcc.patch b/community-testing/torcs/torcs-gcc.patch
deleted file mode 100644
index fcc5604e7..000000000
--- a/community-testing/torcs/torcs-gcc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp
---- src.old/drivers/olethros/Trajectory.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/drivers/olethros/Trajectory.cpp	2008-04-06 22:28:52.000000000 +0200
-@@ -10,8 +10,10 @@
-  ***************************************************************************/
- #include <cstdio>
- #include <cstdlib>
-+#include <cstring>
- #include <cmath>
- #include <cassert>
-+#include <ctime>
- #include <list>
- #include <vector>
- #include "Trajectory.h"
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:22:57.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- 
- #include <algorithm>
--#include <new.h>
-+#include <new>
- 
- class BBoxCompAxis {
- public:
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:23:11.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- #include "BBoxTree.h"
- 
--#include <new.h>
-+#include <new>
- 
- BBoxInternal *free_node;
- 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:22:29.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Object.h"
- #include "Encounter.h"
- 
--#include <new.h>
-+#include <new>
- 
- void addPair(ObjectPtr object1, ObjectPtr object2);
- void removePair(ObjectPtr object1, ObjectPtr object2);
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:22:40.000000000 +0200
-@@ -33,7 +33,7 @@
- #include "Convex.h" 
- #include "Complex.h" 
- 
--#include <new.h>
-+#include <new>
- 
- Object::Object(DtObjectRef obj, ShapePtr shape) : 
-   ref(obj), 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:22:12.000000000 +0200
-@@ -37,7 +37,7 @@
- }
- 
- #include <vector>
--#include <new.h>  
-+#include <new>  
- 
- typedef vector<unsigned int> IndexBuf;
- 
diff --git a/community-testing/torcs/torcs.desktop b/community-testing/torcs/torcs.desktop
deleted file mode 100644
index 03d1ba010..000000000
--- a/community-testing/torcs/torcs.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=TORCS
-Comment=The Open Racing Car Simulator
-Exec=torcs
-Icon=torcs.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
diff --git a/community-testing/torcs/torcs.sh b/community-testing/torcs/torcs.sh
deleted file mode 100644
index 0f1b4fe8d..000000000
--- a/community-testing/torcs/torcs.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-export PATH=$PATH:/opt/torcs/bin
diff --git a/community-testing/tuxpaint/PKGBUILD b/community-testing/tuxpaint/PKGBUILD
deleted file mode 100644
index 003e686ee..000000000
--- a/community-testing/tuxpaint/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 63296 2012-01-30 19:09:20Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
-# Adopted: royrocks <royrocks13@gmail.com>
-pkgname=tuxpaint
-pkgver=0.9.21
-pkgrel=5
-pkgdesc="Tux Paint is a free drawing program designed for young children."
-arch=('i686' 'x86_64')
-url="http://www.tuxpaint.org"
-license=('GPL')
-backup=('etc/tuxpaint/tuxpaint.conf')
-depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg')
-source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch)
-md5sums=('a88401d1860648098eeed819cff038fa'
-         '11d11119b3316c13f7b7a77048317bce')
-sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4'
-          '5595a65ebabc46bebd2d0670589effc8dbdd4e0c')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # python2 fix
- for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
-    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
- patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
- sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile
- echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop
- make PREFIX=/usr
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install
- chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/*
- chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html"
-}
diff --git a/community-testing/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch b/community-testing/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
deleted file mode 100644
index 25e80cd2a..000000000
--- a/community-testing/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
-No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
-
---- src/tuxpaint.c	2011/07/29 21:27:39	1.828
-+++ src/tuxpaint.c	2011/08/08 17:59:12	1.829
-@@ -13425,12 +13425,7 @@
-       {
- 	png_init_io(png_ptr, fi);
- 
--	info_ptr->width = surf->w;
--	info_ptr->height = surf->h;
--	info_ptr->bit_depth = 8;
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->interlace_type = 1;
--	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
-+        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 
- 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
- 				   PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/community-testing/tvtime/PKGBUILD b/community-testing/tvtime/PKGBUILD
deleted file mode 100644
index d1f042ba4..000000000
--- a/community-testing/tvtime/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 63298 2012-01-30 19:09:33Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:thefatprecious <marty@loomar.com>
-
-pkgname=tvtime
-pkgver=1.0.2
-pkgrel=3
-pkgdesc="A high quality television application for use with video capture cards"
-arch=('i686' 'x86_64')
-url='http://tvtime.sourceforge.net/'
-license=('GPL' 'LGPL')
-depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv'
-	 'libsm' 'libxxf86vm')
-makedepends=('libxt' 'v4l-utils')
-source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz
-	tvtime-1.0.2+linux-headers-2.6.18.patch
-	tvtime-1.0.2-gcc41.patch
-	tvtime-1.0.2-locale_t.patch)
-md5sums=('4b3d03afe61be239b08b5e522cd8afed'
-         'e956821745686b5b3a784f7471996ade'
-         'c782789825dfa664e1f6fcc96ac7246c'
-         '1069dc5b47bba8456cbf48e34cb5c0b6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch
-  patch -p1 < ../tvtime-1.0.2-gcc41.patch
-  patch -p1 < ../tvtime-1.0.2-locale_t.patch
-  sed -i '1,1i#include <zlib.h>' src/pngoutput.c
-  [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc
-  make
-  make DESTDIR=$pkgdir install
-  install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml
-}
diff --git a/community-testing/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/community-testing/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch
deleted file mode 100644
index d0772783d..000000000
--- a/community-testing/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: tvtime-1.0.2/src/videoinput.c
-===================================================================
---- tvtime-1.0.2.orig/src/videoinput.c
-+++ tvtime-1.0.2/src/videoinput.c
-@@ -35,8 +35,9 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
--#include "videodev.h"
--#include "videodev2.h"
-+#include <libv4l1-videodev.h>
-+#include <linux/videodev2.h>
-+#define BASE_VIDIOCPRIVATE      192             /* 192-255 are private */
- #include "videoinput.h"
- #include "mixer.h"
- 
diff --git a/community-testing/tvtime/tvtime-1.0.2-gcc41.patch b/community-testing/tvtime/tvtime-1.0.2-gcc41.patch
deleted file mode 100644
index 58e9bb204..000000000
--- a/community-testing/tvtime/tvtime-1.0.2-gcc41.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm
---- tvtime-1.0.1/plugins/greedyh.asm	2005-08-14 18:16:43.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/greedyh.asm	2005-11-28 17:53:09.210774544 +0100
-@@ -18,7 +18,7 @@
- 
- #include "x86-64_macros.inc"
- 
--void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
-+void FUNCT_NAME(TDeinterlaceInfo* pInfo)
- {
-     int64_t i;
-     bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc
---- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc	2004-10-20 17:31:05.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc	2005-11-28 17:53:33.251119856 +0100
-@@ -5,9 +5,9 @@
- #endif
- 
- #ifdef USE_STRANGE_BOB
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
- #else
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
- #endif
- 
- int SEARCH_EFFORT_FUNC(0)		// we don't try at all ;-)
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp
---- tvtime-1.0.1/plugins/tomsmocomp.cpp	2004-10-20 19:38:04.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp	2005-11-28 17:52:53.862107896 +0100
-@@ -31,7 +31,7 @@
- 
- #define IS_MMX
- #define SSE_TYPE MMX
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
-+#define FUNCT_NAME filterDScaler_MMX
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_MMX
- #undef  SSE_TYPE
-@@ -39,7 +39,7 @@
- 
- #define IS_3DNOW
- #define SSE_TYPE 3DNOW
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
-+#define FUNCT_NAME filterDScaler_3DNOW
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_3DNOW
- #undef  SSE_TYPE
-@@ -47,7 +47,7 @@
- 
- #define IS_SSE
- #define SSE_TYPE SSE
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
-+#define FUNCT_NAME filterDScaler_SSE
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_SSE
- #undef  SSE_TYPE
diff --git a/community-testing/tvtime/tvtime-1.0.2-locale_t.patch b/community-testing/tvtime/tvtime-1.0.2-locale_t.patch
deleted file mode 100644
index cbbb05458..000000000
--- a/community-testing/tvtime/tvtime-1.0.2-locale_t.patch
+++ /dev/null
diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules
deleted file mode 100644
index 37403ae2f..000000000
--- a/community-testing/virtualbox/10-vboxdrv.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk
deleted file mode 100644
index e5cbcebcd..000000000
--- a/community-testing/virtualbox/LocalConfig.kmk
+++ /dev/null
@@ -1,19 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD
deleted file mode 100644
index 9b503c19c..000000000
--- a/community-testing/virtualbox/PKGBUILD
+++ /dev/null
@@ -1,189 +0,0 @@
-# $Id: PKGBUILD 63300 2012-01-30 19:09:55Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgbase=virtualbox
-pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.8
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
-#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-        UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
-        10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
-        change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
-
-_extramodules=extramodules-3.2-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-
-build() {
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
-
-    patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
-    patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-
-    cp "$srcdir/LocalConfig.kmk" .
-
-    ./configure --disable-docs \
-        --enable-webservice \
-        --enable-vde \
-        --enable-vnc \
-        --nofatal \
-        --with-linux=/usr/src/linux-${_kernver}
-    source ./env.sh
-    kmk all
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
-}
-
-package_virtualbox() {
-    pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
-    optdepends=('qt: for VirtualBox GUI'
-                'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-sdk: developer kit'
-                'virtualbox-source: host kernel source modules for non-stock kernels')
-
-    backup=('etc/vbox/vbox.cfg')
-    replaces=('virtualbox-ose')
-    conflicts=('virtualbox-ose')
-    install=virtualbox.install
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls}
-
-    #doc
-    install -m 0644 "$srcdir/UserManual-$pkgver.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf"
-
-    #Binaries and Wrapper with Launchers
-    install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-
-    for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do
-        ln -sf VBox "$pkgdir/usr/bin/$i"
-    done
-    install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
-
-    #components
-    install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
-    #lib
-    install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m 0644 *.gc *.r0  VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
-    #setuid root binaries
-    install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
-    #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
-    #language
-    install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
-    #useless scripts
-    install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
-
-    #icons
-    install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
-    pushd icons
-    for i in *; do
-        install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-        cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-    done
-    popd
-
-    #desktop
-    install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
-    install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
-    #install configuration
-    mkdir -p "$pkgdir/etc/vbox"
-    echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
-    #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \
-        "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
-    install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
-        "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
-}
-
-package_virtualbox-source() {
-    pkgdesc="VirtualBox kernel modules source"
-    depends=(gcc make)
-    provides=(virtualbox-modules)
-    optdepends=('linux-headers'
-                'kernel26-lts-headers')
-    install=virtualbox-source.install
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-    mkdir -p $pkgdir/usr/lib/virtualbox
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    #sources for modules
-    cp -r src ${pkgdir}/usr/lib/virtualbox
-    #install compilation script
-    install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild"
-}
-
-package_virtualbox-sdk() {
-    pkgdesc="VirtualBox Software Developer Kit (SDK)"
-    depends=('python2')
-
-    mkdir -p "$pkgdir/usr/lib/virtualbox"
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
-    #python sdk
-    pushd sdk/installer
-    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}"
-    popd
-    rm -rf sdk/installer
-    mv sdk "$pkgdir/usr/lib/virtualbox"
-}
-
-package_virtualbox-archlinux-additions(){
-    pkgdesc="Additions only for Arch Linux guests (userspace tools)"
-    depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    replaces=('virtualbox-guest-additions')
-    conflicts=('virtualbox-guest-additions')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-
-    install -d "$pkgdir"/{usr/bin,sbin}
-    install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
-    install -m755 mount.vboxsf "$pkgdir/sbin"
-
-    install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-        "$pkgdir"/usr/bin/VBoxClient-all
-    install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-        "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_111.so \
-        "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
-    install -d "$pkgdir/usr/lib/xorg/modules/dri"
-    install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
-    ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
-    install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so"
-
-    # install rc.d script
-    install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service"
-
-    # install sample config
-    install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
-}
-md5sums=('2092bba46baa62fab5520d67dee2ece8'
-         '2f6b36ff143eb8da55ee92676708e757'
-         '5f85710e0b8606de967716ded7b2d351'
-         '6ab2455c391d8cc005e2f4461ae26a3b'
-         '78ffa67ff131680f1d2b6f06d4325c5b'
-         '67688bff176d3c6fac5664dc282fea52'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '3c08ad30b89add47d3f45121200a5360'
-         'e7416331d0bc331f3b5aae3e5d104642')
diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch
deleted file mode 100644
index d8531499d..000000000
--- a/community-testing/virtualbox/change_default_driver_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:11:37.903456612 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:12:41.024021274 +0000
-@@ -36,13 +36,8 @@
- //#define DEBUG_DRI_CALLS
- 
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \
diff --git a/community-testing/virtualbox/vbox-service.conf b/community-testing/virtualbox/vbox-service.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/community-testing/virtualbox/vbox-service.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/community-testing/virtualbox/vbox-service.rc b/community-testing/virtualbox/vbox-service.rc
deleted file mode 100644
index 6f1b8d892..000000000
--- a/community-testing/virtualbox/vbox-service.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vbox-service
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
-  start)
-    stat_busy "Starting $name service"
-    [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
-    && { add_daemon vbox-service; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  stop)
-    stat_busy "Stopping $name service"
-    [[ -n "$PID" ]] && kill $PID &>/dev/null \
-    && { rm_daemon vbox-service; stat_done; } \
-    || { stat_fail; exit 1; }
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    stat_busy "Checking $name status";
-    ck_status $name
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-    exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/virtualbox/vboxbuild b/community-testing/virtualbox/vboxbuild
deleted file mode 100644
index e6fb94edd..000000000
--- a/community-testing/virtualbox/vboxbuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-
-MODLIST=()
-LOG="/var/log/vbox-install.log"
->| "$LOG"
-
-if [[ $INSTALL_DIR ]]; then
-  VBOXMANAGE=$INSTALL_DIR/VBoxManage
-  BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp
-  BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp
-  BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp
-  BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp
-else
-  echo "error: missing vbox.cfg"
-  exit 1
-fi
-
-if [[ -f /proc/modules ]]; then
-  IFS=$'\n' read -r -d '' -a MODLIST < \
-    <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules)
-fi
-
-if (( ${#MODLIST[*]} )); then
-  stat_busy "Unloading VirtualBox kernel modules"
-  modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
-fi
-
-for kdir in /lib/modules/[2-3]*; do
-  if [[ ! -d $kdir/kernel ]]; then
-    # found a stale kernel
-    mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
-    if (( ${#mods[@]} )); then
-      stat_busy "Removing all old VirtualBox kernel modules"
-      if rm -f "${mods[@]}" &&
-          rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
-        stat_done
-      else
-        stat_fail
-      fi
-    fi
-  fi
-done
-
-# default to the currently running kernel
-if (( ! $# )); then
-  set -- $(uname -r)
-fi
-
-for kernver; do
-  export KERN_DIR=/lib/modules/$kernver/build
-  export MODULE_DIR=/lib/modules/$kernver/extramodules
-  if [[ ! -d $KERN_DIR ]]; then
-    printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
-        "$KERN_DIR"
-    continue
-  fi
-
-  stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
-    if ! $BUILDVBOXDRV \
-      --save-module-symvers /tmp/vboxdrv-Module.symvers \
-      --no-print-directory install >> $LOG 2>&1; then
-      echo  "Look at $LOG to find out what went wrong"
-      stat_fail
-    fi
-    for build in BUILDVBOX{NETFLT,NETADP,PCI}; do
-      if ! ${!build} \
-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
-        --no-print-directory install >> $LOG 2>&1; then
-        echo  "Look at $LOG to find out what went wrong"
-        stat_fail
-      fi
-    done
-    gzip -f9 "$MODULE_DIR"/*.ko
-    depmod "$kernver"
-  stat_done
-done
-
-if (( ${#MODLIST[*]} )); then
-  stat_busy "Reloading VirtualBox kernel modules"
-  modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
-fi
-
diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch
deleted file mode 100644
index 710e2e511..000000000
--- a/community-testing/virtualbox/vboxdrv-reference.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -75,10 +75,9 @@
-   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-   "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-   "module by executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. If it is available in your distribution, you should install the "
--  "DKMS package first. This package keeps track of Linux kernel changes and "
--  "recompiles the vboxdrv kernel module if necessary."
-+  "  <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-source and"
-+  "execute /usr/bin/vboxbuild ."
-   );
- 
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
- 
- QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
-   "The VirtualBox kernel modules do not match this version of "
--  "VirtualBox. The installation of VirtualBox was apparently not "
--  "successful. Executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "may correct this. Make sure that you do not mix the "
--  "OSE version and the PUEL version of VirtualBox."
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-   );
- 
- QString g_QStrHintOtherNoDriver = QApplication::tr(
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
-     cat << EOF
- WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-          available for the current kernel (`uname -r`) or it failed to
--         load. Please recompile the kernel module and install it by
-+         load. Please reinstall the kernel module virtualbox-modules or
-+         if you don't use our stock kernel compile the modules with
- 
--           sudo /etc/init.d/vboxdrv setup
-+           sudo /usr/bin/vboxbuild
- 
-          You will not be able to start VMs until this problem is fixed.
- EOF
- elif [ ! -c /dev/vboxdrv ]; then
-     cat << EOF
--WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- 
--           sudo /etc/init.d/vboxdrv restart
-+           sudo modprobe vboxdrv
- 
-          and if that is not successful, try to re-install the package.
- 
diff --git a/community-testing/virtualbox/virtualbox-source.install b/community-testing/virtualbox/virtualbox-source.install
deleted file mode 100644
index 24d90b1c2..000000000
--- a/community-testing/virtualbox/virtualbox-source.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> To compile the modules do /usr/bin/vboxbuild
-EOF
-
-}
-
-post_upgrade() {
-/bin/cat << EOF
-===> To recompile the modules do /usr/bin/vboxbuild
-EOF
-}
diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install
deleted file mode 100644
index c794b857d..000000000
--- a/community-testing/virtualbox/virtualbox.install
+++ /dev/null
@@ -1,34 +0,0 @@
-utils() {
-    if [ -x usr/bin/update-mime-database ]; then
-        update-mime-database usr/share/mime > /dev/null 2>&1
-    fi
-
-    if [ -x usr/bin/xdg-icon-resource ]; then
-        xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
-    fi
-
-    if [ -x usr/bin/update-desktop-database ]; then
-        usr/bin/update-desktop-database -q
-    fi
-}
-
-post_install() {
-    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    utils
-}
-
-post_upgrade() {
-    getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
-    utils
-    if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
-/bin/cat << EOF
-===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
-EOF
-    fi
-}
-
-post_remove() {
-    groupdel vboxusers >/dev/null 2>&1 || true
-    utils
-}
diff --git a/community-testing/virtviewer/PKGBUILD b/community-testing/virtviewer/PKGBUILD
deleted file mode 100644
index 598c81431..000000000
--- a/community-testing/virtviewer/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 63302 2012-01-30 19:09:59Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jonathan Wiersma <archaur at jonw dot org>
-
-pkgname=virtviewer
-pkgver=0.4.1
-pkgrel=2
-pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
-depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
-makedepends=('intltool')
-url="http://virt-manager.et.redhat.com"
-arch=('i686' 'x86_64')
-license=('GPL')
-source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
-md5sums=('1cc86ed3fbbe37a56faa6476b2e6dbcd')
-
-build() {
-  cd $srcdir/virt-viewer-$pkgver
-  export LDFLAGS=-lX11
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/vtk/PKGBUILD b/community-testing/vtk/PKGBUILD
deleted file mode 100644
index 39187a72c..000000000
--- a/community-testing/vtk/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 63306 2012-01-30 19:10:27Z ibiru $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
-# Contributor: leepesjee <lpeschier at xs4all dot nl>
-# Contributor: Olivier Medoc
-# Contributor: ignotus
-# Contributor: Fabian Moser
-# Contributor: djscholl
-
-pkgname=vtk
-pkgver=5.8.0
-pkgrel=8
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org'
-license=('BSD')
-depends=('libpng' 'libtiff' 'libjpeg-turbo' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql' 'hdf5' 'expat' 'libtheora')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
-optdepends=('python2: python bindings'
-            'java-runtime: java bindings'
-            'tk: tcl bindings'
-            'gnuplot: plotting tools'
-            'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
-        "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'fixkernelversioncheck.diff'
-        'ffmpeg-0.8.diff'
-        'fix-boost-graph-api-changes.diff')
-md5sums=('37b7297d02d647cc6ca95b38174cb41f'
-         'a05295b81930e894fc0e31866f399151'
-         '9e137af23701f76fc727222ebac23389'
-         'e992321c9d1def6034d0fa6607b40c5a'
-         'e715aef2aea26fc05f904efb5d0d5627')
-
-build() {
-  cd VTK
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12568
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-
-  # fix compilation error:
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
-
-  # fix compilation error: http://vtk.org/Bug/view.php?id=12772
-  # remove next pkgver bump
-  patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
-
-  cd ${srcdir}
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  # flags to enable using system libs
-  local cmake_system_flags=""
-  for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do # LIBPROJ4
-    cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
-  done
-
-  # flags to use python2 instead of python which is 3.x.x on archlinux
-  local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
-
-  cmake \
-    -Wno-dev \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-    -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \
-    -DBUILD_DOCUMENTATION:BOOL=ON \
-    -DDOCUMENTATION_HTML_HELP:BOOL=ON \
-    -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
-    -DBUILD_EXAMPLES:BOOL=ON \
-    -DVTK_USE_HYBRID:BOOL=ON \
-    -DVTK_USE_PARALLEL:BOOL=ON \
-    -DVTK_USE_PATENTED:BOOL=ON \
-    -DVTK_USE_BOOST:BOOL=ON \
-    -DVTK_USE_INFOVIS:BOOL=ON \
-    -DVTK_USE_GL2PS:BOOL=ON \
-    -DVTK_USE_MYSQL:BOOL=ON \
-    -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
-    -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
-    -DVTK_WRAP_JAVA:BOOL=ON \
-    -DVTK_WRAP_PYTHON:BOOL=ON \
-    -DVTK_WRAP_TCL:BOOL=ON \
-    -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
-    -DVTK_USE_QT:BOOL=ON \
-    -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
-    -DVTK_USE_GUISUPPORT:BOOL=ON \
-    -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-    ${cmake_system_flags} \
-    ${cmake_system_python_flags} \
-    ${srcdir}/VTK
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-
-  # Move the vtk.jar to the arch-specific location
-  install -dv ${pkgdir}/usr/share/java/vtk
-  mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
-    ${pkgdir}/usr/share/java/vtk
-
-  # Install license
-  install -dv ${pkgdir}/usr/share/licenses/vtk
-  install -m644 ${srcdir}/VTK/Copyright.txt \
-    ${pkgdir}/usr/share/licenses/vtk
-
-  # Put an entry in /etc/ld.so.conf.d
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
-}
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/vtk/fix-boost-graph-api-changes.diff b/community-testing/vtk/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 2162e7a28..000000000
--- a/community-testing/vtk/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date:   Tue Dec 13 15:36:06 2011 -0500
-
-    BUG: 12772 fixes for change in Boost graph API
-    
-    This fixes bug 12772, where an API change in Boost was causing
-    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
-    reporting the issue and posting the patch.
-    
-    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,15 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
- 
- 
-+namespace {
-+  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+    return e.Id;
-+  }
-+  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+    return e.underlying_desc.Id;
-+  }
-+}
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +104,8 @@ public:
- 
-     // Copy the vertex and edge data from the graph to the tree.
-     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
--    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+                                  unwrap_edge_id(e), tree_e.Id);
-   }
- 
- private:
diff --git a/community-testing/vtk/fixkernelversioncheck.diff b/community-testing/vtk/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-testing/vtk/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
- 
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
-   # Linux Specific flags
-   ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
-   OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-   IF (HDF5_ENABLE_LARGE_FILE)
-     SET (LARGEFILE 1)
-   ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
-   SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-testing/w3cam/PKGBUILD b/community-testing/w3cam/PKGBUILD
deleted file mode 100644
index 8a63cdf9a..000000000
--- a/community-testing/w3cam/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 63308 2012-01-30 19:10:32Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Christian Schmidt <mucknert@gmx.net>
-
-pkgname=w3cam
-pkgver=0.7.2
-pkgrel=10
-pkgdesc="a small and fast CGI program to retrieve images from a video4linux device."
-arch=('i686' 'x86_64')
-url="http://mpx.freeshell.net/"
-license=('GPL')
-depends=('libpng' 'libjpeg')
-makedepends=('v4l-utils')
-source=(http://mpx.freeshell.net/$pkgname-$pkgver.tar.gz)
-md5sums=('eec0b301b32bc8e9f65a4e54248c9868')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's|#include <linux/videodev.h>|#include <libv4l1-videodev.h>|' v4l.c vidcat.c w3cam.c w3camd/w3v4l.c
-  ./configure --prefix=/usr --with-device=/dev/video0 --with-ttf-inc=/usr/include/freetype
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/cgi-bin $pkgdir/usr/bin $pkgdir/usr/man/man1 $pkgdir/usr/share/
-  make prefix=$pkgdir/usr/ install
-  mkdir -p $pkgdir/usr/lib/w3cam/
-  mv $pkgdir/usr/cgi-bin/* $pkgdir/usr/lib/w3cam/
-  mv $pkgdir/usr/man $pkgdir/usr/share/man
-  rm -rf $pkgdir/usr/cgi-bin
-}
diff --git a/community-testing/warmux/PKGBUILD b/community-testing/warmux/PKGBUILD
deleted file mode 100644
index 17e0dfdd2..000000000
--- a/community-testing/warmux/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 63310 2012-01-30 19:10:44Z ibiru $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: pukyxd 
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-
-pkgname=warmux
-pkgver=11.04.1
-pkgrel=4
-pkgdesc="A clone of the worms game"
-arch=('i686' 'x86_64')
-url="http://www.wormux.org/"
-license=('GPL')
-makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
-replaces=('wormux')
-source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	include-zlib.patch
-	gcc-fix.patch)
-md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
-         'c8285955e880f80e3c68312715a3061c'
-         '693176b72c9568c0c223be76ea7dd0d2')
-
-build() { 
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  # libpng 1.5 fix
-  patch -Np1 -i ../include-zlib.patch
-  # gcc fix
-  patch -Np1 -i ../gcc-fix.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}")
-
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -r ${pkgdir}/usr/share/warmux
-}
diff --git a/community-testing/warmux/gcc-fix.patch b/community-testing/warmux/gcc-fix.patch
deleted file mode 100644
index d4ceb0746..000000000
--- a/community-testing/warmux/gcc-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-## i-love-you-lordheavy.patch [diff]
-diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
---- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
-@@ -81,7 +81,7 @@
- }
- 
- // Build an action from a network packet
--Action::Action(const char *buffer, DistantComputer* _creator)
-+Action::Action(char *buffer, DistantComputer* _creator)
- {
-   m_creator = _creator;
- 
-diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
---- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
-@@ -168,7 +168,7 @@
-   Action(Action_t type, Double value1, Double value2);
- 
-   // Build an action from a network packet
--  Action(const char* buffer, DistantComputer* _creator);
-+  Action(char* buffer, DistantComputer* _creator);
- 
-   ~Action();
- 
diff --git a/community-testing/warmux/include-zlib.patch b/community-testing/warmux/include-zlib.patch
deleted file mode 100644
index c7e77aba1..000000000
--- a/community-testing/warmux/include-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
---- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
-+++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
-@@ -25,6 +25,7 @@
- #include <SDL_image.h>
- #include <SDL_rotozoom.h>
- #include <png.h>
-+#include <zlib.h>
- 
- #include "graphic/surface.h"
- #include "tool/math_tools.h"
diff --git a/community-testing/warzone2100/PKGBUILD b/community-testing/warzone2100/PKGBUILD
deleted file mode 100644
index eaeae8a6c..000000000
--- a/community-testing/warzone2100/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63312 2012-01-30 19:10:50Z ibiru $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-
-pkgname=warzone2100
-pkgver=2.3.9
-pkgrel=2
-pkgdesc="3D realtime strategy game on a future Earth"
-url="http://wz2100.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'mesa' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
-makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip')
-source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7185090a089c9c0e0eca7535a8f25dca')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --with-distributor="Arch linux"
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/widelands/PKGBUILD b/community-testing/widelands/PKGBUILD
deleted file mode 100644
index 49c336ea2..000000000
--- a/community-testing/widelands/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 63314 2012-01-30 19:11:05Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands
-pkgver=16
-_realver=build16
-pkgrel=5
-pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
-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/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2
-        widelands-0.16-libpng15.patch
-        $pkgname.desktop
-        $pkgname.png
-        $pkgname.sh)
-md5sums=('3d8c28e145b73c64d8ed1625319d25a2'
-         'e492620b071cbd1db04280173653a67c'
-         '15820bf099fd6f16251fe70a75c534bb'
-         '3dfda7e9ca76ca00dd98d745d0ceb328'
-         '7cae50aba5ed0cd2cfeea79124637b46')
-
-build() {
-    cd $srcdir/$pkgname-$_realver-src
-
-    patch -Np0 < $srcdir/widelands-0.16-libpng15.patch
-
-    mkdir -p build/compile && cd build/compile
-
-    cmake ../.. -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_DATADIR=share/$pkgname \
-        -DWL_INSTALL_BINDIR=bin
-    make
-}
-
-package() {
-    depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16')
-
-    cd $srcdir/$pkgname-$_realver-src/build/compile
-
-    make DESTDIR="$pkgdir" install
-
-    rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds}
-
-    # Install bin, icon and desktop file
-    #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname
-    #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
-    install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
-    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-}
diff --git a/community-testing/widelands/widelands-0.16-libpng15.patch b/community-testing/widelands/widelands-0.16-libpng15.patch
deleted file mode 100644
index 9f733e7b9..000000000
--- a/community-testing/widelands/widelands-0.16-libpng15.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/graphic/SDL_mng.cc
-+++ src/graphic/SDL_mng.cc
-@@ -276,7 +276,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		SDL_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -356,9 +356,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--			int const s = (info_ptr->channels == 4) ? 0 : 8;
-+			int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -369,7 +369,7 @@
- 		SDL_AllocSurface
- 			(SDL_SWSURFACE,
- 			 width, height,
--			 bit_depth * info_ptr->channels,
-+			 bit_depth * png_get_channels(png_ptr, info_ptr),
- 			 Rmask, Gmask, Bmask, Amask);
- 	if (not surface) {
- 		SDL_SetError("Out of memory");
-@@ -407,6 +407,9 @@
- 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
- 	png_read_end(png_ptr, info_ptr);
- 
-+	png_colorp png_palette;
-+	int png_num_palette;
-+
- 	/* Load the palette, if any */
- 	if ((palette = surface->format->palette)) {
- 		if (color_type == PNG_COLOR_TYPE_GRAY) {
-@@ -416,12 +419,12 @@
- 				palette->colors[i].g = i;
- 				palette->colors[i].b = i;
- 			}
--		} else if (info_ptr->num_palette > 0) {
--			palette->ncolors = info_ptr->num_palette;
--			for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
--				palette->colors[i].b = info_ptr->palette[i].blue;
--				palette->colors[i].g = info_ptr->palette[i].green;
--				palette->colors[i].r = info_ptr->palette[i].red;
-+		} else if (png_num_palette > 0) {
-+			palette->ncolors = png_num_palette;
-+			for (uint32_t i = 0; i < png_num_palette; ++i) {
-+				palette->colors[i].b = png_palette[i].blue;
-+				palette->colors[i].g = png_palette[i].green;
-+				palette->colors[i].r = png_palette[i].red;
- 			}
- 		}
- 	}
diff --git a/community-testing/widelands/widelands-build15-gcc-4.5-patch b/community-testing/widelands/widelands-build15-gcc-4.5-patch
deleted file mode 100644
index 6ba313358..000000000
--- a/community-testing/widelands/widelands-build15-gcc-4.5-patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-07-01 21:15:56.000000000 +0000
-@@ -113,7 +113,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Map::button_clicked, *this, 4,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -142,7 +142,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name
- 			 	());
- 		break;
- 	}
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-07-01 21:17:39.000000000 +0000
-@@ -272,7 +272,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Random_Map::button_clicked, *this, 8,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -343,7 +343,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 		break;
- 	case 9:
- 		break;
-@@ -476,7 +476,7 @@
- 			(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
- 			++m_currentworld;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 		button_clicked(-1);  // Update other values in UI as well
- 
diff --git a/community-testing/widelands/widelands.desktop b/community-testing/widelands/widelands.desktop
deleted file mode 100644
index 9715d816c..000000000
--- a/community-testing/widelands/widelands.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-GenericName=Widelands
-Comment=Realtime strategy game
-Icon=widelands
-Exec=widelands
-Type=Application
-Categories=Game;StrategyGame;
diff --git a/community-testing/widelands/widelands.png b/community-testing/widelands/widelands.png
deleted file mode 100644
index c329cf667..000000000
--- a/community-testing/widelands/widelands.png
+++ /dev/null
diff --git a/community-testing/widelands/widelands.sh b/community-testing/widelands/widelands.sh
deleted file mode 100644
index 0b21a1694..000000000
--- a/community-testing/widelands/widelands.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/widelands
-./widelands $*
diff --git a/community-testing/winefish/PKGBUILD b/community-testing/winefish/PKGBUILD
deleted file mode 100644
index 12335e8bd..000000000
--- a/community-testing/winefish/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 64109 2012-02-08 23:55:49Z allan $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Claudio Riva <firetux83@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=winefish
-pkgver=1.3.3
-pkgrel=11
-pkgdesc="LaTeX editor based on Bluefish with auto-completion and syntax highlighting"
-url="http://winefish.berlios.de/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'desktop-file-utils' 'shared-mime-info')
-makedepends=('pkgconfig')
-optdepends=('aspell: for spell check')
-install=$pkgname.install
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tgz)
-md5sums=('63531e4dde7a53ab3a74e1152c7af1e9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-update-databases \
-    --with-freedesktop_org-menu=/usr/share/applications \
-    --with-icon-path=/usr/share/pixmaps --mandir=/usr/share/man
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/winefish/winefish.install b/community-testing/winefish/winefish.install
deleted file mode 100644
index 8ae71b3e6..000000000
--- a/community-testing/winefish/winefish.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
diff --git a/community-testing/xautomation/PKGBUILD b/community-testing/xautomation/PKGBUILD
deleted file mode 100644
index 8374931da..000000000
--- a/community-testing/xautomation/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 63317 2012-01-30 19:11:16Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com>
-
-pkgname=xautomation
-pkgver=1.05
-pkgrel=2
-pkgdesc='Controls X from the command line and does "visual scraping".'
-url='http://hoopajoo.net/projects/xautomation.html'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libpng' 'libxtst')
-source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz"
-        'xautomation-1.05-fix-libs.patch')
-md5sums=('4526ea5085a680a3ae8629af1731e5fa'
-         'a8d8b12ed180ce9693f706d0f75d97fe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i ../xautomation-1.05-fix-libs.patch
-
-  ./configure --prefix=/usr 
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install	
-}
diff --git a/community-testing/xautomation/xautomation-1.05-fix-libs.patch b/community-testing/xautomation/xautomation-1.05-fix-libs.patch
deleted file mode 100644
index ee3f9247a..000000000
--- a/community-testing/xautomation/xautomation-1.05-fix-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rup xautomation-1.05.orig/Makefile.am xautomation-1.05/Makefile.am
---- xautomation-1.05.orig/Makefile.am	2009-04-14 18:06:23.000000000 +0200
-+++ xautomation-1.05/Makefile.am	2012-01-27 02:06:44.016492587 +0100
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = xte rgb2pat png2pat visgrep pat2ppm patextract xmousepos
- man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1
- xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h
--xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst
-+xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11
- rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h
- rgb2pat_LDADD = -lpng
- png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h
-diff -rup xautomation-1.05.orig/Makefile.in xautomation-1.05/Makefile.in
---- xautomation-1.05.orig/Makefile.in	2011-09-07 00:48:19.000000000 +0200
-+++ xautomation-1.05/Makefile.in	2012-01-27 02:14:02.010831581 +0100
-@@ -220,7 +220,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1
- xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h
--xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst
-+xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11
- rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h
- rgb2pat_LDADD = -lpng
- png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h
diff --git a/community-testing/xemacs/PKGBUILD b/community-testing/xemacs/PKGBUILD
deleted file mode 100644
index 62f4d9f27..000000000
--- a/community-testing/xemacs/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 63321 2012-01-30 19:11:47Z ibiru $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor : Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=xemacs
-pkgver=21.5.31
-pkgrel=5
-pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
-arch=('i686' 'x86_64')
-url="http://www.xemacs.org/"
-license=('GPL')
-depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
-optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
-            'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
-makedepends=('xbitmaps')
-install=xemacs.install
-source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz
-        xemacs.desktop
-        xemacs-21.5.29-optimization-bug.patch)
-md5sums=('0185fe905d0b8d8d094d9b60cf262d4a'
-         'a4d3d5c0aa2c7ce7bec491f809ca3694'
-         'eb061b10ea3bbe1026df5326ae1618e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-# Fix problem caused by improper optimization with GCC>=4.1.2 on i686
-# (and possibly other arches). See
-# http://tracker.xemacs.org/XEmacs/its/issue354
-# for the upstream bug report.
-  patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch
- 	
-  ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \
-      --without-postgresql --with-athena=xaw \
-      --enable-database=berkdb --without-ldap \
-      --enable-menubars=lucid --enable-scrollbars=lucid \
-      --enable-widgets=athena --enable-dialogs=athena \
-      --enable-external-widget \
-      --with-jpeg --with-png --with-tiff \
-      --with-ncurses --with-pop --with-xfs --disable-sound \
-      --infodir=/usr/share/info \
-      --with-mule \
-      --mandir=/usr/share/man/man1
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el
-
-  rm "${pkgdir}"/usr/bin/{b2m,ctags,etags}
-  rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1}
-
-  # fix  FS#7927
-  install -d -m755 "${pkgdir}/usr/share/pixmaps"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm"
-
-  # correct permissions
-  chown -R root:root "${pkgdir}"
-
-  rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info}
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch
deleted file mode 100644
index 32a1a02c2..000000000
--- a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Work around a GCC optimization bug as described in
-http://tracker.xemacs.org/XEmacs/its/issue354
-
---- src/dumper.c.~1~	2008-01-26 09:54:11.000000000 +0100
-+++ src/dumper.c	2008-05-03 10:17:03.000000000 +0200
-@@ -2584,7 +2584,7 @@
- #endif /* !WIN32_NATIVE */
- 
- 
--static int
-+int
- pdump_file_try (Wexttext *exe_path)
- {
-   Wexttext *w = exe_path + wext_strlen (exe_path);
diff --git a/community-testing/xemacs/xemacs.desktop b/community-testing/xemacs/xemacs.desktop
deleted file mode 100644
index 257c56947..000000000
--- a/community-testing/xemacs/xemacs.desktop
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Name=XEmacs Text Editor
-Name[bg]=редактор XEmacs
-Name[ca]=Editor XEmacs
-Name[cs]=Editor XEmacs
-Name[da]=XEmacs tekstredigerer
-Name[de]=XEmacs Texteditor
-Name[eo]=La redaktilo XEmakso
-Name[es]=Emacs para X
-Name[et]=Emacs X'i kasutajaliidesega
-Name[fi]=XEmacs editori
-Name[fr]=Éditeur XEmacs
-Name[hu]=XEmacs szövegszerkesztő
-Name[is]=XEmacs-ritill
-Name[it]=Emacs per X
-Name[ja]=XEmacs テキスト・エディター
-Name[mk]=Софи�тицираниот XEmacs уредувач
-Name[no]=XEmacs-tekstredigerer
-Name[pt]=Editor XEmacs
-Name[ro]=Editorul XEmacs
-Name[ru]=Редактор XEmacs
-Name[sk]=Editor XEmacs
-Name[sl]=Urejevalnik XEmacs
-Name[uk]=Редактор XEmacs
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=xemacs %f
-Icon=/usr/share/pixmaps/xemacs-icon.xpm
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-Encoding=UTF-8
-StartupWMClass=Emacs
diff --git a/community-testing/xemacs/xemacs.install b/community-testing/xemacs/xemacs.install
deleted file mode 100644
index a04ee187f..000000000
--- a/community-testing/xemacs/xemacs.install
+++ /dev/null
@@ -1,35 +0,0 @@
-infodir=usr/share/info
-filelist=(beta.info.gz custom.info.gz 
-	  emodules.info.gz external-widget.info.gz 
-	  internals.info-1.gz internals.info-2.gz 
-	  internals.info-3.gz internals.info-4.gz 
-	  internals.info-5.gz internals.info.gz 
-	  lispref.info-1.gz lispref.info-10.gz 
-	  lispref.info-2.gz lispref.info-3.gz 
-	  lispref.info-4.gz lispref.info-5.gz 
-	  lispref.info-6.gz lispref.info-7.gz 
-	  lispref.info-8.gz lispref.info-9.gz 
-	  lispref.info.gz new-users-guide.info.gz 
-	  term.info.gz termcap.info.gz 
-	  xemacs-faq.info-1.gz xemacs-faq.info-2.gz 
-	  xemacs-faq.info.gz xemacs.info-1.gz 
-	  xemacs.info-2.gz xemacs.info-3.gz 
-	  xemacs.info-4.gz xemacs.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-  update-desktop-database -q
-}
diff --git a/community-testing/xloadimage/PKGBUILD b/community-testing/xloadimage/PKGBUILD
deleted file mode 100644
index f65fc905b..000000000
--- a/community-testing/xloadimage/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 63323 2012-01-30 19:11:59Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=xloadimage
-pkgver=4.1
-pkgrel=12
-pkgdesc="An utility to view many different types of images under X11"
-arch=(i686 x86_64)
-#url="http://world.std.com/~jimf/xloadimage.html"
-url="http://sioseis.ucsd.edu/xloadimage.html"
-license=("MIT")
-depends=('libtiff' 'libpng' 'libx11' 'libxext')
-makedepends=('patch' 'imake')
-source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz
-	license.txt
-	enable-image-types.patch
-	png15-tiff4.patch)
-md5sums=('86b42b1b628a9c00008b7deec21e1175'
-         'cc16a51aeb5083b8ff07939dfe244130'
-         '3a2703925011276fd2d2bd139b676487'
-         'c797cfc3f4588b96275d82c2c9cc7025')
-
-build() {
-  cd $srcdir/$pkgname.$pkgver
-
-  patch -p1 <$srcdir/enable-image-types.patch
-  patch -p1 <$srcdir/png15-tiff4.patch
-  xmkmf
-  make
-
-  install -D -m755 xloadimage $pkgdir/usr/bin/xloadimage
-  install -D -m755 uufilter $pkgdir/usr/bin/uufilter
-  install -D -m644 xloadimagerc $pkgdir/etc/xloadimagerc.example
-  install -D -m644 xloadimage.man $pkgdir/usr/man/man1/xloadimage.1x
-  install -D -m644 uufilter.man $pkgdir/usr/man/man1/uufilter.1x
-  install -D -m644 $srcdir/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
-  ln -s /usr/bin/xloadimage $pkgdir/usr/bin/xsetbg
-
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}
diff --git a/community-testing/xloadimage/enable-image-types.patch b/community-testing/xloadimage/enable-image-types.patch
deleted file mode 100644
index b61e36b87..000000000
--- a/community-testing/xloadimage/enable-image-types.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -wbBur xloadimage.4.1/imagetypes.h xloadimage.4.1.my/imagetypes.h
---- xloadimage.4.1/imagetypes.h	2011-02-11 11:47:37.000000000 +0000
-+++ xloadimage.4.1.my/imagetypes.h	2011-02-11 16:04:35.000000000 +0000
-@@ -94,15 +94,9 @@
-   {niffIdent,      niffLoad,      niffDump,    "niff",      "Native Image File Format (NIFF)"},
-   {sunRasterIdent, sunRasterLoad, NULL,        "sunraster", "Sun Rasterfile"},
-   {gifIdent,       gifLoad,       NULL,        "gif",       "GIF Image"},
--#ifdef HAVE_LIBJPEG
-   {jpegIdent,      jpegLoad,      jpegDump,    "jpeg",      "JFIF-style JPEG Image"},
--#endif
--#ifdef HAVE_LIBTIFF
-   {tiffIdent,      tiffLoad,      tiffDump,    "tiff",      "TIFF image"},
--#endif
--#ifdef HAVE_LIBPNG
-   {pngIdent,       pngLoad,       NULL,        "png",       "PNG image"},
--#endif
-   {fbmIdent,       fbmLoad,       NULL,        "fbm",       "FBM Image"},
-   {cmuwmIdent,     cmuwmLoad,     NULL,        "cmuraster", "CMU WM Raster"},
-   {pbmIdent,       pbmLoad,       pbmDump,     "pbm",       "Portable Bit Map (PBM, PGM, PPM)"},
-diff -wbBur xloadimage.4.1/Imakefile xloadimage.4.1.my/Imakefile
---- xloadimage.4.1/Imakefile	2011-02-11 12:05:53.000000000 +0000
-+++ xloadimage.4.1.my/Imakefile	2011-02-11 16:06:21.000000000 +0000
-@@ -40,7 +40,7 @@
-  PNG_SRC = png.c
-  PNG_OBJ = png.o
- 
--  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS)
-+  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG
- LOCAL_LIBRARIES = $(TIFF_LIB)  $(JPEG_LIB) $(PNG_LIB) $(XLIB)
- 
- SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c  mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c  rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c  xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c  merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c  xloadimage.c  $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC)
-diff -wbBur xloadimage.4.1/Makefile xloadimage.4.1.my/Makefile
---- xloadimage.4.1/Makefile	2011-02-11 12:06:16.000000000 +0000
-+++ xloadimage.4.1.my/Makefile	2011-02-11 16:06:24.000000000 +0000
-@@ -2,7 +2,7 @@
- # $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $
- 
- # ----------------------------------------------------------------------
--# Makefile generated from "Imake.tmpl" and </tmp/IIf.yUZBVe>
-+# Makefile generated from "Imake.tmpl" and </tmp/IIf.7u155R>
- # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
- # $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $
- #
-@@ -1063,7 +1063,7 @@
-  PNG_SRC = png.c
-  PNG_OBJ = png.o
- 
--  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS)
-+  EXTRA_DEFINES = $(TIFF_DEFS) $(JPEG_DEFS) $(PNG_DEFS) -DHAVE_LIBJPEG -DHAVE_LIBTIFF -DHAVE_LIBPNG
- LOCAL_LIBRARIES = $(TIFF_LIB)  $(JPEG_LIB) $(PNG_LIB) $(XLIB)
- 
- SRCS = new.c niff.c value.c zio.c cmuwmraster.c faces.c fbm.c gif.c imagetypes.c img.c  mac.c mcidas.c mc_tables.c pbm.c pcx.c pdsuncomp.c  rle.c rlelib.c sunraster.c vff.c vicar.c xbitmap.c xpixmap.c  xwd.c bright.c clip.c compress.c dither.c fill.c halftone.c  merge.c reduce.c rotate.c smooth.c undither.c zoom.c config.c misc.c options.c root.c send.c window.c  xloadimage.c  $(TIFF_SRC) $(JPEG_SRC) $(PNG_SRC)
-diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c
---- xloadimage.4.1/png.c	2011-02-11 11:47:37.000000000 +0000
-+++ xloadimage.4.1.my/png.c	2011-02-11 16:06:50.000000000 +0000
-@@ -18,6 +18,7 @@
-  * 
-  */
- 
-+#define _GETOPT_H
- 
- #include "image.h"	/* xloadimage declarations */
- #ifdef HAVE_LIBPNG
-diff -wbBur xloadimage.4.1/jpeg.c xloadimage.4.1.my/jpeg.c
---- xloadimage.4.1/jpeg.c	2011-02-11 14:47:37.000000000 +0300
-+++ xloadimage.4.1.my/jpeg.c	2011-11-21 14:32:30.000000000 +0400
-@@ -319,6 +319,7 @@
-       if (verbose)
- 	printf("  Using arithmetic coding.\n");
-       cinfo->arith_code = TRUE;
-+    }
- #else
-       fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n");
-     }
diff --git a/community-testing/xloadimage/license.txt b/community-testing/xloadimage/license.txt
deleted file mode 100644
index be7eec597..000000000
--- a/community-testing/xloadimage/license.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 1989, 1993 Jim Frost
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  The author makes no representations
- * about the suitability of this software for any purpose.  It is
- * provided "as is" without express or implied warranty.
- *
- * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
- * USE OR PERFORMANCE OF THIS SOFTWARE.
- */
diff --git a/community-testing/xloadimage/png15-tiff4.patch b/community-testing/xloadimage/png15-tiff4.patch
deleted file mode 100644
index 8536e36f3..000000000
--- a/community-testing/xloadimage/png15-tiff4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c
---- xloadimage.4.1/png.c	2011-02-11 14:47:37.000000000 +0300
-+++ xloadimage.4.1.my/png.c	2012-01-19 11:58:44.000000000 +0400
-@@ -75,7 +75,7 @@
- {
-   debug(" #error ");
-   output_warn( png_ptr, str);
--  longjmp(png_ptr->jmpbuf, 1);	/* return control to outer routine */
-+  longjmp(png_jmpbuf(png_ptr), 1);	/* return control to outer routine */
- }
- 
- 
-@@ -164,7 +164,7 @@
-     png_destroy_read_struct(png_pp, info_pp, end_pp);
-     return 0;
-   }
--  if (setjmp((*png_pp)->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(*png_pp))) {
-     /* On error */
-     png_destroy_read_struct(png_pp, info_pp, end_pp);
-     return 0;
-@@ -220,7 +220,7 @@
-     zclose(zinput_file);
-     return 0;
-   }
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* On error */
-     freeImage(image);
-     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-diff -wbBur xloadimage.4.1/tiff.c xloadimage.4.1.my/tiff.c
---- xloadimage.4.1/tiff.c	2011-02-11 14:47:38.000000000 +0300
-+++ xloadimage.4.1.my/tiff.c	2012-01-19 12:00:00.000000000 +0400
-@@ -34,14 +34,14 @@
-      struct tiff_info *info;
- {
-   ZFILE *zf;
--  TIFFHeader th;
-+  TIFFHeaderCommon th;
-   TIFF *tiff;
- 
-   zf = zopen(fullname);
- 
-   /* read TIFF header and see if it looks right
-    */
--  if ((zread(zf, (byte *)&th, sizeof(TIFFHeader)) == sizeof(TIFFHeader)) &&
-+  if ((zread(zf, (byte *)&th, sizeof(TIFFHeaderCommon)) == sizeof(TIFFHeaderCommon)) &&
-       ((th.tiff_magic == TIFF_BIGENDIAN) ||
-        (th.tiff_magic == TIFF_LITTLEENDIAN))) {
- 
diff --git a/community-testing/xmms-imms/PKGBUILD b/community-testing/xmms-imms/PKGBUILD
deleted file mode 100644
index efa402648..000000000
--- a/community-testing/xmms-imms/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 64113 2012-02-08 23:56:14Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Kritoke <kritoke@nospam.gmail.com>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=xmms-imms
-pkgver=3.1.0_rc8
-pkgrel=3
-pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste."
-arch=(i686 x86_64)
-license=("GPL")
-url="http://imms.luminal.org/"
-depends=('xmms' 'pcre' 'sqlite3' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw')
-replaces=('imms')
-source=(http://imms.googlecode.com/files/imms-${pkgver/_/-}.tar.bz2)
-md5sums=('31b77cbc2dba334b039c5618bbbf203e')
-
-build() {
-  cd $srcdir/imms-${pkgver/_/-}
-
-  if [ $NOEXTRACT -ne 1 ]; then
-    autoheader
-    aclocal
-    autoconf
-    ./configure --prefix=/usr --disable-immsremote
-  fi
-
-  make || return 1
-  mkdir -p $pkgdir/usr/bin
-  make prefix=$pkgdir/usr DESTDIR=$startdir/pkg/usr/lib/xmms/General \
-	 BMPDESTDIR=$pkgdir/usr/lib/bmp/General install || return 1
-}
diff --git a/community-testing/xmoto/PKGBUILD b/community-testing/xmoto/PKGBUILD
deleted file mode 100644
index 0a865690d..000000000
--- a/community-testing/xmoto/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Contributor: Denis (dtonator@gmail.com)
-
-pkgname=xmoto
-pkgver=0.5.9
-pkgrel=1
-pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
-arch=('i686' 'x86_64')
-url="http://xmoto.tuxfamily.org"
-license=('GPL')
-depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' 
-	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++')
-install=xmoto.install
-source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
-        'xmoto-0.5.9-libpng15.patch')
-sha1sums=('07757accce78151dc8873bef8270df0e56196772'
-          '27f52bd30772f67898e0bfd8c1e12478a4848192')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}/xmoto-0.5.9-libpng15.patch"
-
-  # build and install 
-  ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install
-
-  # install desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \
-        ${pkgdir}/usr/share/applications/xmoto.desktop
-
-  # install icon for desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \
-        ${pkgdir}/usr/share/pixmaps/xmoto.xpm
-}
diff --git a/community-testing/xmoto/xmoto-0.5.9-libpng15.patch b/community-testing/xmoto/xmoto-0.5.9-libpng15.patch
deleted file mode 100644
index 0410c81c5..000000000
--- a/community-testing/xmoto/xmoto-0.5.9-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/image/tim_png.cpp	2011-10-11 22:18:11.000000000 +0200
-+++ b/src/image/tim_png.cpp	2012-01-19 19:58:24.000000000 +0100
-@@ -24,6 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include "png.h"
- 
diff --git a/community-testing/xmoto/xmoto.desktop b/community-testing/xmoto/xmoto.desktop
deleted file mode 100644
index 5ae6fe226..000000000
--- a/community-testing/xmoto/xmoto.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Icon=/usr/share/xmoto/xmoto_icone_x.ico
-Exec=/usr/bin/xmoto
-Terminal=false
-StartupNotify=false
-
-Name=XMoto
-GenericName=Game
-Comment=is a 2D physics-based motocross game.
-
-Categories=Game;
diff --git a/community-testing/xmoto/xmoto.install b/community-testing/xmoto/xmoto.install
deleted file mode 100644
index 52399d4c1..000000000
--- a/community-testing/xmoto/xmoto.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  /usr/bin/update-desktop-database 
-}
-
-post_upgrade() {
-  /usr/bin/update-desktop-database 
-}
-
-post_remove() {
-  /usr/bin/update-desktop-database 
-}
-
-op=$1
-shift
-$op $*
diff --git a/community-testing/xnc/PKGBUILD b/community-testing/xnc/PKGBUILD
deleted file mode 100644
index 4cf3968de..000000000
--- a/community-testing/xnc/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63327 2012-01-30 19:12:18Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=xnc
-pkgver=5.0.4
-pkgrel=6
-pkgdesc="X nortern captain file manager"
-arch=(i686 x86_64)
-url="http://xnc.jinr.ru/"
-license=('GPL')
-depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7')
-makedepends=('libxt')
-options=('!makeflags')
-#source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch)
-source=(ftp://ftp.archlinux.org/other/community/xnc/xnc-$pkgver.src.tar.gz
-	xnc-gcc44.patch
-	libpng15.patch)
-md5sums=('62446cdfdf5730f125fb351a658c0bd3'
-         'c0037a081824bca691e59a4ec68b6686'
-         '7159af1c645fda860f0e5057100651ad')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/xnc-gcc44.patch
-  patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/xnc/libpng15.patch b/community-testing/xnc/libpng15.patch
deleted file mode 100644
index 53b941b81..000000000
--- a/community-testing/xnc/libpng15.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -wbBur xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c
---- xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c	2002-08-05 14:43:09.000000000 +0400
-+++ xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c	2012-01-19 13:46:48.000000000 +0400
-@@ -138,7 +138,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		IMG_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -207,9 +207,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -217,7 +217,7 @@
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		IMG_SetError("Out of memory");
- 		goto done;
-@@ -252,6 +252,10 @@
- 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
- 	png_read_end(png_ptr, info_ptr);
- 
-+	png_colorp plte;
-+	int num_palette;
-+	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
-+
- 	/* Load the palette, if any */
- 	palette = surface->format->palette;
- 	if ( palette ) {
-@@ -262,12 +266,12 @@
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else if (num_palette > 0 ) {
-+		palette->ncolors = num_palette;
-+		for( i=0; i<num_palette; ++i ) {
-+		    palette->colors[i].b = plte[i].blue;
-+		    palette->colors[i].g = plte[i].green;
-+		    palette->colors[i].r = plte[i].red;
- 		}
- 	    }
- 	}
diff --git a/community-testing/xnc/xnc-gcc44.patch b/community-testing/xnc/xnc-gcc44.patch
deleted file mode 100644
index 120d9d467..000000000
--- a/community-testing/xnc/xnc-gcc44.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -wbBur xnc-5.0.4/src/include/commonfuncs.h xnc-5.0.4.my/src/include/commonfuncs.h
---- xnc-5.0.4/src/include/commonfuncs.h	2002-10-16 10:44:17.000000000 +0400
-+++ xnc-5.0.4.my/src/include/commonfuncs.h	2011-11-17 18:59:19.000000000 +0400
-@@ -15,7 +15,7 @@
- extern int   path_to_fullpath(char* dest, char *srcdir);
- extern void  add_path_content(char *curdir, const char *cont, int vms_host=0);
- extern void  upper_path(char *curdir, int vms_host=0);
--extern char* get_first_content(const char *curdir, char *cont);
-+extern const char* get_first_content(const char *curdir, char *cont);
- extern void  get_last_content(char *curdir, char *cont);
- extern void  get_last_and_rest_content(char* curdir, char* last, char* rest);
- extern void  str_swap(char *str1, char *str2);
-diff -wbBur xnc-5.0.4/src/lib/tool/commonfuncs.cxx xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx
---- xnc-5.0.4/src/lib/tool/commonfuncs.cxx	2002-10-16 10:44:20.000000000 +0400
-+++ xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx	2011-11-17 18:59:19.000000000 +0400
-@@ -117,9 +117,9 @@
- }
- 
- //Get first content of dirname
--char*   get_first_content(const char *curdir, char *cont)
-+const char*   get_first_content(const char *curdir, char *cont)
- {
--        char *b=strchr(curdir,'/');
-+        const char *b=strchr(curdir,'/');
-         if(b)
-           {
-                   strncpy(cont,curdir,b-curdir);
-diff -wbBur xnc-5.0.4/src/lib/vfs/afs.cxx xnc-5.0.4.my/src/lib/vfs/afs.cxx
---- xnc-5.0.4/src/lib/vfs/afs.cxx	2003-11-27 18:36:43.000000000 +0300
-+++ xnc-5.0.4.my/src/lib/vfs/afs.cxx	2011-11-17 18:59:19.000000000 +0400
-@@ -29,7 +29,7 @@
- // The return value is static, so copy it before using the
- // method again!
- 
--char *create_dirs(char *rootdir, char* dirlist)
-+char *create_dirs(char *rootdir, const char* dirlist)
- {
-    char str[L_MAXPATH];
-    char cont[FLIST_NAME];
-@@ -1350,7 +1350,7 @@
-     add_path_content(curdir, to_dir);
-   } else        //If we here then we doing cd not to subdir but to subdir/subdir...
-   {
--    char *s=to_dir;
-+    const char *s=to_dir;
-     if(*s)
-     {
-       do
-diff -wbBur xnc-5.0.4/src/lib/vfs/ftpfs.cxx xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx
---- xnc-5.0.4/src/lib/vfs/ftpfs.cxx	2002-10-30 15:47:38.000000000 +0300
-+++ xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx	2011-11-17 18:59:19.000000000 +0400
-@@ -1413,7 +1413,7 @@
-                  return;
-          if(strcmp(dir,"/"))
-          {
--                 char *s=dir;
-+                 const char *s=dir;
-                  if(*s=='/')         //Skip leading '/'
-                          s++;
-                  do
-diff -wbBur xnc-5.0.4/src/man_page.cxx xnc-5.0.4.my/src/man_page.cxx
---- xnc-5.0.4/src/man_page.cxx	2002-10-02 16:54:33.000000000 +0400
-+++ xnc-5.0.4.my/src/man_page.cxx	2011-11-17 18:59:00.000000000 +0400
-@@ -81,7 +81,7 @@
-       buf[j] = 0;
-       manf->size = j;
-       delete buf;
--      fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC);
-+      fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-       write(fp, buf2, j);
-       close(fp);
-       delete manf;
diff --git a/community-testing/xplanet/PKGBUILD b/community-testing/xplanet/PKGBUILD
deleted file mode 100644
index f23f65846..000000000
--- a/community-testing/xplanet/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 63329 2012-01-30 19:12:24Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=xplanet
-pkgver=1.2.2
-pkgrel=2
-pkgdesc="An Xearth wannabe"
-arch=(i686 x86_64)
-url="http://xplanet.sourceforge.net/"
-license=('GPL')
-depends=('pango' 'libungif' 'libtiff' 'libxss')
-source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz)
-md5sums=('b38c3b4cfdd772643f876a9bb15f288b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-freetype
-  make
-  make prefix=$pkgdir/usr install
-}
diff --git a/community-testing/xvkbd/PKGBUILD b/community-testing/xvkbd/PKGBUILD
deleted file mode 100644
index c48eda54b..000000000
--- a/community-testing/xvkbd/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 63468 2012-02-04 13:50:13Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Benjamin Andresen <benny@klapmuetz.org>
-# Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi>
-
-pkgname=xvkbd
-pkgver=3.2
-pkgrel=3
-pkgdesc="virtual (graphical) keyboard program for X Window System"
-arch=('i686' 'x86_64')
-url="http://homepage3.nifty.com/tsato/xvkbd/"
-license=('GPL')
-depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp' 'libxpm')
-makedepends=('imake')
-source=(http://homepage3.nifty.com/tsato/xvkbd/xvkbd-$pkgver.tar.gz)
-md5sums=('1bce8d6c27e6e7df92ec09b414f82dad')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  xmkmf
-  sed -i 's|#include <X11/Xaw/|#include <X11/Xaw3d/|' xvkbd.c
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR=$pkgdir install
-  # fix
-  rm -f $pkgdir/usr/lib/X11/app-defaults
-  mkdir -p $pkgdir/usr/lib/X11
-  mv $pkgdir/etc/X11/app-defaults $pkgdir/usr/lib/X11/
-  rm -rf $pkgdir/etc/
-}
diff --git a/community/binutils-avr/PKGBUILD b/community/binutils-avr/PKGBUILD
deleted file mode 100644
index cd2f9c7e8..000000000
--- a/community/binutils-avr/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 60627 2011-12-15 18:55:59Z jelle $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: danst0 <danst0@west.de>
-
-pkgname=binutils-avr
-pkgver=2.22
-pkgrel=1
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-depends=('glibc>=2.12-5' 'zlib')
-options=('!libtool' '!distcc' '!ccache')
-source=(http://ftp.gnu.org/gnu/${pkgname/-avr}/${pkgname/-avr}-${pkgver}.tar.bz2{,.sig})
-md5sums=('ee0f10756c84979622b992a4a61ea3f5'
-         '6aea2485019497583e5c3f5fc4a39cd5')
-
-build() {
-	cd ${srcdir}/${pkgname/-avr}-${pkgver}
-
-	mkdir build
-	cd build
-
-  	CC="gcc -L$(pwd)/bfd/.libs/"
-  	if [ "${CARCH}" = "x86_64" ]; then
-    		../configure --build=$(../config.guess) \
-                	--disable-multilib \
-                 	--disable-nls \
-                 	--enable-64-bit-bfd \
-                 	--enable-install-libbfd \
-                 	--includedir=/usr/$(../config.guess)/include \
-                 	--infodir=/usr/share/info \
-                 	--libdir=/usr/lib \
-                 	--mandir=/usr/share/man \
-                 	--prefix=/usr \
-                 	--target=avr
-	else
-		../configure --build=$(../config.guess) \
-                	--disable-nls \
-                	--enable-install-libbfd \
-                 	--includedir=/usr/$(../config.guess)/include \
-                 	--infodir=/usr/share/info \
-                 	--libdir=/usr/lib \
-                 	--mandir=/usr/share/man \
-                 	--prefix=/usr \
-                 	--target=avr
-  	fi
-
-  	# This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
-  	make configure-host
-
-  	make tooldir=/usr
-}
-
-package() {
- 	cd ${srcdir}/${pkgname/-avr}-${pkgver}
-
-	cd build
-	make DESTDIR=${pkgdir} tooldir=/usr install
-
-  	rm -f ${pkgdir}/usr/lib/libiberty.a
-
-  	for bin in addr2line ar as c++filt gprof ld nm objcopy objdump ranlib readelf size strings strip ; do
-    		rm -f ${pkgdir}/usr/bin/${bin} || return 1
-  	done
-
-  	for info in as bfd binutils configure gprof ld standards; do
-    		mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info
- 	done
-}
-
diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD
deleted file mode 100644
index e886b8a88..000000000
--- a/community/cuda-toolkit/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=cuda-toolkit
-pkgver=4.1.28
-pkgrel=2
-_fedver=14
-pkgdesc="NVIDIA's GPU programming toolkit"
-arch=('i686' 'x86_64')
-
-url="http://www.nvidia.com/object/cuda_home.html"
-license=('custom')
-depends=('gcc-libs' 'opencl-nvidia')
-optdepends=('gdb: for cuda-gdb')
-if [ "$CARCH" = "i686" ]; then
-  _arch=32
-  md5sums=('835d403e86f4b014b348c587ffb23c0d'
-           '5af5226b36cd3f9993f762f85b5d236a'
-           'c0781c63e726eaf03e10135b42b85729')
-else
-  _arch=64
-  md5sums=('c82103da07d0e96f3d65d7b308b74446'
-           '5af5226b36cd3f9993f762f85b5d236a'
-           'c0781c63e726eaf03e10135b42b85729')
-fi
-
-install=cuda-toolkit.install
-source=(http://developer.download.nvidia.com/compute/cuda/4_1/rel/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run
-        cuda-toolkit.sh
-        cuda-toolkit.conf)
-
-build() {
-  cd "$srcdir"
-}
-
-package() {
-  cd "$srcdir"
-
-  mkdir -p $pkgdir/opt/cuda-toolkit
-  sh cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run --keep -- --prefix=$pkgdir/opt/cuda-toolkit
-
-  sed -i "/unsupported GNU/d" $pkgdir/opt/cuda-toolkit/include/host_config.h
-  sed -i "s|/build/pkg||g" $pkgdir/opt/cuda-toolkit/bin/nvvp
-
-  install -Dm755 cuda-toolkit.sh $pkgdir/etc/profile.d/cuda-toolkit.sh
-  install -Dm644 cuda-toolkit.conf $pkgdir/etc/ld.so.conf.d/cuda-toolkit.conf
-  install -Dm644 $pkgdir/opt/cuda-toolkit/doc/EULA.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
-  mkdir -p $pkgdir/usr/lib
-  cd $pkgdir/usr/lib
-  ln -s /usr/lib/libncurses.so.5 libtinfo.so.5
-}
diff --git a/community/cuda-toolkit/cuda-toolkit.conf b/community/cuda-toolkit/cuda-toolkit.conf
deleted file mode 100644
index 0f55b39a7..000000000
--- a/community/cuda-toolkit/cuda-toolkit.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/opt/cuda-toolkit/lib64
-/opt/cuda-toolkit/lib
diff --git a/community/cuda-toolkit/cuda-toolkit.install b/community/cuda-toolkit/cuda-toolkit.install
deleted file mode 100644
index 4e1a1a6b7..000000000
--- a/community/cuda-toolkit/cuda-toolkit.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-    echo "You need to relogin in order for the cuda-toolkit binaries to appear in your path."
-    post_upgrade
-}
-
-post_upgrade() {
-    ldconfig -r .
-}
diff --git a/community/cuda-toolkit/cuda-toolkit.sh b/community/cuda-toolkit/cuda-toolkit.sh
deleted file mode 100755
index 737eb1d3e..000000000
--- a/community/cuda-toolkit/cuda-toolkit.sh
+++ /dev/null
@@ -1 +0,0 @@
-export PATH=$PATH:/opt/cuda-toolkit/bin
diff --git a/community/extremetuxracer/libpng14.patch b/community/extremetuxracer/libpng14.patch
deleted file mode 100644
index 5c9999857..000000000
--- a/community/extremetuxracer/libpng14.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp	2007-09-01 19:38:12.000000000 +0300
-+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp	2010-01-25 03:47:21.000000000 +0200
-@@ -53,7 +53,7 @@
-     if (!info_ptr)
-     {
-         png_destroy_read_struct(&png_ptr,
--           (png_infopp)NULL, (png_infopp)NULL);
-+           NULL, NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -62,7 +62,7 @@
-     if (!end_info)
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr,
--          (png_infopp)NULL);
-+          NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -77,7 +77,7 @@
- 	
- 	
- 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
--       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+       &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	
- 	if(bit_depth == 16)
-         png_set_strip_16(png_ptr);
-@@ -88,7 +88,7 @@
- 		png_set_expand(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 	
- 	if( color_type == PNG_COLOR_TYPE_GRAY ||
-@@ -96,7 +96,7 @@
- 		png_set_gray_to_rgb(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 		
- 	this->width=width;
-@@ -114,7 +114,7 @@
- 	}
- 	
- 	png_read_end(png_ptr, info_ptr);
--	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 	fclose(fp);
- }
- 
diff --git a/community/fltk2/libpng14.patch b/community/fltk2/libpng14.patch
deleted file mode 100644
index f6c49228e..000000000
--- a/community/fltk2/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr fltk-2.0.x-r6829.orig/images/fl_png.cxx fltk-2.0.x-r6829/images/fl_png.cxx
---- fltk-2.0.x-r6829.orig/images/fl_png.cxx	2010-01-23 04:42:12.000000000 +0200
-+++ fltk-2.0.x-r6829/images/fl_png.cxx	2010-01-23 04:58:31.000000000 +0200
-@@ -62,7 +62,7 @@ bool pngImage::test(const uchar* datas, 
- #if !HAVE_LIBPNG
-   return 0;
- #else
--  return png_check_sig((png_byte*)datas, (int)size)!=0;
-+  return png_sig_cmp((png_byte*)datas, 0, (int)size)==0;
- #endif
- }
- 
diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD
deleted file mode 100644
index 8cb0333b1..000000000
--- a/community/freecol/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 56049 2011-09-29 16:29:17Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: TDY <tdy@gmx.com>
-# Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com>
-
-pkgname=freecol
-pkgver=0.10.3
-pkgrel=1
-pkgdesc="A turn-based strategy game based on Colonization"
-arch=('i686' 'x86_64')
-url="http://www.freecol.org/"
-license=('GPL')
-depends=('java-runtime')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip
-        fc.desktop fc.sh)
-md5sums=('9aafa286247470831cd322e688ed5103'
-         '55594d770904af3e3e3852d375085357'
-         'ae473cd1d86f8f764250ee00b6fda90b')
-
-build() {
-  cd "$srcdir/$pkgname"
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-
-  install -Dm644 FreeCol.jar "$pkgdir/usr/share/java/$pkgname/FreeCol.jar"
-  install -Dm644 FreeCol.pdf "$pkgdir/usr/share/doc/$pkgname/FreeCol.pdf"
-  install -Dm644 $pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
-  install -Dm644 ../fc.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm755 ../fc.sh "$pkgdir/usr/bin/$pkgname"
-
-  cp -r data jars "$pkgdir/usr/share/java/$pkgname/"
-  find "$pkgdir/usr/share/java/$pkgname" -type d -exec chmod 755 '{}' \;
-  find "$pkgdir/usr/share/java/$pkgname" -type f -exec chmod 644 '{}' \;
-}
diff --git a/community/freecol/fc.desktop b/community/freecol/fc.desktop
deleted file mode 100644
index 83ed6a97d..000000000
--- a/community/freecol/fc.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=FreeCol
-GenericName=Strategy Game
-Comment=A free Colonization clone
-TryExec=/usr/bin/freecol
-Exec=freecol
-Icon=/usr/share/pixmaps/freecol.xpm
-Categories=Game;StrategyGame;
diff --git a/community/freecol/fc.sh b/community/freecol/fc.sh
deleted file mode 100644
index 0ce3dac3a..000000000
--- a/community/freecol/fc.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-FC_PATH=/usr/share/java/freecol
-LOG_PATH=/tmp/freecol
-
-[ ! -d "$LOG_PATH" ] && install -dm755 $LOG_PATH
-cd $LOG_PATH
-java -Xmx256M -jar $FC_PATH/FreeCol.jar "$@" --freecol-data $FC_PATH/data \
-  &> ./messages.log
diff --git a/community/gcc-avr/PKGBUILD b/community/gcc-avr/PKGBUILD
deleted file mode 100644
index db977e4d4..000000000
--- a/community/gcc-avr/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 57845 2011-11-03 12:26:59Z jelle $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: danst0 <danst0@west.de>
-
-pkgname=gcc-avr
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="The GNU avr Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'custom')
-url="http://gcc.gnu.org/"
-depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc')
-options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
-source=(http://ftp.gnu.org/gnu/gcc/${pkgname/-avr}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2)
-md5sums=('0c0e7e35d2215e19de9c97efba507553'
-         '0d75ca7ca35b1e7f252223f9d23a6ad1')
-
-build() {
-	export CFLAGS="-O2 -pipe"
-  	export CXXFLAGS="-O2 -pipe"
-
-  	cd "${srcdir}/${pkgname/-avr}-${pkgver}" 
-
-  	mkdir build
-  	cd build
-  	../configure --disable-libssp \
-        	--disable-nls \
-		--enable-languages=c,c++ \
-		--infodir=/usr/share/info \
-               	--libdir=/usr/lib \
-               	--libexecdir=/usr/lib \
-               	--mandir=/usr/share/man \
-               	--prefix=/usr \
-               	--target=avr \
-               	--with-gnu-as \
-               	--with-gnu-ld \
-               	--with-as=/usr/bin/avr-as \
-               	--with-ld=/usr/bin/avr-ld
-
-  	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname/-avr}-${pkgver}"
-
-  	cd build
-  	make -j1 DESTDIR=${pkgdir} install
-
-  	install -Dm644 "${srcdir}/${pkgname/-avr}-${pkgver}/COPYING.RUNTIME" \
-		"${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION"
-
-  	rm -f ${pkgdir}/usr/lib/libiberty.a
-  	rm -rf ${pkgdir}/usr/share/man/man7
-  	rm -rf ${pkgdir}/usr/share/info
-}
-
-md5sums=('780f614ab18c7a9066dec6387d7490b2'
-         '87ecd60431e41096419dd8a10f76e46b')
diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog
deleted file mode 100644
index d0a376568..000000000
--- a/community/geos/geos.changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-2010-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 3.2.2
-
-2010-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 3.2.1
diff --git a/community/glpng/libglpng-1.45-debian.patch b/community/glpng/libglpng-1.45-debian.patch
deleted file mode 100644
index 062bf6364..000000000
--- a/community/glpng/libglpng-1.45-debian.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up libglpng-1.45.orig libglpng-1.45
-diff -up libglpng-1.45.orig/src/glpng.c.orig libglpng-1.45.orig/src/glpng.c
---- libglpng-1.45.orig/src/glpng.c.orig	2000-07-10 21:27:10.000000000 +0200
-+++ libglpng-1.45.orig/src/glpng.c	2009-05-17 23:02:38.000000000 +0200
-@@ -29,7 +29,7 @@
- #include <GL/gl.h>

- #include <stdlib.h>
- #include <math.h>
--#include "png/png.h"
-+#include <png.h>
- 

- /* Used to decide if GL/gl.h supports the paletted extension */

- #ifdef GL_COLOR_INDEX1_EXT

-@@ -113,6 +113,7 @@ static void Resize(int components, const
- 	}
- }
- 

-+#ifdef _WIN32
- static int ExtSupported(const char *x) {
- 	static const GLubyte *ext = NULL;
- 	const char *c;
-@@ -129,6 +130,7 @@ static int ExtSupported(const char *x) {
- 
- 	return 0;
- }
-+#endif

- 

- #define GET(o) ((int)*(data + (o)))

- 

diff --git a/community/glpng/libpng14.patch b/community/glpng/libpng14.patch
deleted file mode 100644
index b9fae8c2d..000000000
--- a/community/glpng/libpng14.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur libglpng-1.45.orig-old/src/glpng.c libglpng-1.45.orig/src/glpng.c
---- libglpng-1.45.orig-old/src/glpng.c	2000-07-11 05:27:10.000000000 +1000
-+++ libglpng-1.45.orig/src/glpng.c	2010-02-13 22:53:53.000000000 +1000
-@@ -269,7 +269,7 @@
- 	if (pinfo == NULL) return 0;
- 
- 	fread(header, 1, 8, fp);
--	if (!png_check_sig(header, 8)) return 0;
-+	if (png_sig_cmp(header, 0, 8)) return 0;
- 
- 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	info = png_create_info_struct(png);
-@@ -373,7 +373,7 @@
- 	png_uint_32 i;
- 
- 	fread(header, 1, 8, fp);
--	if (!png_check_sig(header, 8)) return 0;
-+	if (png_sig_cmp(header, 0, 8)) return 0;
- 
- 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 	info = png_create_info_struct(png);
diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD
deleted file mode 100644
index 33cb3d7c6..000000000
--- a/community/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.4
-pkgrel=1
-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=('1101e1d1cb1b55b84b9214ef02217ec3'
-         '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/lightspark/lightspark.install b/community/lightspark/lightspark.install
deleted file mode 100644
index 75e2b7b55..000000000
--- a/community/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/lightspark/llvm29.diff b/community/lightspark/llvm29.diff
deleted file mode 100644
index f859852af..000000000
--- a/community/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/lorcon-old-svn/PKGBUILD b/community/lorcon-old-svn/PKGBUILD
deleted file mode 100644
index 271937ec6..000000000
--- a/community/lorcon-old-svn/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 60383 2011-12-12 18:03:48Z andrea $
-# Maintainer:
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: fnord0 [fnord0 <AT> riseup <DOT> net]
-
-pkgname=lorcon-old-svn
-pkgver=224
-pkgrel=1
-pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames"
-url='http://802.11ninja.net'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libnl')
-options=('!libtool')
-source=("ftp://ftp.archlinux.org/other/community/lorcon-old/lorcon-old-${pkgver}.tar.bz2")
-md5sums=('7a939cc8ec0d70d1b312b9fe9f0dfaf8')
-
-build() {
-  cd "${srcdir}/lorcon-old-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/lorcon-old-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mdf2iso/ChangeLog b/community/mdf2iso/ChangeLog
deleted file mode 100644
index c206c3cde..000000000
--- a/community/mdf2iso/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2007-06-29 tardo <tardo@nagi-fanboi.net>
-* Rebuilt with LFS patch
-
-2007-06-29 Georg Grabler (STiAT) <ggrabler@gmail.com>
-* Added lfs.patch (long file system support) for images > 4GB
-
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/mdf2iso/PKGBUILD b/community/mdf2iso/PKGBUILD
deleted file mode 100644
index 21370ed35..000000000
--- a/community/mdf2iso/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 25104 2010-08-30 23:20:53Z lcarlier $
-# Contributor: Jeff Mickey <j@codemac.net>
-# Contributer: Henrik Ronellenfitsch <henrik at searinox dot de>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=mdf2iso
-pkgver=0.3.0
-pkgrel=4
-pkgdesc="Converts Alcohol 120% .mdf files into .iso files"
-arch=('i686' 'x86_64')
-url="http://mdf2iso.berlios.de"
-license=('GPL')
-depends=('glibc')
-source=(http://download.berlios.de/mdf2iso/${pkgname}-${pkgver}-src.tar.bz2 lfs.patch)
-md5sums=('a190625318476a196930ac66acd8fd07' 'a7510b8bc36d468ace80df3ecf55a3a3')
-
-build() {
-	cd ${srcdir}/${pkgname}
-
-	patch -p1 < ../lfs.patch
-	./configure --prefix=/usr
-	make || return 1
-}
-
-package() {
-	cd ${srcdir}/${pkgname}
-
-	make DESTDIR=${pkgdir} install
-}
diff --git a/community/mdf2iso/lfs.patch b/community/mdf2iso/lfs.patch
deleted file mode 100644
index 5ff62c0ba..000000000
--- a/community/mdf2iso/lfs.patch
+++ /dev/null
@@ -1,683 +0,0 @@
-Only in mdf2iso/src: .deps
-Only in mdf2iso.new/src: .kdbgrc.mdf2iso
-diff -bur mdf2iso/src/Makefile.am mdf2iso.new/src/Makefile.am
---- mdf2iso/src/Makefile.am	2005-05-19 11:24:11.000000000 +0200
-+++ mdf2iso.new/src/Makefile.am	2005-07-31 17:47:36.000000000 +0200
-@@ -1,2 +1,3 @@
- bin_PROGRAMS = mdf2iso
- mdf2iso_SOURCES = mdf2iso.c
-+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall
-diff -bur mdf2iso/src/Makefile.in mdf2iso.new/src/Makefile.in
---- mdf2iso/src/Makefile.in	2005-05-22 21:42:09.000000000 +0200
-+++ mdf2iso.new/src/Makefile.in	2005-07-31 17:49:16.000000000 +0200
-@@ -136,6 +136,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- mdf2iso_SOURCES = mdf2iso.c
-+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall
- all: all-am
- 
- .SUFFIXES:
-@@ -149,9 +150,9 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign  src/Makefile
-+	  $(AUTOMAKE) --gnu  src/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- 	@case '$?' in \
-diff -bur mdf2iso/src/mdf2iso.c mdf2iso.new/src/mdf2iso.c
---- mdf2iso/src/mdf2iso.c	2005-05-22 21:52:08.000000000 +0200
-+++ mdf2iso.new/src/mdf2iso.c	2005-07-31 19:41:56.000000000 +0200
-@@ -1,4 +1,4 @@
-- /*  $Id: mdf2iso.c, 22/05/05 
-+/*  $Id: mdf2iso.c, 22/05/05 
- 
-     Copyright (C) 2004,2005 Salvatore Santagati <salvatore.santagati@gmail.com>   
- 
-@@ -16,19 +16,14 @@
-     along with this program; if not, write to the                         
-     Free Software Foundation, Inc.,                                       
-     59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.        
--  */
-+*/
- 
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
- 
--#define VERSION "0.3.0"
--
--/* Support Large File */
--
--#define _FILE_OFFSET_BITS 64
--
-+#define VERSION "0.3.1"
- 
- 
- const char SYNC_HEADER[12] = { (char) 0x00,
-@@ -83,14 +78,21 @@
-   (char) 0x00
- };
- 
-+#define ISO9660 0
-+#define SYNC 1
-+#define SYNC_MDF 2
-+#define MDF_AUDIO 3
-+#define UNKNOWN -1
- 
--void
--toc_file (char *destfilename, int sub)
-+int toc_file (char *destfilename, int sub)
- {
--  char destfiletoc[1024], destfiledat[1024];
-+  int ret=0;
-+  char *destfiletoc;
-+  char *destfiledat;
-   FILE *ftoc;
--  strcpy (destfiletoc, destfilename);
--  strcpy (destfiledat, destfilename);
-+  
-+  destfiletoc=strdup(destfilename);
-+  destfiledat=strdup(destfilename);
-   strcpy (destfiletoc + strlen (destfilename) - 4, ".toc");
-   strcpy (destfiledat + strlen (destfilename) - 4, ".dat");
- 
-@@ -100,11 +102,8 @@
-       fprintf (ftoc, "// Track 1\n");
-       fprintf (ftoc, "TRACK MODE1_RAW");
- 
--      if (sub == 1)
--	fprintf (ftoc, " RW_RAW\n");
--
--      else
--	fprintf (ftoc, "\n");
-+    if (sub == 1) fprintf (ftoc, " RW_RAW\n");
-+    else fprintf (ftoc, "\n");
- 
-       fprintf (ftoc, "NO COPY\n");
-       fprintf (ftoc, "DATAFILE \"%s\"\n", destfiledat);
-@@ -114,26 +113,27 @@
-     }
-   else
-     {
--      printf ("%s\n", strerror (errno));
--      exit (EXIT_FAILURE);
-+    printf ("Error opening %s for output: %s\n",destfiletoc,strerror(errno));
-+    ret=-1;
-     };
--
-+  free(destfiletoc);
-+  free(destfiledat);
-+  return ret;
- }
- 
--int
--number_file (char *destfilename)
-+/*
-+int number_file (char *destfilename)
- {
-   int i = 1, test_mdf = 0;
-   int n_mdf;
-   char mdf[2], destfilemdf[2354];
-   FILE *fsource;
-+  
-   strcpy (destfilemdf, destfilename);
-   strcpy (destfilemdf + strlen (destfilename) - 1, ".0");
-   for (i = 0; test_mdf == 0; i++)
--
-     {
-       if ((fsource = fopen (destfilemdf, "rb")) != NULL)
--
- 	{
- 	  printf ("\nCheck : ");
- 	  sprintf (mdf, "md%d", i);
-@@ -141,203 +141,219 @@
- 	  printf ("%s, ", destfilemdf);
- 	  fclose (fsource);
- 	}
--
-       else
- 	{
- 	  test_mdf = 1;
- 	}
--    };
-+  }
-   printf ("\r                                   \n");
-   n_mdf = i - 1;
-   return (n_mdf);
- }
-+*/
- 
--void
--cuesheets (char *destfilename)
-+int cuesheets (char *destfilename)
- {
--  char destfilecue[1024], destfilebin[1024];
-+  int ret=0;
-+  char *destfilecue;
-+  char *destfilebin;
-   FILE *fcue;
--  strcpy (destfilecue, destfilename);
--  strcpy (destfilebin, destfilename);
-+  
-+  destfilecue=strdup(destfilename);
-+  destfilebin=strdup(destfilename);
-   strcpy (destfilecue + strlen (destfilename) - 4, ".cue");
-   strcpy (destfilebin + strlen (destfilename) - 4, ".bin");
--  fcue = fopen (destfilecue, "w");
-+  if ((fcue = fopen (destfilecue, "w"))!=NULL)
-+  {
-   fprintf (fcue, "FILE \"%s\" BINARY\n", destfilebin);
-   fprintf (fcue, "TRACK 1 MODE1/2352\n");
-   fprintf (fcue, "INDEX 1 00:00:00\n");
-   rename (destfilename, destfilebin);
-   printf ("Create Cuesheets : %s\n", destfilecue);
-   fclose (fcue);
-+  }
-+  else
-+  {
-+    printf ("Error opening %s for output: %s\n",destfilecue,strerror(errno));
-+    ret=-1;
-+  }
-+  return ret;
- }
- 
--void
--main_percent (int percent_bar)
-+int previous_percent=-1;
-+void main_percent (int percent_bar)
-+// Prints a progress bar, takes a percentage as argument.
- {
--  int progress_bar, progress_space;
-+  //int progress_bar, progress_space;
-+ 
-+  if (percent_bar==previous_percent) return;  // Nothing changed, don't waste CPU cycles.
-+  
-+  printf("%3d%% [:%.*s>%.*s:]\r",percent_bar,20-(percent_bar/5),"                    ",
-+                                                  percent_bar/5,"====================");
-+  /*
-   printf ("%d%% [:", percent_bar);
--  for (progress_bar = 1; progress_bar <= (int) (percent_bar / 5);
--       progress_bar++)
-+  for (progress_bar = 1; progress_bar <= (int) (percent_bar / 5); progress_bar++)
-     printf ("=");
-   printf (">");
- 
--  for (progress_space = 0; progress_space < (20 - progress_bar);
--       progress_space++)
--    printf (" ");
-+  for (; progress_bar <= 20; ++progress_bar) printf (" ");
-   printf (":]\r");
-+  */
- }
- 
--void
--usage ()
-+void usage ()
-+// Prints the command line syntax
- {
--  printf ("mdf2iso v%s by Salvatore Santagati\n", VERSION);
--  printf ("Web     : http//mdf2iso.berlios.de\n");
--  printf ("Email   : salvatore.santagati@gmail.com\n");
--  printf ("Irc     : irc.freenode.net #ignus\n");
--  printf ("Note	: iodellavitanonhocapitouncazzo\n");
--  printf ("License : released under the GNU GPL v2 or later\n\n");
-+  printf (" Web     : http//mdf2iso.berlios.de\n");
-+  printf (" Email   : salvatore.santagati@gmail.com\n");
-+  printf (" Irc     : irc.freenode.net #ignus\n");
-+  printf (" Note    : iodellavitanonhocapitouncazzo\n\n");
-   printf ("Usage :\n");
--  printf ("mdf2iso [OPTION] [BASENAME.MDF] [DESTINATION]\n\n");
--  printf ("OPTION\n");
--  printf ("\t--toc    Generate toc file\n");
--  printf ("\t--cue    Generate cue file\n");
--  printf ("\t--help   display this notice\n\n");
-+  printf ("mdf2iso [--cue|--toc|--help] <sourcefile> [destfile]\n\n");
-+  printf ("Options:\n");
-+  printf ("  --toc    Generate toc/dat files\n");
-+  printf ("  --cue    Generate cue/bin files\n");
-+  printf ("  --help   Display this notice\n");
-+  printf (" sourcefile\tFilename of the .mdf file to be converted\n");
-+  printf (" destfile\tFilename of the target ISO9660 file.\n"\
-+          "\t\tIf none given, one is derived from sourcefile.\n\n");
- }
- 
--int
--main (int argc, char **argv)
-+char mdftype(FILE *f)
-+/* returns 
-+   -1 for unknown
-+   0 for ISO9660
-+   1 for SYNC
-+   2 for SYNC MDF
-+   3 for MDF Audio
-+   (see #defines above)
-+*/
- {
--  int seek_ecc, sector_size, seek_head, sector_data, n_mdf;
-+  char buf[12];
-+  
-+  fseek(f, 32768, SEEK_SET);
-+  fread(buf, sizeof (char), 8, f);
-+  if (!memcmp (ISO_9660, buf, 8)) return ISO9660; // File is ISO9660
-+  
-+  fseek(f, 0L, SEEK_SET);
-+  fread(buf, sizeof (char), 12, f);
-+  
-+  fseek (f, 2352, SEEK_SET);
-+  
-+  if (!memcmp (SYNC_HEADER, buf, 12))  // Has SYNC_HEADER
-+  {
-+    fread (buf, sizeof (char), 12, f);
-+    if (!memcmp (SYNC_HEADER_MDF, buf, 12)) return SYNC_MDF;   // File is SYNC MDF
-+    if (!memcmp (SYNC_HEADER, buf, 12)) return SYNC;       // File is SYNC
-+  }
-+  else  // Does not have SYNC_HEADER
-+  {
-+    fread(buf, sizeof (char), 12, f);
-+    if (!memcmp (SYNC_HEADER_MDF_AUDIO, buf, 12)) return MDF_AUDIO; // File is MDF Audio
-+  }
-+
-+  // Reached a point where nothing else matters.  
-+  return UNKNOWN;  // Unknown format
-+}
-+
-+
-+// === Main program code ===
-+
-+int main (int argc, char **argv)
-+{
-+  int seek_ecc, sector_size, seek_head, sector_data;//, n_mdf;
-   int cue = 0, cue_mode = 0, sub = 1, toc = 0, sub_toc = 0;
-   int opts = 0;
--  double size_iso, write_iso;
--  long percent = 0;
--  long i, source_length, progressbar;
--  char buf[2448], destfilename[2354];
-+  long i, source_length;
-+  char buf[2448];
-+  char *destfilename=NULL;
-+  char *basefilename=NULL;
-   FILE *fdest, *fsource;
- 
-+  // Print identification
-+  printf ("mdf2iso v%s by Salvatore Santagati\n", VERSION);
-+  printf ("Licensed under GPL v2 or later\n");
- 
--  if (argc < 2)
- 
-+  // *** Process command line options ***
-+  
-+  if (argc < 2)
-     {
--      usage ();
--      exit (EXIT_FAILURE);
-+    // Not enough parameters; print help
-+    usage();
-+    exit(EXIT_FAILURE);
-     }
- 
--  else
--
--    {
-+  // Search for options --cue and --toc
-       for (i = 0; i < argc; i++)
--
- 	{
--
- 	  if (!strcmp (argv[i], "--help"))
--
- 	    {
- 	      usage ();
- 	      exit (EXIT_SUCCESS);
- 	    }
- 	  if (!strcmp (argv[i], "--cue"))
--
- 	    {
- 	      cue = 1;
- 	      opts++;
- 	    }
- 	  if (!strcmp (argv[i], "--toc"))
--
- 	    {
- 	      toc = 1;
- 	      opts++;
- 	    }
- 	}
- 
--      if ((cue == 1) && (toc == 1))
--
--	{
--	  usage ();
--	  exit (EXIT_FAILURE);
--	}
--      if ((opts == 1) && (argc <= 2))
--
-+  // Catch impossible parameter combinations
-+  if (((cue == 1) && (toc == 1)) ||
-+     ((opts == 1) && (argc <= 2)))
- 	{
--	  usage ();
--	  exit (EXIT_FAILURE);
-+    usage();
-+    exit(EXIT_FAILURE);
- 	}
- 
-+  // Get the base filename
-+  basefilename=argv[1+opts];  // simple pointer, but makes life easier.
- 
-+  // Get the destination filename
-       if (argc >= (3 + opts))
--	strcpy (destfilename, argv[2 + opts]);
--
--      else
--
--	{
--	  strcpy (destfilename, argv[1 + opts]);
--	  if (strlen (argv[1 + cue]) < 5
--	      || strcmp (destfilename + strlen (argv[1 + opts]) - 4, ".mdf"))
--	    strcpy (destfilename + strlen (argv[1 + opts]), ".iso");
--
-+    // The destination filename is explicitly entered at the prompt
-+    destfilename=strdup(argv[2 + opts]);
- 	  else
--	    strcpy (destfilename + strlen (argv[1 + opts]) - 4, ".iso");
--	}
--      if ((fsource = fopen (argv[1 + opts], "rb")) != NULL)
--
- 	{
--	  fseek (fsource, 32768, SEEK_CUR);
--	  fread (buf, sizeof (char), 8, fsource);
--	  if (memcmp (ISO_9660, buf, 8))
--
-+    // Derive destination filename from the basename:
-+    //  If basename is "*.mdf" use "*.iso" als destname
-+    //  otherwise simply append ".iso" to the basename to create destname.
-+    destfilename=strdup(basefilename);
-+    i=strlen(destfilename);  // Reusing 'i' here as temporary variable
-+    if (i < 5 || strcmp(destfilename + i - 4, ".mdf"))
- 	    {
--	      fseek (fsource, 0L, SEEK_SET);
--	      fread (buf, sizeof (char), 12, fsource);
--	      if (!memcmp (SYNC_HEADER, buf, 12))
--
--		{
--		  fseek (fsource, 0L, SEEK_SET);
--		  fseek (fsource, 2352, SEEK_CUR);
--		  fread (buf, sizeof (char), 12, fsource);
--		  if (!memcmp (SYNC_HEADER_MDF, buf, 12))
--
--		    {
--		      if (cue == 1)
--			{
--			  cue_mode = 1;
--
--			  /* BAD SECTOR TO NORMAL IMAGE */
--			  seek_ecc = 96;
--			  sector_size = 2448;
--			  sector_data = 2352;
--			  seek_head = 0;
--			}
--
--		      else if (toc == 0)
--
--			{
--
--			  /*BAD SECTOR */
--			  seek_ecc = 384;
--			  sector_size = 2448;
--			  sector_data = 2048;
--			  seek_head = 16;
-+      destfilename=realloc(destfilename,i+5); 
-+      strcat(destfilename, ".iso");
- 			}
--
- 		      else
--
--			{
--
--			  /*BAD SECTOR */
--			  seek_ecc = 0;
--			  sector_size = 2448;
--			  sector_data = 2448;
--			  seek_head = 0;
--			  sub_toc = 1;
--			}
-+      strcpy(destfilename + i - 3, "iso");
- 		    }
- 
--		  else
-+  // *** Preprocess basefile ***
- 
-+  // Try opening basefile
-+  if ((fsource = fopen(basefilename, "rb")) == NULL)
- 		    {
--		      if (!memcmp (SYNC_HEADER, buf, 12))
-+    free(destfilename);
-+    printf ("Could not open %s: %s\n", basefilename, strerror(errno));
-+    exit (EXIT_FAILURE);
-+  }
- 
-+  // Determine filetype & set some stuff accordingly (or exit)
-+  switch (mdftype(fsource))
- 			{
-+    case ISO9660:
-+            printf("%s is already ISO9660.\n",basefilename);
-+            fclose(fsource);
-+            free(destfilename);
-+            exit(EXIT_SUCCESS);
-+    case SYNC: 
- 			  if (cue == 1)
- 			    {
- 			      cue_mode = 1;
-@@ -348,129 +364,134 @@
- 			      seek_head = 0;
- 			    }
- 			  if (toc == 0)
--
- 			    {
--
- 			      /*NORMAL IMAGE */
- 			      seek_ecc = 288;
- 			      sector_size = 2352;
- 			      sector_data = 2048;
- 			      seek_head = 16;
- 			    }
--
- 			  else
--
- 			    {
- 			      seek_ecc = 0;
- 			      sector_size = 2352;
- 			      sector_data = 2352;
- 			      seek_head = 0;
- 			    }
--			}
--
--		      else
--
--			{
--			  printf ("Sorry I don't know this format :(\n");
--			  exit (EXIT_FAILURE);
--			}
--		    }
--		}
--
--	      else
--
-+            break;
-+    case SYNC_MDF:
-+            if (cue == 1)
- 		{
--		  fseek (fsource, 0L, SEEK_SET);
--		  fseek (fsource, 2352, SEEK_CUR);
--		  fread (buf, sizeof (char), 12, fsource);
--		  if (memcmp (SYNC_HEADER_MDF_AUDIO, buf, 12))
-+              cue_mode = 1;
- 
-+              /* BAD SECTOR TO NORMAL IMAGE */
-+              seek_ecc = 96;
-+              sector_size = 2448;
-+              sector_data = 2352;
-+              seek_head = 0;
-+            }
-+            else if (toc == 0)
- 		    {
--		      printf ("Sorry I don't know this format :(\n");
--		      exit (EXIT_FAILURE);
-+              /*BAD SECTOR */
-+              seek_ecc = 384;
-+              sector_size = 2448;
-+              sector_data = 2048;
-+              seek_head = 16;
- 		    }
--
- 		  else
--
- 		    {
--
-+              /*BAD SECTOR */
-+              seek_ecc = 0;
-+              sector_size = 2448;
-+              sector_data = 2448;
-+              seek_head = 0;
-+              sub_toc = 1;
-+            }
-+            break;
-+    case MDF_AUDIO:
- 		      /*BAD SECTOR AUDIO */
- 		      seek_head = 0;
- 		      sector_size = 2448;
- 		      seek_ecc = 96;
- 		      sector_data = 2352;
- 		      cue = 0;
-+            break;
-+    default:printf("Unknown format for %s.\n",basefilename);
-+            fclose(fsource);
-+            free(destfilename);
-+            exit (EXIT_FAILURE);
- 		    }
--		}
--	      if ((fdest = fopen (destfilename, "wb")) != NULL);
- 
--	      else
-+  //  *** Create destination file ***
-+    
-+  // Try opening the destination file for output
-+  if ((fdest = fopen (destfilename, "wb")) == NULL)
- 		{
--		  printf ("%s\n", strerror (errno));
-+    printf ("Unable to open %s for output: %s\n",destfilename,strerror(errno));
-+    free(destfilename);
-+    fclose(fsource);
- 		  exit (EXIT_FAILURE);
--		};
-+  }
-+
-+    
- 	      fseek (fsource, 0L, SEEK_END);
- 	      source_length = ftell (fsource) / sector_size;
--	      size_iso = (int) (source_length * sector_data);
--	      progressbar = 100 / source_length;
- 	      fseek (fsource, 0L, SEEK_SET);
--
- 	      {
- 		for (i = 0; i < source_length; i++)
--
- 		  {
- 		    fseek (fsource, seek_head, SEEK_CUR);
--		    if (fread (buf, sizeof (char), sector_data, fsource));
--
--		    else
-+      if (fread(buf, sizeof (char), sector_data, fsource)!=sector_data)
- 		      {
--			printf ("%s\n", strerror (errno));
-+        printf ("Error reading from %s: %s\n",basefilename, strerror (errno));
-+        fclose(fsource);
-+        fclose(fdest);
-+        remove(destfilename);
-+        free(destfilename);
- 			exit (EXIT_FAILURE);
--		      };
--		    if (fwrite (buf, sizeof (char), sector_data, fdest));
--
--		    else
-+      }
-+      if (fwrite (buf, sizeof (char), sector_data, fdest)!=sector_data)
- 		      {
--			printf ("%s\n", strerror (errno));
-+        printf ("Error writing to %s: %s\n",destfilename, strerror (errno));
-+        fclose(fsource);
-+        fclose(fdest);
-+        remove(destfilename);
-+        free(destfilename);
- 			exit (EXIT_FAILURE);
--		      };
-+      }
- 		    fseek (fsource, seek_ecc, SEEK_CUR);
--		    write_iso = (int) (sector_data * i);
--		    if (i != 0)
--		      percent = (int) (write_iso * 100 / size_iso);
--		    main_percent (percent);
--	      }} printf ("100%%[:====================:]\n");
-+      main_percent(i*100/source_length);
-+    }
-+  } printf ("100%% [:=====================:]\n");
- 
- 	      fclose (fsource);
- 	      fclose (fdest);
- 
--	      if (cue == 1)
--		cuesheets (destfilename);
--	      if (toc == 1)
--		toc_file (destfilename, sub_toc);
-+  // *** create Toc or Cue file is requested ***
-+  if (cue == 1) if (cuesheets(destfilename))
-+  {
-+    free(destfilename);
-+    exit(EXIT_FAILURE);
-+  }
-+  if (toc == 1) if (toc_file(destfilename, sub_toc))
-+  {
-+    free(destfilename);
-+    exit(EXIT_FAILURE);
-+  }
- 	      if ((toc == 0) && (cue == 0))
--		printf ("Create iso9660: %s\n", destfilename);
-+    printf("Created iso9660: %s\n", destfilename);
-+
-+  free(destfilename);
- 
- 	      exit (EXIT_SUCCESS);
--	    }
- 
--	  else
--	    printf ("This is file iso9660 ;)\n");
-+/*
- 	  n_mdf = number_file (destfilename) - 1;
--	  /* if (n_mdf > 1)
--
-+  / * if (n_mdf > 1) 
- 	     {
- 	     printf ("\rDetect %d md* file and now emerge this\n", n_mdf);
- 	     }
--	   */
-+  * /
- 	  fclose (fsource);
--	  exit (EXIT_SUCCESS);
--	}
--
--      else
--	{
--	  printf ("%s\n", strerror (errno));
--	  exit (EXIT_FAILURE);
--	};
--    }
-+  exit (EXIT_SUCCESS);*/
- }
diff --git a/community/megaglest/megaglest.sh b/community/megaglest/megaglest.sh
deleted file mode 100644
index 571a01be7..000000000
--- a/community/megaglest/megaglest.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
- # Wrapper script for Megaglest.
- 
- MAINDIR=/usr/share/megaglest
- BASEDIR="$HOME/.config"
- DIR="$BASEDIR/megaglest"
- if [ ! -d "$DIR" ]; then
- mkdir -p $DIR
- fi
- cd $DIR
- [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini .
- [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest .
- [ -f servers.ini ] || cp $MAINDIR/servers.ini .
- [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini .
- for i in data scenarios techs tilesets tutorials; do
- [ -h $i ] || ln -s $MAINDIR/$i .
- done
- [ -d maps ] || mkdir maps
- [ -d screens ] || mkdir screens
- cd maps
- for i in $MAINDIR/maps/*; do
- [ -h `basename $i` ] || ln -s $i .
- done
- cd ..
- 
- exec ./megaglest
\ No newline at end of file
diff --git a/community/mtpaint/libpng14.patch b/community/mtpaint/libpng14.patch
deleted file mode 100644
index 7df3b2127..000000000
--- a/community/mtpaint/libpng14.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c
---- mtpaint-3.31.orig/src/png.c	2010-01-25 00:43:07.000000000 +0200
-+++ mtpaint-3.31/src/png.c	2010-01-25 00:43:39.000000000 +0200
-@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_
- 	if (settings->bpp == 3)
- 	{
- 		png_set_strip_16(png_ptr);
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		png_set_palette_to_rgb(png_ptr);
- 		png_set_gray_to_rgb(png_ptr);
- 
-@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_
- 		png_set_strip_alpha(png_ptr);
- 		png_set_packing(png_ptr);
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		for (i = 0; i < height; i++)
- 		{
- 			row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
diff --git a/community/pylorcon/PKGBUILD b/community/pylorcon/PKGBUILD
deleted file mode 100644
index 6502fdbd4..000000000
--- a/community/pylorcon/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributer: fnord0 <fnord0 AT riseup DOT net>
-
-pkgname=pylorcon
-pkgver=3
-pkgrel=4
-pkgdesc="Python wrapper for the C LORCON (Loss Of Radio CONnectivity) library"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pylorcon/"
-license=('GPLv2')
-depends=('python2' 'lorcon-old-svn')
-source="http://pylorcon.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2"
-md5sums=('214d97bdf84e47131f8b55445fea1def')
-
-package() {
-	  cd ${srcdir}/${pkgname}
-	  python2 setup.py install --root=${pkgdir} --optimize=1
-}
diff --git a/community/python-bsddb/db_5.3.patch b/community/python-bsddb/db_5.3.patch
deleted file mode 100644
index 6ea4d18bb..000000000
--- a/community/python-bsddb/db_5.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Jesus Cea <jcea@jcea.es>
-# Date 1324876054 -3600
-# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12
-# Parent  670b1ec4472908a9dc745a338a9f595f92aba667
-Support Berkeley DB 5.3.x
-
-diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py
---- a/setup2.py	Mon Dec 26 06:04:34 2011 +0100
-+++ b/setup2.py	Mon Dec 26 06:07:34 2011 +0100
-@@ -128,7 +128,7 @@
-     incdir = libdir = None
-     if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
-         # Supported Berkeley DB versions, in order of preference.
--        db_ver_list = ((5, 2), (5, 1), (5, 0),
-+        db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
-                 (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2))
- 
-         # construct a list of paths to look for the header file in on
-
diff --git a/community/python2-pycuda/PKGBUILD b/community/python2-pycuda/PKGBUILD
deleted file mode 100644
index 37049dea1..000000000
--- a/community/python2-pycuda/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 62828 2012-01-27 14:09:50Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-pkgname=python2-pycuda
-pkgver=2011.2.2
-pkgrel=1
-pkgdesc="Python wrapper for Nvidia CUDA"
-arch=('i686' 'x86_64')
-url="http://mathema.tician.de/software/pycuda"
-license=('MIT/X Consortium')
-source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz)
-depends=('cuda-toolkit' 'python2-numpy' 'python2-pytools' 'python2')
-optdepends=('python2-pytest')
-makedepends=('ctags' 'python2-distribute' 'mesa')
-provides=('pycuda')
-replaces=('pycuda')
-conflicts=('pycuda')
-sha1sums=('026ca33f66d35c82a087a5ef3f8e0f213575059b')
-
-build() {
-   cd "${srcdir}/pycuda-${pkgver}"
-   python2 ./configure.py \
-                  --cuda-root=/opt/cuda-toolkit \
-                  --boost-compiler=gcc \
-                  --cuda-enable-gl \
-                  --cuda-inc-dir=/opt/cuda-toolkit/include \
-                  --cudadrv-lib-dir=/opt/cuda-toolkit/lib \
-                  --cudart-lib-dir=/opt/cuda-toolkit/lib
-
-   make
-}
-
-package() {
-   cd "${srcdir}/pycuda-${pkgver}"
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
-}
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
deleted file mode 100644
index 58b64cd6c..000000000
--- a/community/qbittorrent/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=qbittorrent
-pkgver=2.9.3
-pkgrel=1
-pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
-url="http://www.qbittorrent.org/"
-license=('GPL')
-depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
-makedepends=('boost' 'geoip')
-optdepends=('python: needed for search'
-            'geoip: improves peer country resolution')
-install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('bd35950260f633215db8acd7c22317dc')
-
-build() {
-  tar xf qbittorrent-${pkgver}.tar.gz
-
-  cd qbittorrent-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd qbittorrent-${pkgver}
-
-  make INSTALL_ROOT=${pkgdir} install
-}
diff --git a/community/qbittorrent/qbittorrent.install b/community/qbittorrent/qbittorrent.install
deleted file mode 100644
index e70c054ec..000000000
--- a/community/qbittorrent/qbittorrent.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/community/remmina-plugins/PKGBUILD b/community/remmina-plugins/PKGBUILD
deleted file mode 100644
index e80c927c3..000000000
--- a/community/remmina-plugins/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63730 2012-02-05 12:09:50Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=remmina-plugins
-pkgver=0.9.2
-pkgrel=3
-pkgdesc="Remina plugins"
-#"Remmina supports multiple network protocols in an integrated and consistant user interface.
-# Currently RDP, VNC, XDMCP and SSH are supported."
-arch=(i686 x86_64)
-url="http://sourceforge.net/projects/remmina/"
-license=('GPL')
-conflicts=(remmina-plugins-svn)
-depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib)
-makedepends=(intltool pkgconfig gettext perl avahi)
-install=remmina-plugins.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz)
-md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-ssh --enable-rdp \
-	--enable-vnc --enable-xdmcp --enable-nx \
-	--enable-telepathy
-  make
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/remmina-plugins/remmina-plugins.install b/community/remmina-plugins/remmina-plugins.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community/remmina-plugins/remmina-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
deleted file mode 100644
index 3880c281c..000000000
--- a/community/systemd/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 61447 2011-12-31 17:01:55Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=systemd
-pkgver=37
-pkgrel=3
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172')
-makedepends=('gperf' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
-            'dbus-python: systemd-analyze'
-            'gtk2: systemadm'
-            'initscripts: legacy support for hostname and vconsole setup'
-            'initscripts-systemd: native boot and initialization scripts'
-            'libnotify: systemadm'
-            'python2-cairo: systemd-analyze'
-            'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-groups=('systemd')
-options=('!libtool' '!strip')
-backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-        etc/dbus-1/system.d/org.freedesktop.login1.conf
-        etc/dbus-1/system.d/org.freedesktop.locale1.conf
-        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-        etc/systemd/system.conf
-        etc/systemd/user.conf
-        etc/systemd/systemd-logind.conf)
-install=systemd.install
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "os-release"
-        systemctl-completion.patch)
-md5sums=('1435f23be79c8c38d1121c6b150510f3'
-         '752636def0db3c03f121f8b4f44a63cd'
-         '8acca6b7be4bfebe4174d89e4625b0ee')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Don't unset locale in getty
-  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
-  sed -i -e '/^Environ.*LANG/s/^/#/' \
-         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
-
-  # fix bash completion
-  patch -Np1 < "$srcdir"/systemctl-completion.patch
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --libexecdir=/usr/lib/systemd \
-              --libdir=/usr/lib \
-              --localstatedir=/var \
-              --with-rootdir= \
-              --with-rootlibdir=/lib
-
-  make
-
-  # fix .so links in manpages
-  sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
-  sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # fix systemd-analyze for python2
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # rename man pages to avoid conflicts with sysvinit and initscripts
-  cd "$pkgdir/usr/share/man"
-
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-}
diff --git a/community/systemd/os-release b/community/systemd/os-release
deleted file mode 100644
index 5e24a6031..000000000
--- a/community/systemd/os-release
+++ /dev/null
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
diff --git a/community/systemd/systemctl-completion.patch b/community/systemd/systemctl-completion.patch
deleted file mode 100644
index afa1ae73f..000000000
--- a/community/systemd/systemctl-completion.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 255e63837bc985ce6f3c3b5ce5d2856e2240138b Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 11 Oct 2011 20:53:05 -0400
-Subject: [PATCH] systemctl-completion: always invoke with --no-legend
-
-In the case of completion for the 'restart' verb, passing the invalid
-unit name (the colums header) causes completion to cease functioning
-entirely, with the error:
-
-  Failed to issue method call: Unit name UNIT is not valid.
-
-This adds a small wrapper function for systemctl which can have common
-options added to it.
-
----
- src/systemctl-bash-completion.sh |   20 ++++++++++++--------
- 1 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/systemctl-bash-completion.sh b/src/systemctl-bash-completion.sh
-index 6369a6c..6ebb792 100644
---- a/src/systemctl-bash-completion.sh
-+++ b/src/systemctl-bash-completion.sh
-@@ -15,6 +15,10 @@
- # You should have received a copy of the GNU General Public License
- # along with systemd; If not, see <http://www.gnu.org/licenses/>.
- 
-+__systemctl() {
-+        systemctl --no-legend "$@"
-+}
-+
- __contains_word () {
-         local word=$1; shift
-         for w in $*; do [[ $w = $word ]] && return 0; done
-@@ -24,7 +28,7 @@ __contains_word () {
- __filter_units_by_property () {
-         local property=$1 value=$2 ; shift ; shift
-         local -a units=( $* )
--        local -a props=( $(systemctl show --property "$property" -- ${units[*]} | grep -v ^$) )
-+        local -a props=( $(__systemctl show --property "$property" -- ${units[*]} | grep -v ^$) )
-         for ((i=0; $i < ${#units[*]}; i++)); do
-                 if [[ "${props[i]}" = "$property=$value" ]]; then
-                         echo "${units[i]}"
-@@ -32,10 +36,10 @@ __filter_units_by_property () {
-         done
- }
- 
--__get_all_units      () { systemctl list-units --full --all | awk '                 {print $1}' ; }
--__get_active_units   () { systemctl list-units --full       | awk '                 {print $1}' ; }
--__get_inactive_units () { systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; }
--__get_failed_units   () { systemctl list-units --full       | awk '$3 == "failed"   {print $1}' ; }
-+__get_all_units      () { __systemctl list-units --full --all | awk '                 {print $1}' ; }
-+__get_active_units   () { __systemctl list-units --full       | awk '                 {print $1}' ; }
-+__get_inactive_units () { __systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; }
-+__get_failed_units   () { __systemctl list-units --full       | awk '$3 == "failed"   {print $1}' ; }
- 
- _systemctl () {
-         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-@@ -134,13 +138,13 @@ _systemctl () {
-                 comps=''
- 
-         elif __contains_word "$verb" ${VERBS[JOBS]}; then
--                comps=$( systemctl list-jobs | awk '{print $1}' )
-+                comps=$( __systemctl list-jobs | awk '{print $1}' )
- 
-         elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
--                comps=$( systemctl list-units --type snapshot --full --all | awk '{print $1}' )
-+                comps=$( __systemctl list-units --type snapshot --full --all | awk '{print $1}' )
- 
-         elif __contains_word "$verb" ${VERBS[ENVS]}; then
--                comps=$( systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' )
-+                comps=$( __systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' )
-                 compopt -o nospace
-         fi
- 
--- 
-1.7.7
-
diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install
deleted file mode 100644
index 04b29688a..000000000
--- a/community/systemd/systemd.install
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
-  if ! usr/bin/getent group lock >/dev/null; then
-    usr/sbin/groupadd -g 54 lock
-  fi
-}
-
-sd_booted() {
-  [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    bin/systemd-machine-id-setup
-  fi
-
-  echo "systemd has been installed to /bin/systemd. Please ensure you append"
-  echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    bin/systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    bin/systemctl daemon-reexec >/dev/null
-  fi
-
-  newpkgver=${1%-*}
-  oldpkgver=${2%-*}
-
-  # catch v31 need for restarting systemd-logind.service
-  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
-    # but only if systemd is running
-    if sd_booted; then
-      bin/systemctl try-restart systemd-logind.service
-    fi
-  fi
-}
-
-post_remove() {
-  if usr/bin/getent group lock >/dev/null; then
-    usr/sbin/groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
deleted file mode 100644
index d29b5b9ae..000000000
--- a/community/texmaker/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: furester <xfurester@hotmail.com> 
-# Contributor: Firmicus <firmicus gmx net> 
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname=texmaker
-pkgver=3.2.2
-pkgrel=1
-pkgdesc='Free cross-platform latex editor'
-arch=('i686' 'x86_64')
-url="http://www.xm1math.net/texmaker/index.html"
-license=('GPL')
-install='texmaker.install'
-depends=('poppler-qt' 'ghostscript' 'qtwebkit')
-source=("http://www.xm1math.net/texmaker/texmaker-${pkgver}.tar.bz2")
-md5sums=('aa04c37a0117a6f924c0f7eed5732fe2')
-
-build() {
-  cd texmaker-${pkgver}
-
-  export INSTALL_ROOT=${pkgdir}
-
-  qmake -unix PREFIX=//usr texmaker.pro
-
-  make
-}
-
-package() {
-  cd texmaker-${pkgver}
-
-  export INSTALL_PATH=${pkgdir}
-
-  make install
-}
diff --git a/community/texmaker/texmaker.install b/community/texmaker/texmaker.install
deleted file mode 100644
index 9591f6c5d..000000000
--- a/community/texmaker/texmaker.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/community/tuxpaint/desktop.patch b/community/tuxpaint/desktop.patch
deleted file mode 100644
index 78d2ed397..000000000
--- a/community/tuxpaint/desktop.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- tuxpaint.desktop2	2008-03-20 15:45:22.000000000 +0100
-+++ tuxpaint.desktop	2008-03-20 15:56:33.000000000 +0100
-@@ -205,3 +205,4 @@
- Comment[zh_cn]=孩�的绘图程�。
- Comment[zh_tw]=��兒童的畫圖程�
- Comment[zw]=Diif program paar keé men Dibuj paar biét biss
-+Categories=Game;KidsGame;Graphics;RasterGraphics;
diff --git a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch
deleted file mode 100644
index 5aee3118c..000000000
--- a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~	2011-07-21 23:05:56.594879049 +0200
-+++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp	2011-07-21 23:28:07.540358742 +0200
-@@ -238,6 +238,17 @@ void ttree_view_node::clear()
- 
- struct ttree_view_node_implementation
- {
-+	template<class W, class It>
-+	static W* find_at_aux(It begin, It end,
-+			      const tpoint& coordinate, const bool must_be_active) {
-+		for (It it = begin; it != end; ++it) {
-+			if(W* widget = it->find_at(coordinate, must_be_active)) {
-+				return widget;
-+			}
-+		}
-+		return NULL;
-+	}
-+
- 	template<class W>
- 	static W* find_at(
- 			  typename tconst_duplicator<W, ttree_view_node>::type&
-@@ -255,13 +266,9 @@ struct ttree_view_node_implementation
- 		}
- 
- 		typedef typename tconst_duplicator<W, ttree_view_node>::type thack;
--		foreach(thack& node, tree_view_node.children_) {
--			if(W* widget = node.find_at(coordinate, must_be_active)) {
--				return widget;
--			}
--		}
--
--		return NULL;
-+		return find_at_aux<W>(tree_view_node.children_.begin(),
-+				      tree_view_node.children_.end(),
-+				      coordinate, must_be_active);
- 	}
- };
- 
-@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size
- 		return size;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz
- 		size.x += (get_indention_level() - 1) * tree_view().indention_step_size_;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s
- 
- 	DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
diff --git a/community/wesnoth/wesnoth-libpng-1.4.0.patch b/community/wesnoth/wesnoth-libpng-1.4.0.patch
deleted file mode 100644
index 338f467af..000000000
--- a/community/wesnoth/wesnoth-libpng-1.4.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp	2010-01-01 15:16:49.000000000 +0200
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp	2010-04-08 17:38:03.066201123 +0300
-@@ -174,8 +174,8 @@
- 	//TODO: review whether providing NULL error handlers is something
- 	//sensible
- 	png_struct* png_ptr = png_create_write_struct
--		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL),
--		 png_error_ptr_NULL, png_error_ptr_NULL);
-+		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL),
-+		 NULL, NULL);
- 	if(!png_ptr)
- 		throw exploder_failure("Unable to initialize the png write structure");
- 
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600
-@@ -15,6 +15,7 @@
- #include "exploder_utils.hpp"
- #include "game_config.hpp"
- #include "serialization/string_utils.hpp"
-+#include <zlib.h>
- #include <png.h>
-
- exploder_point::exploder_point(const std::string &s)
diff --git a/core/glibc/glibc-2.15-strcmp-disable-avx.patch b/core/glibc/glibc-2.15-strcmp-disable-avx.patch
deleted file mode 100644
index 7f1f5b8f2..000000000
--- a/core/glibc/glibc-2.15-strcmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strcasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strncasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
- 
- 
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
- 	.type STRCMP_SSE2, @function; \
diff --git a/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch b/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
deleted file mode 100644
index b69d095d3..000000000
--- a/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cdaf4b2f3ef60365c6b8006a63410368a7b38f39 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:12:32 -0500
-Subject: [PATCH 1/4] partially fix parsing of alias with dots
-
----
- libkmod/libkmod-util.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
-index 7c2611b..6a9f697 100644
---- a/libkmod/libkmod-util.c
-+++ b/libkmod/libkmod-util.c
-@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- 		case ']':
- 			return -EINVAL;
- 		case '[':
--			while (alias[s] != ']' &&
--					alias[s] != '.' && alias[s] != '\0')
-+			while (alias[s] != ']' && alias[s] != '\0')
- 				s++;
- 
- 			if (alias[s] != ']')
-@@ -144,7 +143,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- 			s++;
- 			break;
- 		case '\0':
--		case '.':
- 			goto finish;
- 		default:
- 			buf[s] = c;
--- 
-1.7.9
-
diff --git a/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch b/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
deleted file mode 100644
index 76cc35049..000000000
--- a/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 1d2f64689b2456ade81d6d489c4f5bfb5fdb92fd Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:13:43 -0500
-Subject: [PATCH 2/4] libkmod-module: used shared code in module creation
-
----
- libkmod/libkmod-module.c |  135 ++++++++++++++++++++++++++-------------------
- 1 files changed, 78 insertions(+), 57 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 47b1709..48e4aa1 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -162,6 +162,76 @@ fail:
- 	return err;
- }
- 
-+/*
-+ * Memory layout with alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey -----.
-+ *        alias -----. |
-+ *        name ----. | |
-+ * }               | | |
-+ * name <----------' | |
-+ * alias <-----------' |
-+ * name\alias <--------'
-+ *
-+ * Memory layout without alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey ---.
-+ *        alias -----|----> NULL
-+ *        name ----. |
-+ * }               | |
-+ * name <----------'-'
-+ *
-+ * @key is "name\alias" or "name" (in which case alias == NULL)
-+ */
-+static int kmod_module_new(struct kmod_ctx *ctx, const char *key,
-+				const char *name, size_t namelen,
-+				const char *alias, size_t aliaslen,
-+				struct kmod_module **mod)
-+{
-+	struct kmod_module *m;
-+	size_t keylen;
-+
-+	m = kmod_pool_get_module(ctx, key);
-+	if (m != NULL) {
-+		*mod = kmod_module_ref(m);
-+		return 0;
-+	}
-+
-+	if (alias == NULL)
-+		keylen = namelen;
-+	else
-+		keylen = namelen + aliaslen + 1;
-+
-+	m = malloc(sizeof(*m) + (alias == NULL ? 1 : 2) * (keylen + 1));
-+	if (m == NULL) {
-+		free(m);
-+		return -ENOMEM;
-+	}
-+
-+	memset(m, 0, sizeof(*m));
-+
-+	m->ctx = kmod_ref(ctx);
-+	m->name = (char *)m + sizeof(*m);
-+	memcpy(m->name, key, keylen + 1);
-+	if (alias == NULL) {
-+		m->hashkey = m->name;
-+		m->alias = NULL;
-+	} else {
-+		m->name[namelen] = '\0';
-+		m->alias = m->name + namelen + 1;
-+		m->hashkey = m->name + keylen + 1;
-+		memcpy(m->hashkey, key, keylen + 1);
-+	}
-+
-+	m->refcount = 1;
-+	kmod_pool_add_module(ctx, m, m->hashkey);
-+	*mod = m;
-+
-+	return 0;
-+}
-+
- /**
-  * kmod_module_new_from_name:
-  * @ctx: kmod library context
-@@ -188,54 +258,15 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
- 						const char *name,
- 						struct kmod_module **mod)
- {
--	struct kmod_module *m;
- 	size_t namelen;
- 	char name_norm[PATH_MAX];
--	char *namesep;
- 
- 	if (ctx == NULL || name == NULL || mod == NULL)
- 		return -ENOENT;
- 
--	if (alias_normalize(name, name_norm, &namelen) < 0) {
--		DBG(ctx, "invalid alias: %s\n", name);
--		return -EINVAL;
--	}
-+	modname_normalize(name, name_norm, &namelen);
- 
--	m = kmod_pool_get_module(ctx, name_norm);
--	if (m != NULL) {
--		*mod = kmod_module_ref(m);
--		return 0;
--	}
--
--	namesep = strchr(name_norm, '/');
--	m = malloc(sizeof(*m) + (namesep == NULL ? 1 : 2) * namelen + 2);
--	if (m == NULL) {
--		free(m);
--		return -ENOMEM;
--	}
--
--	memset(m, 0, sizeof(*m));
--
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name_norm, namelen + 1);
--
--	if (namesep) {
--		size_t len = namesep - name_norm;
--
--		m->name[len] = '\0';
--		m->alias = m->name + len + 1;
--		m->hashkey = m->name + namelen + 1;
--		memcpy(m->hashkey, name_norm, namelen + 1);
--	} else {
--		m->hashkey = m->name;
--	}
--
--	m->refcount = 1;
--	kmod_pool_add_module(ctx, m, m->hashkey);
--	*mod = m;
--
--	return 0;
-+	return kmod_module_new(ctx, name_norm, name_norm, namelen, NULL, 0, mod);
- }
- 
- int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
-@@ -251,9 +282,9 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
- 
- 	memcpy(key, name, namelen);
- 	memcpy(key + namelen + 1, alias, aliaslen + 1);
--	key[namelen] = '/';
-+	key[namelen] = '\\';
- 
--	err = kmod_module_new_from_name(ctx, key, mod);
-+	err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod);
- 	if (err < 0)
- 		return err;
- 
-@@ -323,7 +354,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 			free(abspath);
- 		else {
- 			ERR(ctx, "kmod_module '%s' already exists with different path: new-path='%s' old-path='%s'\n",
--									name, abspath, m->path);
-+							name, abspath, m->path);
- 			free(abspath);
- 			return -EEXIST;
- 		}
-@@ -332,21 +363,11 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 		return 0;
- 	}
- 
--	m = malloc(sizeof(*m) + namelen + 1);
--	if (m == NULL)
--		return -errno;
--
--	memset(m, 0, sizeof(*m));
-+	err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
-+	if (err < 0)
-+		return err;
- 
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name, namelen + 1);
- 	m->path = abspath;
--	m->hashkey = m->name;
--	m->refcount = 1;
--
--	kmod_pool_add_module(ctx, m, m->hashkey);
--
- 	*mod = m;
- 
- 	return 0;
--- 
-1.7.9
-
diff --git a/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch b/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
deleted file mode 100644
index 5bbc93a90..000000000
--- a/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fdf78d80d298353c29e1fe8c00602669dd9662bb Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:05:26 -0500
-Subject: [PATCH 3/4] modprobe: handle all error returns from init_module
-
----
- tools/kmod-modprobe.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 3e51506..c882856 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -551,6 +551,8 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
- 
- 	err = kmod_module_insert_module(mod, flags, opts);
- 	switch (err) {
-+	case 0:
-+		break;
- 	case -EEXIST:
- 		/*
- 		 * We checked for EEXIST with an earlier call to
-@@ -564,7 +566,7 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
- 			ERR("Module %s already in kernel.\n",
- 					kmod_module_get_name(mod));
- 		break;
--	case -EPERM:
-+	default:
- 		ERR("could not insert '%s': %s\n", kmod_module_get_name(mod),
- 				strerror(-err));
- 		break;
--- 
-1.7.9
-
diff --git a/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch b/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch
deleted file mode 100644
index 80cc73130..000000000
--- a/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4e3dd21aff55b5bbaa08b037fc2a5625bfffc0a5 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:39:30 -0500
-Subject: [PATCH 4/4] modprobe: remove 0 refcnt deps
-
----
- tools/kmod-modprobe.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index c882856..bd991a5 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -381,7 +381,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
- static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- {
- 	const char *modname = kmod_module_get_name(mod);
--	struct kmod_list *pre = NULL, *post = NULL;
-+	struct kmod_list *pre = NULL, *post = NULL, *deps, *itr;
- 	const char *cmd = NULL;
- 	int err;
- 
-@@ -422,7 +422,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- 	rmmod_do_deps_list(post, false);
- 
- 	if (do_dependencies && remove_dependencies) {
--		struct kmod_list *deps = kmod_module_get_dependencies(mod);
-+		deps = kmod_module_get_dependencies(mod);
- 
- 		err = rmmod_do_deps_list(deps, true);
- 		if (err < 0)
-@@ -451,6 +451,17 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- 
- 	rmmod_do_deps_list(pre, false);
- 
-+	deps = kmod_module_get_dependencies(mod);
-+	if (deps != NULL) {
-+		kmod_list_foreach_reverse(itr, deps) {
-+			struct kmod_module *dep = kmod_module_get_module(itr);
-+			if (kmod_module_get_refcnt(dep) == 0)
-+				rmmod_do_remove_module(dep);
-+			kmod_module_unref(dep);
-+		}
-+		kmod_module_unref_list(deps);
-+	}
-+
- error:
- 	kmod_module_unref_list(pre);
- 	kmod_module_unref_list(post);
--- 
-1.7.9
-
diff --git a/extra/brltty/brltty-4.2-S_ISCHR.patch b/extra/brltty/brltty-4.2-S_ISCHR.patch
deleted file mode 100644
index eddac9616..000000000
--- a/extra/brltty/brltty-4.2-S_ISCHR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up brltty-4.2/Programs/sys_linux.c.BAD brltty-4.2/Programs/sys_linux.c
---- brltty-4.2/Programs/sys_linux.c.BAD	2010-05-21 09:04:10.003122084 -0400
-+++ brltty-4.2/Programs/sys_linux.c	2010-05-21 09:04:19.376198268 -0400
-@@ -23,6 +23,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/stat.h>
- #include <linux/kd.h>
- 
- #ifdef HAVE_LINUX_INPUT_H
diff --git a/extra/ddd/ChangeLog b/extra/ddd/ChangeLog
deleted file mode 100644
index b3d8b00af..000000000
--- a/extra/ddd/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2010-08-11  Eric Belanger  <eric@archlinux.org>
-
-	* ddd 3.3.12-2
-	* Built against elfutils
-	* Added gcc build patch
-	* Fixed install script
-
-2009-03-22  Eric Belanger  <eric@archlinux.org>
-
-	* ddd 3.3.12-1
-	* Upstream update
-	* Updated license
-
-2008-11-11  Eric Belanger  <eric@archlinux.org>
-
-	* ddd 3.3.11-5
-	* Rebuilt against libxaw 1.0.5 (close FS#12074)
-	* Added info file support
-	* Added ChangeLog
diff --git a/extra/ecasound/ecasound.changelog b/extra/ecasound/ecasound.changelog
deleted file mode 100644
index a735f70c1..000000000
--- a/extra/ecasound/ecasound.changelog
+++ /dev/null
@@ -1,49 +0,0 @@
-2011-05-14 Ray Rashif <schiv@archlinux.org>
-
-	* ecasound 2.8.0
-	* upstream release
-
-2010-08-22 Ray Rashif <schiv@archlinux.org>
-
-	* ecasound 2.7.2-1
-	* python(3) rebuild
-	* python(2) is optional [1]
-	* added new liboil depend [2]
-	* added some optdepends [1]
-
-	[1] http://eca.cx/ecasound/README (or see source archive)
-	[2] http://eca.cx/relnotes/ecasound_v2_7_2_relnotes.txt
-
-2010-07-10 Ray Rashif <schiv@archlinux.org>
-
-	* ecasound 2.7.1-2
-	* added jack support [1]
-	* added OSC (liblo) support
-
-	[1] http://bugs.archlinux.org/task/20113
-
-2010-02-21  Eric Belanger  <eric@archlinux.org>
-
-	* ecasound 2.7.1-1
-	* Upstream update
-	* Improved description
-
-2010-01-23  Eric Belanger  <eric@archlinux.org>
-
-	* ecasound 2.7.0-1
-	* Upstream update
-
-2009-06-18  Eric Belanger  <eric@archlinux.org>
-
-	* ecasound 2.6.0-1
-	* Upstream update
-	* Built against readline 6.0.00
-
-2009-01-14  Eric Belanger  <eric@archlinux.org>
-
-	* ecasound 2.5.2-1
-	* Upstream update
-	* Enabled alsa support
-	* Added ruby makedepends
-	* Corrected license
-	* Added ChangeLog
diff --git a/extra/gimp/gimp-poppler-0.18.patch b/extra/gimp/gimp-poppler-0.18.patch
deleted file mode 100644
index 0715460bc..000000000
--- a/extra/gimp/gimp-poppler-0.18.patch
+++ /dev/null
@@ -1,476 +0,0 @@
-From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Fri, 6 May 2011 11:58:44 +0200
-Subject: [PATCH] patch: poppler-0.17
-
-Squashed commit of the following:
-
-commit 529d940222dfc352d41fbf72de29134421aa4002
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Fri May 6 11:50:30 2011 +0200
-
-    use code based on pixbufs instead of cairo surfaces
-
-    this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for
-    hints how to do this
-
-commit f8671d8767d4cdab830dc06310e96c63a88ec0fd
-Author: Mukund Sivaraman <muks@banu.com>
-Date:   Thu Apr 21 13:57:13 2011 +0530
-
-    file-pdf-load: Update attribution, removing bogus copyright
-    (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019)
-
-commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:52:18 2011 +0200
-
-    file-pdf-load: Use better API + cleanups
-
-    * fixes issues with poppler 0.17 completely
-    * uses new libgimp API to pass surfaces instead of pixbufs
-    * uses GTK+ 3 API to convert surfaces to pixbufs where available
-    (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2)
-
-commit 4e92302c4a14a961f112587a0ad86696c88da2f8
-Author: Nils Philippsen <nils@redhat.com>
-Date:   Thu Apr 21 13:38:08 2011 +0200
-
-    file-pdf-load: Don't use deprecated API (bug #646947)
-
-    (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237)
-
-    Conflicts:
-
-    	plug-ins/common/file-pdf.c
----
- plug-ins/common/file-pdf.c |  323 ++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 283 insertions(+), 40 deletions(-)
-
-diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c
-index a43b459..43c2b7d 100644
---- a/plug-ins/common/file-pdf.c
-+++ b/plug-ins/common/file-pdf.c
-@@ -4,6 +4,9 @@
-  *
-  * Copyright (C) 2005 Nathan Summers
-  *
-+ * Some code in render_page_to_surface() borrowed from
-+ * poppler.git/glib/poppler-page.cc.
-+ *
-  * 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
-@@ -80,16 +83,20 @@ static gboolean          load_dialog       (PopplerDocument        *doc,
- static PopplerDocument * open_document     (const gchar            *filename,
-                                             GError                **error);
- 
--static GdkPixbuf *       get_thumbnail     (PopplerDocument        *doc,
-+static cairo_surface_t * get_thumb_surface (PopplerDocument        *doc,
-+                                            gint                    page,
-+                                            gint                    preferred_size);
-+
-+static GdkPixbuf *       get_thumb_pixbuf  (PopplerDocument        *doc,
-                                             gint                    page,
-                                             gint                    preferred_size);
- 
- static gint32            layer_from_pixbuf (gint32                  image,
--                                            const gchar            *layer_name,
--                                            gint                    position,
--                                            GdkPixbuf              *buf,
--                                            gdouble                 progress_start,
--                                            gdouble                 progress_scale);
-+					                        const gchar            *layer_name,
-+					                        gint                    position,
-+					                        GdkPixbuf              *pixbuf,
-+					                        gdouble                 progress_start,
-+					                        gdouble                 progress_scale);
- 
- /**
-  ** the following was formerly part of
-@@ -433,11 +440,12 @@ run (const gchar      *name,
-         }
-       else
-         {
--          gdouble      width  = 0;
--          gdouble      height = 0;
--          gdouble      scale;
--          gint32       image  = -1;
--          GdkPixbuf   *pixbuf = NULL;
-+          gdouble    width     = 0;
-+          gdouble    height    = 0;
-+          gdouble    scale;
-+          gint32     image     = -1;
-+          gint       num_pages = 0;
-+          GdkPixbuf *pixbuf    = NULL;
- 
-           /* Possibly retrieve last settings */
-           gimp_get_data (LOAD_PROC, &loadvals);
-@@ -455,7 +463,10 @@ run (const gchar      *name,
-                   g_object_unref (page);
-                 }
- 
--              pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32);
-+              num_pages = poppler_document_get_n_pages (doc);
-+
-+              pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32);
-+
-               g_object_unref (doc);
-             }
- 
-@@ -548,6 +559,187 @@ open_document (const gchar  *filename,
-   return doc;
- }
- 
-+/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */
-+
-+#if (!GTK_CHECK_VERSION (3, 0, 0))
-+
-+static cairo_format_t
-+gdk_cairo_format_for_content (cairo_content_t content)
-+{
-+  switch (content)
-+    {
-+    case CAIRO_CONTENT_COLOR:
-+      return CAIRO_FORMAT_RGB24;
-+    case CAIRO_CONTENT_ALPHA:
-+      return CAIRO_FORMAT_A8;
-+    case CAIRO_CONTENT_COLOR_ALPHA:
-+    default:
-+      return CAIRO_FORMAT_ARGB32;
-+    }
-+}
-+
-+static cairo_surface_t *
-+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface,
-+                                   cairo_content_t  content,
-+                                   int              src_x,
-+                                   int              src_y,
-+                                   int              width,
-+                                   int              height)
-+{
-+  cairo_surface_t *copy;
-+  cairo_t *cr;
-+
-+  copy = cairo_image_surface_create (gdk_cairo_format_for_content (content),
-+                                     width,
-+                                     height);
-+
-+  cr = cairo_create (copy);
-+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-+  cairo_set_source_surface (cr, surface, -src_x, -src_y);
-+  cairo_paint (cr);
-+  cairo_destroy (cr);
-+
-+  return copy;
-+}
-+
-+static void
-+convert_alpha (guchar *dest_data,
-+               int     dest_stride,
-+               guchar *src_data,
-+               int     src_stride,
-+               int     src_x,
-+               int     src_y,
-+               int     width,
-+               int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      guint alpha = src[x] >> 24;
-+
-+      if (alpha == 0)
-+        {
-+          dest_data[x * 4 + 0] = 0;
-+          dest_data[x * 4 + 1] = 0;
-+          dest_data[x * 4 + 2] = 0;
-+        }
-+      else
-+        {
-+          dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >>  8) * 255 + alpha / 2) / alpha;
-+          dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >>  0) * 255 + alpha / 2) / alpha;
-+        }
-+      dest_data[x * 4 + 3] = alpha;
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+static void
-+convert_no_alpha (guchar *dest_data,
-+                  int     dest_stride,
-+                  guchar *src_data,
-+                  int     src_stride,
-+                  int     src_x,
-+                  int     src_y,
-+                  int     width,
-+                  int     height)
-+{
-+  int x, y;
-+
-+  src_data += src_stride * src_y + src_x * 4;
-+
-+  for (y = 0; y < height; y++) {
-+    guint32 *src = (guint32 *) src_data;
-+
-+    for (x = 0; x < width; x++) {
-+      dest_data[x * 3 + 0] = src[x] >> 16;
-+      dest_data[x * 3 + 1] = src[x] >>  8;
-+      dest_data[x * 3 + 2] = src[x];
-+    }
-+
-+    src_data += src_stride;
-+    dest_data += dest_stride;
-+  }
-+}
-+
-+/**
-+ * gdk_pixbuf_get_from_surface:
-+ * @surface: surface to copy from
-+ * @src_x: Source X coordinate within @surface
-+ * @src_y: Source Y coordinate within @surface
-+ * @width: Width in pixels of region to get
-+ * @height: Height in pixels of region to get
-+ *
-+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A)
-+ * representation inside a #GdkPixbuf. This allows you to efficiently read
-+ * individual pixels from cairo surfaces. For #GdkWindows, use
-+ * gdk_pixbuf_get_from_window() instead.
-+ *
-+ * This function will create an RGB pixbuf with 8 bits per channel.
-+ * The pixbuf will contain an alpha channel if the @surface contains one.
-+ *
-+ * Return value: (transfer full): A newly-created pixbuf with a reference
-+ *     count of 1, or %NULL on error
-+ */
-+static GdkPixbuf *
-+gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
-+                              gint             src_x,
-+                              gint             src_y,
-+                              gint             width,
-+                              gint             height)
-+{
-+  cairo_content_t content;
-+  GdkPixbuf *dest;
-+
-+  /* General sanity checks */
-+  g_return_val_if_fail (surface != NULL, NULL);
-+  g_return_val_if_fail (width > 0 && height > 0, NULL);
-+
-+  content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR;
-+  dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-+                         !!(content & CAIRO_CONTENT_ALPHA),
-+                         8,
-+                         width, height);
-+
-+  surface = gdk_cairo_surface_coerce_to_image (surface, content,
-+                                               src_x, src_y,
-+                                               width, height);
-+  cairo_surface_flush (surface);
-+  if (cairo_surface_status (surface) || dest == NULL)
-+    {
-+      cairo_surface_destroy (surface);
-+      return NULL;
-+    }
-+
-+  if (gdk_pixbuf_get_has_alpha (dest))
-+    convert_alpha (gdk_pixbuf_get_pixels (dest),
-+                   gdk_pixbuf_get_rowstride (dest),
-+                   cairo_image_surface_get_data (surface),
-+                   cairo_image_surface_get_stride (surface),
-+                   0, 0,
-+                   width, height);
-+  else
-+    convert_no_alpha (gdk_pixbuf_get_pixels (dest),
-+                      gdk_pixbuf_get_rowstride (dest),
-+                      cairo_image_surface_get_data (surface),
-+                      cairo_image_surface_get_stride (surface),
-+                      0, 0,
-+                      width, height);
-+
-+  cairo_surface_destroy (surface);
-+  return dest;
-+}
-+
-+#endif
-+
- static gint32
- layer_from_pixbuf (gint32        image,
-                    const gchar  *layer_name,
-@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32        image,
-   return layer;
- }
- 
-+static cairo_surface_t *
-+render_page_to_surface (PopplerPage *page,
-+                        int          width,
-+                        int          height,
-+                        double       scale)
-+{
-+  cairo_surface_t *surface;
-+  cairo_t *cr;
-+
-+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-+  cr = cairo_create (surface);
-+
-+  cairo_save (cr);
-+  cairo_translate (cr, 0.0, 0.0);
-+
-+  if (scale != 1.0)
-+    cairo_scale (cr, scale, scale);
-+
-+  poppler_page_render (page, cr);
-+  cairo_restore (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+  cairo_paint (cr);
-+
-+  cairo_destroy (cr);
-+
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+render_page_to_pixbuf (PopplerPage *page,
-+                       int          width,
-+                       int          height,
-+                       double       scale)
-+{
-+  GdkPixbuf *pixbuf;
-+  cairo_surface_t *surface;
-+
-+  surface = render_page_to_surface (page, width, height, scale);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-+  return pixbuf;
-+}
-+
- static gint32
- load_image (PopplerDocument        *doc,
-             const gchar            *filename,
-@@ -597,7 +837,7 @@ load_image (PopplerDocument        *doc,
-       gdouble      page_width;
-       gdouble      page_height;
- 
--      GdkPixbuf   *buf;
-+      GdkPixbuf   *pixbuf;
-       gint         width;
-       gint         height;
- 
-@@ -627,15 +867,13 @@ load_image (PopplerDocument        *doc,
-           gimp_image_set_resolution (image_ID, resolution, resolution);
-         }
- 
--      buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
--
--      poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf);
-+      pixbuf = render_page_to_pixbuf (page, width, height, scale);
- 
--      layer_from_pixbuf (image_ID, page_label, i, buf,
-+      layer_from_pixbuf (image_ID, page_label, i, pixbuf,
-                          doc_progress, 1.0 / pages->n_pages);
- 
-       g_free (page_label);
--      g_object_unref (buf);
-+      g_object_unref(pixbuf);
- 
-       doc_progress = (double) (i + 1) / pages->n_pages;
-       gimp_progress_update (doc_progress);
-@@ -676,30 +914,22 @@ load_image (PopplerDocument        *doc,
-   return image_ID;
- }
- 
--static GdkPixbuf *
--get_thumbnail (PopplerDocument *doc,
--               gint             page_num,
--               gint             preferred_size)
-+static cairo_surface_t *
-+get_thumb_surface (PopplerDocument *doc,
-+                   gint             page_num,
-+                   gint             preferred_size)
- {
-   PopplerPage *page;
--  GdkPixbuf   *pixbuf;
-+  cairo_surface_t *surface;
- 
-   page = poppler_document_get_page (doc, page_num);
- 
-   if (! page)
-     return NULL;
- 
--  /* XXX: Remove conditional when we depend on poppler 0.8.0, but also
--   * add configure check to make sure POPPLER_WITH_GDK is enabled!
--   */
--#ifdef POPPLER_WITH_GDK
--  pixbuf = poppler_page_get_thumbnail_pixbuf (page);
--#else
--  pixbuf = poppler_page_get_thumbnail (page);
--#endif
--
-+  surface = poppler_page_get_thumbnail (page);
- 
--  if (! pixbuf)
-+  if (! surface)
-     {
-       gdouble width;
-       gdouble height;
-@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc,
-       width  *= scale;
-       height *= scale;
- 
--      pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
--                               width, height);
--
--      poppler_page_render_to_pixbuf (page,
--                                     0, 0, width, height, scale, 0, pixbuf);
-+      surface = render_page_to_surface (page, width, height, scale);
-     }
- 
-   g_object_unref (page);
- 
-+  return surface;
-+}
-+
-+static GdkPixbuf *
-+get_thumb_pixbuf (PopplerDocument *doc,
-+                  gint             page_num,
-+                  gint             preferred_size)
-+{
-+  cairo_surface_t *surface;
-+  GdkPixbuf *pixbuf;
-+
-+  surface = get_thumb_surface (doc, page_num, preferred_size);
-+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
-+                                        cairo_image_surface_get_width (surface),
-+                                        cairo_image_surface_get_height (surface));
-+  cairo_surface_destroy (surface);
-+
-   return pixbuf;
- }
- 
-@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data)
-       idle_data->page_no  = i;
- 
-       /* FIXME get preferred size from somewhere? */
--      idle_data->pixbuf = get_thumbnail (thread_data->document, i,
--                                         THUMBNAIL_SIZE);
-+      idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i,
-+                                            THUMBNAIL_SIZE);
- 
-       g_idle_add (idle_set_thumbnail, idle_data);
- 
--- 
-1.7.5
diff --git a/extra/gnugo/gnugo.install b/extra/gnugo/gnugo.install
deleted file mode 100644
index b0271070c..000000000
--- a/extra/gnugo/gnugo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(gnugo.info.gz gnugo.info-1.gz gnugo.info-2.gz gnugo.info-3.gz)
-
-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
-}
diff --git a/extra/gtk2/cups-custom-print.patch b/extra/gtk2/cups-custom-print.patch
deleted file mode 100644
index ffc89aa32..000000000
--- a/extra/gtk2/cups-custom-print.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8170436e61ea68c713d75ad374d22c3261be9203 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <benjamin@sipsolutions.net>
-Date: Sat, 24 Dec 2011 16:26:32 +0000
-Subject: Set cups Custom print options correctly (bug #543520, patch by Marek Kašík)
-
-This patch fixes the cups print backend to pass Custom options with
-the "Custom." prefix to cups if neccessary.
----
-diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
-index 14a1b5d..2751ee4 100644
---- a/modules/printbackends/cups/gtkprintbackendcups.c
-+++ b/modules/printbackends/cups/gtkprintbackendcups.c
-@@ -483,22 +483,44 @@ cups_print_cb (GtkPrintBackendCups *print_backend,
-   GDK_THREADS_LEAVE ();  
- }
- 
-+typedef struct {
-+  GtkCupsRequest *request;
-+  GtkPrinterOptionSet *options;
-+} CupsOptionsData;
-+
- static void
- add_cups_options (const gchar *key,
- 		  const gchar *value,
- 		  gpointer     user_data)
- {
--  GtkCupsRequest *request = user_data;
-+  CupsOptionsData *data = (CupsOptionsData *) user_data;
-+  GtkCupsRequest *request = data->request;
-+  GtkPrinterOptionSet *options = data->options;
-+  GtkPrinterOption *option = NULL;
-+  gchar *new_value = NULL;
- 
-   if (!g_str_has_prefix (key, "cups-"))
-     return;
- 
-   if (strcmp (value, "gtk-ignore-value") == 0)
-     return;
-+
-+  option = gtk_printer_option_set_lookup (options, key);
-   
-   key = key + strlen ("cups-");
- 
--  gtk_cups_request_encode_option (request, key, value);
-+  /* Add "Custom." prefix to custom values */
-+  if (value && option &&
-+      !gtk_printer_option_has_choice (option, value))
-+    new_value = g_strdup_printf ("Custom.%s", value);
-+
-+  if (new_value)
-+    {
-+      gtk_cups_request_encode_option (request, key, new_value);
-+      g_free (new_value);
-+    }
-+  else
-+    gtk_cups_request_encode_option (request, key, value);
- }
- 
- static void
-@@ -511,8 +533,12 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
- {
-   GtkPrinterCups *cups_printer;
-   CupsPrintStreamData *ps;
-+  CupsOptionsData *options_data;
-   GtkCupsRequest *request;
-   GtkPrintSettings *settings;
-+  GtkPrinterOptionSet *options;
-+  GtkPrintCapabilities capabilities;
-+  GtkPageSetup *page_setup;
-   const gchar *title;
-   char  printer_absolute_uri[HTTP_MAX_URI];
- 
-@@ -521,6 +547,8 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
- 
-   cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
-   settings = gtk_print_job_get_settings (job);
-+  capabilities = cups_printer_get_capabilities (GTK_PRINTER (cups_printer));
-+  page_setup = gtk_printer_get_default_page_size (GTK_PRINTER (cups_printer));
- 
-   request = gtk_cups_request_new_with_username (NULL,
-                                                 GTK_CUPS_POST,
-@@ -558,8 +586,18 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
-                                      IPP_TAG_NAME, "job-name", 
-                                      NULL, title);
- 
--  gtk_print_settings_foreach (settings, add_cups_options, request);
--  
-+  options = cups_printer_get_options (GTK_PRINTER (cups_printer), settings, page_setup, capabilities);
-+
-+  options_data = g_new0 (CupsOptionsData, 1);
-+  options_data->request = request;
-+  options_data->options = options;
-+
-+  gtk_print_settings_foreach (settings, add_cups_options, options_data);
-+
-+  g_object_unref (page_setup);
-+  g_object_unref (options);
-+  g_free (options_data);
-+
-   ps = g_new0 (CupsPrintStreamData, 1);
-   ps->callback = callback;
-   ps->user_data = user_data;
---
-cgit v0.9.0.2
diff --git a/extra/imlib/libpng14.patch b/extra/imlib/libpng14.patch
deleted file mode 100644
index 2cc174e29..000000000
--- a/extra/imlib/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
---- imlib-1.9.15-orig/Imlib/load.c	2010-01-18 20:58:27.000000000 -0500
-+++ imlib-1.9.15/Imlib/load.c	2010-01-18 21:02:04.000000000 -0500
-@@ -1619,7 +1619,7 @@
-     return 0;
-   fread(buf, 1, 8, f);
-   rewind(f);
--  return (int)png_check_sig(buf, 8);
-+  return (int)png_sig_cmp(buf, 0, 8)==0;
- #else
-   return 0;
- #endif
diff --git a/extra/ksensors/PKGBUILD b/extra/ksensors/PKGBUILD
deleted file mode 100644
index 6db8e7e85..000000000
--- a/extra/ksensors/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 64746 2010-01-22 03:14:29Z eric $
-# Contributor: Torsten Evers <tevers@onlinehome.de>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-pkgname=ksensors
-pkgver=0.7.3
-pkgrel=5
-pkgdesc="ksensors is nice lm_sensors frontend for KDE"
-arch=('i686' 'x86_64')
-url="http://ksensors.sourceforge.net/"
-license=("GPL")
-depends=("lm_sensors>=3.0.0" 'kdelibs3')
-source=(#http://mesh.dl.sourceforge.net/sourceforge/ksensors/$pkgname-$pkgver.tar.gz \
-	http://people.atrpms.net/~hdegoede/ksensors-0.7.3-fedora-14.tar.gz)
-md5sums=('7c64a2ef836c13d72b5711791819072e')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  . /etc/profile.d/qt3.sh
-  . /etc/profile.d/kde3.sh
-  ./configure --prefix=/opt/kde  --without-arts
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/extra/ksensors/ksensors.patch b/extra/ksensors/ksensors.patch
deleted file mode 100644
index 299458f0d..000000000
--- a/extra/ksensors/ksensors.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- admin/cvs.sh	2003-07-11 23:00:30.000000000 +0800
-+++ admin/cvs.sh	2006-08-28 14:54:23.000000000 +0800
-@@ -29,7 +29,7 @@
- {
- AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
- case $AUTOCONF_VERSION in
--  Autoconf*2.5* | autoconf*2.5* ) : ;;
-+  Autoconf*2.[56]* | autoconf*2.[56]* ) : ;;
-   "" )
-     echo "*** AUTOCONF NOT FOUND!."
-     echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
-@@ -44,7 +44,7 @@
-  
- AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
- case $AUTOHEADER_VERSION in
--  Autoconf*2.5* | autoheader*2.5* ) : ;;
-+  Autoconf*2.[56]* | autoheader*2.[56]* ) : ;;
-   "" )
-     echo "*** AUTOHEADER NOT FOUND!."
-     echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
---- src/hdsensorslist.cpp	2004-08-09 02:30:05.000000000 +0800
-+++ src/hdsensorslist.cpp	2006-08-28 15:27:02.000000000 +0800
-@@ -206,13 +206,17 @@
- 
- bool HDSensorsList::getDisks(QStringList &disks )
- {
--  DIR *dir= opendir("/proc/ide");
--  if(!dir) return false;
-+  DIR *dir;
-+
-+  /* Get a listing of the hard drives looking under sysfs first before falling back to /proc/ide */
-+  if((dir = opendir ("/sys/block")) == NULL)
-+    if ((dir = opendir ("/proc/ide")) == NULL)
-+      return false;
-   QString str;
-   struct dirent *ptr;
-   while((ptr= readdir(dir))) {
--    if(ptr->d_name[0]=='h' && ptr->d_name[1]=='d') {
--       str.sprintf("/dev/hd%c",ptr->d_name[2]);
-+    if((ptr->d_name[0] == 'h' || ptr->d_name[0] == 's') && ptr->d_name[1] == 'd') {
-+       str.sprintf("/dev/%s", ptr->d_name);
-        disks << str;
-     }
-   }
---- src/lmsensorscfgdesign.ui	2004-08-11 22:36:54.000000000 +0800
-+++ src/lmsensorscfgdesign.ui	2006-08-28 14:54:23.000000000 +0800
-@@ -748,29 +748,13 @@
-                                 <property name="name">
-                                     <cstring>unnamed</cstring>
-                                 </property>
--                                <widget class="QLabel">
-+                                <widget class="QButtonGroup">
-                                     <property name="name">
--                                        <cstring>TextLabel1_3_2_2_2_2</cstring>
-+                                        <cstring>ButtonGroup9</cstring>
-                                     </property>
--                                    <property name="text">
-+                                    <property name="title">
-                                         <string>On reach alarm value:</string>
-                                     </property>
--                                </widget>
--                                <widget class="QFrame">
--                                    <property name="name">
--                                        <cstring>Frame11_2_2_2</cstring>
--                                    </property>
--                                    <property name="frameShape">
--                                        <enum>HLine</enum>
--                                    </property>
--                                    <property name="frameShadow">
--                                        <enum>Sunken</enum>
--                                    </property>
--                                </widget>
--                                <widget class="QLayoutWidget">
--                                    <property name="name">
--                                        <cstring>layout9</cstring>
--                                    </property>
-                                     <grid>
-                                         <property name="name">
-                                             <cstring>unnamed</cstring>
diff --git a/extra/libksba/PKGBUILD b/extra/libksba/PKGBUILD
deleted file mode 100644
index 20179c686..000000000
--- a/extra/libksba/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 149501 2012-02-08 10:55:32Z tpowa $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=libksba
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="A CMS and X.509 access library"
-arch=(i686 x86_64)
-license=('GPL')
-url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
-depends=('bash' 'libgpg-error' 'glibc')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-options=(!libtool)
-install=libksba.install
-
-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
-}
-md5sums=('e797f370b69b4dc776499d6a071ae137')
diff --git a/extra/libksba/libksba.install b/extra/libksba/libksba.install
deleted file mode 100644
index 3715b8960..000000000
--- a/extra/libksba/libksba.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(ksba.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/extra/libwmf/libpng14.patch b/extra/libwmf/libpng14.patch
deleted file mode 100644
index 3d38c717a..000000000
--- a/extra/libwmf/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c libwmf-0.2.8.4/src/extra/gd/gd_png.c
---- libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c	2005-07-27 23:35:06.000000000 +0300
-+++ libwmf-0.2.8.4/src/extra/gd/gd_png.c	2010-01-17 01:33:58.000000000 +0200
-@@ -136,7 +136,7 @@
-   /* first do a quick check that the file really is a PNG image; could
-    * have used slightly more general png_sig_cmp() function instead */
-   gdGetBuf (sig, 8, infile);
--  if (!png_check_sig (sig, 8))
-+  if (png_sig_cmp (sig, 0, 8))
-     return NULL;		/* bad signature */
- 
- #ifndef PNG_SETJMP_NOT_SUPPORTED
diff --git a/extra/netpbm/libpng-1.4.patch b/extra/netpbm/libpng-1.4.patch
deleted file mode 100644
index c02ded734..000000000
--- a/extra/netpbm/libpng-1.4.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur netpbm-orig/converter/other/pnmtopng.c netpbm/converter/other/pnmtopng.c
---- netpbm-orig/converter/other/pnmtopng.c	2010-01-22 00:13:48.000000000 -0500
-+++ netpbm/converter/other/pnmtopng.c	2010-01-22 00:21:33.000000000 -0500
-@@ -2641,7 +2641,7 @@
-         info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
-         if (transparent > 0) {
-             info_ptr->valid |= PNG_INFO_tRNS;
--            info_ptr->trans_values = 
-+            info_ptr->trans_color = 
-                 xelToPngColor_16(transcolor, maxval, png_maxval);
-         }
-     } else {
-@@ -2653,10 +2653,10 @@
-         if (info_ptr->valid && PNG_INFO_tRNS) 
-             pm_message("Transparent color {gray, red, green, blue} = "
-                        "{%d, %d, %d, %d}",
--                       info_ptr->trans_values.gray,
--                       info_ptr->trans_values.red,
--                       info_ptr->trans_values.green,
--                       info_ptr->trans_values.blue);
-+                       info_ptr->trans_color.gray,
-+                       info_ptr->trans_color.red,
-+                       info_ptr->trans_color.green,
-+                       info_ptr->trans_color.blue);
-         else
-             pm_message("No transparent color");
-     }
-diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopnm.c
---- netpbm-orig/converter/other/pngtopnm.c	2010-01-22 00:33:25.000000000 -0500
-+++ netpbm/converter/other/pngtopnm.c	2010-01-22 00:39:21.000000000 -0500
-@@ -569,8 +569,8 @@
-             for (i = 0, foundGray = FALSE;
-                  i < info_ptr->num_trans && !foundGray;
-                  ++i) {
--                if (info_ptr->trans[i] != 0 &&
--                    info_ptr->trans[i] != maxval) {
-+                if (info_ptr->trans_alpha[i] != 0 &&
-+                    info_ptr->trans_alpha[i] != maxval) {
-                     foundGray = TRUE;
-                 }
-             }
-@@ -641,7 +641,7 @@
-                 unsigned int i;
-                 trans_mix = TRUE;
-                 for (i = 0; i < info_ptr->num_trans; ++i)
--                    if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) {
-+                    if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) {
-                         trans_mix = FALSE;
-                         break;
-                     }
-@@ -1061,7 +1061,7 @@
-             setXel(&xelrow[col], fgColor, bgColor, alphaHandling,
-                    (pngxP->info_ptr->valid & PNG_INFO_tRNS) &&
-                    index < pngxP->info_ptr->num_trans ?
--                   pngxP->info_ptr->trans[index] : maxval);
-+                   pngxP->info_ptr->trans_alpha[index] : maxval);
-         }
-         break;
-                 
diff --git a/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi b/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi
deleted file mode 100644
index 54195d8b3..000000000
--- a/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-   	<match key="volume.fstype" string="ntfs">
-        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
-        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
-        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
-        <merge key="volume.fstype" type="string">ntfs-3g</merge>
-       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
-        <append key="volume.mount.valid_options" type="strlist">atime</append>
-        <append key="volume.mount.valid_options" type="strlist">noatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
-       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
-       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">uid=</append>
-       	<append key="volume.mount.valid_options" type="strlist">gid=</append>
-      	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
-       	<append key="volume.mount.valid_options" type="strlist">silent</append>
-       	<append key="volume.mount.valid_options" type="strlist">force</append>
-       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
-       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
-       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
-       	<append key="volume.mount.valid_options" type="strlist">debug</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
-       	<append key="volume.mount.valid_options" type="strlist">sync</append>
-       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
-       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
-       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
-        <append key="volume.mount.valid_options" type="strlist">quiet</append>
-       	<append key="volume.mount.valid_options" type="strlist">remount</append>
-       	<append key="volume.mount.valid_options" type="strlist">exec</append>
-       	<append key="volume.mount.valid_options" type="strlist">recover</append>
-       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
-       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
-       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-	</match>
-  </device>
-</deviceinfo>
diff --git a/extra/ntrack/dead-loop-fix.patch b/extra/ntrack/dead-loop-fix.patch
deleted file mode 100644
index 133bb4ace..000000000
--- a/extra/ntrack/dead-loop-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-=== modified file 'modules/ntrack-libnl.c'
---- modules/ntrack-libnl.c	2011-04-25 16:28:19 +0000
-+++ modules/ntrack-libnl.c	2011-04-25 17:25:24 +0000
-@@ -394,6 +394,9 @@
- 		if (rtnl_link_get_ifindex(link) > iindex)
- 			break;
- 		i = i->next;
-+
-+		if (i == linklist)
-+			break;
- 	}
- 	return result;
- }
-
diff --git a/extra/openjdk6/glibc2_15.diff b/extra/openjdk6/glibc2_15.diff
deleted file mode 100644
index 8fe1b077a..000000000
--- a/extra/openjdk6/glibc2_15.diff
+++ /dev/null
@@ -1,236 +0,0 @@
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent  2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid@redhat.com>
-
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -34,8 +34,6 @@
- 
- // Portions of code courtesy of Clifford Click
- 
--#define MAXFLOAT        ((float)3.40282346638528860e+38)
--
- // Classic Add functionality.  This covers all the usual 'add' behaviors for
- // an algebraic ring.  Add-integer, add-float, add-double, and binary-or are
- // all inherited from this class.  The various identity values are supplied
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jniCheck.cpp
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@
-     if (env != xenv) {                                                   \
-       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
-     }                                                                    \
--    __ENTRY(result_type, header, thr)
-+    VM_ENTRY_BASE(result_type, header, thr)
- 
- 
- #define UNCHECKED() (unchecked_jni_NativeInterface)
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnter.xsl
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@
-     <xsl:value-of select="$space"/>
-     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
-     <xsl:value-of select="$space"/>
--    <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+    <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
-     <xsl:apply-templates select="." mode="functionid"/>
-     <xsl:text> , current_thread)</xsl:text>
-     <xsl:value-of select="$space"/>
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnv.cpp
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@
-     // from native so as to resolve the jthread.
- 
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     oop thread_oop = JNIHandles::resolve_external_guard(thread);
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiExport.cpp
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@
-     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
-     // transition code: native to VM
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+    VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
-diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/runtime/interfaceSupport.hpp
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@
-   }
- };
- 
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
- 
- 
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@
- 
- // LEAF routines do not lock, GC or throw exceptions
- 
--#define __LEAF(result_type, header)                                  \
-+#define VM_LEAF_BASE(result_type, header)                            \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   /* begin of body */
-@@ -441,7 +441,7 @@
- 
- // ENTRY routines may lock, GC and throw exceptions
- 
--#define __ENTRY(result_type, header, thread)                         \
-+#define VM_ENTRY_BASE(result_type, header, thread)                   \
-   TRACE_CALL(result_type, header)                                    \
-   HandleMarkCleaner __hm(thread);                                    \
-   Thread* THREAD = thread;                                           \
-@@ -450,7 +450,7 @@
- 
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
- 
--#define __QUICK_ENTRY(result_type, header, thread)                   \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread)             \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   Thread* THREAD = thread;                                           \
-@@ -463,20 +463,20 @@
- #define IRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define IRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--    __LEAF(result_type, header)                                      \
-+    VM_LEAF_BASE(result_type, header)                                \
-     debug_only(No_Safepoint_Verifier __nspv(true);)
- 
- 
- #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@
-   result_type header {                                               \
-     nmethodLocker _nmlock(nm);                                       \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- #define IRT_END }
- 
-@@ -497,20 +497,20 @@
- #define JRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define JRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--  __LEAF(result_type, header)                                        \
-+  VM_LEAF_BASE(result_type, header)                                  \
-   debug_only(JRT_Leaf_Verifier __jlv;)
- 
- 
- #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header)                         \
- extern "C" {                                                         \
-   result_type JNICALL header {                                \
-@@ -555,7 +555,7 @@
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JNI_LEAF(result_type, header)                                \
-@@ -563,7 +563,7 @@
-   result_type JNICALL header {                                \
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_ENTRY_NO_ENV(result_type, header)                        \
-@@ -588,7 +588,7 @@
-     JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_QUICK_ENTRY(result_type, header)                         \
-@@ -597,14 +597,14 @@
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_LEAF(result_type, header)                                \
- extern "C" {                                                         \
-   result_type JNICALL header {                                       \
-     VM_Exit::block_if_vm_exited();                                   \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- #define JVM_END } }
\ No newline at end of file
diff --git a/extra/pathological/ChangeLog b/extra/pathological/ChangeLog
deleted file mode 100644
index 3cd114178..000000000
--- a/extra/pathological/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-2010-08-24  Eric Belanger  <eric@archlinux.org>
-
-	* pathological 1.1.3-6
-	* Rebuilt against python2
-
-2009-07-10  Eric Belanger  <eric@archlinux.org>
-
-	* pathological 1.1.3-5
-	* Removed binary from /usr/share (close FS#15302)
-	* Moved saved games to /var
-	* Fixed segmentation fault
-	* FHS man pages
-	* Added docs
-	* Added ChangeLog
diff --git a/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch b/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch
deleted file mode 100644
index e661db57c..000000000
--- a/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e5555d7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 25 Jan 2012 19:03:05 +0000
-Subject: Revert "Reject trapezoids where top (botttom) is above (below) the edges"
-
-Cairo 1.10 will sometimes generate trapezoids like this, so we can't
-consider them invalid. Fixes bug 45009, reported by Michael Biebl.
-
-This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06.
----
-diff --git a/pixman/pixman.h b/pixman/pixman.h
-index 20ff496..18d9513 100644
---- a/pixman/pixman.h
-+++ b/pixman/pixman.h
-@@ -908,14 +908,10 @@ struct pixman_triangle
- };
- 
- /* whether 't' is a well defined not obviously empty trapezoid */
--#define pixman_trapezoid_valid(t)					\
--    ((t)->left.p1.y != (t)->left.p2.y &&				\
--     (t)->right.p1.y != (t)->right.p2.y &&				\
--     (int) ((t)->bottom - (t)->top) > 0 &&				\
--     (t)->bottom <= (t)->left.p2.y &&					\
--     (t)->bottom <= (t)->right.p2.y &&					\
--     (t)->top >= (t)->left.p1.y &&					\
--     (t)->top >= (t)->right.p1.y)
-+#define pixman_trapezoid_valid(t)				   \
-+    ((t)->left.p1.y != (t)->left.p2.y &&			   \
-+     (t)->right.p1.y != (t)->right.p2.y &&			   \
-+     (int) ((t)->bottom - (t)->top) > 0)
- 
- struct pixman_span_fix
- {
-diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c
-index de518d8..ff03b50 100644
---- a/test/composite-traps-test.c
-+++ b/test/composite-traps-test.c
-@@ -251,6 +251,6 @@ test_composite (int      testnum,
- int
- main (int argc, const char *argv[])
- {
--    return fuzzer_test_main("composite traps", 40000, 0x4346479C,
-+    return fuzzer_test_main("composite traps", 40000, 0xE3112106,
- 			    test_composite, argc, argv);
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/qt3/mysql.patch b/extra/qt3/mysql.patch
deleted file mode 100644
index 5f61edc67..000000000
--- a/extra/qt3/mysql.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sql/drivers/mysql/qsql_mysql.cpp
-+++ src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -37,7 +37,6 @@
- #include "qsql_mysql.h"
- #include <private/qsqlextension_p.h>
- 
--#include <qapplication.h>
- #include <qdatetime.h>
- #include <qvaluevector.h>
- #include <qsqlrecord.h>
-@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
- }
- 
- /////////////////////////////////////////////////////////
--static void qServerEnd()
--{
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID >= 40000
--    mysql_server_end();
--# endif // MYSQL_VERSION_ID
--#endif // Q_NO_MYSQL_EMBEDDED
--}
- 
- static void qServerInit()
- {
-@@ -366,9 +357,7 @@ static void qServerInit()
- 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
- #  endif
-     }
--    qAddPostRoutine(qServerEnd);
-     init = TRUE;    
--    
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- }
-@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
- 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
- 	delete ext;
-     }
-+#ifndef Q_NO_MYSQL_EMBEDDED
-+# if MYSQL_VERSION_ID > 40000
-+    mysql_server_end();
-+# endif
-+#endif
- }
- 
- bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/extra/qt3/qt-font-default-subst.diff b/extra/qt3/qt-font-default-subst.diff
deleted file mode 100644
index 3e286f74e..000000000
--- a/extra/qt3/qt-font-default-subst.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/kernel/qfontdatabase_x11.cpp
-+++ src/kernel/qfontdatabase_x11.cpp
-@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
- 	    if (script == QFont::Latin)
- 		// add Euro character
- 		FcCharSetAddChar(cs, 0x20ac);
--	    if (script == QFont::Han_SimplifiedChinese)
--		FcCharSetAddChar(cs, 0x3400);
--	    if (script == QFont::Han_TraditionalChinese){
--		FcCharSetAddChar(cs, 0x3435);
--		FcCharSetAddChar(cs, 0xE000);
--		FcCharSetAddChar(cs, 0xF6B1);
--	    }
--	    if (script == QFont::MiscellaneousSymbols)
--		FcCharSetAddChar(cs, 0x2714);
- 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- 	    FcCharSetDestroy(cs);
- 	}
-@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
-     FcPatternPrint(pattern);
- #endif
- 
-+    // XftFontMatch calls the right ConfigSubstitute variants, but as we use
-+    // FcFontMatch/Sort here we have to do it manually.
-     FcConfigSubstitute(0, pattern, FcMatchPattern);
-+    XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
-+
- //     qDebug("1: pattern contains:");
- //     FcPatternPrint(pattern);
- 
-@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
- 	    value.u.s = (const FcChar8 *)cs.data();
- 	    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- 	}
--#ifdef FONT_MATCH_DEBUG
--	printf("final pattern contains:\n");
--	FcPatternPrint(pattern);
--#endif
-     }
- 
-     if (script != QFont::Unicode) {
-@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
-         if (script == QFont::Latin)
-             // add Euro character
-             FcCharSetAddChar(cs, 0x20ac);
--	if (script == QFont::Han_SimplifiedChinese)
--	    FcCharSetAddChar(cs, 0x3400);
--	if (script == QFont::Han_TraditionalChinese) {
--	    FcCharSetAddChar(cs, 0x3435);
--	    FcCharSetAddChar(cs, 0xE000);
--	    FcCharSetAddChar(cs, 0xF6B1);
--	}
--	if (script == QFont::MiscellaneousSymbols)
--	    FcCharSetAddChar(cs, 0x2714);
-         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
-         FcCharSetDestroy(cs);
-     }
- 
-+#ifdef FONT_MATCH_DEBUG
-+	printf("final pattern contains:\n");
-+	FcPatternPrint(pattern);
-+#endif
-+
-     QFontEngine *fe = 0;
- 
-     for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
---- src/kernel/qfontdatabase.cpp
-+++ src/kernel/qfontdatabase.cpp
-@@ -554,7 +554,7 @@ static const unsigned short sample_chars
-     // GeometricSymbols,
-     { 0x2500, 0x0 },
-     // MiscellaneousSymbols,
--    { 0x2640, 0x0 },
-+    { 0x2640, 0x2714, 0x0 },
-     // EnclosedAndSquare,
-     { 0x2460, 0x0 },
-     // Braille,
diff --git a/extra/qt3/qt3-png14.patch b/extra/qt3/qt3-png14.patch
deleted file mode 100644
index e8a194529..000000000
--- a/extra/qt3/qt3-png14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/kernel/qpngio.cpp.orig	2010-01-16 22:02:41.000000000 +0100
-+++ src/kernel/qpngio.cpp	2010-01-16 22:03:56.000000000 +0100
-@@ -159,7 +159,7 @@
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr->trans_color.gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -187,7 +187,7 @@
- 		    info_ptr->palette[i].red,
- 		    info_ptr->palette[i].green,
- 		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr->trans_alpha[i]
- 		    )
- 		);
- 		i++;
-@@ -321,9 +321,9 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
-     if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- 	QRgb trans = 0xFF000000 | qRgb(
--	      (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+	      (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+	      (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+	      (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
- 	for (uint y=0; y<height; y++) {
- 	    for (uint x=0; x<info_ptr->width; x++) {
- 		if (((uint**)jt)[y][x] == trans) {
diff --git a/extra/qt3/utf8-bug-qt3.diff b/extra/qt3/utf8-bug-qt3.diff
deleted file mode 100644
index 43e84a99f..000000000
--- a/extra/qt3/utf8-bug-qt3.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -154,6 +154,7 @@
- 
- class QUtf8Decoder : public QTextDecoder {
-     uint uc;
-+    uint min_uc;
-     int need;
-     bool headerDone;
- public:
-@@ -167,8 +168,9 @@
- 	result.setLength( len ); // worst case
- 	QChar *qch = (QChar *)result.unicode();
- 	uchar ch;
-+        int error = -1;
- 	for (int i=0; i<len; i++) {
--	    ch = *chars++;
-+	    ch = chars[i];
- 	    if (need) {
- 		if ( (ch&0xc0) == 0x80 ) {
- 		    uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- 			    *qch++ = QChar(high);
- 			    *qch++ = QChar(low);
- 			    headerDone = TRUE;
-+			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                            *qch++ = QChar::replacement;
- 			} else {
- 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
- 				*qch++ = uc;
-@@ -190,6 +194,7 @@
- 		    }
- 		} else {
- 		    // error
-+                    i = error;
- 		    *qch++ = QChar::replacement;
- 		    need = 0;
- 		}
-@@ -200,12 +205,21 @@
- 		} else if ((ch & 0xe0) == 0xc0) {
- 		    uc = ch & 0x1f;
- 		    need = 1;
-+                    error = i;
-+		    min_uc = 0x80;
- 		} else if ((ch & 0xf0) == 0xe0) {
- 		    uc = ch & 0x0f;
- 		    need = 2;
-+                    error = i;
-+		    min_uc = 0x800;
- 		} else if ((ch&0xf8) == 0xf0) {
- 		    uc = ch & 0x07;
- 		    need = 3;
-+                    error = i;
-+                    min_uc = 0x10000;
-+                } else {
-+                    // error
-+                    *qch++ = QChar::replacement;
- 		}
- 	    }
- 	}
---- src/tools/qstring.cpp
-+++ src/tools/qstring.cpp
-@@ -5805,6 +5805,7 @@
-     result.setLength( len ); // worst case
-     QChar *qch = (QChar *)result.unicode();
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -5822,6 +5823,12 @@
- 			unsigned short low = uc%0x400 + 0xdc00;
- 			*qch++ = QChar(high);
- 			*qch++ = QChar(low);
-+		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = QChar(0xdbff);
-+                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
- 		    } else {
- 			*qch++ = uc;
- 		    }
-@@ -5844,14 +5851,17 @@
- 		uc = ch & 0x1f;
- 		need = 1;
- 		error = i;
-+		min_uc = 0x80;
- 	    } else if ((ch & 0xf0) == 0xe0) {
- 		uc = ch & 0x0f;
- 		need = 2;
- 		error = i;
-+		min_uc = 0x800;
- 	    } else if ((ch&0xf8) == 0xf0) {
- 		uc = ch & 0x07;
- 		need = 3;
- 		error = i;
-+		min_uc = 0x10000;
- 	    } else {
- 	        // Error
-                 qch = addOne(qch, result);
diff --git a/extra/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 b/extra/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7
deleted file mode 100644
index 30a556acf..000000000
--- a/extra/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7
+++ /dev/null
@@ -1,3 +0,0 @@
-if /bin/sh ../libtool --silent --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../src -I/opt/kde/include -I/opt/qt/include -I.  -I/opt/kde/include/skim -I/usr/include/scim-1.0     -DQT_THREAD_SUPPORT  -D_REENTRANT  -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -march=i686 -mtune=generic -O2 -pipe -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common  -MT smartpinyinui.lo -MD -MP -MF ".deps/smartpinyinui.Tpo" -c -o smartpinyinui.lo smartpinyinui.cpp; \
-        then mv -f ".deps/smartpinyinui.Tpo" ".deps/smartpinyinui.Plo"; else rm -f ".deps/smartpinyinui.Tpo"; exit 1; fi
-smartpinyinui.cpp:26:36: error: skimeditshortcutbutton.h: No such file or directory
diff --git a/extra/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch b/extra/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch
deleted file mode 100644
index 91a948d5d..000000000
--- a/extra/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp
---- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43	2008-02-25 16:27:05.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-02-25 16:26:41.000000000 +0800
-@@ -28,6 +28,7 @@
- #define SCIM_PHRASE_MAX_RELATION 1000
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
- 
-diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp
---- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43	2008-02-25 16:27:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-02-25 16:28:08.000000000 +0800
-@@ -22,6 +22,7 @@
- 
- #include <time.h>
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_special_table.h"
- 
-diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp
---- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43	2008-02-25 16:26:10.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-02-25 16:26:26.000000000 +0800
-@@ -29,6 +29,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin.h"
- 
- // Internal functions
-diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
---- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43	2008-02-25 16:27:15.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-02-25 16:27:28.000000000 +0800
-@@ -27,6 +27,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
- #include "scim_pinyin.h"
diff --git a/extra/scim-uim/uim-1.5.5-header.diff b/extra/scim-uim/uim-1.5.5-header.diff
deleted file mode 100644
index 0e6565827..000000000
--- a/extra/scim-uim/uim-1.5.5-header.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp
-+++ scim-uim-0.2.0/src/scim_uim_imengine.cpp
-@@ -34,7 +34,8 @@
-
- #include <scim.h>
- #include "scim_uim_imengine.h"
--#include <uim/uim-compat-scm.h>
-+#include <uim/uim-scm.h>
-+#include <uim/uim-util.h>
-
- #define scim_module_init uim_LTX_scim_module_init
- #define scim_module_exit uim_LTX_scim_module_exit
-
diff --git a/extra/slim/gcc44.patch b/extra/slim/gcc44.patch
deleted file mode 100644
index 390ea8a86..000000000
--- a/extra/slim/gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur slim-1.3.2/switchuser.h slim-1.3.2.a/switchuser.h
---- slim-1.3.2/switchuser.h	2010-07-08 07:04:10.000000000 +0200
-+++ slim-1.3.2.a/switchuser.h	2010-08-21 15:10:34.306212393 +0200
-@@ -13,6 +13,7 @@
- #define _SWITCHUSER_H_
- 
- #include <stdlib.h>
-+#include <stdio.h> /* remove */
- #include <unistd.h>
- #include <string.h>
- #include <pwd.h>
diff --git a/extra/spassgen/PKGBUILD b/extra/spassgen/PKGBUILD
deleted file mode 100644
index 653a51f57..000000000
--- a/extra/spassgen/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 77993 2010-04-19 08:07:51Z dgriffiths $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=spassgen
-pkgver=1.5
-pkgrel=7
-pkgdesc="A small program that generates passwords"
-arch=(i686 x86_64)
-url="http://spassgen.sourceforge.net/"
-license=('GPL2')
-depends=('qt3')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ed019dda56551fb860c74016baa91fa4')
-
-build() {
-  cd ${srcdir}/${pkgname}
-  . /etc/profile.d/qt3.sh
-  qmake -project spassgen.pro || return 1
-  qmake || return 1
-  make || return 1
-  install -d ${pkgdir}/opt/kde/{bin,share/icons/crystalsvg}
-  install -m755 spassgen ${pkgdir}/opt/kde/bin/spassgen || return 1
-  cd icons
-  cp -r * ${pkgdir}/opt/kde/share/icons/crystalsvg || return 1
-  rm -r ${pkgdir}/opt/kde/share/icons/crystalsvg/16x16/.xvpics
- }
diff --git a/extra/transfig/ChangeLog b/extra/transfig/ChangeLog
deleted file mode 100644
index c303c33c0..000000000
--- a/extra/transfig/ChangeLog
+++ /dev/null
@@ -1,36 +0,0 @@
-2010-05-26  Jan de Groot  <jgc@archlinux.org>
-	* transfig 3.2.5c-3
-	* Rebuilt for libpng 1.4.2, png_set_dither has been renamed
-
-2010-01-27  Eric Belanger  <eric@archlinux.org>
-
-	* transfig 3.2.5c-2
-	* Rebuilt for libpng 1.4 and libjpeg 8
-
-2010-01-11  Eric Belanger  <eric@archlinux.org>
-
-	* transfig 3.2.5c-1
-	* Upstream update
-	* Removed force option
-
-2009-08-12  Eric Belanger  <eric@archlinux.org>
-
-	* transfig 3.2.5a-1
-	* Upstream update
-	* Added force option
-
-2009-03-21  Eric Belanger  <eric@archlinux.org>
-
-	* transfig 3.2.5-2
-	* Removed uneeded stderr message (close FS#13825)
-
-2008-12-14  Eric Belanger  <eric@archlinux.org>
-
-	* transfig 3.2.5-1
-	* Upstream update
-	* Added arch tag
-	* Added license
-	* Added imake makedepends
-	* Added man pages
-	* Removed old patches
-	* Added ChangeLog
diff --git a/extra/vorbis-tools/ChangeLog b/extra/vorbis-tools/ChangeLog
deleted file mode 100644
index 54e3adcb8..000000000
--- a/extra/vorbis-tools/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-2010-04-10  Andrea Scarpino  <andrea@archlinux.org>
-
-	* vorbis-tools 1.4.0-2
-	* libao 1.0 rebuild
-
-2010-04-10  Andrea Scarpino  <andrea@archlinux.org>
-
-	* vorbis-tools 1.4.0-1
-	* Upstream release
-
-2009-10-04  Eric Belanger  <eric@archlinux.org>
-
-	* vorbis-tools 1.2.0-4
-	* Added vcut tool (close FS#14749)
-	* Fixed license
-
-2008-03-15 Travis Willard <travis@archlinux.org>
-
-	* vorbis-tools 1.2.0-3
-	* Removed explicit /usr/man usage
-
-2008-03-15 Travis Willard <travis@archlinux.org>
-
-	* vorbis-tools 1.2.0-1
-	* New upstream release.
-	* Added ChangeLog
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
deleted file mode 100644
index c3ec48db6..000000000
--- a/extra/wesnoth/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 148958 2012-02-05 11:57:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Jacobo Arvelo <unix4all@ya.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=wesnoth
-pkgver=1.8.6
-pkgrel=4
-pkgdesc="A turn-based strategy game on a fantasy world"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2')
-makedepends=('boost')
-install=wesnoth.install
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        wesnoth-libpng-1.4.0.patch
-        wesnoth-1.8.6-boost-foreach.patch
-        wesnoth.tmpfiles.conf)
-md5sums=('f1c3179869b01b61e253e74aeb241034'
-         '3b0d2edcb45e8ecc8c790f92bdcb0087'
-         'dc414ab7e1334941548e9db6db9c2460'
-         'b8122f5054e3895c9c054e87460869dc')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch"
-  patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch"
-  ./autogen.sh
-  ./configure --prefix=/usr --localstatedir=/var --enable-tools \
-      --enable-editor --enable-server --with-fifodir=/run/wesnothd
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install-exec
-  install -dm755 "$pkgdir/usr/lib/tmpfiles.d/"
-  install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
-
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint"
-}
diff --git a/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch
deleted file mode 100644
index 5aee3118c..000000000
--- a/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~	2011-07-21 23:05:56.594879049 +0200
-+++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp	2011-07-21 23:28:07.540358742 +0200
-@@ -238,6 +238,17 @@ void ttree_view_node::clear()
- 
- struct ttree_view_node_implementation
- {
-+	template<class W, class It>
-+	static W* find_at_aux(It begin, It end,
-+			      const tpoint& coordinate, const bool must_be_active) {
-+		for (It it = begin; it != end; ++it) {
-+			if(W* widget = it->find_at(coordinate, must_be_active)) {
-+				return widget;
-+			}
-+		}
-+		return NULL;
-+	}
-+
- 	template<class W>
- 	static W* find_at(
- 			  typename tconst_duplicator<W, ttree_view_node>::type&
-@@ -255,13 +266,9 @@ struct ttree_view_node_implementation
- 		}
- 
- 		typedef typename tconst_duplicator<W, ttree_view_node>::type thack;
--		foreach(thack& node, tree_view_node.children_) {
--			if(W* widget = node.find_at(coordinate, must_be_active)) {
--				return widget;
--			}
--		}
--
--		return NULL;
-+		return find_at_aux<W>(tree_view_node.children_.begin(),
-+				      tree_view_node.children_.end(),
-+				      coordinate, must_be_active);
- 	}
- };
- 
-@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size
- 		return size;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz
- 		size.x += (get_indention_level() - 1) * tree_view().indention_step_size_;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s
- 
- 	DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
diff --git a/extra/wesnoth/wesnoth-libpng-1.4.0.patch b/extra/wesnoth/wesnoth-libpng-1.4.0.patch
deleted file mode 100644
index 338f467af..000000000
--- a/extra/wesnoth/wesnoth-libpng-1.4.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp	2010-01-01 15:16:49.000000000 +0200
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp	2010-04-08 17:38:03.066201123 +0300
-@@ -174,8 +174,8 @@
- 	//TODO: review whether providing NULL error handlers is something
- 	//sensible
- 	png_struct* png_ptr = png_create_write_struct
--		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL),
--		 png_error_ptr_NULL, png_error_ptr_NULL);
-+		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL),
-+		 NULL, NULL);
- 	if(!png_ptr)
- 		throw exploder_failure("Unable to initialize the png write structure");
- 
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600
-@@ -15,6 +15,7 @@
- #include "exploder_utils.hpp"
- #include "game_config.hpp"
- #include "serialization/string_utils.hpp"
-+#include <zlib.h>
- #include <png.h>
-
- exploder_point::exploder_point(const std::string &s)
diff --git a/extra/wesnoth/wesnoth.install b/extra/wesnoth/wesnoth.install
deleted file mode 100644
index 4f1e419ae..000000000
--- a/extra/wesnoth/wesnoth.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-cat << EOF
-Note:
-==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma"
-==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth
-==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
-EOF
-}
diff --git a/extra/wesnoth/wesnoth.tmpfiles.conf b/extra/wesnoth/wesnoth.tmpfiles.conf
deleted file mode 100644
index 3ec0f6013..000000000
--- a/extra/wesnoth/wesnoth.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/wesnothd 0700 root root -
diff --git a/extra/xaw3d/LICENSE b/extra/xaw3d/LICENSE
deleted file mode 100644
index 395de2d9b..000000000
--- a/extra/xaw3d/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 1989  X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-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
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
diff --git a/extra/xaw3d/Xaw3d-1.5-box.c.patch b/extra/xaw3d/Xaw3d-1.5-box.c.patch
deleted file mode 100644
index 252238af8..000000000
--- a/extra/xaw3d/Xaw3d-1.5-box.c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## box.c.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xaw3d-1.5+E~/lib/Xaw3d/Box.c xaw3d-1.5+E/lib/Xaw3d/Box.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Box.c	1996-10-15 16:41:18.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Box.c	2007-04-24 15:28:39.000000000 +0200
-@@ -353,8 +353,16 @@
- 	else {
- 	    width = preferred_width;
- 	    do { /* find some width big enough to stay within this height */
-+#if 0 
- 		width *= 2;
- 		if (width > constraint->width) width = constraint->width;
-+#endif
-+                if (width > constraint->width/2) {  /* avoid short int overflow */
-+ 		    width = constraint->width;
-+		}
-+                else { 
-+		    width *= 2; 
-+		}
- 		DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE);
- 	    } while (preferred_height > constraint->height &&
- 		     width < constraint->width);
diff --git a/extra/xaw3d/Xaw3d-1.5-debian-fixes.patch b/extra/xaw3d/Xaw3d-1.5-debian-fixes.patch
deleted file mode 100644
index 5593f249b..000000000
--- a/extra/xaw3d/Xaw3d-1.5-debian-fixes.patch
+++ /dev/null
@@ -1,647 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c	2008-10-06 11:42:13.000000000 +0200
-@@ -51,11 +51,17 @@ in this Software without prior written a
- #include <X11/Xaw3d/MultiSrcP.h> 
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- #if (defined(ASCII_STRING) || defined(ASCII_DISK))
- #  include <X11/Xaw3d/AsciiText.h> /* for Widget Classes. */
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- /****************************************************************
-  *
-@@ -1007,7 +1013,9 @@ InitStringOrFile(src, newString)
- AsciiSrcObject src;
- Boolean newString;
- {
--    char * open_mode = NULL;
-+    mode_t open_mode = 0;
-+    const char *fdopen_mode = NULL;
-+    int fd;
-     FILE * file;
-     char fileName[TMPSIZ];
- 
-@@ -1049,7 +1057,8 @@ Boolean newString;
- 	    XtErrorMsg("NoFile", "asciiSourceCreate", "XawError",
- 		     "Creating a read only disk widget and no file specified.",
- 		       NULL, 0);
--	open_mode = "r";
-+	open_mode = O_RDONLY;
-+	fdopen_mode = "r";
- 	break;
-     case XawtextAppend:
-     case XawtextEdit:
-@@ -1057,9 +1066,17 @@ Boolean newString;
- 	    src->ascii_src.string = fileName;
- 	    (void) tmpnam(src->ascii_src.string);
- 	    src->ascii_src.is_tempfile = TRUE;
--	    open_mode = "w";
--	} else
--	    open_mode = "r+";
-+	    open_mode = O_WRONLY | O_CREAT | O_EXCL;
-+	    fdopen_mode = "w";
-+	} else {
-+/* O_NOFOLLOW is a BSD & Linux extension */
-+#ifdef O_NOFOLLOW
-+		open_mode = O_RDWR | O_NOFOLLOW;
-+#else
-+		open_mode = O_RDWR; /* unsafe; subject to race conditions */
-+#endif
-+		fdopen_mode = "r+";
-+	}
- 	break;
-     default:
- 	XtErrorMsg("badMode", "asciiSourceCreate", "XawError",
-@@ -1078,11 +1095,14 @@ Boolean newString;
-     }
-     
-     if (!src->ascii_src.is_tempfile) {
--	if ((file = fopen(src->ascii_src.string, open_mode)) != 0) {
--	    (void) fseek(file, (Off_t)0, 2);
--	    src->ascii_src.length = (XawTextPosition) ftell(file);
--	    return file;
--	} else {
-+	if ((fd = open(src->ascii_src.string, open_mode, 0666))) {
-+	    if ((file = fdopen(fd, fdopen_mode)) != NULL) {
-+		    (void)fseek(file, 0, SEEK_END);
-+		    src->ascii_src.length = (XawTextPosition)ftell(file);
-+		    return (file);
-+	    }
-+	}
-+	{	    
- 	    String params[2];
- 	    Cardinal num_params = 2;
- 	    
-@@ -1094,7 +1114,7 @@ Boolean newString;
- 	}
-     } 
-     src->ascii_src.length = 0;
--    return((FILE *)NULL);
-+    return(NULL);
- }
- 
- static void
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h
---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian	1996-10-15 16:41:18.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h	2008-10-06 11:42:13.000000000 +0200
-@@ -85,7 +85,11 @@ SOFTWARE.
- #ifdef L_tmpnam
- #define TMPSIZ L_tmpnam
- #else
--#define TMPSIZ 32		/* bytes to allocate for tmpnam */
-+#ifdef PATH_MAX
-+#define TMPSIZ PATH_MAX
-+#else
-+#define TMPSIZ 1024		/* bytes to allocate for tmpnam */
-+#endif
- #endif
- 
- #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian	1996-10-15 16:41:20.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c	2008-10-06 11:42:13.000000000 +0200
-@@ -53,6 +53,8 @@ in this Software without prior written a
- #include <X11/Xaw3d/XawInit.h>
- #include <X11/Xaw3d/MenuButtoP.h>
- 
-+#include "XawAlloc.h"
-+
- static void ClassInitialize();
- static void PopupMenu();
- 
-@@ -179,9 +181,16 @@ Cardinal * num_params;
- 
-   if (menu == NULL) {
-     char error_buf[BUFSIZ];
--    (void) sprintf(error_buf, "MenuButton: %s %s.",
--	    "Could not find menu widget named", mbw->menu_button.menu_name);
--    XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
-+    char *err1 = "MenuButton: Could not find menu widget named ";
-+    char *perr;
-+    int len;
-+
-+    len = strlen(err1) + strlen(mbw->menu_button.menu_name) + 1 + 1;
-+    perr = XtStackAlloc(len, error_buf);
-+    if (perr == NULL) return;
-+    sprintf(perr, "%s%s.", err1, mbw->menu_button.menu_name);
-+    XtAppWarning(XtWidgetToApplicationContext(w), perr);
-+    XtStackFree(perr, error_buf);
-     return;
-   }
-   if (!XtIsRealized(menu))
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian	2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c	2008-10-06 11:42:13.000000000 +0200
-@@ -74,6 +74,9 @@ in this Software without prior written a
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- 
- /****************************************************************
-  *
-@@ -1077,7 +1080,9 @@ InitStringOrFile(src, newString)
-     MultiSrcObject src;
-     Boolean newString;
- {
--    char * open_mode = NULL;
-+    mode_t open_mode = 0;
-+    const char *fdopen_mode = NULL;
-+    int fd;
-     FILE * file;
-     char fileName[TMPSIZ];
-     Display *d = XtDisplayOfObject((Widget)src);
-@@ -1128,7 +1133,8 @@ InitStringOrFile(src, newString)
- 	    XtErrorMsg("NoFile", "multiSourceCreate", "XawError",
- 		     "Creating a read only disk widget and no file specified.",
- 		       NULL, 0);
--	open_mode = "r";
-+	open_mode = O_RDONLY;
-+	fdopen_mode = "r";
- 	break;
-     case XawtextAppend:
-     case XawtextEdit:
-@@ -1141,9 +1147,17 @@ InitStringOrFile(src, newString)
- 
- 	    (void) tmpnam(src->multi_src.string);
- 	    src->multi_src.is_tempfile = TRUE;
--	    open_mode = "w";
--	} else
--	    open_mode = "r+";
-+	    open_mode = O_WRONLY | O_CREAT | O_EXCL;
-+	    fdopen_mode = "w";
-+	} else {
-+/* O_NOFOLLOW is a BSD & Linux extension */
-+#ifdef O_NOFOLLOW 
-+		open_mode = O_RDWR | O_NOFOLLOW;
-+#else
-+		open_mode = O_RDWR; /* unsafe; subject to race conditions */
-+#endif
-+		fdopen_mode = "r+";
-+	}
- 	break;
-     default:
- 	XtErrorMsg("badMode", "multiSourceCreate", "XawError",
-@@ -1162,11 +1176,14 @@ InitStringOrFile(src, newString)
-     }
-     
-     if (!src->multi_src.is_tempfile) {
--	if ((file = fopen(src->multi_src.string, open_mode)) != 0) {
--	    (void) fseek(file, (Off_t)0, 2);
--            src->multi_src.length = ftell (file);
--	    return file;
--	} else {
-+	if ((fd = open(src->multi_src.string, open_mode, 0666))) {
-+		if ((file = fdopen(fd, fdopen_mode)) != NULL) {
-+			(void)fseek(file, 0, SEEK_END);
-+			src->multi_src.length = (XawTextPosition)ftell(file);
-+			return (file);
-+		}
-+	}
-+	{
- 	    String params[2];
- 	    Cardinal num_params = 2;
- 	    
-@@ -1178,7 +1195,7 @@ InitStringOrFile(src, newString)
- 	}
-     } 
-     src->multi_src.length = 0;
--    return((FILE *)NULL);
-+    return(NULL);
- #undef StrLen
- }
- 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian	1996-10-15 16:41:21.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h	2008-10-06 11:42:13.000000000 +0200
-@@ -113,7 +113,11 @@ SOFTWARE.
- #ifdef L_tmpnam
- #define TMPSIZ L_tmpnam
- #else
--#define TMPSIZ 32		/* bytes to allocate for tmpnam */
-+#ifdef PATH_MAX
-+#define TMPSIZ PATH_MAX
-+#else
-+#define TMPSIZ 1024		/* bytes to allocate for tmpnam */
-+#endif
- #endif
- 
- #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c	2008-10-06 11:42:13.000000000 +0200
-@@ -56,6 +56,8 @@ SOFTWARE.
- #include <X11/Xaw3d/SimpleP.h>
- #include <X11/Xmu/Drawing.h>
- 
-+#include "XawAlloc.h"
-+
- #define offset(field) XtOffsetOf(SimpleRec, simple.field)
- 
- static XtResource resources[] = {
-@@ -148,11 +150,17 @@ static void ClassPartInitialize(class)
- 
-     if (c->simple_class.change_sensitive == NULL) {
- 	char buf[BUFSIZ];
--
--	(void) sprintf(buf,
--		"%s Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.",
--		c->core_class.class_name);
--	XtWarning(buf);
-+	char *pbuf;
-+	char *msg1 = " Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.";
-+	int len;
-+
-+	len = strlen(msg1) + strlen(c->core_class.class_name) + 1;
-+	pbuf = XtStackAlloc(len, buf);
-+	if (pbuf != NULL) {
-+	    sprintf(pbuf, "%s%s", c->core_class.class_name, msg1);
-+	    XtWarning(pbuf);
-+	    XtStackFree(pbuf, buf);
-+	}
- 	c->simple_class.change_sensitive = ChangeSensitive;
-     }
- 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian	2003-02-17 07:45:07.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c	2008-10-06 11:42:13.000000000 +0200
-@@ -51,6 +51,8 @@ in this Software without prior written a
- #include <X11/Xmu/Initer.h>
- #include <X11/Xmu/CharSet.h>
- 
-+#include "XawAlloc.h"
-+
- #define streq(a, b)        ( strcmp((a), (b)) == 0 )
- 
- #define offset(field) XtOffsetOf(SimpleMenuRec, simple_menu.field)
-@@ -755,9 +757,17 @@ Cardinal * num_params;
- 
-   if ( (menu = FindMenu(w, params[0])) == NULL) {
-     char error_buf[BUFSIZ];
--    (void) sprintf(error_buf, "%s '%s'",
--	    "Xaw - SimpleMenuWidget: could not find menu named: ", params[0]);
--    XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
-+    char *err1 = "Xaw - SimpleMenuWidget: could not find menu named: ";
-+    char *perr;
-+    int len;
-+
-+    len = strlen(err1) + strlen(params[0]) + 2 + 1;
-+    perr = XtStackAlloc(len, error_buf);
-+    if (perr == NULL)
-+	return;
-+    sprintf(perr, "%s'%s'", err1, params[0]);
-+    XtAppWarning(XtWidgetToApplicationContext(w), perr);
-+    XtStackFree(perr, error_buf);
-     return;
-   }
-   
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian	2003-02-10 18:18:00.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c	2008-10-06 11:42:13.000000000 +0200
-@@ -315,7 +315,15 @@ XtIntervalId *id;		/* unused */
-        if (w->strip_chart.points != NULL) {
- 	   w->strip_chart.points[0].x = w->strip_chart.interval + s;
- 	   XDrawPoints(XtDisplay(w), XtWindow(w), w->strip_chart.hiGC,
--		       w->strip_chart.points, w->strip_chart.scale,
-+		/*
-+		 * patch:
-+		 *
-+		 *     w->strip_chart.points, w->strip_chart.scale,
-+		 * 
-+		 * this to avoid a subdle bug of extra spurios scan
-+		 * line in this widget.
-+		 */
-+		       w->strip_chart.points, w->strip_chart.scale - 1, 
- 		       CoordModePrevious);
-        }
- 
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Text.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian	2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c	2008-10-06 11:43:16.000000000 +0200
-@@ -76,6 +76,8 @@ SOFTWARE.
- #include <ctype.h>		/* for isprint() */
- #include <stdlib.h>
- 
-+#include "XawAlloc.h"
-+
- #ifndef MAX_LEN_CT
- #define MAX_LEN_CT 6		/* for sequence: ESC $ ( A \xx \xx */
- #endif
-@@ -521,6 +523,8 @@ Cardinal *num_args;		/* unused */
-   TextWidget ctx = (TextWidget) new;
-   char error_buf[BUFSIZ];
-   int s;
-+  char *perr; /* frankie */
-+  size_t len; /* frankie */
- 
-   ctx->text.threeD = XtVaCreateWidget("threeD", threeDWidgetClass, new,
-                                  XtNx, 0, XtNy, 0,
-@@ -569,10 +573,17 @@ Cardinal *num_args;		/* unused */
-   if (ctx->text.scroll_vert != XawtextScrollNever) 
-     if ( (ctx->text.resize == XawtextResizeHeight) ||
-      	 (ctx->text.resize == XawtextResizeBoth) ) {
--      (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
--	      "Vertical scrolling not allowed with height resize.\n",
--	      "Vertical scrolling has been DEACTIVATED.");
--      XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+      char *err1 = "Xaw Text Widget ";
-+      char *err2 = ":\nVertical scrolling not allowed with height resize.\n";
-+      char *err3 = "Vertical scrolling has been DEACTIVATED.";
-+      len = strlen(err1) + strlen(err2) + strlen(err3) +
-+		strlen(ctx->core.name) + 1;
-+      perr = XtStackAlloc(len, error_buf);
-+      if (perr != NULL) {
-+	(void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+	XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+	XtStackFree(perr, error_buf);
-+      }
-       ctx->text.scroll_vert = XawtextScrollNever;
-     }
-     else if (ctx->text.scroll_vert == XawtextScrollAlways)
-@@ -580,18 +591,32 @@ Cardinal *num_args;		/* unused */
- 
-   if (ctx->text.scroll_horiz != XawtextScrollNever) 
-     if (ctx->text.wrap != XawtextWrapNever) {
--      (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
--	      "Horizontal scrolling not allowed with wrapping active.\n",
--	      "Horizontal scrolling has been DEACTIVATED.");
--      XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+      char *err1 = "Xaw Text Widget ";
-+      char *err2 = ":\nHorizontal scrolling not allowed with wrapping active.";
-+      char *err3 = "\nHorizontal scrolling has been DEACTIVATED.";
-+      len = strlen(err1) + strlen(err2) + strlen(err3) +
-+		strlen(ctx->core.name) + 1;
-+      perr = XtStackAlloc(len, error_buf);
-+      if (perr != NULL) {
-+	(void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+	XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+	XtStackFree(perr, error_buf);
-+      }
-       ctx->text.scroll_horiz = XawtextScrollNever;
-     }
-     else if ( (ctx->text.resize == XawtextResizeWidth) ||
- 	      (ctx->text.resize == XawtextResizeBoth) ) {
--      (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
--	      "Horizontal scrolling not allowed with width resize.\n",
--	      "Horizontal scrolling has been DEACTIVATED.");
--      XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+      char *err1 = "Xaw Text Widget ";
-+      char *err2 = ":\nHorizontal scrolling not allowed with width resize.\n";
-+      char *err3 = "Horizontal scrolling has been DEACTIVATED.";
-+      len = strlen(err1) + strlen(err2) + strlen(err3) +
-+		strlen(ctx->core.name) + 1;
-+      perr = XtStackAlloc(len, error_buf);
-+      if (perr != NULL) {
-+	(void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+	XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+	XtStackFree(perr, error_buf);
-+      }
-       ctx->text.scroll_horiz = XawtextScrollNever;
-     }
-     else if (ctx->text.scroll_horiz == XawtextScrollAlways)
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c	2008-10-06 11:42:13.000000000 +0200
-@@ -66,6 +66,8 @@ in this Software without prior written a
- #include <X11/Xos.h>		/* for O_RDONLY */
- #include <errno.h>
- 
-+#include "XawAlloc.h"
-+
- #ifdef X_NOT_STDC_ENV
- extern int errno;
- #endif
-@@ -809,6 +811,8 @@ DoSearch(search)
- struct SearchAndReplace * search;
- {
-   char msg[BUFSIZ];
-+  char *pmsg;
-+  int len;
-   Widget tw = XtParent(search->search_popup);
-   XawTextPosition pos;
-   XawTextScanDirection dir;
-@@ -835,9 +839,20 @@ struct SearchAndReplace * search;
-    /* The Raw string in find.ptr may be WC I can't use here, so I re - call 
-    GetString to get a tame version. */
- 
--  if (pos == XawTextSearchError) 
--    (void) sprintf( msg, "Could not find string ``%s''.", GetString( search->search_text ) );
--  else {
-+  if (pos == XawTextSearchError) {
-+    char *msg1 = "Could not find string ``";
-+    char *msg2 = "''.";
-+    len = strlen(msg1) + strlen(msg2) +
-+		strlen(GetString( search->search_text )) + 1;
-+    pmsg = XtStackAlloc(len, msg);
-+    if (pmsg != NULL) {
-+      (void) sprintf( pmsg, "%s%s%s", msg1, GetString( search->search_text ),
-+			msg2);
-+    } else {
-+      pmsg = msg;
-+      (void) sprintf( pmsg, "Could not find string");
-+    }
-+  } else {
-     if (dir == XawsdRight)
-       XawTextSetInsertionPoint( tw, pos + text.length);
-     else
-@@ -849,7 +864,8 @@ struct SearchAndReplace * search;
-   }
-   
-   XawTextUnsetSelection(tw);
--  SetSearchLabels(search, msg, "", TRUE);
-+  SetSearchLabels(search, pmsg, "", TRUE);
-+  XtStackFree(pmsg, msg);
-   return(FALSE);
- }
- 
-@@ -982,13 +998,26 @@ Boolean once_only, show_current;
-       if ( (new_pos == XawTextSearchError) ) {
- 	if (count == 0) {
- 	  char msg[BUFSIZ];
-+	  char *pmsg;
-+	  int len;
-+	  char *msg1 = "*** Error: Could not find string ``";
-+	  char *msg2 = "''. ***";
- 
-              /* The Raw string in find.ptr may be WC I can't use here, 
- 		so I call GetString to get a tame version.*/
- 
--	  (void) sprintf( msg, "%s %s %s", "*** Error: Could not find string ``",
--		  GetString( search->search_text ), "''. ***");
--	  SetSearchLabels(search, msg, "", TRUE);
-+	  len = strlen(msg1) + strlen(msg2) +
-+		strlen(GetString( search->search_text )) + 1;
-+	  pmsg = XtStackAlloc(len, msg);
-+	  if (pmsg != NULL) {
-+	    (void) sprintf( pmsg, "%s%s%s", msg1,
-+				GetString( search->search_text ), msg2);
-+	  } else {
-+	    pmsg = msg;
-+	    (void) sprintf(pmsg, "*** Error: Could not find string ***");
-+	  }
-+	  SetSearchLabels(search, pmsg, "", TRUE);
-+	  XtStackFree(pmsg, msg);
- 	  return(FALSE);
- 	}
- 	else
-@@ -1011,9 +1040,22 @@ Boolean once_only, show_current;
- 
-     if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) {
-       char msg[BUFSIZ];
--      
--      (void) sprintf( msg, "'%s' with '%s'. ***", find.ptr, replace.ptr);
-+      char *pmsg;
-+      int len;
-+      char *msg1 = "' with '";
-+      char *msg2 = "'. ***";
-+
-+      len = 1 + strlen(msg1) + strlen(msg2) + strlen(find.ptr) +
-+		strlen(replace.ptr) + 1;
-+      pmsg = XtStackAlloc(len, msg);
-+      if (pmsg != NULL) {
-+	(void) sprintf( pmsg, "`%s%s%s%s", find.ptr, msg1, replace.ptr, msg2);
-+      } else {
-+	pmsg = msg;
-+	(void) sprintf(pmsg, "string ***");
-+      }
-       SetSearchLabels(search, "*** Error while replacing", msg, TRUE);
-+      XtStackFree(pmsg, msg);
-       return(FALSE);
-     }      
- 
-@@ -1164,13 +1206,20 @@ XtArgVal value;
- {
-   Widget temp_widget;
-   char buf[BUFSIZ];
-+  char *pbuf;
-+  int len;
- 
--  (void) sprintf(buf, "%s.%s", FORM_NAME, name);
-+  len = strlen(FORM_NAME) + strlen(name) + 2;
-+  pbuf = XtStackAlloc(len, buf);
-+  if (pbuf == NULL) return FALSE;
-+  (void) sprintf(pbuf, "%s.%s", FORM_NAME, name);
- 
--  if ( (temp_widget = XtNameToWidget(shell, buf)) != NULL) {
-+  if ( (temp_widget = XtNameToWidget(shell, pbuf)) != NULL) {
-     SetResource(temp_widget, res_name, value);
-+    XtStackFree(pbuf, buf);
-     return(TRUE);
-   }
-+  XtStackFree(pbuf, buf);
-   return(FALSE);
- }
- 
-diff -up /dev/null Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h
---- /dev/null	2008-10-06 08:37:32.418005377 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h	2008-10-06 11:42:13.000000000 +0200
-@@ -0,0 +1,10 @@
-+/* $XFree86: xc/lib/Xaw/XawAlloc.h,v 1.1.2.1 1998/05/16 09:05:23 dawes Exp $ */
-+
-+#define XtStackAlloc(size, stack_cache_array)     \
-+    ((size) <= sizeof(stack_cache_array)          \
-+    ?  (XtPointer)(stack_cache_array)             \
-+    :  XtMalloc((unsigned)(size)))
-+     
-+#define XtStackFree(pointer, stack_cache_array) \
-+    if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); else
-+
---- xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c	2003-08-04 17:27:58.000000000 +0200
-+++ xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c	2003-08-07 15:02:39.000000000 +0200
-@@ -52,6 +52,8 @@
- #include <X11/Xaw3d/Cardinals.h>
- #include <stdio.h>
- 
-+#include "XawAlloc.h"
-+
- /* needed for abs() */
- #ifndef X_NOT_STDC_ENV
- #include <stdlib.h>
-@@ -712,6 +714,8 @@
-     int x, y;
-     unsigned int width, height, bw;
-     char buf[BUFSIZ];
-+    char *pbuf;
-+    int len;
-     
-     if (is_left) {
- 	width = height = 0;
-@@ -720,18 +724,24 @@
- 	    if (!XGetGeometry(XtDisplayOfObject(w), 
- 			    entry->sme_bsb.left_bitmap, &root, &x, &y,
- 			    &width, &height, &bw, &entry->sme_bsb.left_depth)) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".",
--			"Could not get Left Bitmap",
--			"geometry information for menu entry",
--			XtName(w));
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+               char *err1 = "Xaw SmeBSB Object: Could not get Left Bitmap geometry information for menu entry ";
-+	       len = strlen(err1) + strlen(XtName(w)) + 3 + 1;
-+               pbuf = XtStackAlloc(len, buf);
-+               if (pbuf == NULL) return;
-+               sprintf(pbuf, "%s\"%s\".", err1, XtName(w));
-+               XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+               XtStackFree(pbuf, buf);
- 	    }
- #ifdef NEVER
- 	    if (entry->sme_bsb.left_depth != 1) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.", 
--			"Left Bitmap of entry",  XtName(w),
--			"is not one bit deep");
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+               char *err1 = "Xaw SmeBSB Object: Left Bitmap of entry ";
-+               char *err2 = " is not one bit deep.";
-+               len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1;
-+               pbuf = XtStackAlloc(len, buf);
-+               if (pbuf == NULL) return;
-+               sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2);
-+               XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+               XtStackFree(pbuf, buf);
- 	    }
- #endif
- 	}
-@@ -745,18 +755,24 @@
- 	    if (!XGetGeometry(XtDisplayOfObject(w),
- 			    entry->sme_bsb.right_bitmap, &root, &x, &y,
- 			    &width, &height, &bw, &entry->sme_bsb.right_depth)) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".",
--			"Could not get Right Bitmap",
--			"geometry information for menu entry",
--			XtName(w));
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+            char *err1 = "Xaw SmeBSB Object: Could not get Right Bitmap geometry information for menu entry ";
-+            len = strlen(err1) + strlen(XtName(w)) + 3 + 1;
-+            pbuf = XtStackAlloc(len, buf);
-+            if (pbuf == NULL) return;
-+            sprintf(pbuf, "%s\"%s\".", err1, XtName(w));
-+            XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+            XtStackFree(pbuf, buf);
- 	    }
- #ifdef NEVER
- 	    if (entry->sme_bsb.right_depth != 1) {
--		(void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.", 
--			"Right Bitmap of entry", XtName(w),
--			"is not one bit deep");
--		XtAppError(XtWidgetToApplicationContext(w), buf);
-+            char *err1 = "Xaw SmeBSB Object: Right Bitmap of entry ";
-+            char *err2 = " is not one bit deep.";
-+            len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1;
-+            pbuf = XtStackAlloc(len, buf);
-+            if (pbuf == NULL) return;
-+            sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2);
-+            XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+            XtStackFree(pbuf, buf);
- 	    }
- #endif
- 	}
diff --git a/extra/xaw3d/Xaw3d-1.5-i18n.patch b/extra/xaw3d/Xaw3d-1.5-i18n.patch
deleted file mode 100644
index aa4730238..000000000
--- a/extra/xaw3d/Xaw3d-1.5-i18n.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Xaw3d-1.5/xc/lib/Xaw3d/MultiSrc.c.orig	Tue Aug  6 22:51:08 2002
-+++ Xaw3d-1.5/xc/lib/Xaw3d/MultiSrc.c	Tue Aug  6 22:51:16 2002
-@@ -735,6 +735,7 @@
-   
-   if ( string_set || (old_src->multi_src.type != src->multi_src.type) ) {
-     RemoveOldStringOrFile(old_src, string_set);
-+    src->multi_src.allocated_string = old_src->multi_src.allocated_string;
-     file = InitStringOrFile(src, string_set);
- 
-     /* Load pieces does this logic for us, but it shouldn't.  Its messy.*/
diff --git a/extra/xaw3d/Xaw3d-1.5E-warnings.patch b/extra/xaw3d/Xaw3d-1.5E-warnings.patch
deleted file mode 100644
index 8ffa7f8f9..000000000
--- a/extra/xaw3d/Xaw3d-1.5E-warnings.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c	2009-03-15 17:04:35.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/MultiSrc.c	2009-03-15 14:22:05.000000000 +0100
-@@ -77,6 +77,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <wchar.h>
- 
- /****************************************************************
-  *
---- Xaw3d-1.5E/xc/lib/Xaw3d/Panner.c	2000-11-27 14:19:24.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Panner.c	2009-03-15 13:50:40.000000000 +0100
-@@ -36,7 +36,7 @@
- #include <X11/Xmu/Misc.h>		/* for Min */
- #include <X11/Xmu/Drawing.h>
- #include <ctype.h>			/* for isascii() etc. */
--#include <math.h>			/* for atof() */
-+#include <stdlib.h>			/* for atof() */
- 
- extern Bool XmuDistinguishablePixels(); /* not defined in any Xmu headers */
- 
---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c	2009-03-15 17:04:35.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Text.c	2009-03-15 13:54:10.000000000 +0100
-@@ -75,6 +75,7 @@
- #include <X11/Xfuncs.h>
- #include <ctype.h>		/* for isprint() */
- #include <stdlib.h>
-+#include <wchar.h>
- 
- #include "XawAlloc.h"
- 
---- Xaw3d-1.5E/xc/lib/Xaw3d/TextAction.c	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextAction.c	2009-03-15 14:19:27.000000000 +0100
-@@ -45,7 +45,9 @@
- #include "XawI18n.h"
- #endif
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
-+#include <wchar.h>
- 
- #define SrcScan                XawTextSourceScan
- #define FindDist               XawTextSinkFindDistance
---- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c	2009-03-15 17:04:35.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextPop.c	2009-03-15 14:19:44.000000000 +0100
-@@ -65,6 +65,7 @@
- #include <stdio.h>
- #include <X11/Xos.h>		/* for O_RDONLY */
- #include <errno.h>
-+#include <wchar.h>
- 
- #include "XawAlloc.h"
- 
---- Xaw3d-1.5E/xc/lib/Xaw3d/TextSrc.c	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextSrc.c	2009-03-15 14:19:13.000000000 +0100
-@@ -49,6 +49,7 @@
- #endif
- #include <stdio.h>
- #include <ctype.h>
-+#include <wchar.h>
- 
- /****************************************************************
-  *
---- Xaw3d-1.5E/xc/lib/Xaw3d/ThreeD.c	2003-02-11 12:41:56.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/ThreeD.c	2009-03-15 14:21:20.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <X11/Xaw3d/XawInit.h>
- #include <X11/Xaw3d/ThreeDP.h>
- #include <X11/Xosdefs.h>
-+#include <X11/Xmu/CharSet.h>
- 
- /* Initialization of defaults */
- 
---- Xaw3d-1.5E/xc/lib/Xaw3d/Tip.c	2003-03-09 01:31:49.000000000 +0100
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Tip.c	2009-03-15 14:21:36.000000000 +0100
-@@ -41,6 +41,7 @@
- #include <X11/Xmu/Converters.h>
- #include <X11/Xaw3d/TipP.h>
- #include <X11/Xaw3d/XawInit.h>
-+#include <stdlib.h>
- 
- #define	TIP_EVENT_MASK (ButtonPressMask	  |	\
- 			ButtonReleaseMask |	\
---- Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.c	1996-10-15 16:41:25.000000000 +0200
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/XawI18n.c	2009-03-15 14:23:11.000000000 +0100
-@@ -55,6 +55,7 @@
- 
- */
- 
-+#include <stdlib.h>
- #include <X11/IntrinsicP.h>
- #include "XawI18n.h"
- 
---- Xaw3d-1.5E/xc/lib/Xaw3d/XawIm.c	1998-04-21 15:42:02.000000000 +0200
-+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/XawIm.c	2009-03-15 14:22:41.000000000 +0100
-@@ -59,6 +59,7 @@
- #include <X11/Xos.h>
- #include <X11/Xfuncs.h>
- #include <X11/ShellP.h>
-+#include <X11/ResourceI.h>
- #include <X11/Xaw3d/TextP.h>
- #include <X11/Xaw3d/MultiSrc.h>
- #include <X11/Xaw3d/MultiSinkP.h>
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h~ Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h
---- Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h~	1996-10-15 16:41:26.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h	2009-03-15 17:18:04.000000000 +0100
-@@ -72,7 +72,4 @@ extern wchar_t _Xaw_atowc (
- 
- #ifndef HAS_ISW_FUNCS
- #include <ctype.h>
--#ifndef iswspace
--#define iswspace(c) (isascii(c) && isspace(toascii(c)))
--#endif
- #endif
diff --git a/extra/xaw3d/Xaw3d-1.5E-xorg-imake.patch b/extra/xaw3d/Xaw3d-1.5E-xorg-imake.patch
deleted file mode 100644
index 9d5312e33..000000000
--- a/extra/xaw3d/Xaw3d-1.5E-xorg-imake.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- Imakefile.config	2003-03-08 15:55:18.000000000 +0100
-+++ Imakefile	2005-01-20 14:48:55.630795072 +0100
-@@ -5,24 +5,24 @@
- XCOMM Build options. Have you read the README.XAW3D file yet?
- XCOMM
- XCOMM For color pixmaps, define MULTIPLANE_PIXMAPS:
--#undef MULTIPLANE_PIXMAPS
-+#define MULTIPLANE_PIXMAPS
- XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
- #define GRAY_BLKWHT_STIPPLES
- XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
--#undef ARROW_SCROLLBARS
-+#define ARROW_SCROLLBARS
- 
--#define DoNormalLib NormalLibXaw
--#define DoSharedLib SharedLibXaw
--#define DoDebugLib DebugLibXaw 
--#define DoProfileLib ProfileLibXaw 
-+#define DoNormalLib NormalLibXaw7
-+#define DoSharedLib SharedLibXaw7
-+#define DoDebugLib DebugLibXaw7 
-+#define DoProfileLib ProfileLibXaw7 
- #define HasSharedData YES
- #define LibName Xaw3d
--#define SoRev SOXAWREV
-+#define SoRev SOXAW7REV
- #define IncSubdir X11
- #define IncSubSubdir Xaw3d
- 
- XCOMM When building outside an X11 source tree:
--XCOMM EXTRA_INCLUDES = -I.
-+EXTRA_INCLUDES = -I.
- 
- #ifdef SharedXawReqs
- REQUIREDLIBS = SharedXawReqs
diff --git a/extra/xaw3d/Xaw3d-ia64.patch b/extra/xaw3d/Xaw3d-ia64.patch
deleted file mode 100644
index 90ce711e9..000000000
--- a/extra/xaw3d/Xaw3d-ia64.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/List.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/List.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/List.c.prototypes	2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/List.c	2008-10-06 10:11:28.000000000 +0200
-@@ -38,6 +38,7 @@ in this Software without prior written a
- 
- #include "Xaw3dP.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c.prototypes	1996-10-15 16:41:20.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c	2008-10-06 10:10:37.000000000 +0200
-@@ -81,6 +81,7 @@ SOFTWARE.
- #include <X11/Xaw3d/TextP.h>
- #include "XawI18n.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- 
- #ifdef GETLASTPOS
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/Text.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.prototypes	2003-02-10 18:28:13.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c	2008-10-06 10:11:11.000000000 +0200
-@@ -74,6 +74,7 @@ SOFTWARE.
- #include <X11/Xaw3d/ThreeDP.h>
- #include <X11/Xfuncs.h>
- #include <ctype.h>		/* for isprint() */
-+#include <stdlib.h>
- 
- #ifndef MAX_LEN_CT
- #define MAX_LEN_CT 6		/* for sequence: ESC $ ( A \xx \xx */
diff --git a/extra/xfce4-systemload-plugin/missing_tooltip.diff b/extra/xfce4-systemload-plugin/missing_tooltip.diff
deleted file mode 100644
index 96f5c1714..000000000
--- a/extra/xfce4-systemload-plugin/missing_tooltip.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- panel-plugin/systemload.c	2007-01-17 18:01:09.000000000 +0000
-+++ panel-plugin/systemload.c.new	2009-05-14 17:17:24.001076632 +0000
-@@ -315,11 +315,18 @@
- {
-     int count;
-     t_global_monitor *global;
-+    GtkSettings *settings;
- 
-     tooltips = gtk_tooltips_new ();
-     g_object_ref (tooltips);
-     gtk_object_sink (GTK_OBJECT (tooltips));
-     
-+    /* reduce the default tooltip timeout to be smaller than the update interval otherwise
-+     * we won't see tooltips on GTK 2.16 or newer */
-+    	settings = gtk_settings_get_default();
-+    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
-+        g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
-+
-     global = g_new(t_global_monitor, 1);
-     global->plugin = plugin;
-     global->timeout_id = 0;
diff --git a/extra/xfce4-timer-plugin/panel48.patch b/extra/xfce4-timer-plugin/panel48.patch
deleted file mode 100644
index 056023712..000000000
--- a/extra/xfce4-timer-plugin/panel48.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Thu, 27 Jan 2011 21:18:45 +0000
-Subject: Fix segfault when creating plugin in 4.8 panel.
-
-Used invalid function type to construct the plugin.
----
-diff --git a/src/xfcetimer.c b/src/xfcetimer.c
-index c27d37a..de7bd2b 100644
---- a/src/xfcetimer.c
-+++ b/src/xfcetimer.c
-@@ -42,7 +42,7 @@
- 
- #include "xfcetimer.h"
- 
--static gboolean create_plugin_control (XfcePanelPlugin *plugin);
-+static void create_plugin_control (XfcePanelPlugin *plugin);
- XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
- 
- void make_menu(plugin_data *pd);
-@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
-  *
-  * Returns %TRUE on success, %FALSE on failure.
-  **/
--static gboolean
-+static void
- create_plugin_control (XfcePanelPlugin *plugin)
- {
- 
-@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin)
-   xfce_panel_plugin_menu_show_configure (plugin);
-   g_signal_connect (plugin, "configure-plugin",
-                       G_CALLBACK (plugin_create_options), pd);
--  return(TRUE);
- }
- 
- 
---
-cgit v0.8.3.4
diff --git a/libre/cups-libre/cups-avahi.patch b/libre/cups-libre/cups-avahi.patch
deleted file mode 100644
index 7e9c8ecea..000000000
--- a/libre/cups-libre/cups-avahi.patch
+++ /dev/null
@@ -1,3156 +0,0 @@
-Description: Avahi support
-Bug: http://www.cups.org/str.php?L3066
-Author: Tim Waugh
-Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011)
-
---- a/backend/dnssd.c
-+++ b/backend/dnssd.c
-@@ -15,14 +15,21 @@
-  *
-  * Contents:
-  *
-+ *   next_txt_record()       - Get next TXT record from a cups_txt_records_t.
-+ *   parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
-  *   main()                  - Browse for printers.
-  *   browse_callback()       - Browse devices.
-  *   browse_local_callback() - Browse local devices.
-  *   compare_devices()       - Compare two devices.
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-+ *   device_type()           - Get DNS-SD type enumeration from string.
-  *   get_device()            - Create or update a device.
-  *   query_callback()        - Process query data.
-+ *   avahi_client_callback() - Avahi client callback function.
-+ *   avahi_query_callback()  - Avahi query callback function.
-+ *   avahi_browse_callback() - Avahi browse callback function.
-+ *   find_device()           - Find a device from its name and domain.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-  */
-@@ -33,7 +40,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -53,7 +71,12 @@
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -65,6 +88,20 @@
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -78,6 +115,7 @@
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -93,12 +131,6 @@
- 					      const char *regtype,
- 					      const char *replyDomain,
- 					      void *context);
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain);
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -107,9 +139,118 @@
- 				       uint16_t rrclass, uint16_t rdlen,
- 				       const void *rdata, uint32_t ttl,
- 				       void *context);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain);
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize);
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
-+ */
-+
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+
-+/*
-+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
-+ */
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) >= txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
-+
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -120,6 +261,13 @@
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -133,12 +281,11 @@
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -198,6 +345,49 @@
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("DEBUG: Unable to create avahi client");
-+    return (0);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -258,6 +448,7 @@
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -265,6 +456,9 @@
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -284,11 +478,35 @@
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -302,6 +520,7 @@
-         if (device->sent)
- 	  sent ++;
- 
-+#ifdef HAVE_DNSSD
-         if (device->ref)
- 	  count ++;
- 
-@@ -333,14 +552,23 @@
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -401,6 +629,7 @@
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'browse_callback()' - Browse devices.
-  */
-@@ -489,6 +718,7 @@
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -569,6 +799,41 @@
- 
- 
- /*
-+ * 'device_type()' - Get DNS-SD type enumeration from string.
-+ */
-+
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp.") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
-+
-+/*
-  * 'get_device()' - Create or update a device.
-  */
- 
-@@ -589,20 +854,7 @@
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_ipps._tcp.") ||
--	   !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPPS;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -622,8 +874,14 @@
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -643,6 +901,9 @@
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -650,13 +911,20 @@
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'query_callback()' - Process query data.
-  */
-@@ -680,7 +948,7 @@
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -714,94 +982,233 @@
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_ipps._tcp.") ||
--           strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPPS;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_client_callback()' - Avahi client callback function.
-+ */
-+
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_query_callback()' - Avahi query callback function.
-+ */
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-+
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+
-+/*
-+ * 'avahi_browse_callback()' - Avahi browse callback function.
-+ */
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
-+
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+/*
-+ * 'find_device()' - Find a device from its name and domain.
-+ */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (_cups_strcasecmp(device->name, dkey.name) ||
--        _cups_strcasecmp(device->domain, dkey.domain))
-+    if (_cups_strcasecmp(device->name, dkey->name) ||
-+        _cups_strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) >= dataend)
--	  break;
--
--        datanext = data + datalen;
--
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
-+	char *key;
-+	char *value;
- 
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
--	          key, value);
--	}
--	else
--	{
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
--	          key);
--	  continue;
--	}
--
--        if (!_cups_strncasecmp(key, "usb_", 4))
-+	key = txt->key;
-+	value = txt->value;
-+        if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
- 	  * Add USB device ID information...
-@@ -856,6 +1263,10 @@
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -905,11 +1316,9 @@
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
---- a/config-scripts/cups-dnssd.m4
-+++ b/config-scripts/cups-dnssd.m4
-@@ -23,6 +23,21 @@
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
---- a/config.h.in
-+++ b/config.h.in
-@@ -390,6 +390,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
---- a/cups/http-support.c
-+++ b/cups/http-support.c
-@@ -43,6 +43,10 @@
-  *   http_copy_decode()   - Copy and decode a URI.
-  *   http_copy_encode()   - Copy and encode a URI.
-  *   http_resolve_cb()    - Build a device URI for the given service name.
-+ *   avahi_resolve_uri_client_cb()
-+ *                        - Avahi client callback for resolving URI.
-+ *   avahi_resolve_uri_resolver_cb()
-+ *                        - Avahi resolver callback for resolving URI.
-  */
- 
- /*
-@@ -60,6 +64,11 @@
- #    include <sys/select.h>
- #  endif /* WIN32 */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -127,6 +136,24 @@
- 					void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1431,6 +1458,9 @@
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
- #  ifdef WIN32
- #    pragma comment(lib, "dnssd.lib")
-@@ -1449,6 +1479,17 @@
-     fd_set		input_set;	/* Input set for select() */
-     struct timeval	stimeout;	/* Timeout value for select() */
- #endif /* HAVE_POLL */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
-+
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-       fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1485,9 +1526,16 @@
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer   = resolved_uri;
-     uribuf.bufsize  = resolved_size;
-     uribuf.options  = options;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+    user_data.uribuf.options = options;
-+#endif
-+
-     resolved_uri[0] = '\0';
- 
-     DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1501,6 +1549,7 @@
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1608,6 +1657,36 @@
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-     {
-@@ -1619,13 +1698,13 @@
-       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if ((options & _HTTP_RESOLVE_STDERR) && !uri)
-       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1895,6 +1974,116 @@
- #endif /* HAVE_DNSSD */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
-+ *                                     URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
-  * End of "$Id: http-support.c 9820 2011-06-10 22:06:26Z mike $".
-  */
---- a/scheduler/Makefile
-+++ b/scheduler/Makefile
-@@ -17,6 +17,7 @@
- 
- CUPSDOBJS =	\
- 		auth.o \
-+		avahi.o \
- 		banners.o \
- 		cert.o \
- 		classes.o \
-@@ -39,7 +40,8 @@
- 		server.o \
- 		statbuf.o \
- 		subscriptions.o \
--		sysman.o
-+		sysman.o \
-+		timeout.o
- LIBOBJS =	\
- 		filter.o \
- 		mime.o \
---- /dev/null
-+++ b/scheduler/avahi.c
-@@ -0,0 +1,445 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Distribution and use rights are outlined in the file "LICENSE.txt"
-+ *   "LICENSE" which should have been included with this file.  If this
-+ *   file is missing or damaged, see the license at "http://www.cups.org/".
-+ *
-+ * Contents:
-+ *
-+ *   watch_read_cb         - Read callback for file descriptor
-+ *   watch_write_cb        - Write callback for file descriptor
-+ *   watched_fd_add_select() - Call cupsdAddSelect() as needed
-+ *   watch_new()           - Create a new file descriptor watch
-+ *   watch_free()          - Free a file descriptor watch
-+ *   watch_update()        - Update watched events for a file descriptor
-+ *   watch_get_events()    - Get events that happened for a file descriptor
-+ *   timeout_cb()          - Run a timed Avahi callback
-+ *   timeout_new()         - Set a wakeup time
-+ *   timeout_update()      - Update the expiration time for a timeout
-+ *   timeout_free()        - Free a timeout
-+ *   compare_watched_fds() - Compare watched file descriptors for array sorting
-+ *   compare_timeouts()    - Compare timeouts for array sorting
-+ *   avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
-+ *   avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
-+ *   avahi_cups_poll_get() - Get the abstract poll API structure
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+typedef struct
-+{
-+  AvahiCupsPoll *cups_poll;
-+
-+  int fd;
-+  AvahiWatchEvent occurred;
-+  cups_array_t *watches;
-+} cupsd_watched_fd_t;
-+
-+struct AvahiWatch
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  AvahiWatchEvent events;
-+  AvahiWatchCallback callback;
-+  void *userdata;
-+};
-+
-+struct AvahiTimeout
-+{
-+  AvahiCupsPoll *cups_poll;
-+  AvahiTimeoutCallback callback;
-+  void *userdata;
-+  cupsd_timeout_t *cupsd_timeout;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static AvahiWatch *	watch_new(const AvahiPoll *api,
-+				  int fd,
-+				  AvahiWatchEvent events,
-+				  AvahiWatchCallback callback,
-+				  void *userdata);
-+static void		watch_free(AvahiWatch *watch);
-+static void		watch_update(AvahiWatch *watch,
-+				     AvahiWatchEvent events);
-+static AvahiWatchEvent	watch_get_events(AvahiWatch *watch);
-+static int		compare_watches(AvahiWatch *p0,
-+					AvahiWatch *p1);
-+
-+
-+/*
-+ * 'watch_read_cb' - Read callback for file descriptor
-+ */
-+
-+static void
-+watch_read_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_IN;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+    if (watch->events & watched_fd->occurred) {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_IN, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_IN;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_write_cb' - Write callback for file descriptor
-+ */
-+
-+static void
-+watch_write_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_OUT;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+    if (watch->events & watched_fd->occurred) {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_OUT, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
-+ */
-+
-+static int						/* O - Watches? */
-+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
-+{
-+  AvahiWatch *watch;
-+  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
-+
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+    if (watch->events & (AVAHI_WATCH_IN |
-+			     AVAHI_WATCH_ERR |
-+			     AVAHI_WATCH_HUP)) {
-+      read_cb = (cupsd_selfunc_t)watch_read_cb;
-+      if (write_cb != NULL)
-+	break;
-+    }
-+
-+    if (watch->events & AVAHI_WATCH_OUT) {
-+      write_cb = (cupsd_selfunc_t)watch_write_cb;
-+      if (read_cb != NULL)
-+	break;
-+    }
-+  }
-+
-+  if (read_cb || write_cb)
-+    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
-+  else
-+    cupsdRemoveSelect (watched_fd->fd);
-+
-+  return (read_cb || write_cb);
-+}
-+
-+/*
-+ * 'watch_new' - Create a new file descriptor watch
-+ */
-+
-+static AvahiWatch *
-+watch_new (const AvahiPoll *api,
-+	   int fd,
-+	   AvahiWatchEvent events,
-+	   AvahiWatchCallback callback,
-+	   void *userdata)
-+{
-+  cupsd_watched_fd_t key, *watched_fd;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
-+  if (watch == NULL)
-+    return (NULL);
-+
-+  watch->events = events;
-+  watch->callback = callback;
-+  watch->userdata = userdata;
-+
-+  key.fd = fd;
-+  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
-+  if (watched_fd == NULL) {
-+    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
-+    if (watched_fd == NULL) {
-+      free (watch);
-+      return (NULL);
-+    }
-+
-+    watched_fd->fd = fd;
-+    watched_fd->occurred = 0;
-+    watched_fd->cups_poll = cups_poll;
-+    watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches,
-+					NULL);
-+  }
-+
-+  watch->watched_fd = watched_fd;
-+  cupsArrayAdd(watched_fd->watches, watch);
-+  watched_fd_add_select (watched_fd);
-+  return (watch);
-+}
-+
-+
-+/*
-+ * 'watch_free' - Free a file descriptor watch
-+ */
-+
-+static void
-+watch_free (AvahiWatch *watch)
-+{
-+  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
-+  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
-+
-+  cupsArrayRemove (watched_fd->watches, watch);
-+  free (watch);
-+
-+  if (!watched_fd_add_select (watched_fd)) {
-+    /* No more watches */
-+    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
-+    free (watched_fd);
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_update' - Update watched events for a file descriptor
-+ */
-+
-+static void
-+watch_update (AvahiWatch *watch,
-+	      AvahiWatchEvent events)
-+{
-+  watch->events = events;
-+  watched_fd_add_select (watch->watched_fd);
-+}
-+
-+
-+/*
-+ * 'watch_get_events' - Get events that happened for a file descriptor
-+ */
-+
-+static AvahiWatchEvent
-+watch_get_events (AvahiWatch *watch)
-+{
-+  return (watch->watched_fd->occurred);
-+}
-+
-+
-+/*
-+ * 'compare_watches' - Compare watches for array sorting
-+ */
-+
-+static int
-+compare_watches (AvahiWatch *p0,
-+		 AvahiWatch *p1)
-+{
-+  if (p0->watched_fd->fd < p1->watched_fd->fd)
-+    return (-1);
-+
-+  return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1);
-+}
-+
-+
-+/*
-+ * 'timeout_cb()' - Run a timed Avahi callback
-+ */
-+
-+static void
-+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
-+{
-+  AvahiTimeout *timeout = userdata;
-+  (timeout->callback) (timeout, timeout->userdata);
-+}
-+
-+
-+/*
-+ * 'timeout_new' - Set a wakeup time
-+ */
-+
-+static AvahiTimeout *
-+timeout_new (const AvahiPoll *api,
-+	     const struct timeval *tv,
-+	     AvahiTimeoutCallback callback,
-+	     void *userdata)
-+{
-+  AvahiTimeout *timeout;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+
-+  timeout = malloc(sizeof(AvahiTimeout));
-+  if (timeout == NULL)
-+    return (NULL);
-+
-+  timeout->cups_poll = cups_poll;
-+  timeout->callback = callback;
-+  timeout->userdata = userdata;
-+  timeout->cupsd_timeout = cupsdAddTimeout (tv,
-+					    (cupsd_timeoutfunc_t)timeout_cb,
-+					    timeout);
-+  cupsArrayAdd (cups_poll->timeouts, timeout);
-+  return (timeout);
-+}
-+
-+
-+/*
-+ * 'timeout_update' - Update the expiration time for a timeout
-+ */
-+
-+static void
-+timeout_update (AvahiTimeout *timeout,
-+		const struct timeval *tv)
-+{
-+  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
-+}
-+
-+
-+/*
-+ * ' timeout_free' - Free a timeout
-+ */
-+
-+static void
-+timeout_free (AvahiTimeout *timeout)
-+{
-+  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
-+  cupsdRemoveTimeout (timeout->cupsd_timeout);
-+  free (timeout);
-+}
-+
-+
-+/*
-+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
-+ */
-+static int
-+compare_watched_fds(cupsd_watched_fd_t *p0,
-+		    cupsd_watched_fd_t *p1)
-+{
-+  if (p0->fd != p1->fd)
-+    return (p0->fd < p1->fd ? -1 : 1);
-+
-+  if (p0 == p1)
-+    return (0);
-+
-+  return (p0 < p1 ? -1 : 1);
-+}
-+
-+
-+/*
-+ * 'compare_timeouts' - Compare timeouts for array sorting
-+ */
-+static int
-+compare_timeouts(AvahiTimeout *p0,
-+		 AvahiTimeout *p1)
-+{
-+ /*
-+  * Just compare pointers to make it a stable sort.
-+  */
-+
-+  if (p0->cupsd_timeout < p1->cupsd_timeout)
-+    return (-1);
-+  return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
-+ */
-+
-+AvahiCupsPoll *
-+avahi_cups_poll_new (void)
-+{
-+  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
-+  if (cups_poll == NULL)
-+    return (NULL);
-+
-+  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
-+					 NULL);
-+  cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts,
-+				      NULL);
-+
-+  cups_poll->api.userdata = cups_poll;
-+  cups_poll->api.watch_new = watch_new;
-+  cups_poll->api.watch_free = watch_free;
-+  cups_poll->api.watch_update = watch_update;
-+  cups_poll->api.watch_get_events = watch_get_events;
-+
-+  cups_poll->api.timeout_new = timeout_new;
-+  cups_poll->api.timeout_update = timeout_update;
-+  cups_poll->api.timeout_free = timeout_free;
-+
-+  return (cups_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
-+ */
-+void
-+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
-+       watched_fd;
-+       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){
-+    cupsArrayClear (watched_fd->watches);
-+  }
-+
-+  cupsArrayClear (cups_poll->watched_fds);
-+  cupsArrayClear (cups_poll->timeouts);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
-+ */
-+
-+const AvahiPoll *
-+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
-+{
-+  return (&cups_poll->api);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
---- /dev/null
-+++ b/scheduler/avahi.h
-@@ -0,0 +1,49 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Distribution and use rights are outlined in the file "LICENSE.txt"
-+ *   which should have been included with this file.  If this file is
-+ *   file is missing or damaged, see the license at "http://www.cups.org/".
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_AUTHORIZATION_H
-+#  include <Security/Authorization.h>
-+#endif /* HAVE_AUTHORIZATION_H */
-+
-+
-+#ifdef HAVE_AVAHI
-+typedef struct
-+{
-+    AvahiPoll api;
-+    cups_array_t *watched_fds;
-+    cups_array_t *timeouts;
-+} AvahiCupsPoll;
-+#endif /* HAVE_AVAHI */
-+
-+/*
-+ * Prototypes...
-+ */
-+
-+#ifdef HAVE_AVAHI
-+extern AvahiCupsPoll *	avahi_cups_poll_new(void);
-+extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
-+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * End of "$Id$".
-+ */
---- a/scheduler/cupsd.h
-+++ b/scheduler/cupsd.h
-@@ -140,6 +140,15 @@
- 
- typedef void (*cupsd_selfunc_t)(void *data);
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * Timeout callback function type...
-+ */
-+
-+typedef struct _cupsd_timeout_s cupsd_timeout_t;
-+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * Globals...
-@@ -173,6 +182,11 @@
- 					/* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_AVAHI
-+VAR cups_array_t *Timeouts;		/* Timed callbacks for main loop */
-+#endif /* HAVE_AVAHI */
-+
-+
- 
- /*
-  * Prototypes...
-@@ -242,6 +256,20 @@
- extern void		cupsdStartServer(void);
- extern void		cupsdStopServer(void);
- 
-+#ifdef HAVE_AVAHI
-+extern void     cupsdInitTimeouts(void);
-+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
-+					 cupsd_timeoutfunc_t cb,
-+					 void *data);
-+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
-+extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
-+extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
-+				    const struct timeval *tv);
-+extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
-+#endif /* HAVE_AVAHI */
-+
-+extern int	cupsdRemoveFile(const char *filename);
-+
- 
- /*
-  * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -122,6 +122,10 @@
-   cupsd_listener_t	*lis;		/* Current listener */
-   time_t		current_time,	/* Current time */
- 			activity,	/* Client activity timer */
-+#ifdef HAVE_AVAHI
-+			avahi_client_time, /* Time for next Avahi client
-+					      check */
-+#endif /* HAVE_AVAHI */
- 			browse_time,	/* Next browse send time */
- 			senddoc_time,	/* Send-Document time */
- 			expire_time,	/* Subscription expire time */
-@@ -148,6 +152,10 @@
-   int			launchd_idle_exit;
- 					/* Idle exit on select timeout? */
- #endif	/* HAVE_LAUNCHD */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Next scheduled timed callback */
-+  long			tmo_delay;	/* Time before it must be called */
-+#endif /* HAVE_AVAHI */
- 
- 
- #ifdef HAVE_GETEUID
-@@ -527,6 +535,14 @@
- 
-   httpInitialize();
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * Initialize timed callback structures.
-+  */
-+
-+  cupsdInitTimeouts();
-+#endif /* HAVE_AVAHI */
-+
-   cupsdStartServer();
- 
-  /*
-@@ -657,6 +673,9 @@
-   */
- 
-   current_time  = time(NULL);
-+#ifdef HAVE_AVAHI
-+  avahi_client_time = current_time;
-+#endif /* HAVE_AVAHI */
-   browse_time   = current_time;
-   event_time    = current_time;
-   expire_time   = current_time;
-@@ -871,6 +890,26 @@
-     }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+   /*
-+    * If a timed callback is due, run it.
-+    */
-+
-+    tmo = cupsdNextTimeout (&tmo_delay);
-+    if (tmo && tmo_delay == 0)
-+      cupsdRunTimeout (tmo);
-+
-+   /*
-+    * Try to restart the Avahi client every 10 seconds if needed...
-+    */
-+
-+    if ((current_time - avahi_client_time) >= 10)
-+    {
-+      avahi_client_time = current_time;
-+      cupsdStartAvahiClient();
-+    }
-+#endif /* HAVE_AVAHI */
-+
- #ifndef __APPLE__
-    /*
-     * Update the network interfaces once a minute...
-@@ -1815,6 +1854,10 @@
-   cupsd_job_t		*job;		/* Job information */
-   cupsd_subscription_t	*sub;		/* Subscription information */
-   const char		*why;		/* Debugging aid */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Timed callback */
-+  long			tmo_delay;	/* Seconds before calling it */
-+#endif /* HAVE_AVAHI */
- 
- 
-  /*
-@@ -1857,6 +1900,19 @@
-   }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * See if there are any scheduled timed callbacks to run.
-+  */
-+
-+  tmo = cupsdNextTimeout (&tmo_delay);
-+  if (tmo)
-+  {
-+    timeout = tmo_delay;
-+    why = "run a timed callback";
-+  }
-+#endif /* HAVE_AVAHI */
-+
-  /*
-   * Check whether we are accepting new connections...
-   */
---- /dev/null
-+++ b/scheduler/timeout.c
-@@ -0,0 +1,195 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Timeout functions for the Common UNIX Printing System (CUPS).
-+ *
-+ *   Copyright (C) 2010 Red Hat, Inc.
-+ *   Authors:
-+ *     Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Distribution and use rights are outlined in the file "LICENSE.txt"
-+ *   which should have been included with this file.  If this file is
-+ *   file is missing or damaged, see the license at "http://www.cups.org/".
-+ *
-+ * Contents:
-+ *
-+ *   cupsdInitTimeouts()  - Initialise timeout structure.
-+ *   cupsdAddTimeout()    - Add a timed callback.
-+ *   cupsdNextTimeout()   - Find the next enabled timed callback.
-+ *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
-+ *   cupsdRemoveTimeout() - Discard a timed callback.
-+ *   compare_timeouts()   - Compare timed callbacks for array sorting.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+struct _cupsd_timeout_s
-+{
-+  struct timeval when;
-+  int enabled;
-+  cupsd_timeoutfunc_t callback;
-+  void *data;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+/*
-+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
-+ */
-+
-+static int
-+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
-+{
-+  if (!p0->enabled || !p1->enabled)
-+  {
-+    if (!p0->enabled && !p1->enabled)
-+      return (0);
-+
-+    return (p0->enabled ? -1 : 1);
-+  }
-+
-+  return (avahi_timeval_compare (&p0->when, &p1->when));
-+}
-+
-+
-+/*
-+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
-+ */
-+
-+void
-+cupsdInitTimeouts(void)
-+{
-+  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
-+}
-+
-+
-+/*
-+ * 'cupsdAddTimeout()' - Add a timed callback.
-+ */
-+
-+cupsd_timeout_t *				/* O - Timeout handle */
-+cupsdAddTimeout(const struct timeval *tv,	/* I - Absolute time */
-+		cupsd_timeoutfunc_t cb,		/* I - Callback function */
-+		void *data)			/* I - User data */
-+{
-+  cupsd_timeout_t *timeout;
-+
-+  timeout = malloc (sizeof(cupsd_timeout_t));
-+  if (timeout != NULL)
-+  {
-+    timeout->enabled = (tv != NULL);
-+    if (tv)
-+    {
-+      timeout->when.tv_sec = tv->tv_sec;
-+      timeout->when.tv_usec = tv->tv_usec;
-+    }
-+
-+    timeout->callback = cb;
-+    timeout->data = data;
-+    cupsArrayAdd (Timeouts, timeout);
-+  }
-+
-+  return timeout;
-+}
-+
-+
-+/*
-+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
-+ */
-+
-+cupsd_timeout_t *		/* O - Next enabled timeout or NULL */
-+cupsdNextTimeout(long *delay)	/* O - Seconds before scheduled */
-+{
-+  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
-+  struct timeval curtime;
-+
-+  if (first && !first->enabled)
-+    first = NULL;
-+
-+  if (first && delay)
-+  {
-+    gettimeofday (&curtime, NULL);
-+    if (avahi_timeval_compare (&curtime, &first->when) > 0)
-+    {
-+      *delay = 0;
-+    } else {
-+      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
-+      if (first->when.tv_usec < curtime.tv_usec)
-+	(*delay)--;
-+    }
-+  }
-+
-+  return (first);
-+}
-+
-+
-+/*
-+ * 'cupsdRunTimeout()' - Run a timed callback.
-+ */
-+
-+void
-+cupsdRunTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  if (!timeout)
-+    return;
-+  timeout->enabled = 0;
-+  if (!timeout->callback)
-+    return;
-+  timeout->callback (timeout, timeout->data);
-+}
-+
-+/*
-+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
-+ */
-+
-+void
-+cupsdUpdateTimeout(cupsd_timeout_t *timeout,	/* I - Timeout */
-+		   const struct timeval *tv)	/* I - Absolute time or NULL */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  timeout->enabled = (tv != NULL);
-+  if (tv)
-+  {
-+    timeout->when.tv_sec = tv->tv_sec;
-+    timeout->when.tv_usec = tv->tv_usec;
-+  }
-+  cupsArrayAdd (Timeouts, timeout);
-+}
-+
-+
-+/*
-+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
-+ */
-+
-+void
-+cupsdRemoveTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  free (timeout);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
---- a/cgi-bin/admin.c
-+++ b/cgi-bin/admin.c
-@@ -1643,7 +1643,7 @@
-       else
- 	local_protocols[0] = '\0';
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
-       {
- 	if (local_protocols[0])
-@@ -1651,7 +1651,7 @@
- 	else
- 	  strcat(local_protocols, "dnssd");
-       }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@
- #endif /* HAVE_GSSAPI */
-   cgiSetVariable("KERBEROS", "");
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-   cgiSetVariable("HAVE_LDAP", "1");
---- a/scheduler/client.c
-+++ b/scheduler/client.c
-@@ -4987,7 +4987,7 @@
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4996,7 +4996,7 @@
-       (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
-        !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-  /*
-   * Check if the hostname is an IP address...
---- a/scheduler/dirsvc.c
-+++ b/scheduler/dirsvc.c
-@@ -27,6 +27,7 @@
-  *   ldap_connect()             - Start new LDAP connection
-  *   ldap_reconnect()           - Reconnect to LDAP Server
-  *   ldap_disconnect()          - Disconnect from LDAP Server
-+ *   cupsdStartAvahiClient()    - Start an Avahi client if needed
-  *   cupsdStartBrowsing()       - Start sending and receiving broadcast
-  *                                information.
-  *   cupsdStartPolling()        - Start polling servers as needed.
-@@ -45,6 +46,8 @@
-  *                                printer.
-  *   dnssdPackTxtRecord()       - Pack an array of key/value pairs into the TXT
-  *                                record format.
-+ *   avahiPackTxtRecord()       - Pack an array of key/value pairs into an
-+ *                                AvahiStringList.
-  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
-  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
-  *                                printer or update the broadcast contents.
-@@ -83,6 +86,7 @@
-  */
- 
- #include "cupsd.h"
-+#include <assert.h>
- #include <grp.h>
- 
- #ifdef HAVE_DNSSD
-@@ -97,6 +101,17 @@
- #    endif /* HAVE_SYSTEMCONFIGURATION */
- #  endif /* __APPLE__ */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/domain.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+#ifdef HAVE_DNSSD
-+typedef char *cupsd_txt_record_t;
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+typedef AvahiStringList *cupsd_txt_record_t;
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -159,27 +174,39 @@
- static void	update_smb(int onoff);
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-+					      int for_lpd);
-+static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
-+static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
-+static void	dnssdRegisterPrinter(cupsd_printer_t *p);
-+static void	dnssdStop(void);
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
- #ifdef HAVE_DNSSD
- #  ifdef HAVE_COREFOUNDATION
- static void	dnssdAddAlias(const void *key, const void *value,
- 		              void *context);
- #  endif /* HAVE_COREFOUNDATION */
--static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
--		                     int for_lpd);
--static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
--static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
--static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
--		                    int count);
- static void	dnssdRegisterCallback(DNSServiceRef sdRef,
- 		                      DNSServiceFlags flags,
- 				      DNSServiceErrorType errorCode,
- 				      const char *name, const char *regtype,
- 				      const char *domain, void *context);
--static void	dnssdRegisterPrinter(cupsd_printer_t *p);
--static void	dnssdStop(void);
- static void	dnssdUpdate(void);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
-+					   int count);
-+static void	avahi_entry_group_cb (AvahiEntryGroup *group,
-+				      AvahiEntryGroupState state,
-+				      void *userdata);
-+static void	avahi_client_cb (AvahiClient *client,
-+				 AvahiClientState state,
-+				 void *userdata);
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- 		{
-@@ -283,10 +310,10 @@
-     ldap_dereg_printer(p);
- #endif /* HAVE_LDAP */
- 
--#ifdef HAVE_DNSSD
--  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdDeregisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -702,10 +729,10 @@
-     slpRegisterPrinter(p); */
- #endif /* HAVE_LIBSLP */
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdRegisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -1419,6 +1446,27 @@
- #endif /* HAVE_LDAP */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
-+ */
-+
-+void
-+cupsdStartAvahiClient(void)
-+{
-+  if (!AvahiCupsClient && !AvahiCupsClientConnecting)
-+  {
-+    if (!AvahiCupsPollHandle)
-+      AvahiCupsPollHandle = avahi_cups_poll_new ();
-+
-+    if (AvahiCupsPollHandle)
-+      avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
-+			AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL);
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+  
- /*
-  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
-  */
-@@ -1542,13 +1590,16 @@
-   else
-     BrowseSocket = -1;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
-   {
-+#ifdef HAVE_DNSSD
-     DNSServiceErrorType error;		/* Error from service creation */
-+#endif /* HAVE_DNSSD */
-     cupsd_listener_t	*lis;		/* Current listening socket */
- 
- 
-+#ifdef HAVE_DNSSD
-    /*
-     * First create a "master" connection for all registrations...
-     */
-@@ -1573,6 +1624,7 @@
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
- 
-       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
-+#endif /* HAVE_DNSSD */
- 
-      /*
-       * Then get the port we use for registrations.  If we are not listening
-@@ -1606,9 +1658,16 @@
-       */
- 
-       cupsdUpdateDNSSDName();
-+
-+#ifdef HAVE_AVAHI
-+      cupsdStartAvahiClient ();
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_DNSSD
-     }
--  }
- #endif /* HAVE_DNSSD */
-+  }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-@@ -1834,10 +1893,10 @@
-     BrowseSocket = -1;
-   }
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdStop();
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-@@ -1902,7 +1961,7 @@
- }
- 
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
-  */
-@@ -1910,8 +1969,14 @@
- void
- cupsdUpdateDNSSDName(void)
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType error;		/* Error from service creation */
-   char		webif[1024];		/* Web interface share name */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		ret;			/* Error from service creation */
-+  char		webif[AVAHI_LABEL_MAX];	/* Web interface share name */
-+#endif /* HAVE_AVAHI */
- #  ifdef HAVE_SYSTEMCONFIGURATION
-   SCDynamicStoreRef sc;			/* Context for dynamic store */
-   CFDictionaryRef btmm;			/* Back-to-My-Mac domains */
-@@ -2042,6 +2107,7 @@
-     else
-       strlcpy(webif, "CUPS Web Interface", sizeof(webif));
- 
-+#ifdef HAVE_DNSSD
-     if (WebIFRef)
-       DNSServiceRefDeallocate(WebIFRef);
- 
-@@ -2054,9 +2120,45 @@
- 				    NULL)) != kDNSServiceErr_NoError)
-       cupsdLogMessage(CUPSD_LOG_ERROR,
- 		      "DNS-SD web interface registration failed: %d", error);
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+    if (!AvahiCupsClient)
-+     /*
-+      * Client not yet running.
-+      */
-+      return;
-+
-+    if (AvahiWebIFGroup)
-+      avahi_entry_group_reset (AvahiWebIFGroup);
-+    else
-+      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
-+					       avahi_entry_group_cb,
-+					       NULL);
-+
-+    if (AvahiWebIFGroup)
-+    {
-+      ret = avahi_entry_group_add_service (AvahiWebIFGroup,
-+					   AVAHI_IF_UNSPEC,
-+					   AVAHI_PROTO_UNSPEC,
-+					   0, /* flags */
-+					   webif, /* name */
-+					   "_http._tcp", /* type */
-+					   NULL, /* domain */
-+					   NULL, /* host */
-+					   DNSSDPort, /* port */
-+					   "path=/", NULL);
-+      if (ret == 0)
-+	ret = avahi_entry_group_commit (AvahiWebIFGroup);
-+
-+      if (ret != 0)
-+	cupsdLogMessage (CUPSD_LOG_ERROR,
-+			 "Avahi web interface registration failed: %d", ret);
-+    }
-+#endif /* HAVE_AVAHI */
-   }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
- #ifdef HAVE_LDAP
-@@ -2334,13 +2436,15 @@
-                     "Bad Back to My Mac domain in dynamic store!");
- }
- #  endif /* HAVE_COREFOUNDATION */
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
-  */
- 
--static char *				/* O - TXT record */
-+static cupsd_txt_record_t		/* O - TXT record */
- dnssdBuildTxtRecord(
-     int             *txt_len,		/* O - TXT record length */
-     cupsd_printer_t *p,			/* I - Printer information */
-@@ -2379,7 +2483,12 @@
-   keyvalue[i  ][0] = "ty";
-   keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
- 
--  snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
-+  snprintf(admin_hostname, sizeof(admin_hostname),
-+	   "%s.local"
-+#ifdef HAVE_DNSSD
-+	   "." /* terminating dot no good for Avahi */
-+#endif /* HAVE_DNSSD */
-+	   , DNSSDHostName);
-   httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
-                    "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
- 		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-@@ -2462,7 +2571,12 @@
-   * Then pack them into a proper txt record...
-   */
- 
-+#ifdef HAVE_DNSSD
-   return (dnssdPackTxtRecord(txt_len, keyvalue, i));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  return (avahiPackTxtRecord(keyvalue, i));
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2474,7 +2588,16 @@
- dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
-                      cupsd_printer_t *b)/* I - Second printer */
- {
--  return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+  if (!a->reg_name)
-+    if (!b->reg_name)
-+      return 0;
-+    else
-+      return -1;
-+  else
-+    if (!b->reg_name)
-+      return 1;
-+    else
-+      return (_cups_strcasecmp(a->reg_name, b->reg_name));
- }
- 
- 
-@@ -2489,6 +2612,10 @@
- {
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-  /*
-   * Closing the socket deregisters the service
-   */
-@@ -2524,6 +2651,24 @@
-     free(p->printer_txt);
-     p->printer_txt = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+  if (p->avahi_group)
-+    {
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+
-+      if (p->ipp_txt)
-+	avahi_string_list_free (p->ipp_txt);
-+
-+      if (p->printer_txt)
-+	avahi_string_list_free (p->printer_txt);
-+
-+      p->ipp_txt = p->printer_txt = NULL;
-+    }
-+#endif /* HAVE_AVAHI */
- 
-  /*
-   * Remove the printer from the array of DNS-SD printers, then clear the
-@@ -2533,8 +2678,10 @@
-   cupsArrayRemove(DNSSDPrinters, p);
-   cupsdClearString(&p->reg_name);
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
-  *                          TXT record format.
-@@ -2644,8 +2791,10 @@
-     LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
-   }
- }
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
-  *		              or update the broadcast contents.
-@@ -2654,20 +2803,40 @@
- static void
- dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType	se;		/* dnssd errors */
-   char			*ipp_txt,	/* IPP TXT record buffer */
- 			*printer_txt,	/* LPD TXT record buffer */
--			name[1024],	/* Service name */
--			*nameptr;	/* Pointer into name */
-+			name[1024];	/* Service name */
-   int			ipp_len,	/* IPP TXT record length */
- 			printer_len,	/* LPD TXT record length */
- 			printer_port;	/* LPD port number */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int			ret;		/* Error code */
-+  AvahiStringList	*ipp_txt,	/* IPP TXT record */
-+			*printer_txt;	/* LPD TXT record */
-+  char			name[AVAHI_LABEL_MAX],	/* Service name */
-+			fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
-+  char			*regtype_copy,	/* Writeable copy of reg type */
-+			*subtype,	/* Current service sub type */
-+			*nextsubtype;	/* Next service sub type */
-+#endif /* HAVE_AVAHI */
-+  char			*nameptr;	/* Pointer into name */
-   const char		*regtype;	/* Registration type */
- 
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-                   !p->ipp_ref ? "new" : "update");
--
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-+		  !p->avahi_group ? "new" : "update");
-+#endif /* HAVE_AVAHI */
-  /*
-   * If per-printer sharing was just disabled make sure we're not
-   * registered before returning.
-@@ -2686,12 +2855,36 @@
-   if (p->info && strlen(p->info) > 0)
-   {
-     if (DNSSDComputerName)
--      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
-+    {
-+     /*
-+      * Make sure there is room for at least 15 characters of
-+      * DNSSDComputerName.
-+      */
-+
-+      assert(sizeof(name) >= 15 + 4);
-+      nameptr = name + strlcpy(name, p->info,
-+			       sizeof(name) - 4 -
-+			       strnlen(DNSSDComputerName, 15));
-+      nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+      strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+    }
-     else
-       strlcpy(name, p->info, sizeof(name));
-   }
-   else if (DNSSDComputerName)
--    snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
-+  {
-+   /*
-+    * Make sure there is room for at least 15 characters of
-+    * DNSSDComputerName.
-+    */
-+
-+    assert(sizeof(name) >= 15 + 4);
-+    nameptr = name + strlcpy(name, p->info,
-+			     sizeof(name) - 4 -
-+			     strnlen(DNSSDComputerName, 15));
-+    nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+    strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+  }
-   else
-     strlcpy(name, p->name, sizeof(name));
- 
-@@ -2712,6 +2905,7 @@
-   * Register IPP and (optionally) LPD...
-   */
- 
-+#ifdef HAVE_DNSSD
-   ipp_len = 0;				/* anti-compiler-warning-code */
-   ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
- 
-@@ -2884,6 +3078,209 @@
- 
-   if (printer_txt)
-     free(printer_txt);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (!AvahiCupsClient)
-+   /*
-+    * Client not running yet.  The client callback will call us again later.
-+    */
-+    return;
-+
-+  ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
-+  printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
-+  regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
-+
-+  if (p->avahi_group && p->ipp_txt && ipp_txt &&
-+      !avahi_string_list_equal (p->ipp_txt, ipp_txt))
-+  {
-+   /*
-+    * Update the existing registration...
-+    */
-+
-+    avahi_string_list_free (p->ipp_txt);
-+
-+    if (p->printer_txt)
-+      avahi_string_list_free (p->printer_txt);
-+
-+   /*
-+    * Update the service group entry.
-+    */
-+
-+    regtype_copy = strdup (regtype);
-+    subtype = strchr (regtype_copy, ',');
-+    if (subtype)
-+      *subtype = '\0';
-+
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Updating TXT record for %s (%s)", name, regtype_copy);
-+    ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+						       AVAHI_IF_UNSPEC,
-+						       AVAHI_PROTO_UNSPEC,
-+						       0, name,
-+						       regtype_copy,
-+						       NULL, ipp_txt);
-+    free (regtype_copy);
-+
-+    if (ret < 0)
-+      goto update_failed;
-+
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+							 AVAHI_IF_UNSPEC,
-+							 AVAHI_PROTO_UNSPEC,
-+							 0, name,
-+							 "_printer._tcp", NULL,
-+							 printer_txt);
-+      if (ret < 0)
-+	goto update_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+    if (ret < 0)
-+    {
-+    update_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to update TXT record for %s: %d",
-+		       name, ret);
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (!p->avahi_group)
-+  {
-+   /*
-+    * Initial registration.  Use the _fax subtype for fax queues...
-+    */
-+
-+    p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
-+					    avahi_entry_group_cb,
-+					    p);
-+
-+    cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		    "Registering Avahi printer %s with name \"%s\" and "
-+		    "type \"%s\"", p->name, name, regtype);
-+
-+    if (!p->avahi_group)
-+    {
-+      ret = 0;
-+      goto add_failed;
-+    }
-+
-+   /*
-+    * Add each service type (DNSSDRegType may contain several,
-+    * separated by commas).
-+    */
-+
-+    subtype = regtype_copy = strdup (regtype);
-+    while (subtype && *subtype)
-+    {
-+      nextsubtype = strchr (subtype, ',');
-+      if (nextsubtype)
-+	*nextsubtype++ = '\0';
-+
-+      if (subtype == regtype_copy)
-+      {
-+       /*
-+	* Main type entry.
-+	*/
-+
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, regtype_copy);
-+	ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						    AVAHI_IF_UNSPEC,
-+						    AVAHI_PROTO_UNSPEC,
-+						    0, name, regtype_copy,
-+						    NULL, NULL,
-+						    DNSSDPort,
-+						    ipp_txt);
-+      }
-+      else
-+      {
-+       /*
-+	* Sub-type entry.
-+	*/
-+
-+	snprintf (fullsubtype, sizeof(fullsubtype),
-+		  "%s._sub.%s", subtype, regtype_copy);
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, fullsubtype);
-+	ret = avahi_entry_group_add_service_subtype (p->avahi_group,
-+						     AVAHI_IF_UNSPEC,
-+						     AVAHI_PROTO_UNSPEC,
-+						     0, name,
-+						     regtype_copy,
-+						     NULL, fullsubtype);
-+      }
-+
-+      if (ret < 0)
-+      {
-+	free (regtype_copy);
-+	goto add_failed;
-+      }
-+
-+      subtype = nextsubtype;
-+    }
-+
-+    free (regtype_copy);
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		      "Registering Avahi printer %s with name \"%s\" and "
-+		      "type \"_printer._tcp\"", p->name, name);
-+
-+      ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						  AVAHI_IF_UNSPEC,
-+						  AVAHI_PROTO_UNSPEC,
-+						  0, name,
-+						  "_printer._tcp", NULL, NULL,
-+						  515,
-+						  printer_txt);
-+      if (ret < 0)
-+	goto add_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+
-+    if (ret < 0)
-+    {
-+    add_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to add Avahi entry for %s: %d",
-+		       name, ret);
-+      if (p->avahi_group)
-+      {
-+	avahi_entry_group_reset (p->avahi_group);
-+	avahi_entry_group_free (p->avahi_group);
-+	p->avahi_group = NULL;
-+      }
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (ipp_txt)
-+    avahi_string_list_free (ipp_txt);
-+
-+  if (printer_txt)
-+    avahi_string_list_free (printer_txt);
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2896,6 +3293,10 @@
- {
-   cupsd_printer_t	*p;		/* Current printer */
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * De-register the individual printers
-@@ -2906,6 +3307,7 @@
-        p = (cupsd_printer_t *)cupsArrayNext(Printers))
-     dnssdDeregisterPrinter(p);
- 
-+#ifdef HAVE_DNSSD
-  /*
-   * Shutdown the rest of the service refs...
-   */
-@@ -2926,14 +3328,17 @@
- 
-   DNSServiceRefDeallocate(DNSSDRef);
-   DNSSDRef = NULL;
-+#endif /* HAVE_DNSSD */
- 
-   cupsArrayDelete(DNSSDPrinters);
-   DNSSDPrinters = NULL;
- 
-   DNSSDPort = 0;
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdUpdate()' - Handle DNS-SD queries.
-  */
-@@ -2955,6 +3360,147 @@
- #endif /* HAVE_DNSSD */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
-+ *                          AvahiStringList.
-+ */
-+
-+static AvahiStringList *		/* O - new string list */
-+avahiPackTxtRecord(char *keyvalue[][2],	/* I - Table of key value pairs */
-+		   int count)		/* I - Number of items in table */
-+{
-+  AvahiStringList *strlst = NULL;
-+  char **elements;
-+  size_t len;
-+  int i = 0;
-+
-+  elements = malloc ((1 + count) * sizeof (char *));
-+  if (!elements)
-+    goto cleanup;
-+
-+  for (i = 0; i < count; i++)
-+    {
-+      len = (1 + strlen (keyvalue[i][0]) +
-+	     (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
-+      elements[i] = malloc (len * sizeof (char));
-+      if (!elements[i])
-+	goto cleanup;
-+
-+      snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
-+    }
-+
-+  strlst = avahi_string_list_new_from_array ((const char **) elements, count);
-+
-+cleanup:
-+  while (--i >= 0)
-+    free (elements[i]);
-+
-+  free (elements);
-+  return (strlst);
-+}
-+
-+
-+/*
-+ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
-+ */
-+static void
-+avahi_entry_group_cb (AvahiEntryGroup *group,
-+		      AvahiEntryGroupState state,
-+		      void *userdata)
-+{
-+  char *name;
-+
-+  if (userdata)
-+    name = ((cupsd_printer_t *) userdata)->reg_name;
-+  else
-+    name = "CUPS web interface";
-+
-+  switch (state)
-+  {
-+  case AVAHI_ENTRY_GROUP_UNCOMMITED:
-+  case AVAHI_ENTRY_GROUP_REGISTERING:
-+    break;
-+
-+  case AVAHI_ENTRY_GROUP_ESTABLISHED:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group established for %s", name);
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group %s has state %d",
-+		     name, state);
-+    break;
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_client_cb()' - Avahi client callback function.
-+ */
-+static void
-+avahi_client_cb (AvahiClient *client,
-+		 AvahiClientState state,
-+		 void *userdata)
-+{
-+  cupsd_printer_t *printer;
-+  switch (state)
-+  {
-+  case AVAHI_CLIENT_S_RUNNING:
-+   /*
-+    * Avahi client started successfully.
-+    */
-+    AvahiCupsClient = client;
-+    AvahiCupsClientConnecting = 0;
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
-+
-+    cupsdUpdateDNSSDName ();
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
-+	  (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
-+			      CUPS_PRINTER_SCANNER))) && printer->shared)
-+	dnssdRegisterPrinter (printer);
-+
-+    break;
-+
-+  case AVAHI_CLIENT_CONNECTING:
-+   /*
-+    * No Avahi daemon, client is waiting.
-+    */
-+    AvahiCupsClientConnecting = 1;
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
-+    break;
-+
-+  case AVAHI_CLIENT_FAILURE:
-+   /*
-+    * Avahi client failed, close it to allow a clean restart.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_ERROR,
-+		     "Avahi client failed, "
-+		     "closing client to allow a clean restart");
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      dnssdDeregisterPrinter (printer);
-+
-+    avahi_client_free(client);
-+    AvahiCupsClientConnecting = 0;
-+    AvahiCupsClient = NULL;
-+
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
-  * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
-  */
---- a/scheduler/dirsvc.h
-+++ b/scheduler/dirsvc.h
-@@ -31,6 +31,10 @@
- #  endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
- 
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
- /*
-  * Browse protocols...
-  */
-@@ -131,19 +135,22 @@
- VAR cupsd_statbuf_t	*PollStatusBuffer VALUE(NULL);
- 					/* Status buffer for pollers */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- VAR char		*DNSSDComputerName VALUE(NULL),
- 					/* Computer/server name */
- 			*DNSSDHostName	VALUE(NULL),
- 					/* Hostname */
- 			*DNSSDRegType VALUE(NULL);
- 					/* Bonjour registration type */
--VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
--					/* List of dynamic ServerAlias's */
- VAR int			DNSSDPort	VALUE(0);
- 					/* Port number to register */
- VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
- 					/* Printers we have registered */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
-+#ifdef HAVE_DNSSD
-+VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
-+					/* List of dynamic ServerAlias's */
- VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Master DNS-SD service reference */
- 			WebIFRef	VALUE(NULL),
-@@ -152,6 +159,17 @@
- 					/* Remote printer browse reference */
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+VAR AvahiCupsPoll	*AvahiCupsPollHandle	VALUE(NULL);
-+					/* AvahiCupsPoll object */
-+VAR AvahiClient		*AvahiCupsClient	VALUE(NULL);
-+					/* AvahiClient object */
-+VAR int			AvahiCupsClientConnecting	VALUE(0);
-+					/* Is AvahiClient object connecting? */
-+VAR AvahiEntryGroup	*AvahiWebIFGroup	VALUE(NULL);
-+					/* Web interface entry group */
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle		BrowseSLPHandle	VALUE(NULL);
- 					/* SLP API handle */
-@@ -195,13 +213,14 @@
- extern void	cupsdRestartPolling(void);
- extern void	cupsdSaveRemoteCache(void);
- extern void	cupsdSendBrowseList(void);
-+extern void	cupsdStartAvahiClient(void);
- extern void	cupsdStartBrowsing(void);
- extern void	cupsdStartPolling(void);
- extern void	cupsdStopBrowsing(void);
- extern void	cupsdStopPolling(void);
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- extern void	cupsdUpdateDNSSDName(void);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void	cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
---- a/scheduler/ipp.c
-+++ b/scheduler/ipp.c
-@@ -6087,7 +6087,7 @@
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -6097,7 +6097,7 @@
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
---- a/scheduler/printers.c
-+++ b/scheduler/printers.c
-@@ -883,9 +883,9 @@
-   cupsdClearString(&p->alert);
-   cupsdClearString(&p->alert_description);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdClearString(&p->pdl);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   cupsArrayDelete(p->filetypes);
- 
-@@ -3765,7 +3765,7 @@
-     attr->values[i].string.text = _cupsStrAlloc(mimetype);
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   {
-     char		pdl[1024];	/* Buffer to build pdl list */
-     mime_filter_t	*filter;	/* MIME filter looping var */
-@@ -3821,7 +3821,7 @@
- 
-     cupsdSetString(&p->pdl, pdl);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
---- a/scheduler/printers.h
-+++ b/scheduler/printers.h
-@@ -16,6 +16,9 @@
- #ifdef HAVE_DNSSD
- #  include <dns_sd.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include "avahi.h"
-+#endif /* HAVE_AVAHI */
- #include <cups/pwg-private.h>
- 
- 
-@@ -95,16 +98,23 @@
-   time_t	marker_time;		/* Last time marker attributes were updated */
-   _ppd_cache_t	*pc;			/* PPD cache and mapping data */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   char		*reg_name,		/* Name used for service registration */
--		*pdl,			/* pdl value for TXT record */
--		*ipp_txt,		/* IPP TXT record contents */
-+		*pdl;			/* pdl value for TXT record */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+#ifdef HAVE_DNSSD
-+  char		*ipp_txt,		/* IPP TXT record contents */
- 		*printer_txt;		/* LPD TXT record contents */
-   int		ipp_len,		/* IPP TXT record length */
- 		printer_len;		/* LPD TXT record length */
-   DNSServiceRef	ipp_ref,		/* Reference for _ipp._tcp,_cups */
- 		printer_ref;		/* Reference for _printer._tcp */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiStringList *ipp_txt,		/* IPP TXT record */
-+		*printer_txt;		/* LPD TXT record */
-+  AvahiEntryGroup *avahi_group;		/* Avahi entry group */
-+#endif /* HAVE_AVAHI */
- };
- 
- 
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -650,7 +650,7 @@
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
- #endif /* HAVE_DNSSD */
- 
diff --git a/libre/seamonkey-libre/seamonkey-appversion.patch b/libre/seamonkey-libre/seamonkey-appversion.patch
deleted file mode 100644
index 0c34cf477..000000000
--- a/libre/seamonkey-libre/seamonkey-appversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur comm-1.9.1.orig/suite/installer/Makefile.in comm-1.9.1/suite/installer/Makefile.in
---- comm-1.9.1.orig/suite/installer/Makefile.in	2010-01-04 23:01:34.000000000 +0200
-+++ comm-1.9.1/suite/installer/Makefile.in	2010-01-11 22:38:44.000000000 +0200
-@@ -42,6 +42,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+MOZ_APP_VERSION="2.0"
-+
- NO_PKG_FILES = \
- 	$(MOZ_APP_NAME)-config \
- 	xpcshell* \
diff --git a/libre/virtualbox-libre/18-system-xorg.patch b/libre/virtualbox-libre/18-system-xorg.patch
deleted file mode 100644
index baca4bc5b..000000000
--- a/libre/virtualbox-libre/18-system-xorg.patch
+++ /dev/null
@@ -1,278 +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/libre/virtualbox-libre/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules
deleted file mode 100644
index d64575709..000000000
--- a/libre/virtualbox-libre/60-vboxguest.rules
+++ /dev/null
@@ -1,3 +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/libre/virtualbox-libre/virtualbox-4-makeself-check.patch b/libre/virtualbox-libre/virtualbox-4-makeself-check.patch
deleted file mode 100644
index 57862b41e..000000000
--- a/libre/virtualbox-libre/virtualbox-4-makeself-check.patch
+++ /dev/null
@@ -1,11 +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/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch b/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch
deleted file mode 100644
index d43962148..000000000
--- a/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch
+++ /dev/null
@@ -1,11 +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/libre/virtualbox-libre/virtualbox-parabola-modules.install b/libre/virtualbox-libre/virtualbox-parabola-modules.install
deleted file mode 100644
index 75d28784a..000000000
--- a/libre/virtualbox-libre/virtualbox-parabola-modules.install
+++ /dev/null
@@ -1,25 +0,0 @@
-KERNEL_VERSION='3.0-LIBRE'
-
-post_install() {
-  cat << EOM
-
-===> virtualbox-parabola-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/libre/virtualbox-parabola-modules/60-vboxguest.rules b/libre/virtualbox-parabola-modules/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/libre/virtualbox-parabola-modules/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/libre/virtualbox-parabola-modules/LocalConfig.kmk b/libre/virtualbox-parabola-modules/LocalConfig.kmk
deleted file mode 100644
index af79f90cd..000000000
--- a/libre/virtualbox-parabola-modules/LocalConfig.kmk
+++ /dev/null
@@ -1,19 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS =
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/libre/virtualbox-parabola-modules/PKGBUILD b/libre/virtualbox-parabola-modules/PKGBUILD
deleted file mode 100644
index d077c092a..000000000
--- a/libre/virtualbox-parabola-modules/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# $Id: PKGBUILD 57345 2011-10-26 09:57:11Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.4
-pkgrel=3.1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers' 'linux-libre')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-         LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
-         '4c88bd122677a35f68abd76eb01b378b'
-         'ed1341881437455d9735875ddf455fbe')
-
-_extramodules=extramodules-3.1-LIBRE
-
-build() {
-    _kernver="$(cat /lib/modules/${_extramodules}/version)"
-
-    export KERN_DIR=/lib/modules/${_kernver}/build
-    export KERN_INCL=/usr/src/linux-${_kernver}/include/
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE"
-
-    cp "$srcdir/LocalConfig.kmk" .
-
-    ./configure \
-        --with-linux=/usr/src/linux-${_kernver} \
-        --disable-java \
-        --disable-docs \
-        --disable-xpcom \
-        --disable-python \
-        --disable-sdl-ttf \
-        --disable-alsa \
-        --disable-pulse \
-        --disable-dbus  \
-        --disable-opengl \
-        --build-headless \
-        --nofatal
-    source ./env.sh
-    kmk all
-
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-    make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-parabola-modules(){
-    pkgdesc="Additions only for Parabola guests (kernel modules)"
-    license=('GPL')
-    install=virtualbox-parabola-modules.install
-    depends=('linux>=3.1' 'linux<3.2')
-    replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
-    conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
-    provides=("virtualbox-archlinux-modules=$pkgver")
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
-    for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
-        install -D -m644 ${module} \
-            "$pkgdir/lib/modules/${_extramodules}/${module}"
-    done
-
-    install -D -m 0644 "$srcdir/60-vboxguest.rules" \
-        "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install"
-}
-
-package_virtualbox-modules(){
-    pkgdesc="Kernel modules for VirtualBox"
-    license=('GPL')
-    install=virtualbox-modules.install
-    depends=('linux>=3.1' 'linux<3.2')
-
-    source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
-
-    cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-
-    install -D -m644 vboxdrv.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
-
-    install -D -m644 vboxnetadp.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
-
-    install -D -m644 vboxnetflt.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
-
-    install -D -m644 vboxpci.ko \
-        "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
-
-    find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
-}
diff --git a/libre/virtualbox-parabola-modules/virtualbox-modules.install b/libre/virtualbox-parabola-modules/virtualbox-modules.install
deleted file mode 100644
index b57135999..000000000
--- a/libre/virtualbox-parabola-modules/virtualbox-modules.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-/bin/cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-    EXTRAMODULES='extramodules-3.1-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.1-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.1-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install b/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install
deleted file mode 100644
index 8801d8c49..000000000
--- a/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-    EXTRAMODULES='extramodules-3.1-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.1-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.1-LIBRE'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/multilib-staging/lib32-glib2/PKGBUILD b/multilib-staging/lib32-glib2/PKGBUILD
deleted file mode 100644
index a0281ebac..000000000
--- a/multilib-staging/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 63935 2012-02-07 13:32:04Z bluewind $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.30.2
-pkgrel=3
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
-makedepends=('gcc-multilib' python2)
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0}
-}
diff --git a/multilib-staging/lib32-pcre/PKGBUILD b/multilib-staging/lib32-pcre/PKGBUILD
deleted file mode 100644
index 3f91b0772..000000000
--- a/multilib-staging/lib32-pcre/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 63933 2012-02-07 13:23:22Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=pcre
-pkgname=lib32-$_pkgbasename
-pkgver=8.30
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
-arch=('x86_64')
-url="http://pcre.sourceforge.net"
-license=('custom')
-depends=('lib32-gcc-libs' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2{,.sig})
-md5sums=('98e8928cccc945d04279581e778fbdff'
-         '01eee0333fa71687e0b6756db77f94ad')
-
-build() {
-  cd "${srcdir}"/${_pkgbasename}-${pkgver}
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-utf8 --enable-unicode-properties --enable-pcre16 --enable-jit
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
deleted file mode 100644
index a97194d77..000000000
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,314 +0,0 @@
-# $Id: PKGBUILD 63451 2012-02-03 23:52:06Z allan $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.6.2
-pkgrel=7
-_snapshot=4.6-20120120
-_libstdcppmanver=20111215
-pkgdesc="The GNU Compiler Collection for multilib"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
-             'lib32-glibc>=2.14')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-	gcc_pure64-multilib.patch
-	gcc-hash-style-both.patch
-        gcc-4.6.2-cloog-0.17.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
-         '450772ce32daed97d7383199f8797f33'
-         '7da5b7ab75b3c29993f953b18bc38579'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         '6d9939a2e667376031679ac9f9c49263')
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  patch -Np1 -i ${srcdir}/gcc_pure64-multilib.patch
-  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  # compatibility with latest cloog
-  patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --enable-multilib --disable-libssp \
-      --enable-checking=release --with-fpmath=sse
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
-  provides=("gcc-libs=$pkgver-$pkgrel")
-  conflicts=('gcc-libs')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove stuff in lib32-gcc-libs
-  rm -rf ${pkgdir}/usr/lib32
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
-  depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm ${pkgdir}/usr/lib32/libgfortran.spec
-
-  # remove stuff in gcc-libs-multilib
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/info
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
-  depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl')
-  groups=('multilib-devel')
-  provides=("gcc=$pkgver-$pkgrel")
-  conflicts=('gcc')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib{,32}/*.so*
-  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib{,32}/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # install gengtype for plugin support
-  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
-  # plugin headers are all over the place at the moment...
-  for i in common objc pragma pretty-print; do
-    ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
-  done
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran-multilib()
-{
-  pkgdesc="Fortran front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-fortran=$pkgver-$pkgrel")
-  conflicts=('gcc-fortran')
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
-  pkgdesc="Objective-C front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-objc=$pkgver-$pkgrel")
-  conflicts=('gcc-objc')
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
-  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-ada=$pkgver-$pkgrel")
-  conflicts=('gcc-ada')
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  cd ../$CHOST/32/libada
-  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
-    INSTALL_DATA="install -m644" install-gnatlib
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
-  pkgdesc="Go front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-go=$pkgver-$pkgrel")
-  conflicts=('gcc-go')
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-testing/gcc-multilib/gcc-4.6.2-cloog-0.17.patch b/multilib-testing/gcc-multilib/gcc-4.6.2-cloog-0.17.patch
deleted file mode 100644
index 0503a05ed..000000000
--- a/multilib-testing/gcc-multilib/gcc-4.6.2-cloog-0.17.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
-diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
-+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
-@@ -1367,7 +1367,7 @@
-   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
-      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
-      we pass an incomplete program to cloog.  */
--  options->language = LANGUAGE_C;
-+  options->language = CLOOG_LANGUAGE_C;
- 
-   /* Enable complex equality spreading: removes dummy statements
-      (assignments) in the generated code which repeats the
diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-testing/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-testing/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-testing/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-testing/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-testing/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch b/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
deleted file mode 100644
index 73df6b873..000000000
--- a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h
---- gcc-4.6-20111223/gcc/config/i386/linux64.h	2011-09-08 11:12:35.000000000 +0200
-+++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h	2012-01-14 19:52:33.688573352 +0100
-@@ -63,7 +63,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64
---- gcc-4.6-20111223/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64	2012-01-14 19:50:27.346242617 +0100
-@@ -25,7 +25,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib-testing/lib32-cairo/PKGBUILD b/multilib-testing/lib32-cairo/PKGBUILD
deleted file mode 100644
index 5c4f291a3..000000000
--- a/multilib-testing/lib32-cairo/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63333 2012-01-30 19:30:30Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.10.2
-pkgrel=3
-pkgdesc="Cairo vector graphics library (32-bit)"
-arch=('x86_64')
-url="http://cairographics.org/"
-license=('LGPL' 'MPL')
-depends=('lib32-libpng' 'lib32-libxrender' 'lib32-fontconfig'
-         'lib32-pixman' 'lib32-glib2' ${_pkgbasename})
-makedepends=('gcc-multilib')
-source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-      --sysconfdir=/etc  --localstatedir=/var \
-      --disable-static --enable-tee
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

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

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

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

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

-      */

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

-     display->buggy_gradients = TRUE;

--#else

--    display->buggy_gradients = FALSE;

--#endif

-     display->buggy_pad_reflect = FALSE;

-     display->buggy_repeat = FALSE;

diff --git a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD b/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index 28b102d55..000000000
--- a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 91063 2010-09-21 19:21:24Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=gdk-pixbuf2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.1
-pkgrel=2
-pkgdesc="An image loading library (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11
-         $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool' '!docs')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  ./configure --prefix=/usr  --libdir=/usr/lib32 \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32
-  rm gdk-pixbuf-csource
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 92d58ef04..000000000
--- a/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD
deleted file mode 100644
index 7faf625b3..000000000
--- a/multilib-testing/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 64115 2012-02-08 23:58:50Z allan $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.30.2
-pkgrel=3
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
-makedepends=('gcc-multilib' python2)
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0}
-}
diff --git a/multilib-testing/lib32-libcanberra/PKGBUILD b/multilib-testing/lib32-libcanberra/PKGBUILD
deleted file mode 100644
index c9bb0e0ce..000000000
--- a/multilib-testing/lib32-libcanberra/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 63335 2012-01-30 19:30:40Z ibiru $
-# Maintainer: Florian Pritz <flo@xssn.at>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libcanberra
-pkgbase=lib32-$_pkgbasename
-pkgname=(lib32-libcanberra lib32-libcanberra-pulse)
-pkgver=0.28
-pkgrel=2
-pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)"
-arch=(x86_64)
-license=('LGPL')
-depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb'
-         $_pkgbasename)
-makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib)
-options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=("$url/$_pkgbasename-$pkgver.tar.gz")
-md5sums=('c198b4811598c4c161ff505e4531b02c')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-      --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \
-      --libdir=/usr/lib32
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_lib32-libcanberra() {
-  optdepends=("$pkgbase-pulse: PulseAudio driver")
-
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la"
-  rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la
-
-
-  # Split libcanberra-pulse
-  mkdir pulse-plugin
-  mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin
-
-  rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}}
-}
-
-package_lib32-libcanberra-pulse() {
-  pkgdesc="PulseAudio plugin for libcanberra (32-bit)"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse')
-
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" 
-}
diff --git a/multilib-testing/lib32-libcups/PKGBUILD b/multilib-testing/lib32-libcups/PKGBUILD
deleted file mode 100644
index 7b0456700..000000000
--- a/multilib-testing/lib32-libcups/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 63336 2012-01-30 19:30:45Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-_pkgbasename=libcups
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.0
-pkgrel=2
-pkgdesc="The CUPS Printing System - client libraries (32-bit)"
-arch=('x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename)
-makedepends=(gcc-multilib)
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2)
-md5sums=('e54ed09ede2340fc3014913333520fe4')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/cups-${pkgver}
-  
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \
-     --enable-ssl=no --disable-gnutls --enable-threads \
-     --with-optim="$CFLAGS" --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/cups-${pkgver}
-  make BUILDROOT=${pkgdir} install-libs
-}
-
diff --git a/multilib-testing/lib32-libglade/PKGBUILD b/multilib-testing/lib32-libglade/PKGBUILD
deleted file mode 100644
index ebea314ea..000000000
--- a/multilib-testing/lib32-libglade/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: TryA <tryagainprod {at} gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libglade
-pkgname=lib32-libglade
-pkgver=2.6.4
-pkgrel=5
-pkgdesc="Allows you to load glade interface files in a program at runtime (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-gtk2' 'lib32-libxml2' "${_pkgbasename}")
-makedepends=('python2' 'pkgconfig' 'gcc-multilib')
-options=('!libtool')
-source=("http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/2.6/${_pkgbasename}-${pkgver}.tar.bz2"
-        'libglade-2.0.1-nowarning.patch')
-url='http://www.gnome.org'
-md5sums=('d1776b40f4e166b5e9c107f1c8fe4139'
-         '4f879c0ce550004905aa0fb24f25c353')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd "${srcdir}/${_pkgbasename}-${pkgver}"
-	patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch"
-	PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var --libdir=/usr/lib32
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgbasename}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	rm -rf ${pkgdir}/usr/{bin,include,share}
-}
diff --git a/multilib-testing/lib32-libglade/libglade-2.0.1-nowarning.patch b/multilib-testing/lib32-libglade/libglade-2.0.1-nowarning.patch
deleted file mode 100644
index fd071215f..000000000
--- a/multilib-testing/lib32-libglade/libglade-2.0.1-nowarning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libglade-2.0.1/glade/glade-gtk.c.nowarning	2003-08-29 14:50:10.000000000 -0400
-+++ libglade-2.0.1/glade/glade-gtk.c	2003-08-29 14:58:41.000000000 -0400
-@@ -639,9 +639,8 @@
- 		if (!strcmp (childinfo->properties[j].name, "label")) {
- 		    label = childinfo->properties[j].value;
- 		    break;
--		} else {
--		    g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
- 		}
-+		/* Ignore all other properties */
- 	    }
- 
- 	    if (label) {
-@@ -683,6 +682,7 @@
- 	    char *icon = NULL;
- 	    gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
- 	    gboolean use_underline = FALSE;
-+	    gboolean sensitive = TRUE;
- 	    GtkWidget *iconw = NULL;
- 	    int j;
- 
-@@ -708,6 +708,8 @@
- 		    group_name = value;
- 		} else if (!strcmp (name, "new_group")) {
- 		    new_group = BOOL (value);
-+		} else if (!strcmp (name, "sensitive")) {
-+		    sensitive = BOOL (value);
- 		} else if (!strcmp (name, "visible")) {
- 		    /* ignore for now */
- 		} else if (!strcmp (name, "tooltip")) {
-@@ -785,6 +787,8 @@
- 		gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
- 					     TRUE);
- 	    }
-+	    
-+	    gtk_widget_set_sensitive (child, sensitive);
- 
- 	    glade_xml_set_common_params (xml, child, childinfo->child);
- 	} else {
diff --git a/multilib-testing/lib32-libpng/PKGBUILD b/multilib-testing/lib32-libpng/PKGBUILD
deleted file mode 100644
index a435c516a..000000000
--- a/multilib-testing/lib32-libpng/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 63343 2012-01-30 19:40:53Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Travis Willard <travis@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-_pkgbasename=libpng
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.7
-_apngver=1.5.7
-pkgrel=1
-pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)"
-arch=('x86_64')
-url="http://www.libpng.org/pub/png/libpng.html"
-license=('custom')
-depends=('lib32-zlib' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz")
-md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d'
-         '6c6a674048cec94db1bc35decf0d142c')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libtiff/PKGBUILD b/multilib-testing/lib32-libtiff/PKGBUILD
deleted file mode 100644
index 2e3e109e7..000000000
--- a/multilib-testing/lib32-libtiff/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 63338 2012-01-30 19:30:53Z ibiru $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-_pkgbasename=libtiff
-pkgname=lib32-$_pkgbasename
-pkgver=4.0.0
-pkgrel=1
-pkgdesc="Library for manipulation of TIFF images (32-bit)"
-arch=('x86_64')
-url="http://www.remotesensing.org/libtiff/"
-license=('custom')
-depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/tiff-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32
-  make
-}
-
-check() {
- cd "${srcdir}/tiff-${pkgver}"
- make check
-}
-
-package() {
-  cd "${srcdir}/tiff-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib-testing/lib32-libtiff/libtiff-CVE-2009-2285.patch
deleted file mode 100644
index 435a84b53..000000000
--- a/multilib-testing/lib32-libtiff/libtiff-CVE-2009-2285.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: tiff-3.8.2/libtiff/tif_lzw.c
-===================================================================
---- tiff-3.8.2.orig/libtiff/tif_lzw.c
-+++ tiff-3.8.2/libtiff/tif_lzw.c
-@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
- 			NextCode(tif, sp, bp, code, GetNextCode);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);
-@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- 			NextCode(tif, sp, bp, code, GetNextCodeCompat);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);
diff --git a/multilib-testing/lib32-pango/PKGBUILD b/multilib-testing/lib32-pango/PKGBUILD
deleted file mode 100644
index 04cb097c6..000000000
--- a/multilib-testing/lib32-pango/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 63339 2012-01-30 19:30:57Z ibiru $
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-# Maintainer: Biru Ionut <ionut@archlinux.ro>
-_pkgbasename=pango
-pkgname=lib32-$_pkgbasename
-pkgver=1.29.4
-pkgrel=3
-pkgdesc="A library for layout and rendering of text (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-glib2>=2.25.15' 'lib32-cairo>=1.10.0' 'lib32-libxft>=2.1.14'
-         'lib32-freetype2>=2.4.2' $_pkgbasename)
-makedepends=("gcc-multilib")
-options=('!libtool' '!emptydirs')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.29/${_pkgbasename}-${pkgver}.tar.xz
-        pango-modules-conffile.patch)
-url="http://www.pango.org/"
-sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f'
-            '4a178b60dd420ae53baeabbecfaaeca4070a4b777b2b3f36d137cd70b5a270c3')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -p0 < ${srcdir}/pango-modules-conffile.patch
-  # No libthai support yet
-  ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc \
-      --with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc \
-      --disable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "$pkgdir"/etc
-  rm -rf "$pkgdir"/usr/{bin/pango-view,share,include}
-  mv "$pkgdir"/usr/bin/pango-querymodules "$pkgdir"/usr/bin/pango-querymodules-32
-}
diff --git a/multilib-testing/lib32-pango/pango-modules-conffile.patch b/multilib-testing/lib32-pango/pango-modules-conffile.patch
deleted file mode 100644
index a959cf1c8..000000000
--- a/multilib-testing/lib32-pango/pango-modules-conffile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pango/modules.c.orig	2010-08-26 06:45:49.329259966 +0200
-+++ pango/modules.c	2010-08-26 06:46:13.786685177 +0200
-@@ -529,7 +529,7 @@
- 
-   if (!file_str)
-     file_str = g_build_filename (pango_get_sysconf_subdirectory (),
--				 "pango.modules",
-+				 "pango.modules-32",
- 				 NULL);
- 
-   files = pango_split_file_list (file_str);
-@@ -640,7 +640,7 @@
-       if (!no_module_warning)
- 	{
- 	  gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (),
--					      "pango.modules",
-+					      "pango.modules-32",
- 					      NULL);
- 	  g_critical ("No modules found:\n"
- 		      "No builtin or dynamically loaded modules were found.\n"
diff --git a/multilib-testing/lib32-pango/pango.install b/multilib-testing/lib32-pango/pango.install
deleted file mode 100644
index 173b6820f..000000000
--- a/multilib-testing/lib32-pango/pango.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	usr/bin/pango-querymodules-32 >etc/pango/pango.modules-32
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [ -f etc/pango/pango.modules-32 ]; then
-		rm etc/pango/pango.modules-32
-	fi
-	post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-	rm etc/pango/pango.modules-32
-}
diff --git a/multilib-testing/lib32-pcre/PKGBUILD b/multilib-testing/lib32-pcre/PKGBUILD
deleted file mode 100644
index 07a17c6f5..000000000
--- a/multilib-testing/lib32-pcre/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 64116 2012-02-08 23:58:52Z allan $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=pcre
-pkgname=lib32-$_pkgbasename
-pkgver=8.30
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
-arch=('x86_64')
-url="http://pcre.sourceforge.net"
-license=('custom')
-depends=('lib32-gcc-libs' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2{,.sig})
-md5sums=('98e8928cccc945d04279581e778fbdff'
-         '01eee0333fa71687e0b6756db77f94ad')
-
-build() {
-  cd "${srcdir}"/${_pkgbasename}-${pkgver}
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-utf8 --enable-unicode-properties --enable-pcre16 --enable-jit
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-qt/PKGBUILD b/multilib-testing/lib32-qt/PKGBUILD
deleted file mode 100644
index 4cbc5b7a4..000000000
--- a/multilib-testing/lib32-qt/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 63340 2012-01-30 19:30:59Z ibiru $
-# Maintainer: Florian Pritz <flo@xssn.at>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=qt
-pkgname=lib32-$_pkgbasename
-pkgver=4.8.0
-pkgrel=2
-pkgdesc='A cross-platform application and UI framework (32-bit)'
-arch=('x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl}
-         lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename)
-optdepends=('lib32-libxinerama: Xinerama support'
-            'lib32-libxcursor: Xcursor support'
-            'lib32-libxfixes: Xfixes support')
-makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2})
-options=('!libtool')
-_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}"
-source=("ftp://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz")
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904')
-
-build() {
-  cd $srcdir/$_pkgfqn
-
-  export QT4DIR=$srcdir/$_pkgfqn
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  # some of those are likely unnecessary, but I'm too lazy to find and remove them
-  sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf
-  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf
-  sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/gcc-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS} -m32|g" mkspecs/common/gcc-base.conf
-  sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf
-  sed -e "s|-O2|$CXXFLAGS -m32|" \
-      -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
-      -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \
-      -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \
-      -i mkspecs/common/g++.conf
-
-  ./configure -confirm-license -opensource -v -platform linux-g++-32 \
-    -prefix /usr \
-    -libdir /usr/lib32 \
-    -plugindir /usr/lib32/qt/plugins \
-    -importdir /usr/lib32/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc \
-    -system-sqlite \
-    -no-phonon \
-    -no-phonon-backend \
-    -no-webkit \
-    -graphicssystem raster \
-    -openssl-linked \
-    -nomake demos \
-    -nomake examples \
-    -nomake docs \
-    -nomake tools \
-    -optimized-qmake \
-    -no-rpath \
-    -dbus-linked \
-    -reduce-relocations \
-    -no-openvg
-
-  make
-}
-
-package() {
-  cd $srcdir/$_pkgfqn
-  make INSTALL_ROOT=$pkgdir install
-
-  # Fix wrong path in pkgconfig files
-  find ${pkgdir}/usr/lib32/pkgconfig -type f -name '*.pc' \
-    -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-  # Fix wrong path in prl files
-  find ${pkgdir}/usr/lib32 -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-sdl_image/PKGBUILD b/multilib-testing/lib32-sdl_image/PKGBUILD
deleted file mode 100644
index 590ee7fa1..000000000
--- a/multilib-testing/lib32-sdl_image/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63466 2012-02-04 12:21:40Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-_pkgbasename=sdl_image
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.12
-pkgrel=2
-pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)"
-arch=('x86_64')
-url="http://www.libsdl.org/projects/SDL_image/"
-license=('LGPL')
-depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' "$_pkgbasename")
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz)
-md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
-
-build() {
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  cd ${srcdir}/SDL_image-${pkgver}
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL_image-${pkgver}
-
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/include
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/multilib-testing/wine/PKGBUILD b/multilib-testing/wine/PKGBUILD
deleted file mode 100644
index c2bae4193..000000000
--- a/multilib-testing/wine/PKGBUILD
+++ /dev/null
@@ -1,147 +0,0 @@
-# $Id: PKGBUILD 63445 2012-02-03 17:46:42Z bluewind $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=wine
-pkgver=1.4rc2
-pkgrel=2
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('41e1a9c293cfab5e8ada6e908eebf534')
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-arch=(i686 x86_64)
-license=(LGPL)
-install=wine.install
-
-depends=(
-  fontconfig      lib32-fontconfig
-  mesa            lib32-mesa 
-  libxcursor      lib32-libxcursor
-  libxrandr       lib32-libxrandr
-  libxdamage      lib32-libxdamage
-  libxi           lib32-libxi
-  gettext         lib32-gettext
-  desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
-  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  gnutls          lib32-gnutls
-  libxinerama     lib32-libxinerama
-  libxcomposite   lib32-libxcomposite
-  libxmu          lib32-libxmu
-  libxxf86vm      lib32-libxxf86vm
-  libxml2         lib32-libxml2
-  libldap         lib32-libldap
-  lcms            lib32-lcms
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  alsa-lib        lib32-alsa-lib
-  oss
-)
-  
-optdepends=(
-  giflib          lib32-giflib
-  libpng          lib32-libpng
-  libldap         lib32-libldap
-  gnutls          lib32-gnutls
-  lcms            lib32-lcms
-  libxml2         lib32-libxml2
-  mpg123          lib32-mpg123
-  openal          lib32-openal
-  v4l-utils       lib32-v4l-utils
-  libpulse        lib32-libpulse
-  alsa-plugins    lib32-alsa-plugins
-  alsa-lib        lib32-alsa-lib
-  oss             cups
-)
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-else
-  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
-  conflicts=('bin32-wine' 'wine-wow64')
-  replaces=('bin32-wine')
-fi
-
-build() {
-  cd "$srcdir"
-
-  # Allow ccache to work
-  mv $pkgname-$_pkgbasever $pkgname
-
-  # Get rid of old build dirs
-  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-32-build
-
-  # These additional CFLAGS solve FS#27662
-  export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-  export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
-
-  if [[ $CARCH == x86_64 ]]; then
-    msg2 "Building Wine-64..."
-
-    mkdir $pkgname-64-build
-    cd "$srcdir/$pkgname-64-build"
-    ../$pkgname/configure \
-      --prefix=/usr \
-      --sysconfdir=/etc \
-      --libdir=/usr/lib \
-      --with-x \
-      --enable-win64
-
-    make
-
-    _wine32opts=(
-      --libdir=/usr/lib32
-      --with-wine64="$srcdir/$pkgname-64-build"
-    )
-
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  msg2 "Building Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-x \
-    "${_wine32opts[@]}"
-
-  # These additional CFLAGS solve FS#27560
-  make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign"
-}
-
-package() {
-  msg2 "Packaging Wine-32..."
-  cd "$srcdir/$pkgname-32-build"
-
-  if [[ $CARCH == i686 ]]; then
-    make prefix="$pkgdir/usr" install
-  else
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib32" \
-      dlldir="$pkgdir/usr/lib32/wine" install
-
-    msg2 "Packaging Wine-64..."
-    cd "$srcdir/$pkgname-64-build"
-    make prefix="$pkgdir/usr" \
-      libdir="$pkgdir/usr/lib" \
-      dlldir="$pkgdir/usr/lib/wine" install
-  fi
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/multilib-testing/wine/wine.install b/multilib-testing/wine/wine.install
deleted file mode 100644
index 0548b7ffd..000000000
--- a/multilib-testing/wine/wine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	#echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
-	#echo "If you are on x86_64, the default WINEARCH will be win64."
-	#echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
-	#echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
-	#echo "See the Arch wiki on wine for more information."
-}
-
-post_remove() {
-	update-desktop-database -q
-}
diff --git a/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch b/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch
deleted file mode 100644
index 7f1f5b8f2..000000000
--- a/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strcasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strncasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
- 
- 
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
- 	.type STRCMP_SSE2, @function; \
diff --git a/multilib/lib32-kmod/PKGBUILD b/multilib/lib32-kmod/PKGBUILD
deleted file mode 100644
index 5f860b7b3..000000000
--- a/multilib/lib32-kmod/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 146696 2012-01-16 19:19:14Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=lib32-kmod
-_pkgbasename=kmod
-pkgver=4
-pkgrel=1
-pkgdesc="Linux kernel module handling"
-arch=('x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
-license=('GPL2')
-depends=('lib32-glibc' 'lib32-zlib' "$_pkgbasename")
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=("http://packages.profusion.mobi/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz")
-md5sums=('e14450a066a48accd0af1995b3c0232d')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure \
-    --libdir=/usr/lib32 \
-    --sysconfdir=/etc \
-    --disable-tools \
-    --with-rootprefix= \
-    --with-zlib
-
-  make
-}
-
-package() {
-  make -C "$_pkgbasename-$pkgver" DESTDIR="$pkgdir" install
-
-  # nuke manpages and headers
-  rm -rf "$pkgdir"/usr/{share,include,bin}
-}
-
-# vim: ft=sh syn=sh et
diff --git a/multilib/lib32-libusb-compat/PKGBUILD b/multilib/lib32-libusb-compat/PKGBUILD
deleted file mode 100644
index d6d74d770..000000000
--- a/multilib/lib32-libusb-compat/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 58048 2011-11-05 19:41:45Z lcarlier $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: arjan <arjan@archlinux.org>
-
-pkgname=lib32-libusb-compat
-pkgver=0.1.3
-pkgrel=2
-pkgdesc="Library to enable user space application programs to communicate with USB devices"
-arch=('x86_64')
-depends=('lib32-libusb' 'libusb-compat')
-makedepends=('gcc-multilib')
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/libusb-compat-$pkgver/libusb-compat-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb')
-
-build() {
-  cd ${srcdir}/libusb-compat-${pkgver}
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/libusb-compat-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{bin,include}
-}
diff --git a/multilib/lib32-libusb/PKGBUILD b/multilib/lib32-libusb/PKGBUILD
deleted file mode 100644
index 69498b604..000000000
--- a/multilib/lib32-libusb/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 58046 2011-11-05 19:39:36Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=lib32-libusb
-pkgver=1.0.8
-pkgrel=2
-pkgdesc="Library to enable user space application programs to communicate with USB devices. (32-bit)"
-arch=('x86_64')
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-depends=('lib32-glibc' 'libusb')
-makedepends=('gcc-multilib')
-source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2)
-options=(!libtool)
-md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef')
-
-build() {
-  cd "${srcdir}/libusb-${pkgver}"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-
-  make
-}
-
-package () {
-  cd "${srcdir}/libusb-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf ${pkgdir}/usr/include
-}
-
diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD
deleted file mode 100644
index 562c1c471..000000000
--- a/multilib/lib32-udev/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63389 2012-02-01 05:09:50Z lcarlier $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=('lib32-udev')
-pkgver=180
-pkgrel=1
-arch=('x86_64')
-pkgdesc="The userspace dev tools (udev) (32-bit)"
-url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-license=('GPL')
-options=(!makeflags !libtool)
-depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev')
-makedepends=('gcc-multilib' 'gperf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz)
-md5sums=('1cf124ab5a124ea35d4748ea414926ec')
-
-build() {
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $srcdir/udev-$pkgver
-
-  ./configure --libdir=/usr/lib32 --disable-introspection
-  make
-}
-  
-package() {
-  
-  cd $srcdir/udev-$pkgver
-
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share}
-  rm -rf ${pkgdir}/usr/lib32/girepository*
-}
diff --git a/staging/apache/PKGBUILD b/staging/apache/PKGBUILD
deleted file mode 100644
index fc316a865..000000000
--- a/staging/apache/PKGBUILD
+++ /dev/null
@@ -1,150 +0,0 @@
-# $Id: PKGBUILD 149226 2012-02-06 14:01:05Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=apache
-pkgver=2.2.22
-pkgrel=1
-pkgdesc='A high performance Unix-based HTTP server'
-arch=('i686' 'x86_64')
-options=('!libtool')
-url='http://www.apache.org/dist/httpd'
-license=('APACHE')
-backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
-        etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
-        etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
-        etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
-        etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre')
-optdepends=('lynx: apachectl status')
-_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
-        http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
-        ${_itkurl}/02-rename-prefork-to-itk.patch
-        ${_itkurl}/03-add-mpm-to-build-system.patch
-        ${_itkurl}/04-correct-output-makefile-location.patch
-        ${_itkurl}/05-add-copyright.patch
-        ${_itkurl}/06-hook-just-after-merging-perdir-config.patch
-        ${_itkurl}/07-base-functionality.patch
-        ${_itkurl}/08-max-clients-per-vhost.patch
-        ${_itkurl}/09-capabilities.patch
-        ${_itkurl}/10-nice.patch
-        ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
-        apachectl-confd.patch
-        apache.conf.d
-        httpd.logrotate
-        httpd
-        arch.layout
-        pcre_info.patch)
-md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
-         '41b3a6e4948679cab70b9caf490877c4'
-         'f1d9d41360908ceb2374da55ae99197a'
-         'cdfa04985a0efa850976aef01c2a0c40'
-         '0930d2d0612eb0a53a0d00aea7e8687f'
-         '3a0c29bb91442c33ea73ebbe072af922'
-         '0ef4729a6f1ffc848ad0e9b440a66f66'
-         '940944caa948340b11ddae56adaef89b'
-         'ce09a987523884de8838f73dc8ec0d19'
-         'e75b7dd8d8afcd299ba4ab2ab81c11e4'
-         'ce1ccc21f3ad8625169c8f62913450ac'
-         '1e5b222edcfbf99a3edc56fcb2074fbe'
-         '4ac64df6e019edbe137017cba1ff2f51'
-         '08b3c875f6260644f2f52b4056d656b0'
-         '6382331e9700ed9e8cc78ea51887b537'
-         'c7e300a287ef7e2e066ac7639536f87e'
-         '3d659d41276ba3bfcb20c231eb254e0c'
-         'f74652f3169baaae595026116ef54599')
-
-build() {
-	cd "${srcdir}/httpd-${pkgver}"
-
-	patch -p1 -i "${srcdir}/pcre_info.patch"
-	patch -Np0 -i "${srcdir}/apachectl-confd.patch"
-
-	# set default user
-	sed -e 's#User daemon#User http#' \
-	    -e 's#Group daemon#Group http#' \
-	    -i docs/conf/httpd.conf.in
-
-	cat "${srcdir}/arch.layout" >> config.layout
-
-	for mpm in prefork worker itk; do
-		if [ "${mpm}" = "itk" ]; then
-                        # Fix patch to apply with latest Apache version
-                        sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
-
-			mkdir -p server/mpm/experimental/itk
-			cp -r server/mpm/prefork/* server/mpm/experimental/itk/
-			mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
-
-			patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
-			patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
-			patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
-			patch -Np1 -i "${srcdir}/05-add-copyright.patch"
-			patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
-			patch -Np1 -i "${srcdir}/07-base-functionality.patch"
-			patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
-			patch -Np1 -i "${srcdir}/09-capabilities.patch"
-			patch -Np1 -i "${srcdir}/10-nice.patch"
-                        patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
-
-			autoconf
-		fi
-		mkdir build-${mpm}
-		pushd build-${mpm}
-		../configure --enable-layout=Arch \
-			--enable-modules=all \
-			--enable-mods-shared=all \
-			--enable-so \
-			--enable-suexec \
-			--with-suexec-caller=http \
-			--with-suexec-docroot=/srv/http \
-			--with-suexec-logfile=/var/log/httpd/suexec.log \
-			--with-suexec-bin=/usr/sbin/suexec \
-			--with-suexec-uidmin=99 --with-suexec-gidmin=99 \
-			--enable-ldap --enable-authnz-ldap \
-			--enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
-			--enable-ssl --with-ssl \
-			--enable-deflate --enable-cgid \
-			--enable-proxy --enable-proxy-connect \
-			--enable-proxy-http --enable-proxy-ftp \
-			--enable-dbd \
-			--with-apr=/usr/bin/apr-1-config \
-			--with-apr-util=/usr/bin/apu-1-config \
-			--with-pcre=/usr \
-			--with-mpm=${mpm}
-		make
-		if [ "${mpm}" = "prefork" ]; then
-			make DESTDIR="${pkgdir}" install
-		else
-			install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}"
-		fi
-		popd
-	done
-
-	install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd"
-	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
-	install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache"
-
-	# symlinks for /etc/httpd
-	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
-	ln -fs /var/run/httpd "${pkgdir}/etc/httpd/run"
-	ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
-	ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
-
-	# set sane defaults
-	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
-	    -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
-	    -i "${pkgdir}/etc/httpd/conf/httpd.conf"
-
-	# cleanup
-	rm -rf "${pkgdir}/usr/share/httpd/manual"
-	rm -rf "${pkgdir}/etc/httpd/conf/original"
-	rm -rf "${pkgdir}/srv/"
-	rm -rf "${pkgdir}/usr/bin"
-}
diff --git a/staging/apache/apache.conf.d b/staging/apache/apache.conf.d
deleted file mode 100644
index c6d0ebf52..000000000
--- a/staging/apache/apache.conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration file for the httpd service.
-
-#
-# The default processing model (MPM) is the process-based
-# 'prefork' model. A thread-based model, 'worker', is also
-# available, but does not work with some modules (such as PHP).
-# The service must be stopped before changing this variable.
-#
-#HTTPD=/usr/sbin/httpd.worker
-
-#
-# To pass additional options (for instance, -D definitions) to the
-# httpd binary at startup, set OPTIONS here.
-#
-#OPTIONS=
diff --git a/staging/apache/apachectl-confd.patch b/staging/apache/apachectl-confd.patch
deleted file mode 100644
index d0f4b699e..000000000
--- a/staging/apache/apachectl-confd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- support/apachectl.in.orig	2010-03-06 18:09:11.000000000 +0100
-+++ support/apachectl.in	2010-03-06 18:12:31.000000000 +0100
-@@ -56,6 +56,12 @@
- # the URL to your server's mod_status status page.  If you do not
- # have one, then status and fullstatus will not work.
- STATUSURL="http://localhost:@PORT@/server-status"
-+
-+# Source /etc/conf.d/apache for $HTTPD setting, etc.
-+if [ -r /etc/conf.d/apache ]; then
-+    . /etc/conf.d/apache
-+fi
-+
- #
- # Set this variable to a command that increases the maximum
- # number of file descriptors allowed per child process. This is
diff --git a/staging/apache/arch.layout b/staging/apache/arch.layout
deleted file mode 100644
index ab59db84b..000000000
--- a/staging/apache/arch.layout
+++ /dev/null
@@ -1,22 +0,0 @@
-<Layout Arch>
-	prefix:          /etc/httpd
-	exec_prefix:     /usr
-	bindir:          /usr/bin
-	sbindir:         /usr/sbin
-	libdir:          /usr/lib/httpd
-	libexecdir:      /usr/lib/httpd/modules
-	mandir:          /usr/share/man
-	sysconfdir:      /etc/httpd/conf
-	datadir:         /usr/share/httpd
-	installbuilddir: /usr/lib/httpd/build
-	errordir:        /usr/share/httpd/error
-	iconsdir:        /usr/share/httpd/icons
-	htdocsdir:       /srv/http
-	manualdir:       /usr/share/httpd/manual
-	cgidir:          /srv/http/cgi-bin
-	includedir:      /usr/include/httpd
-	localstatedir:   /var
-	runtimedir:      /var/run/httpd
-	logfiledir:      /var/log/httpd
-	proxycachedir:   /var/cache/httpd
-</Layout>
\ No newline at end of file
diff --git a/staging/apache/httpd b/staging/apache/httpd
deleted file mode 100755
index 6fa9c3cc7..000000000
--- a/staging/apache/httpd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=httpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-APACHECTL=/usr/sbin/apachectl
-
-case "$1" in
-  start)
-    stat_busy "Starting Apache Web Server"
-    [ ! -d /var/run/httpd ] && install -d /var/run/httpd
-    if $APACHECTL start >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Apache Web Server"
-    if $APACHECTL stop >/dev/null ; then
-      rm_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  reload)
-    stat_busy "Reloading Apache Web Server"
-    if $APACHECTL graceful >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    stat_busy "Restarting Apache Web Server"
-    if $APACHECTL restart >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  status)
-    stat_busy "Checking Apache Web Server status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/staging/apache/httpd.logrotate b/staging/apache/httpd.logrotate
deleted file mode 100644
index a723d20d2..000000000
--- a/staging/apache/httpd.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/httpd/*log {
-   missingok
-   postrotate
-      /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
-   endscript
-}
diff --git a/staging/apache/pcre_info.patch b/staging/apache/pcre_info.patch
deleted file mode 100644
index f1774db63..000000000
--- a/staging/apache/pcre_info.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- httpd-2.2.22/server/util_pcre.c	2005-11-11 01:20:05.000000000 +1000
-+++ httpd-2.2.22/server/util_pcre.c	2012-02-06 23:45:37.687946748 +1000
-@@ -137,7 +137,7 @@
- 
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
- 
--preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
-+preg->re_nsub = pcre_fullinfo((const pcre *)preg->re_pcre, NULL, NULL, NULL);
- return 0;
- }
- 
diff --git a/staging/apr/PKGBUILD b/staging/apr/PKGBUILD
deleted file mode 100644
index e724d1e33..000000000
--- a/staging/apr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 149224 2012-02-06 13:52:26Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=apr
-pkgver=1.4.5
-pkgrel=2
-pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
-url="http://apr.apache.org/"
-depends=('util-linux-ng>=2.16')
-options=('!libtool')
-license=('APACHE')
-source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('8b53f5a5669d0597f2da889a2f576eb6')
-
-build() {
-  cd "${srcdir}/apr-${pkgver}"
-  export apr_cv_accept4=no
-
-  ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
-    --with-installbuilddir=/usr/share/apr-1/build \
-    --enable-nonportable-atomics \
-    --with-devrandom=/dev/urandom
-  make
-}
-
-check() {
-  cd "${srcdir}/apr-${pkgver}"
-  make -j1 check
-}
-
-package() {
-  cd "${srcdir}/apr-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/ettercap/PKGBUILD b/staging/ettercap/PKGBUILD
deleted file mode 100644
index 656311dc9..000000000
--- a/staging/ettercap/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 149171 2012-02-06 04:26:56Z allan $
-# Maintainer:
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=ettercap
-pkgname=('ettercap' 'ettercap-gtk')
-pkgver=NG_0.7.4.2
-_origver=${pkgver/_/-}
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://ettercap.sourceforge.net/"
-license=('GPL')
-makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz")
-md5sums=('ab2354bf9c91195f06ad0b5d058565a4')
-
-build() {
-  cd "${srcdir}"
-  sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop
-
-  cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
-
-  cd ${pkgbase}-${_origver}
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --disable-gtk
-  make
-
-  cd ../${pkgbase}-${_origver}-gtk
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --enable-gtk
-  make
-}
-
-package_ettercap() {
-  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
-  backup=('etc/etter.conf')
-
-  cd "${srcdir}"/${pkgbase}-${_origver}
-  make DESTDIR="${pkgdir}" install
-}
-
-package_ettercap-gtk() {
-  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
-  depends=('ettercap' 'gtk2' 'hicolor-icon-theme')
-  optdepends=('gksu: to run ettercap from the menu')
-  install=ettercap-gtk.install
-
-  cd "${srcdir}"/${pkgbase}-${_origver}-gtk
-  install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
-  install -Dm644 desktop/ettercap.desktop \
-    "${pkgdir}"/usr/share/applications/ettercap.desktop
-  install -Dm644 share/ettercap.png \
-    "${pkgdir}"/usr/share/ettercap/ettercap.png
-  install -Dm644 desktop/ettercap.xpm \
-    "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm
-  install -Dm644 desktop/ettercap.svg \
-    "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg
-}
diff --git a/staging/ettercap/ettercap-gtk.install b/staging/ettercap/ettercap-gtk.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/staging/ettercap/ettercap-gtk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/git/ChangeLog b/staging/git/ChangeLog
deleted file mode 100644
index f0c15233e..000000000
--- a/staging/git/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-Simple version bumps are omitted from the following ChangeLog.
-
-2011-08-16 Dan McGee <dan@archlinux.org>
-	Version 1.7.6.1-1
-	* Enable USE_LIBPCRE for `git grep -P` usage
-
-2011-05-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.5.1-1
-	* Byte compile emacs files (FS#20874)
-	* Respect CFLAGS/LDFLAGS (FS#23963)
-
-2011-04-27 Dan McGee <dan@archlinux.org>
-	Version 1.7.5-1
-	* Add missing optdepends for git send-email (FS#20923)
-
-2011-01-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.3.5-1
-	* More flexible git-daemon RC scripts (FS#20575)
-
-2010-10-01 Allan McRae <allan@archlinux.org>
-	Version 1.7.3.1-2
-	* Python 2/3 rebuild
-
-2010-06-29 Dan McGee <dan@archlinux.org>
-	Version 1.7.1.1-1
-	* Add emacs completion files (FS#17968)
-	* Add git-daemon RC scripts (FS#19291)
-
-2009-06-05 Dan McGee <dan@archlinux.org>
-	Version 1.6.3.2-1
-	* Remove gitweb from /usr/share; it needs customization to be helpful
-	* Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683)
-
-2008-09-14 Dan McGee <dan@archlinux.org>
-	Version 1.6.0.2-1
-	* Moved optional depends from install file to optdepends array
-
-2008-06-15 Dan McGee <dan@archlinux.org>
-	Version 1.5.6-1
-	* Removed 'cpio' dependency, clone is now a builtin and no longer needs it
-
-2008-02-02 Dan McGee <dan@archlinux.org>
-	Version 1.5.4-1
-	* Upstream version 1.5.4
-	* Enable pthreads support in pack-objects. To use, set the pack.threads
-	  git config option. Read manpages of pack-objects and config for more
-	  details.
-	* Changelog added (with entries going back a bit).
-
-2008-01-28 Kevin Piche <kevin@archlinux.org>
-	Version 1.5.3.7-2
-	* Updated for new perl policy (vendor dirs)
-	* Change license to GPL2
-
-2007-11-01 Eric Belanger <eric@archlinux.org>
-	Version 1.5.3.5-2
-	* Fix Perl module location
diff --git a/staging/git/PKGBUILD b/staging/git/PKGBUILD
deleted file mode 100644
index c1a7609f8..000000000
--- a/staging/git/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 149392 2012-02-07 13:13:55Z bluewind $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=git
-pkgver=1.7.9
-pkgrel=2
-pkgdesc="the fast distributed version control system"
-arch=(i686 x86_64)
-url="http://git-scm.com/"
-license=('GPL2')
-depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
-optdepends=('tk: gitk and git gui'
-            'perl-libwww: git svn'
-            'perl-term-readkey: git svn'
-            'perl-mime-tools: git send-email'
-            'perl-net-smtp-ssl: git send-email TLS support'
-            'perl-authen-sasl: git send-email TLS support'
-            'python2: various helper scripts'
-            'subversion: git svn'
-            'cvsps: git cvsimport')
-replaces=('git-core')
-provides=('git-core')
-backup=('etc/conf.d/git-daemon.conf')
-#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2"
-#        "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2"
-source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
-        "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
-        git-daemon
-        git-daemon.conf)
-changelog=ChangeLog
-
-build() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1
-
-  cd contrib/emacs
-  make prefix=/usr
-}
-
-package() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
-
-  # bash completion
-  mkdir -p "$pkgdir"/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
-  # more contrib stuff
-  cp -a ./contrib $pkgdir/usr/share/git/ 
-  # scripts are for python 2.x
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
-    $(find "$pkgdir" -name '*.py') \
-    "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview}
-
-  # emacs interface
-  cd contrib/emacs
-  make prefix=/usr DESTDIR="$pkgdir" install
-
-  # how 'bout some manpages?
-  for mansect in man1 man5 man7; do
-    for manpage in "$srcdir"/$mansect/*; do
-      install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage)
-    done
-  done
-
-  # remove perllocal.pod, .packlist, and empty directories.
-  rm -rf "$pkgdir"/usr/lib/perl5
-
-  # git daemon script
-  install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon
-  install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
-}
-
-sha1sums=('ed51ef5ef250daaa6e98515cf2641820cd268d4c'
-          '1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a'
-          'f2b41828bd912b72e2cb3e14677739c4f370de66'
-          '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/staging/git/git-daemon b/staging/git/git-daemon
deleted file mode 100644
index 21ba73ed5..000000000
--- a/staging/git/git-daemon
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/lib/git-core/git-daemon"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/staging/git/git-daemon.conf b/staging/git/git-daemon.conf
deleted file mode 100644
index 3f9a12060..000000000
--- a/staging/git/git-daemon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# path to git repositories served
-GIT_REPO="/srv/git/"
-# see `man git-daemon` for all available options
-# $GIT_REPO will be present twice in most configs
-GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
diff --git a/staging/glib2/PKGBUILD b/staging/glib2/PKGBUILD
deleted file mode 100644
index d941d1363..000000000
--- a/staging/glib2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 149165 2012-02-06 04:06:32Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.30.2
-pkgrel=2
-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/staging/glib2/glib2.csh b/staging/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/staging/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/staging/glib2/glib2.sh b/staging/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/staging/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/staging/grep/PKGBUILD b/staging/grep/PKGBUILD
deleted file mode 100644
index cb98ef16f..000000000
--- a/staging/grep/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149159 2012-02-06 01:59:43Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.10
-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=('709915434d09f5db655e5ebd7fd6bb7f'
-         '9ad5c390a6ad7f566c58db28ddb06aed')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --without-included-regex
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/grep/grep.install b/staging/grep/grep.install
deleted file mode 100644
index 7cd31301f..000000000
--- a/staging/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/staging/kdelibs3/PKGBUILD b/staging/kdelibs3/PKGBUILD
deleted file mode 100644
index f3e59936b..000000000
--- a/staging/kdelibs3/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 149185 2012-02-06 07:30:33Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kdelibs3
-pkgver=3.5.10
-pkgrel=13
-pkgdesc='KDE3 Core Libraries'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
-         'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
-optdepends=('hspell: for Hebrew spell-checking support')
-options=('libtool')
-install=kdelibs3.install
-source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2"
-        'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
-        'acinclude.patch'
-        'kde3.profile'
-        'kde4-compatibility.patch'
-        'kconf_updaterc'
-        'openssl.patch'
-        'kdelibs3-missing-include.patch')
-sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
-          'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
-          '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
-          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
-          '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
-          '35e56fe4c5f71685e64b13f448dcacc620166e06'
-          '50e92950498463defb9149ffcf8cbc2e8cd1063b'
-          'e5f5b8c060a2db9cedb82bf18caadfa869921779')
-
-build() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	. /etc/profile.d/qt3.sh
-	. "$srcdir"/kde3.profile
-
-	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
-	patch -p1 -i "$srcdir"/acinclude.patch
-	patch -p1 -i "$srcdir"/kde4-compatibility.patch
-	patch -p1 -i "${srcdir}"/openssl.patch
-	patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
-
-	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-	make -f admin/Makefile.common cvs
-
-	./configure --prefix=/opt/kde \
-		--with-distribution='Arch Linux' \
-		--with-alsa \
-		--disable-debug \
-		--disable-dnssd \
-		--disable-dnotify \
-		--enable-inotify \
-		--enable-sendfile \
-		--without-lua \
-		--with-hspell \
-		--enable-gcc-hidden-visibility \
-		--enable-final \
-		--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \
-		--without-arts \
-		--disable-libfam
-	make
-}
-
-package() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	make DESTDIR="$pkgdir" install
-
-	# disable broken kconf_update by default
-	install -D -m644 "$srcdir"/kconf_updaterc \
-      "$pkgdir"/opt/kde/share/config/kconf_updaterc
-
-	# install KDE3 profile
-	install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
-	# make KDE3 styles available to Qt3
-	install -d -m755 "$pkgdir"/opt/qt/plugins
-	ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles
-
-	# cert bundle seems to be hardcoded
-	# link it to the one from ca-certificates
-	rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-	ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-
-	# we don't have khelpcenter anyway
-	rm -rf "$pkgdir"/opt/kde/share/doc
-
-	install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-	echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
-}
diff --git a/staging/kdelibs3/acinclude.patch b/staging/kdelibs3/acinclude.patch
deleted file mode 100644
index 0610d6df5..000000000
--- a/staging/kdelibs3/acinclude.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-2009-12-10  Stepan Kasal  <skasal@redhat.com>
-
-The change of implementation of AC_REQUIRE in 2.64 caused a regression
-in the arts project.
-This can be fixed by shuffling some macro calls.
-
-I suppose that most of this patch will not be needed with a future
-release of Autoconf.
-But the last chunk of this patch is a real bug in this source and
-should go upstream.
-
---- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
-+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
-@@ -3081,8 +3081,18 @@
- fi
- ])
- 
-+AC_DEFUN([AC_CHECK_COMPILERS_CC],
-+[ 
-+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+  CFLAGS=" $CFLAGS"
-+  AC_PROG_CC
-+  CXXFLAGS=" $CXXFLAGS"
-+  AC_PROG_CXX
-+])
-+
- AC_DEFUN([AC_CHECK_COMPILERS],
- [
-+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
-   AC_ARG_ENABLE(debug,
- 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-   [
-@@ -3141,11 +3151,6 @@
-     [kde_use_profiling="no"]
-   )
- 
--  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
--  CFLAGS=" $CFLAGS"
--
--  AC_PROG_CC 
--
-   AC_PROG_CPP
- 
-   if test "$GCC" = "yes"; then
-@@ -3174,10 +3179,6 @@
-      LDFLAGS=""
-   fi
- 
--  CXXFLAGS=" $CXXFLAGS"
--
--  AC_PROG_CXX
--
-   KDE_CHECK_FOR_BAD_COMPILER
- 
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-@@ -3503,8 +3504,8 @@
- AC_REQUIRE([AC_LIBTOOL_DLOPEN])
- AC_REQUIRE([KDE_CHECK_LIB64])
- 
--AC_OBJEXT
--AC_EXEEXT
-+AC_REQUIRE([AC_OBJEXT])
-+AC_REQUIRE([AC_EXEEXT])
- 
- AM_PROG_LIBTOOL
- AC_LIBTOOL_CXX
diff --git a/staging/kdelibs3/kconf_updaterc b/staging/kdelibs3/kconf_updaterc
deleted file mode 100644
index 24c2623fb..000000000
--- a/staging/kdelibs3/kconf_updaterc
+++ /dev/null
@@ -1,2 +0,0 @@
-updateInfoAdded=false
-autoUpdateDisabled=true
diff --git a/staging/kdelibs3/kde3.profile b/staging/kdelibs3/kde3.profile
deleted file mode 100755
index ef09631ff..000000000
--- a/staging/kdelibs3/kde3.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export PATH=$PATH:/opt/kde/bin
-if [ ! -z $XDG_DATA_DIRS ]; then
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share
-else
-  export XDG_DATA_DIRS=/opt/kde/share
-fi
diff --git a/staging/kdelibs3/kde4-compatibility.patch b/staging/kdelibs3/kde4-compatibility.patch
deleted file mode 100644
index 129c314ae..000000000
--- a/staging/kdelibs3/kde4-compatibility.patch
+++ /dev/null
@@ -1,1012 +0,0 @@
-diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp
---- kdelibs-3.5.10/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
-+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp	2009-08-06 06:18:06.000000000 +0200
-@@ -158,7 +158,7 @@
-           int i = 0;
- 
-           // argument 0 has to be drkonqi
--          argv[i++] = "drkonqi";
-+          argv[i++] = "/usr/lib/kde4/libexec/drkonqi";
- 
- #if defined Q_WS_X11
-           // start up on the correct display
-@@ -325,7 +325,7 @@
-       _exit(253);
-     if(!geteuid() && setuid(getuid()) < 0)
-       _exit(253);
--    execvp("drkonqi", const_cast< char** >( argv ));
-+    execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv ));
-     _exit(errno);
-   }
-   else
-diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am
---- kdelibs-3.5.10/kded/Makefile.am	2005-10-10 17:06:29.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.am	2009-08-06 06:21:37.000000000 +0200
-@@ -58,7 +58,7 @@
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
- 
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- 
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
-diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in
---- kdelibs-3.5.10/kded/Makefile.in	2008-08-20 18:05:57.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.in	2009-08-06 06:22:19.000000000 +0200
-@@ -535,7 +535,7 @@
- 
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
- #>- all: all-am
-@@ -1173,7 +1173,7 @@
- 	-rm -f  kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc
- 
- #>+ 2
--KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
-+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
- 
- #>+ 2
- docs-am:
-diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu
---- kdelibs-3.5.10/kded/applications.menu	2005-09-10 10:27:40.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/applications.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,469 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>Applications</Name>
--	<Directory>kde-main.directory</Directory>
--	<!-- Search the default locations -->
--	<KDELegacyDirs/>
--	<DefaultAppDirs/>
--	<DefaultDirectoryDirs/>
--	<DefaultLayout>
--		<Merge type="menus"/>
--		<Merge type="files"/>
--		<Separator/>
--		<Menuname>More</Menuname>
--	</DefaultLayout>
--	<Layout>
--		<Merge type="menus"/>
--		<Menuname>Applications</Menuname>
--		<Merge type="files"/>
--	</Layout>
--
--	<Menu>
--		<Name>Applications</Name>
--		<Directory>kde-unknown.directory</Directory>
--		<OnlyUnallocated/>
--		<Include>
--			<Not>
--				<!-- Don't list non-KDE core applications -->
--				<And>
--					<Category>Core</Category>
--					<Not><Category>KDE</Category></Not>
--				</And>
--				<!-- Don't list SUSE's YaST in here -->
--				<Category>X-SuSE-YaST</Category>
--			</Not>
--		</Include>
--	</Menu>
--       <Menu>
--                <Name>Development</Name>
--                <Directory>kde-development.directory</Directory>
--                <Menu>
--                        <Name>X-KDE-KDevelopIDE</Name>
--                        <Directory>kde-development-kdevelop.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Development</Category>
--                                <Category>X-KDE-KDevelopIDE</Category>
--                                </And>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>Translation</Name>
--			<Directory>kde-development-translation.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>Translation</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Web Development</Name>
--			<Directory>kde-development-webdevelopment.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>WebDevelopment</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Include>
--                        <And>
--                        <Category>Development</Category>
--                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
--                        <Not><Category>Translation</Category></Not>
--                        <Not><Category>WebDevelopment</Category></Not>
--                        </And>
--                </Include>
--        </Menu>
--	<Menu>
--		<Name>Science</Name>
--		<Directory>kde-science.directory</Directory>
--		<Include>
--			<And><!-- Include /any/ Science app which is not an Education app -->
--				<Or>
--					<Category>Astronomy</Category>
--					<Category>Biology</Category>
--					<Category>Chemistry</Category>
--					<Category>Geology</Category>
--					<Category>MedicalSoftware</Category>
--					<Category>Physics</Category>
--					<Category>Math</Category>
--					<Category>Science</Category>
--				</Or>
--				<Not><Category>Education</Category></Not>
--			</And>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Edutainment</Name>
--		<Directory>kde-edutainment.directory</Directory>
--		<Menu>
--			<Name>Languages</Name>
--			<Directory>kde-edu-languages.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Mathematics</Name>
--			<Directory>kde-edu-mathematics.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Math</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Miscellaneous</Name>
--			<Directory>kde-edu-miscellaneous.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Not>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				<Category>Math</Category>
--				<Category>Science</Category>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Not>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Science</Name>
--			<Directory>kde-edu-science.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Science</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Tools</Name>
--			<Directory>kde-edu-tools.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Games</Name>
--		<Directory>kde-games.directory</Directory>
--		<Menu>
--			<Name>Arcade</Name>
--			<Directory>kde-games-arcade.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>ArcadeGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Board</Name>
--			<Directory>kde-games-board.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>BoardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Card</Name>
--			<Directory>kde-games-card.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>CardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Kidsgames</Name>
--			<Directory>kde-games-kids.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Or>
--				<Category>X-KDE-KidsGame</Category>
--				<Category>KidsGame</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>TacticStrategy</Name>
--			<Directory>kde-games-strategy.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>StrategyGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Include>
--			<And>
--			<Category>Game</Category>
--			<Not>
--			<Category>ArcadeGame</Category>
--			<Category>BoardGame</Category>
--			<Category>CardGame</Category>
--			<Category>X-KDE-KidsGame</Category>
--			<Category>KidsGame</Category>
--			<Category>StrategyGame</Category>
--			</Not>
--			</And>
--		</Include>
--               <Menu>
--                        <Name>Toys</Name>
--                        <Directory>kde-toys.directory</Directory>
--                        <Include>
--                                 <Category>Amusement</Category>
--                        </Include>
--               </Menu>
--	</Menu>
--	<Menu>
--		<Name>Graphics</Name>
--		<Directory>kde-graphics.directory</Directory>
--		<Include>
--			<And>
--			<Category>Graphics</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Graphics</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Internet</Name>
--		<Directory>kde-internet.directory</Directory>
--		<Include>
--			<And>
--			<Category>Network</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--		  <Name>Terminal</Name>
--		  <Directory>kde-internet-terminal.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Network</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Multimedia</Name>
--		<Directory>kde-multimedia.directory</Directory>
--		<Include>
--			<And>
--			<Category>AudioVideo</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>AudioVideo</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Office</Name>
--		<Directory>kde-office.directory</Directory>
--		<Layout>
--			<Merge type="menus"/>
--			<Filename>kde-koshell.desktop</Filename>
--			<Filename>kde-Kontact.desktop</Filename>
--			<Separator/>
--			<Filename>kde-kword.desktop</Filename>
--			<Filename>kde-kspread.desktop</Filename>
--			<Filename>kde-kpresenter.desktop</Filename>
--			<Merge type="files"/>
--			<Separator/>
--			<Menuname>More</Menuname>
--		</Layout>
--		<Include>
--                        <And>
--			<Category>Office</Category>
--                        <Not><Category>X-KDE-More</Category></Not>
--                        </And>
--                </Include>
--                <Menu>
--                        <Name>More</Name>
--                        <Directory>kde-more.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Office</Category>
--                                <Category>X-KDE-More</Category>
--                                </And>
--                        </Include>
--                </Menu>
--	</Menu>
--	<Menu>
--		<Name>Settingsmenu</Name>
--		<Directory>kde-settingsmenu.directory</Directory>
--		<Include>
--			<Category>Settings</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>System</Name>
--		<Directory>kde-system.directory</Directory>
--		<Include>
--			<And>
--			<Category>System</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>System</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>ScreenSavers</Name>
--			<Directory>kde-system-screensavers.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>Terminal</Name>
--			<Directory>kde-system-terminal.directory</Directory>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Utilities</Name>
--		<Directory>kde-utilities.directory</Directory>
--		<Include>
--			<And>
--			<Category>Utility</Category>
--			<Not><Category>Accessibility</Category></Not>
--			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
--			<Not><Category>X-KDE-Utilities-File</Category></Not>
--			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
--			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>Accessibility</Name>
--			<Directory>kde-utilities-accessibility.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>Accessibility</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Desktop</Name>
--			<Directory>kde-utilities-desktop.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Desktop</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Menu>
--                        <Name>Editors</Name>
--                        <Directory>kde-editors.directory</Directory>
--                        <Include>
--                                <Category>TextEditor</Category>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>File</Name>
--			<Directory>kde-utilities-file.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-File</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Peripherals</Name>
--			<Directory>kde-utilities-peripherals.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Peripherals</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>PIM</Name>
--			<Directory>kde-utilities-pim.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-PIM</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>XUtilities</Name>
--			<Directory>kde-utilities-xutils.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Include>
--		<And>
--		<Category>KDE</Category>
--		<Category>Core</Category>
--		</And>
--	</Include>
--	<DefaultMergeDirs/>
--	<MergeFile>applications-kmenuedit.menu</MergeFile>
--</Menu>
-diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp
---- kdelibs-3.5.10/kded/kbuildsycoca.cpp	2007-05-14 09:52:43.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp	2009-08-06 06:23:48.000000000 +0200
-@@ -379,7 +379,7 @@
-      connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
-              this, SLOT(slotCreateEntry(const QString &, KService **)));
-              
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu
---- kdelibs-3.5.10/kded/kde-applications.menu	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-3.5.10.new/kded/kde-applications.menu	2005-09-10 10:27:40.000000000 +0200
-@@ -0,0 +1,469 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>Applications</Name>
-+	<Directory>kde-main.directory</Directory>
-+	<!-- Search the default locations -->
-+	<KDELegacyDirs/>
-+	<DefaultAppDirs/>
-+	<DefaultDirectoryDirs/>
-+	<DefaultLayout>
-+		<Merge type="menus"/>
-+		<Merge type="files"/>
-+		<Separator/>
-+		<Menuname>More</Menuname>
-+	</DefaultLayout>
-+	<Layout>
-+		<Merge type="menus"/>
-+		<Menuname>Applications</Menuname>
-+		<Merge type="files"/>
-+	</Layout>
-+
-+	<Menu>
-+		<Name>Applications</Name>
-+		<Directory>kde-unknown.directory</Directory>
-+		<OnlyUnallocated/>
-+		<Include>
-+			<Not>
-+				<!-- Don't list non-KDE core applications -->
-+				<And>
-+					<Category>Core</Category>
-+					<Not><Category>KDE</Category></Not>
-+				</And>
-+				<!-- Don't list SUSE's YaST in here -->
-+				<Category>X-SuSE-YaST</Category>
-+			</Not>
-+		</Include>
-+	</Menu>
-+       <Menu>
-+                <Name>Development</Name>
-+                <Directory>kde-development.directory</Directory>
-+                <Menu>
-+                        <Name>X-KDE-KDevelopIDE</Name>
-+                        <Directory>kde-development-kdevelop.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Development</Category>
-+                                <Category>X-KDE-KDevelopIDE</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>Translation</Name>
-+			<Directory>kde-development-translation.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>Translation</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Web Development</Name>
-+			<Directory>kde-development-webdevelopment.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>WebDevelopment</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Include>
-+                        <And>
-+                        <Category>Development</Category>
-+                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
-+                        <Not><Category>Translation</Category></Not>
-+                        <Not><Category>WebDevelopment</Category></Not>
-+                        </And>
-+                </Include>
-+        </Menu>
-+	<Menu>
-+		<Name>Science</Name>
-+		<Directory>kde-science.directory</Directory>
-+		<Include>
-+			<And><!-- Include /any/ Science app which is not an Education app -->
-+				<Or>
-+					<Category>Astronomy</Category>
-+					<Category>Biology</Category>
-+					<Category>Chemistry</Category>
-+					<Category>Geology</Category>
-+					<Category>MedicalSoftware</Category>
-+					<Category>Physics</Category>
-+					<Category>Math</Category>
-+					<Category>Science</Category>
-+				</Or>
-+				<Not><Category>Education</Category></Not>
-+			</And>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Edutainment</Name>
-+		<Directory>kde-edutainment.directory</Directory>
-+		<Menu>
-+			<Name>Languages</Name>
-+			<Directory>kde-edu-languages.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Mathematics</Name>
-+			<Directory>kde-edu-mathematics.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Math</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Miscellaneous</Name>
-+			<Directory>kde-edu-miscellaneous.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Not>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				<Category>Math</Category>
-+				<Category>Science</Category>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Not>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Science</Name>
-+			<Directory>kde-edu-science.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Science</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Tools</Name>
-+			<Directory>kde-edu-tools.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Games</Name>
-+		<Directory>kde-games.directory</Directory>
-+		<Menu>
-+			<Name>Arcade</Name>
-+			<Directory>kde-games-arcade.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>ArcadeGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Board</Name>
-+			<Directory>kde-games-board.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>BoardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Card</Name>
-+			<Directory>kde-games-card.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>CardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Kidsgames</Name>
-+			<Directory>kde-games-kids.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Or>
-+				<Category>X-KDE-KidsGame</Category>
-+				<Category>KidsGame</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>TacticStrategy</Name>
-+			<Directory>kde-games-strategy.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>StrategyGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Include>
-+			<And>
-+			<Category>Game</Category>
-+			<Not>
-+			<Category>ArcadeGame</Category>
-+			<Category>BoardGame</Category>
-+			<Category>CardGame</Category>
-+			<Category>X-KDE-KidsGame</Category>
-+			<Category>KidsGame</Category>
-+			<Category>StrategyGame</Category>
-+			</Not>
-+			</And>
-+		</Include>
-+               <Menu>
-+                        <Name>Toys</Name>
-+                        <Directory>kde-toys.directory</Directory>
-+                        <Include>
-+                                 <Category>Amusement</Category>
-+                        </Include>
-+               </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Graphics</Name>
-+		<Directory>kde-graphics.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Graphics</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Graphics</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Internet</Name>
-+		<Directory>kde-internet.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Network</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+		  <Name>Terminal</Name>
-+		  <Directory>kde-internet-terminal.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Network</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Multimedia</Name>
-+		<Directory>kde-multimedia.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>AudioVideo</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>AudioVideo</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Office</Name>
-+		<Directory>kde-office.directory</Directory>
-+		<Layout>
-+			<Merge type="menus"/>
-+			<Filename>kde-koshell.desktop</Filename>
-+			<Filename>kde-Kontact.desktop</Filename>
-+			<Separator/>
-+			<Filename>kde-kword.desktop</Filename>
-+			<Filename>kde-kspread.desktop</Filename>
-+			<Filename>kde-kpresenter.desktop</Filename>
-+			<Merge type="files"/>
-+			<Separator/>
-+			<Menuname>More</Menuname>
-+		</Layout>
-+		<Include>
-+                        <And>
-+			<Category>Office</Category>
-+                        <Not><Category>X-KDE-More</Category></Not>
-+                        </And>
-+                </Include>
-+                <Menu>
-+                        <Name>More</Name>
-+                        <Directory>kde-more.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Office</Category>
-+                                <Category>X-KDE-More</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Settingsmenu</Name>
-+		<Directory>kde-settingsmenu.directory</Directory>
-+		<Include>
-+			<Category>Settings</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>System</Name>
-+		<Directory>kde-system.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>System</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>System</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>ScreenSavers</Name>
-+			<Directory>kde-system-screensavers.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>Terminal</Name>
-+			<Directory>kde-system-terminal.directory</Directory>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Utilities</Name>
-+		<Directory>kde-utilities.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Utility</Category>
-+			<Not><Category>Accessibility</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-+			<Not><Category>X-KDE-Utilities-File</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-+			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>Accessibility</Name>
-+			<Directory>kde-utilities-accessibility.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>Accessibility</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Desktop</Name>
-+			<Directory>kde-utilities-desktop.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Desktop</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Menu>
-+                        <Name>Editors</Name>
-+                        <Directory>kde-editors.directory</Directory>
-+                        <Include>
-+                                <Category>TextEditor</Category>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>File</Name>
-+			<Directory>kde-utilities-file.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-File</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Peripherals</Name>
-+			<Directory>kde-utilities-peripherals.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Peripherals</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>PIM</Name>
-+			<Directory>kde-utilities-pim.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-PIM</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>XUtilities</Name>
-+			<Directory>kde-utilities-xutils.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Include>
-+		<And>
-+		<Category>KDE</Category>
-+		<Category>Core</Category>
-+		</And>
-+	</Include>
-+	<DefaultMergeDirs/>
-+	<MergeFile>applications-kmenuedit.menu</MergeFile>
-+</Menu>
diff --git a/staging/kdelibs3/kdelibs3-missing-include.patch b/staging/kdelibs3/kdelibs3-missing-include.patch
deleted file mode 100644
index 5b84ef746..000000000
--- a/staging/kdelibs3/kdelibs3-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdeprint/cups/cupsdconf2/cups-util.c.old	2012-01-19 01:30:26.000000000 -0500
-+++ kdeprint/cups/cupsdconf2/cups-util.c	2012-01-19 01:31:33.000000000 -0500
-@@ -2,6 +2,7 @@
- #include <cups/http.h>
- #include <cups/cups.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/staging/kdelibs3/kdelibs3.install b/staging/kdelibs3/kdelibs3.install
deleted file mode 100644
index 7291ac0a2..000000000
--- a/staging/kdelibs3/kdelibs3.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-}
diff --git a/staging/kdelibs3/openssl.patch b/staging/kdelibs3/openssl.patch
deleted file mode 100644
index a948b884a..000000000
--- a/staging/kdelibs3/openssl.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
-                                    const EVP_CIPHER *,unsigned char *,int ,
-                                             pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
-@@ -430,9 +435,14 @@ KConfig *cfg;
-       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
-       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
-       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
-       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
-       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
-       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
-       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
-       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
-       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -594,7 +604,7 @@ KConfig *cfg;
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
- 
- 
-@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
-    else return -1;
- }
- 
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+   else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
-    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
-    else return 0L;
-@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
-         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-    else return -1;
- }
--
-+#endif
- 
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
-    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
-@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
- 
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@ public:
-     */
-    int PEM_write_bio_X509(BIO *bp, X509 *x);
- 
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-    /*
-     *   X509_asn1_meth - used for netscape output
-     */
-    ASN1_METHOD *X509_asn1_meth();
--
-+#endif
- 
-    /*
-     *   ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@ public:
-     */
-    void sk_free(STACK *s);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /* 
-     *  Number of elements in the stack
-@@ -543,6 +549,9 @@ public:
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /* 
-     *  Create a new stack
-@@ -555,6 +564,9 @@ public:
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
- 
-    /* 
-     *  Duplicate the stack
-diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
- 
- 
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
--    STACK_OF(X509) *x509 = sk_new(NULL);
-+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
-     KSSLCertificate *cert = certs.first();
-     while(cert) {
- 	sk_X509_push(x509, cert->getCert());
-diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -1003,17 +1003,31 @@ return qba;
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	NETSCAPE_X509 nx;
-+	ASN1_OCTET_STRING hdr;
-+#else
-+   ASN1_HEADER ah;
-+   ASN1_OCTET_STRING os;
-+#endif
-+	KTempFile ktf;
- 
--	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
--	os.length = strlen(NETSCAPE_CERT_HDR);
--	ah.header = &os;
--	ah.data = (char *)getCert();
--	ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+	hdr.length = strlen(NETSCAPE_CERT_HDR);
-+	nx.header = &hdr;
-+	nx.cert = getCert();
-+
-+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+   os.length = strlen(NETSCAPE_CERT_HDR);
-+   ah.header = &os;
-+   ah.data = (char *)getCert();
-+   ah.meth = d->kossl->X509_asn1_meth();
- 
--	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
- 
- 	ktf.close();
- 
diff --git a/staging/kmod/PKGBUILD b/staging/kmod/PKGBUILD
deleted file mode 100644
index d78008662..000000000
--- a/staging/kmod/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 149394 2012-02-07 13:26:20Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=5
-pkgrel=1
-pkgdesc="Linux kernel module handling"
-arch=('i686' 'x86_64')
-url="http://git.profusion.mobi/cgit.cgi/kmod.git"
-license=('GPL2')
-depends=('glibc' 'zlib')
-options=('!libtool' '!strip')
-provides=('module-init-tools=3.16')
-conflicts=('module-init-tools')
-replaces=('module-init-tools')
-source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
-        "depmod-search.conf")
-md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
-         '4b8cbcbc54b9029c99fd730e257d4436')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  CFLAGS+=' -g -O0' ./configure \
-    --sysconfdir=/etc \
-    --with-rootprefix= \
-    --with-zlib \
-    --enable-debug
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  # binary directories
-  install -dm755 "$pkgdir"/{,s}bin
-
-  # configuration directories
-  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
-
-  # add symlinks to kmod
-  ln -s /usr/bin/kmod "$pkgdir/bin/lsmod"
-  for tool in {ins,rm,dep}mod mod{info,probe}; do
-    ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool"
-  done
-
-  # install depmod.d file for search/ dir
-  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/staging/kmod/depmod-search.conf b/staging/kmod/depmod-search.conf
deleted file mode 100644
index 3feb67b05..000000000
--- a/staging/kmod/depmod-search.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /etc/depmod.d/depmod.conf
-#
-
-search updates extramodules built-in
diff --git a/staging/less/PKGBUILD b/staging/less/PKGBUILD
deleted file mode 100644
index 76568817c..000000000
--- a/staging/less/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 149161 2012-02-06 02:15:27Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=less
-pkgver=444
-pkgrel=3
-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
-}
diff --git a/staging/libpciaccess/PKGBUILD b/staging/libpciaccess/PKGBUILD
deleted file mode 100644
index 963cc6e28..000000000
--- a/staging/libpciaccess/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libpciaccess
-pkgver=0.12.902
-pkgrel=1
-pkgdesc="X11 PCI access library"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('pkgconfig' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('e605bb4f12ba16246567dc4eae654ec0ed6c3324')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/libtool/PKGBUILD b/staging/libtool/PKGBUILD
deleted file mode 100644
index 5b9eb9198..000000000
--- a/staging/libtool/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 149447 2012-02-07 20:03:23Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuilt with each new gcc version
-
-pkgname=('libtool' 'libltdl')
-pkgver=2.4.2
-pkgrel=3
-pkgdesc="A generic library support script"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make check
-}
-
-package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.2')
-  groups=('base-devel')
-  install=libtool.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
-                         install-ltdlincludeHEADERS install-data-local
-  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
-}
diff --git a/staging/libtool/libtool.install b/staging/libtool/libtool.install
deleted file mode 100644
index 73cf56422..000000000
--- a/staging/libtool/libtool.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/staging/libx11/PKGBUILD b/staging/libx11/PKGBUILD
deleted file mode 100644
index 01a0e6f91..000000000
--- a/staging/libx11/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 148563 2012-02-03 17:25:36Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libx11
-pkgver=1.4.99.1
-pkgrel=1
-pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('libxcb' 'xproto' 'kbproto')
-makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
-options=('!libtool')
-license=('custom')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
-        xorg.sh
-        xorg.csh)
-sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d '
-          '4b756387426afb2a5bb7a155631ec42348abf5c1'
-          '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8')
-
-build() {
-  cd "${srcdir}/libX11-${pkgver}"
-  ./configure --prefix=/usr --disable-static --disable-xf86bigfont
-  make
-}
-
-package() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/"
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/libx11/xorg.csh b/staging/libx11/xorg.csh
deleted file mode 100644
index 26c49a222..000000000
--- a/staging/libx11/xorg.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-setenv XDG_DATA_HOME ${HOME}/.local/share
-setenv XDG_CONFIG_HOME ${HOME}/.config
-setenv XDG_CACHE_HOME ${HOME}/.cache
-
-if (! ($?XDG_DATA_DIRS) ) then
-  	setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/
-else
-	setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS}
-endif
-
-if (! ($?XDG_CONFIG_DIRS) ) then
-	setenv XDG_CONFIG_DIRS /etc/xdg
-else
-	setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS}
-endif
diff --git a/staging/libx11/xorg.sh b/staging/libx11/xorg.sh
deleted file mode 100644
index e1de6866c..000000000
--- a/staging/libx11/xorg.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_CACHE_HOME=$HOME/.cache
-
-if [ -z $XDG_DATA_DIRS ]; then
-	export XDG_DATA_DIRS=/usr/share/:/usr/local/share/
-else
-	export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS
-fi
-
-if [ -z $XDG_CONFIG_DIRS ]; then
-	export XDG_CONFIG_DIRS=/etc/xdg
-else
-	export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS
-fi
diff --git a/staging/libxcb/PKGBUILD b/staging/libxcb/PKGBUILD
deleted file mode 100644
index 79d46ec52..000000000
--- a/staging/libxcb/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148551 2012-02-03 16:32:29Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxcb
-pkgver=1.8
-pkgrel=2
-pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python2')
-options=('!libtool')
-license=('custom')
-source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('18b76759d5bbb863777f37bf3aec23ebaa31d5be'
-          '3455e84642283bc91c8313af319002a20bbcbdf4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch b/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index f17de1b1d..000000000
--- a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
---- libxcb-1.1/configure.ac.pthread-stubs	2007-11-04 18:17:11.000000000 -0500
-+++ libxcb-1.1/configure.ac	2007-11-12 10:27:06.000000000 -0500
-@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/staging/libxi/PKGBUILD b/staging/libxi/PKGBUILD
deleted file mode 100644
index 693a559c9..000000000
--- a/staging/libxi/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 149782 2012-02-10 20:18:57Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libxi
-pkgver=1.5.99.3
-pkgrel=1
-pkgdesc="X11 Input extension library"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org"
-depends=('libxext' 'inputproto')
-makedepends=('pkgconfig' 'xorg-util-macros')
-options=(!libtool)
-license=('custom')
-source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha1sums=('55de70d18b20341f307b80da035400ed0467c920')
-
-build() {
-  cd "${srcdir}/libXi-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/libXi-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/lighttpd/PKGBUILD b/staging/lighttpd/PKGBUILD
deleted file mode 100644
index d55be70bf..000000000
--- a/staging/lighttpd/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 149209 2012-02-06 09:59:10Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=lighttpd
-pkgver=1.4.30
-pkgrel=3
-pkgdesc='a secure, fast, compliant and very flexible web-server'
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://www.lighttpd.net/"
-depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
-optdepends=('libxml2: mod_webdav'
-            'lua: mod_cml/mod_magnet'
-            'libmysqlclient: mod_mysql_vhost'
-            'sqlite3: mod_webdav')
-backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
-options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
-        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
-            '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
-            'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
-            '550aa1abaced6bc9e8d65c2b069bfc96bf4d06734b17eeb140c5d00705de1230'
-            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/lighttpd/modules \
-		--sysconfdir=/etc/lighttpd \
-		--with-mysql \
-		--with-ldap \
-		--with-attr \
-		--with-openssl \
-		--with-kerberos5 \
-		--without-fam \
-		--with-webdav-props \
-		--with-webdav-locks \
-		--with-gdbm \
-		--with-memcache \
-		--with-lua
-	make
-}
-
-check() {
-	cd $srcdir/$pkgname-$pkgver
-	make check
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make DESTDIR=$pkgdir install
-
-	install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
-	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
-	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
-	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
-
-	pushd doc/config >/dev/null
-	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
-	popd >/dev/null
-
-	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/staging/lighttpd/lighttpd.conf b/staging/lighttpd/lighttpd.conf
deleted file mode 100644
index ed192352a..000000000
--- a/staging/lighttpd/lighttpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a minimal example config
-# See /usr/share/doc/lighttpd
-# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
-
-server.port		= 80
-server.username		= "http"
-server.groupname	= "http"
-server.document-root	= "/srv/http"
-server.errorlog		= "/var/log/lighttpd/error.log"
-dir-listing.activate	= "enable"
-index-file.names	= ( "index.html" )
-mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png", "" => "application/octet-stream" )
diff --git a/staging/lighttpd/lighttpd.logrotate.d b/staging/lighttpd/lighttpd.logrotate.d
deleted file mode 100644
index 5be47b863..000000000
--- a/staging/lighttpd/lighttpd.logrotate.d
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/lighttpd/*log {
-	missingok
-	copytruncate
-	notifempty
-	sharedscripts
-	postrotate
-	/etc/rc.d/lighttpd reload >/dev/null || true
-	endscript
-}
diff --git a/staging/lighttpd/lighttpd.rc.d b/staging/lighttpd/lighttpd.rc.d
deleted file mode 100644
index 88f0a1474..000000000
--- a/staging/lighttpd/lighttpd.rc.d
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-pid_file='/var/run/lighttpd/lighttpd-angel.pid'
-
-get_pid() {
-	if [ -r "${pid_file}" ]; then
-		cat "${pid_file}"
-	else
-		pgrep -f /usr/sbin/lighttpd-angel
-	fi
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/lighttpd/lighttpd.conf ]; then
-		stat_append '(/etc/lighttpd/lighttpd.conf not found)'
-		stat_die
-	fi
-
-	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
-		stat_die
-	fi
-
-	local piddir=$(dirname "${pid_file}")
-	if [ ! -d "${piddir}" ]; then
-		install -d -m755 -o http -g http "${piddir}"
-	fi
-
-	stat_done
-}
-
-start() {
-	stat_busy 'Starting lighttpd'
-
-	local PID=$(get_pid)
-	if [ -z "$PID" ]; then
-		nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 &
-		if [ $? -gt 0 ]; then
-			stat_die
-		else
-			echo $! > "${pid_file}"
-			add_daemon lighttpd
-			stat_done
-		fi
-	else
-		stat_die
-	fi
-}
-
-stop() {
-	stat_busy 'Stopping lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-gracefull-stop() {
-	stat_busy 'Stopping lighttpd gracefully'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -INT $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-reload() {
-	stat_busy 'Reloading lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_die
-	else
-		stat_done
-	fi
-}
-
-
-case "$1" in
-	start)
-		test_config
-		start
-		;;
-	stop)
-		test_config
-		stop
-		;;
-	gracefull-stop)
-		test_config
-		stop
-		;;
-	reload)
-		test_config
-		reload
-		;;
-	restart)
-		test_config
-		stop
-		while [ -n "$(get_pid)" ]; do
-			sleep 1
-		done
-		start
-		;;
-	status)
-		stat_busy 'Checking lighttpd status'
-		ck_status lighttpd
-		;;
-	*)
-	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/staging/mesa/LICENSE b/staging/mesa/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/staging/mesa/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/staging/mesa/PKGBUILD b/staging/mesa/PKGBUILD
deleted file mode 100644
index b19a25a48..000000000
--- a/staging/mesa/PKGBUILD
+++ /dev/null
@@ -1,301 +0,0 @@
-# $Id: PKGBUILD 149788 2012-02-10 21:07:50Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=mesa
-#pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
-# prepare 7.12/8.0
-pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110709
-    #pkgver=7.11
-  else
-    pkgver=8.0
-fi
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE)
-if [ "${_git}" = "true" ]; then
-	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
-	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
-	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
-  else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
-	#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
-)
-fi
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '1a5668fe72651a670611164cefc703b2')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-if [ "${_git}" = "true" ]; then
-    autoreconf -vfi
-    ./autogen.sh --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
-    --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi\
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-shared-dricore
-    
-    #    --enable-gallium-svga \
-    
-  else
-     autoreconf -vfi
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
-    --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi\
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-shared-dricore
-fi
-
-  make
-}
-
-package_libgl() {
-  depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-  replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-
-  bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
-
-  cd src/mesa/drivers/dri
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-#  ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" # gallium is now default so this is obsolete in 8.0
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_libglapi() {
-  depends=('glibc')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
-  bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgles() {
-  depends=('libglapi' 'khrplatform-devel')
-  pkgdesc="Mesa GLES libraries and headers"
-
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/GLES"
-  install -m755 -d "${pkgdir}/usr/include/GLES2"
-  bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
-}
-
-package_libegl() {
-  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
-  pkgdesc="Mesa EGL libraries and headers"
-
-  cd ${srcdir}/?esa-*   
-  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/"
-  install -m755 -d "${pkgdir}/usr/include/EGL"
-  install -m755 -d "${pkgdir}/usr/share"
-  install -m755 -d "${pkgdir}/usr/share/doc"
-  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
-  install -m755 -d "${pkgdir}/usr/lib/egl"
-  bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
-  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
-  bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
-}
-
-package_khrplatform-devel() {
-  #depends=('')
-  pkgdesc="Khronos platform development package"
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/include/KHR"
-  bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
-}
-
-package_mesa() {
-  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-  cd ${srcdir}/?esa-*   
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/lib/libGL.so"*
-  rm -f "${pkgdir}/usr/lib/libglapi.so"*
-  rm -f "${pkgdir}/usr/lib/libGLESv"*
-  rm -f "${pkgdir}/usr/lib/libEGL"*
-  rm -rf "${pkgdir}/usr/lib/egl"
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -f "${pkgdir}/usr/include/GL/glew.h"
-  rm -f "${pkgdir}/usr/include/GL/glxew.h"
-  rm -f "${pkgdir}/usr/include/GL/wglew.h"
-  rm -f "${pkgdir}/usr/include/GL/glut.h"
-  rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_ati-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  # classic mesa drivers for radeon,r200
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-}
-
-package_intel-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel"
-
-#  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 8.0
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-}
-
-package_unichrome-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
-}
-
-package_mach64-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Mach64"
-  conflicts=('xf86-video-mach64<6.8.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
-}
-
-package_mga-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Matrox"
-  conflicts=('xf86-video-mga<1.4.11')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
-}
-
-package_r128-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Rage128"
-  conflicts=('xf86-video-r128<6.8.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
-}
-
-package_savage-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
-  conflicts=('xf86-video-savage<2.3.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
-}
-
-package_sis-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for SiS"
-  conflicts=('xf86-video-sis<0.10.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
-}
-
-package_tdfx-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for 3dfx"
-  conflicts=('xf86-video-tdfx<1.4.3')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
-}
-
-package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
-
-#package_llvm-dri() {
-#  depends=("libgl=${pkgver}")
-#  pkgdesc="Mesa common LLVM support"
-
-#if [ "${_git}" = "true" ]; then
-#    cd ${srcdir}/mesa-*/src/gallium
-#  else
-#    cd "${srcdir}/Mesa-${pkgver}/src/gallium"
-#fi
-
-  # gallium llvmpipe
-#if [ "${_git}" = "true" ]; then
-#    make -C drivers/llvmpipe DESTDIR="${pkgdir}" install
-#    #make -C targets/dri-swrast DESTDIR="${pkgdir}" install
-#  else
-#    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-#fi
-#}
diff --git a/staging/pcre/PKGBUILD b/staging/pcre/PKGBUILD
deleted file mode 100644
index 3e1085ae4..000000000
--- a/staging/pcre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 149157 2012-02-06 01:57:58Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=pcre
-pkgver=8.30
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64')
-url="http://www.pcre.org/"
-license=('BSD')
-depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('98e8928cccc945d04279581e778fbdff'
-         '01eee0333fa71687e0b6756db77f94ad')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --enable-pcre16 --enable-jit \
-    --enable-utf8 --enable-unicode-properties
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD
deleted file mode 100644
index ca7fb3552..000000000
--- a/staging/php/PKGBUILD
+++ /dev/null
@@ -1,368 +0,0 @@
-# $Id: PKGBUILD 149322 2012-02-06 19:35:03Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=php
-pkgname=('php'
-         'php-cgi'
-         'php-apache'
-         'php-fpm'
-         'php-embed'
-         'php-pear'
-         'php-enchant'
-         'php-gd'
-         'php-intl'
-         'php-ldap'
-         'php-mcrypt'
-         'php-mssql'
-         'php-odbc'
-         'php-pgsql'
-         'php-pspell'
-         'php-snmp'
-         'php-sqlite'
-         'php-tidy'
-         'php-xsl')
-pkgver=5.3.10
-_suhosinver=5.3.9-0.9.10
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
-             'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
-             'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
-             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
-        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'pcre_info.patch')
-md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
-         'c099b3d7eac95018ababd41ded7f3066'
-         'c15d18f846be1d69144a5d0056ee6506'
-         'ffc338e8ce2a990f6f2a486355bbab65'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         'b01be5f816988fcee7e78225836e5e27'
-         '740ec5fe2ecfd9d7febd4081c90ec65b'
-         '07c4e412909ac65a44ec90e7a2c4bade'
-         '8d3806bbb19e390f9b32ccf21611d937')
-
-build() {
-	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
-		--prefix=/usr \
-		--sysconfdir=/etc/php \
-		--localstatedir=/var \
-		--with-layout=GNU \
-		--with-config-file-path=/etc/php \
-		--with-config-file-scan-dir=/etc/php/conf.d \
-		--enable-inline-optimization \
-		--disable-debug \
-		--disable-rpath \
-		--disable-static \
-		--enable-shared \
-		--mandir=/usr/share/man \
-		--without-pear \
-		"
-
-	phpextensions="--enable-bcmath=shared \
-		--enable-calendar=shared \
-		--enable-dba=shared \
-		--enable-exif=shared \
-		--enable-ftp=shared \
-		--enable-gd-native-ttf \
-		--enable-intl=shared \
-		--enable-json=shared \
-		--enable-mbregex \
-		--enable-mbstring \
-		--enable-pdo \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-session \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sqlite-utf8 \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-xml \
-		--enable-zip=shared \
-		--with-bz2=shared \
-		--with-curl=shared \
-		--with-db4=/usr \
-		--with-enchant=shared,/usr \
-		--with-freetype-dir=shared,/usr \
-		--with-gd=shared \
-		--with-gdbm=shared \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-icu-dir=/usr \
-		--with-imap-ssl=shared \
-		--with-imap=shared \
-		--with-jpeg-dir=shared,/usr \
-		--with-ldap=shared \
-		--with-ldap-sasl \
-		--with-mcrypt=shared \
-		--with-mhash \
-		--with-mssql=shared \
-		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
-		--with-mysql=shared,mysqlnd \
-		--with-mysqli=shared,mysqlnd \
-		--with-openssl=shared \
-		--with-pcre-regex=/usr \
-		--with-pdo-mysql=shared,mysqlnd \
-		--with-pdo-odbc=shared,unixODBC,/usr \
-		--with-pdo-pgsql=shared \
-		--with-pdo-sqlite=shared,/usr \
-		--with-pgsql=shared \
-		--with-png-dir=shared,/usr \
-		--with-pspell=shared \
-		--with-regex=php \
-		--with-snmp=shared \
-		--with-sqlite3=shared,/usr \
-		--with-sqlite=shared \
-		--with-tidy=shared \
-		--with-unixODBC=shared,/usr \
-		--with-xmlrpc=shared \
-		--with-xsl=shared \
-		--with-zlib \
-		--without-db2 \
-		--without-db3 \
-		"
-
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
-	export PEAR_INSTALLDIR
-
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	patch -p1 -i ${srcdir}/pcre_info.patch
-
-	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
-	# adjust paths
-	patch -p0 -i ${srcdir}/php.ini.patch
-	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-
-	# php
-	mkdir ${srcdir}/build-php
-	cd ${srcdir}/build-php
-	ln -s ../${pkgbase}-${pkgver}/configure
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		${phpextensions}
-	make
-
-	# cgi and fcgi
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${srcdir}/build-php ${srcdir}/build-cgi
-	cd ${srcdir}/build-cgi
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-cgi \
-		${phpextensions}
-	make
-
-	# apache
-	cp -a ${srcdir}/build-php ${srcdir}/build-apache
-	cd ${srcdir}/build-apache
-	./configure ${phpconfig} \
-		--disable-cli \
-		--with-apxs2 \
-		${phpextensions}
-	make
-
-	# fpm
-	cp -a ${srcdir}/build-php ${srcdir}/build-fpm
-	cd ${srcdir}/build-fpm
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
-		${phpextensions}
-	make
-
-	# embed
-	cp -a ${srcdir}/build-php ${srcdir}/build-embed
-	cd ${srcdir}/build-embed
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-embed=shared \
-		${phpextensions}
-	make
-
-	# pear
-	cp -a ${srcdir}/build-php ${srcdir}/build-pear
-	cd ${srcdir}/build-pear
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		--with-pear \
-		${phpextensions}
-	make
-}
-
-# check() {
-# 	cd ${srcdir}/build-php
-# 	make test
-# }
-
-package_php() {
-	pkgdesc='An HTML-embedded scripting language'
-	depends=('pcre' 'libxml2' 'bzip2' 'curl')
-	replaces=('php-fileinfo' 'php-gmp' 'php-curl')
-	provides=('php-fileinfo' 'php-gmp' 'php-curl')
-	conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
-	backup=('etc/php/php.ini')
-
-	cd ${srcdir}/build-php
-	make -j1 INSTALL_ROOT=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/pear
-	# install php.ini
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
-	install -d -m755 ${pkgdir}/etc/php/conf.d/
-
-	# remove static modules
-	rm -f ${pkgdir}/usr/lib/php/modules/*.a
-	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
-	# remove empty directory
-	rmdir ${pkgdir}/usr/include/php/include
-}
-
-package_php-cgi() {
-	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
-}
-
-package_php-apache() {
-	pkgdesc='Apache SAPI for PHP'
-	depends=('php' 'apache')
-	backup=('etc/httpd/conf/extra/php5_module.conf')
-
-	install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
-	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
-}
-
-package_php-fpm() {
-	pkgdesc='FastCGI Process Manager for PHP'
-	depends=('php')
-	backup=('etc/php/php-fpm.conf')
-
-	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
-	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
-	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
-	install -d -m755 ${pkgdir}/etc/php/fpm.d
-}
-
-package_php-embed() {
-	pkgdesc='Embed SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
-}
-
-package_php-pear() {
-	pkgdesc='PHP Extension and Application Repository'
-	depends=('php')
-	backup=('etc/php/pear.conf')
-
-	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
-}
-
-package_php-enchant() {
-	depends=('php' 'enchant')
-	pkgdesc='enchant module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
-}
-
-package_php-gd() {
-	depends=('php' 'libpng' 'libjpeg' 'freetype2')
-	pkgdesc='gd module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
-}
-
-package_php-intl() {
-	depends=('php' 'icu')
-	pkgdesc='intl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
-}
-
-package_php-ldap() {
-	depends=('php' 'libldap')
-	pkgdesc='ldap module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
-}
-
-package_php-mcrypt() {
-	depends=('php' 'libmcrypt' 'libltdl')
-	pkgdesc='mcrypt module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
-}
-
-package_php-mssql() {
-	depends=('php' 'freetds')
-	pkgdesc='mssql module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
-}
-
-package_php-odbc() {
-	depends=('php' 'unixodbc')
-	pkgdesc='ODBC modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
-}
-
-package_php-pgsql() {
-	depends=('php' 'postgresql-libs')
-	pkgdesc='PostgreSQL modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
-}
-
-package_php-pspell() {
-	depends=('php' 'aspell')
-	pkgdesc='pspell module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
-}
-
-package_php-snmp() {
-	depends=('php' 'net-snmp')
-	pkgdesc='snmp module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
-}
-
-package_php-sqlite() {
-	depends=('php' 'sqlite3')
-	pkgdesc='sqlite3 module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
-}
-
-package_php-tidy() {
-	depends=('php' 'tidyhtml')
-	pkgdesc='tidy module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
-}
-
-package_php-xsl() {
-	depends=('php' 'libxslt')
-	pkgdesc='xsl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
-}
diff --git a/staging/php/apache.conf b/staging/php/apache.conf
deleted file mode 100644
index c3ca0aad5..000000000
--- a/staging/php/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php5_module
-
-<IfModule dir_module>
-	<IfModule php5_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm
deleted file mode 100644
index 7a1ba2597..000000000
--- a/staging/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/php-fpm.log {
-	missingok
-	postrotate
-	/etc/rc.d/php-fpm logrotate >/dev/null || true
-	endscript
-}
diff --git a/staging/php/pcre_info.patch b/staging/php/pcre_info.patch
deleted file mode 100644
index e6d10df06..000000000
--- a/staging/php/pcre_info.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- php-5.3.10/ext/pcre/php_pcre.c	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.c	2012-02-06 13:31:36.198935107 +0100
-@@ -241,6 +241,7 @@
- 	char				*pattern;
- 	int					 do_study = 0;
- 	int					 poptions = 0;
-+	int				count = 0;
- 	unsigned const char *tables = NULL;
- #if HAVE_SETLOCALE
- 	char				*locale = setlocale(LC_CTYPE, NULL);
-@@ -252,10 +252,10 @@
- 	   back the compiled pattern, otherwise go on and compile it. */
- 	if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
- 		/*
--		 * We use a quick pcre_info() check to see whether cache is corrupted, and if it
-+		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
- 		 * is, we flush it and compile the pattern from scratch.
- 		 */
--		if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
-+		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
- 			zend_hash_clean(&PCRE_G(pcre_cache));
- 		} else {
- #if HAVE_SETLOCALE
---- php-5.3.10/ext/pcre/php_pcre.def	2009-01-11 14:59:00.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.def	2012-02-06 13:31:47.775299315 +0100
-@@ -4,7 +4,6 @@
- php_pcre_exec
- php_pcre_get_substring
- php_pcre_get_substring_list
--php_pcre_info
- php_pcre_maketables
- php_pcre_study
- php_pcre_version
---- php-5.3.10/main/php_compat.h	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/main/php_compat.h	2012-02-06 13:26:59.272834580 +0100
-@@ -34,7 +34,6 @@
- #define pcre_exec			php_pcre_exec
- #define pcre_get_substring		php_pcre_get_substring
- #define pcre_get_substring_list		php_pcre_get_substring_list
--#define pcre_info			php_pcre_info
- #define pcre_maketables			php_pcre_maketables
- #define pcre_study			php_pcre_study
- #define pcre_version			php_pcre_version
diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch
deleted file mode 100644
index b923edb38..000000000
--- a/staging/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
- ;  - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
- 
- ; Error log file
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -140,7 +140,8 @@
- ;                            specific port;
- ;   '/path/to/unix/socket' - to listen on a unix socket.
- ; Note: This value is mandatory.
--listen = 127.0.0.1:9000
-+;listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm/php-fpm.sock
- 
- ; Set listen(2) backlog. A value of '-1' means unlimited.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -151,9 +152,9 @@
- ; BSD-derived systems allow connections regardless of permissions. 
- ; Default Values: user and group are set as the running user
- ;                 mode is set to 0666
--;listen.owner = @php_fpm_user@
--;listen.group = @php_fpm_group@
--;listen.mode = 0666
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
-+listen.mode = 0660
-  
- ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -442,7 +443,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-  
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch
deleted file mode 100644
index 3dc5b6560..000000000
--- a/staging/php/php.ini.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- php.ini-production	2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
- ; or per-virtualhost web server configuration file. This directive is
- ; *NOT* affected by whether Safe Mode is turned On or Off.
- ; http://php.net/open-basedir
--;open_basedir =
-+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
- 
- ; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
- 
- ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
--; extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
- ; On windows:
- ; extension_dir = "ext"
- 
-@@ -950,53 +950,49 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
- ;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--;
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_fileinfo.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_intl.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_exif.dll      ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--
--; The MIBS data available in the PHP distribution must be installed. 
--; See http://www.php.net/manual/en/snmp.installation.php 
--;extension=php_snmp.dll
--
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
-+;extension=bcmath.so
-+;extension=bz2.so
-+;extension=calendar.so
-+extension=curl.so
-+;extension=dba.so
-+;extension=enchant.so
-+;extension=exif.so
-+;extension=ftp.so
-+;extension=gd.so
-+extension=gettext.so
-+;extension=gmp.so
-+;extension=iconv.so
-+;extension=imap.so
-+;extension=intl.so
-+extension=json.so
-+;extension=ldap.so
-+;extension=mcrypt.so
-+;extension=mssql.so
-+;extension=mysqli.so
-+;extension=mysql.so
-+;extension=odbc.so
-+;extension=openssl.so
-+;extension=pdo_mysql.so
-+;extension=pdo_odbc.so
-+;extension=pdo_pgsql.so
-+;extension=pdo_sqlite.so
-+;extension=pgsql.so
-+;extension=phar.so
-+;extension=posix.so
-+;extension=pspell.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=soap.so
-+;extension=sockets.so
-+;extension=sqlite3.so
-+;extension=sqlite.so
-+;extension=sysvmsg.so
-+;extension=sysvsem.so
-+;extension=sysvshm.so
-+;extension=tidy.so
-+;extension=xmlrpc.so
-+;extension=xsl.so
-+;extension=zip.so
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm
deleted file mode 100644
index 54bcf4d5b..000000000
--- a/staging/php/rc.d.php-fpm
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
-	try=0
-	while test $try -lt 35 ; do
-		case "$1" in
-			'created')
-			if [ -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-			'removed')
-			if [ ! -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-		esac
-
-		stat_append '.'
-		try=`expr $try + 1`
-		sleep 1
-	done
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/php/php-fpm.conf ]; then
-		stat_append '(/etc/php/php-fpm.conf not found)'
-		stat_die
-	fi
-
-	local test=$(/usr/sbin/php-fpm -t 2>&1)
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/php/php-fpm.conf)'
-		stat_die
-	elif echo $test | grep -qi 'error'; then
-		stat_append '(error in /etc/php/php.ini)'
-		stat_die
-	fi
-
-	[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			add_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	stop)
-		test_config
-		stat_busy 'Gracefully shutting down php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	force-quit)
-		stat_busy 'Terminating php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	restart)
-		$0 stop
-		$0 start
-	;;
-
-	reload)
-		test_config
-		stat_busy 'Reload service php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	logrotate)
-		stat_busy 'Reopen php-fpm log'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	*)
-		echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
-		exit 1
-	;;
-
-esac
diff --git a/staging/postfix/PKGBUILD b/staging/postfix/PKGBUILD
deleted file mode 100644
index 94384b85d..000000000
--- a/staging/postfix/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 149211 2012-02-06 10:51:29Z bisson $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=postfix
-pkgver=2.9.0
-pkgrel=2
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
-        'aliases.patch' \
-        'rc.d')
-sha1sums=('a04a72a8b9436279a30b7d1b62197be63124a132'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make makefiles DEBUG='' CCARGS=' \
-		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
-		-DHAS_LDAP \
-		-DUSE_TLS \
-		-DHAS_MYSQL -I/usr/include/mysql \
-		-DHAS_PGSQL -I/usr/include/postgresql \
-		-DHAS_SQLITE \
-	' AUXLIBS=' \
-		-lsasl2 \
-		-lldap -llber \
-		-lssl -lcrypto \
-		-lmysqlclient -lz -lm \
-		-lpq \
-		-lsqlite3 -lpthread \
-	' OPT="${CFLAGS} ${LDFLAGS}"
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sh postfix-install -non-interactive \
-		install_root="${pkgdir}" \
-		daemon_directory="/usr/lib/${pkgname}" \
-		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man"
-
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
-	cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
-}
diff --git a/staging/postfix/aliases.patch b/staging/postfix/aliases.patch
deleted file mode 100644
index 6767870b7..000000000
--- a/staging/postfix/aliases.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig	2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf	2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
- 
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi".  This is a separate
-@@ -392,6 +393,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #
diff --git a/staging/postfix/install b/staging/postfix/install
deleted file mode 100644
index cb97e2e6c..000000000
--- a/staging/postfix/install
+++ /dev/null
@@ -1,33 +0,0 @@
-post_install() {
-	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
-	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
-	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
-}
-
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF
-
-==> You must now run "postfix reload" due to inter-daemon protocol change.
-
-EOF
-	fi
-}
-
-pre_remove() {
-	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
-	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
-	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
-}
diff --git a/staging/postfix/rc.d b/staging/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/staging/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	/usr/sbin/postfix start &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	/usr/sbin/postfix stop &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	/usr/sbin/postfix reload &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD
deleted file mode 100644
index e29f99793..000000000
--- a/staging/sip/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 150156 2012-02-13 17:15:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgbase=sip
-pkgname=('sip' 'python2-sip')
-pkgver=4.13.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
-
-build() {
-  cd "${srcdir}"
-  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-  
-  ### Python2 version ###
-  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
-  python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-}
-
-package_sip() {
-  pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
-  depends=('python')
-  replaces=('python-sip')
-  provides=('python-sip')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-sip() {
-  pkgdesc="A tool that makes it easy to create Python2 bindings for C and C++ libraries"
-  depends=('sip' 'python2')
-
-  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # Provided by sip
-  rm "${pkgdir}/usr/bin/sip"
-}
diff --git a/staging/slang/PKGBUILD b/staging/slang/PKGBUILD
deleted file mode 100644
index 533512f2e..000000000
--- a/staging/slang/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149167 2012-02-06 04:07:35Z allan $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=slang
-pkgver=2.2.4
-pkgrel=2
-pkgdesc="S-Lang is a powerful interpreted language"
-arch=('i686' 'x86_64')
-url="http://www.jedsoft.org/slang/"
-license=('GPL')
-depends=('glibc' 'pcre' 'zlib')
-backup=('etc/slsh.rc')
-options=('!makeflags')
-source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('7fcfd447e378f07dd0c0bae671fe6487'
-         '0e37091fe52b4ef609c3cee8eda0e101')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-all
-}
diff --git a/staging/swig/PKGBUILD b/staging/swig/PKGBUILD
deleted file mode 100644
index b6363adc1..000000000
--- a/staging/swig/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 149312 2012-02-06 19:02:09Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=swig
-pkgver=2.0.4
-pkgrel=3
-pkgdesc="Generate scripting interfaces to C/C++ code"
-arch=('i686' 'x86_64')
-url="http://www.swig.org/"
-license=('custom')
-depends=('zlib' 'pcre')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('ace563563a8f6f367ba82236e5bea240adea0d94')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-  install -D -m644 LICENSE-UNIVERSITIES "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE-UNIVERSITIES
-}
diff --git a/staging/thunar/PKGBUILD b/staging/thunar/PKGBUILD
deleted file mode 100644
index bff7fd5fe..000000000
--- a/staging/thunar/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 149173 2012-02-06 06:22:31Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=thunar
-pkgver=1.2.3
-pkgrel=4
-pkgdesc="Modern file manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://thunar.xfce.org"
-license=('GPL2' 'LGPL2.1')
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev'
-         'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
-            'polkit-gnome: for mounting internal partitions (needs root password)'
-            'xfce4-panel: for trash applet'
-            'tumbler: for thumbnail previews'
-            'thunar-volman: manages removable devices'
-            'thunar-archive-plugin: create and deflate archives'
-            'thunar-media-tags-plugin: view/edit id3/ogg tags')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-$pkgver.tar.bz2)
-sha256sums=('e66aa9ad61a9202e15cc7c5fffc7b961da9ab3b4428f874c1ec8e46eb4ffaca6')
-
-build() {
-  cd "$srcdir/Thunar-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-gio-unix \
-    --enable-dbus \
-    --enable-startup-notification \
-    --enable-gudev \
-    --enable-notifications \
-    --enable-exif \
-    --enable-pcre \
-    --enable-gtk-doc \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/Thunar-$pkgver"
-
-  make DESTDIR=${pkgdir} install
-  sed -i 's:x-directory/gnome-default-handler;::' \
-    "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/thunar/thunar.install b/staging/thunar/thunar.install
deleted file mode 100644
index 87c29e4db..000000000
--- a/staging/thunar/thunar.install
+++ /dev/null
@@ -1,14 +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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/udev/PKGBUILD b/staging/udev/PKGBUILD
deleted file mode 100644
index cb1bbdcc9..000000000
--- a/staging/udev/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 149449 2012-02-07 20:56:41Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=udev
-pkgver=181
-pkgrel=1
-pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils')
-install=udev.install
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz)
-url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
-backup=(etc/udev/udev.conf)
-groups=('base')
-options=(!makeflags !libtool)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
-              --with-rootprefix= \
-              --sysconfdir=/etc \
-              --libdir=/usr/lib \
-              --libexecdir=/lib \
-              --with-systemdsystemunitdir=/lib/systemd/system \
-              --enable-udev_acl
-
-  make
-}
-  
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # /dev/loop0 is created for convenience, to autoload the module if necessary
-  # this is no longer needed when util-linux-2.21 is released as /dev/loop-control
-  # will be used instead. In that case move this to udev-compat
-  install -d -m755 ${pkgdir}/lib/udev/devices/
-  mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0
-  chgrp disk ${pkgdir}/lib/udev/devices/loop0
- 
-  # udevd moved, symlink to make life easy for restarting udevd manually
-  ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  for i in $pkgdir/lib/udev/rules.d/*.rules; do
-    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
-               s#GROUP="tape"#GROUP="storage"#g;
-               s#GROUP="cdrom"#GROUP="optical"#g' $i
-  done
-}
-md5sums=('0d7af750702620a871b9f9b98d8ad859')
diff --git a/staging/udev/udev.install b/staging/udev/udev.install
deleted file mode 100644
index 7c866c2a3..000000000
--- a/staging/udev/udev.install
+++ /dev/null
@@ -1,73 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo "ATTENTION UDEV:"
-    echo "----------"
-    if [ "$(vercmp $2 168)" -lt 0 ]; then
-      echo "Kernel 2.6.32 or newer is now required."
-      echo "  --"
-      echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
-      echo "  --"
-      echo "Arch specific cd symlinks are now no longer created."
-      echo "  --"
-      echo "cd and net persistent rules will no longer be autogenerated,"
-      echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
-      echo "  --"
-      echo "Errors are now logged (possibly to the console) by default."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 171)" -lt 0 ]; then
-      echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
-      echo "blacklisting in MODULES no longer works."
-      echo "See 'man modprobe.conf' for a replacement to blacklisting."
-      echo "To disable a module mod1 on the kernel command line, use"
-      echo "mod1.disable=1"
-      echo "or"
-      echo "modprobe.blacklist=mod1"
-      echo "  --"
-      echo "The following modules are no longer unconditionally loaded:"
-      echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
-      echo "Add them to MODULES in rc.conf if you need them."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 172)" -lt 0 ]; then
-      echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
-      echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
-      echo "takes precedence."
-      echo "  --"
-      echo "kbd and rtc devices are no longer world readable."
-      echo "  --"
-      echo "rtc is no longer in the audio group and fb devices are no longer in"
-      echo "the video group, as permissions and ownership of fb devices are controlled"
-      echo "by X."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 174)" -lt 0 ]; then
-      echo "We now use upstream rules for assigning devices to the 'disk', 'optical',"
-      echo "'scanner' and 'video' groups. Beware of any changes."
-      echo "  --"
-      echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-      echo "  --"
-      echo "For security reasons, we no longer add devices to the 'storage' group. Use"
-      echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-      echo "this functionality back."
-      echo " --"
-      echo "We no longer create the static nodes on install needed for an initrd-less boot"
-      echo "where devtmpfs is not mounted by the kernel, this only affects fresh installs."
-      echo " --"
-    fi
-    if [ "$(vercmp $2 175)" -lt 0 ]; then
-      echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels"
-      echo "have this enabled."
-      echo " --"
-    fi
-    echo "udev-compat has been removed, and should be uninstalled."
-    echo " --"
-    echo "Framebuffers are no longer blacklisted by default."
-    echo " --"
-    echo "binaries moved from /sbin to /usr/bin"
-    echo "---------------"
-  fi
-}
diff --git a/staging/varnish/PKGBUILD b/staging/varnish/PKGBUILD
deleted file mode 100644
index 4e189a1ff..000000000
--- a/staging/varnish/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 149324 2012-02-06 20:02:40Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Douglas Soares de Andrade
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=varnish
-pkgver=3.0.2
-pkgrel=5
-pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
-url="http://www.varnish-cache.org/"
-license=('BSD')
-depends=('gcc' 'libedit' 'pcre')
-backup=('etc/conf.d/varnish'
-        'etc/varnish/default.vcl')
-install=$pkgname.install
-options=('!libtool')
-source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
-        "$pkgname.conf.d"
-        "rc.$pkgname")
-md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
-         'edd1237d097d72173d9772754335890c'
-         '8366f51568c0bbb3d3891aa0cc724369')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var/lib
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
-  install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/varnish/rc.varnish b/staging/varnish/rc.varnish
deleted file mode 100644
index 2841665e5..000000000
--- a/staging/varnish/rc.varnish
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/varnish
-
-reload_vcl() {
-  local activecfg newcfg
-
-  if [[ -z $VARNISH_CFG ]]; then
-    printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n'
-    return 1
-  fi
-
-  activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
-  if [[ -z $activecfg ]]; then
-    printf '==> ERROR: No active VCL found!\n'
-    return 1
-  fi
-
-  printf -v newcfg 'vcl-%(%s)T' -1
-
-  varnishadm "vcl.load $newcfg $VARNISH_CFG" &&
-  varnishadm "vcl.use $newcfg" &&
-  varnishadm "vcl.discard $activecfg" || return 1
-}
-
-pidfile=/run/varnish.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-    if [[ ! -d /proc/$PID ]]; then
-      # stale pidfile
-      unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Varnish Reverse Proxy"
-    if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
-      add_daemon varnish
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Varnish Reverse Proxy"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon varnish
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Recompiling and Reloading VCL"
-    reload_vcl && stat_done || stat_fail
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-  ;;
-esac
diff --git a/staging/varnish/varnish.conf.d b/staging/varnish/varnish.conf.d
deleted file mode 100644
index 904ca119f..000000000
--- a/staging/varnish/varnish.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Command line options to varnishd
-#
-
-VARNISHD_OPTS="-a 0.0.0.0:80 \
-               -b localhost:8080 \
-               -T localhost:6082 \
-               -s malloc,64M
-               -u nobody -g nobody"
-
-VARNISH_CFG="/etc/varnish/default.vcl"
diff --git a/staging/varnish/varnish.install b/staging/varnish/varnish.install
deleted file mode 100644
index 1cbb1f16e..000000000
--- a/staging/varnish/varnish.install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# remove localstatedir -- compiled VCL and slab files will still be here.
-post_remove() {
-  rm -rf var/lib/varnish
-}
diff --git a/staging/xf86-input-acecad/PKGBUILD b/staging/xf86-input-acecad/PKGBUILD
deleted file mode 100644
index 40735d15c..000000000
--- a/staging/xf86-input-acecad/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148590 2012-02-04 10:05:48Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-acecad
-pkgver=1.5.0
-pkgrel=3
-pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('sysfsutils')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        assign-local-private-after-allocating.patch)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
-          '9301020b0ef3c6f2081e957481a88d2e187a7973')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch
deleted file mode 100644
index e3e635a6f..000000000
--- a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 27 Jun 2011 03:13:54 +0000
-Subject: Assign local->private after allocating.
-
-It is detrimental to the user experience when the driver tries to derefernce
-null pointers.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/acecad.c b/src/acecad.c
-index ad6d793..604fe91 100644
---- a/src/acecad.c
-+++ b/src/acecad.c
-@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
-         return BadAlloc;
- 
-     memset(priv, 0, sizeof(AceCadPrivateRec));
-+    local->private = priv;
- 
-     local->device_control = DeviceControl;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/staging/xf86-input-aiptek/PKGBUILD b/staging/xf86-input-aiptek/PKGBUILD
deleted file mode 100644
index b46dc59b1..000000000
--- a/staging/xf86-input-aiptek/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148592 2012-02-04 10:07:28Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-aiptek
-pkgver=1.4.1
-pkgrel=3
-pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-evdev/PKGBUILD b/staging/xf86-input-evdev/PKGBUILD
deleted file mode 100644
index 98c3b85b3..000000000
--- a/staging/xf86-input-evdev/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148594 2012-02-04 10:10:18Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <Alexander@archlinux.org
-
-pkgname=xf86-input-evdev
-pkgver=2.6.99.901
-pkgrel=1
-pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool' '!makeflags')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('fb978b06cfb7a6a6b99dc9f9bca4362abdf79f20')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-joystick/50-joystick.conf b/staging/xf86-input-joystick/50-joystick.conf
deleted file mode 100644
index 95a295ab0..000000000
--- a/staging/xf86-input-joystick/50-joystick.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-	Identifier "joystick catchall"
-	MatchIsJoystick "on"
-	MatchDevicePath "/dev/input/event*"
-	Driver "joystick"
-EndSection
diff --git a/staging/xf86-input-joystick/PKGBUILD b/staging/xf86-input-joystick/PKGBUILD
deleted file mode 100644
index f7c08e092..000000000
--- a/staging/xf86-input-joystick/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 148596 2012-02-04 10:13:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-joystick
-pkgver=1.6.0
-pkgrel=4
-pkgdesc="X.Org Joystick input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch
-        50-joystick.conf)
-sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
-          '7812a34013a2333641bd7c5d044c46179490cb32'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-joystick/git-fixes.patch b/staging/xf86-input-joystick/git-fixes.patch
deleted file mode 100644
index b3afa06cc..000000000
--- a/staging/xf86-input-joystick/git-fixes.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
-From: Terry Lambert <tlambert@chromium.org>
-Date: Sat, 16 Jul 2011 00:23:22 +0000
-Subject: Return proper default for unknown values in pInfo->device_control.
-
-Signed-off-by: Terry Lambert <tlambert@chromium.org>
-Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/jstk.c b/src/jstk.c
-index ec6b79a..6db0e7c 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
- 
-     default:
-         ErrorF("unsupported mode=%d\n", what);
--        return !Success;
--        break;
-+        return BadValue;
-     } /* switch (what) */
-     return Success;
- }
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index 3c471ce..d699dcd 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
-         DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n"));
-         dev->public.on = FALSE;
-         break;
-+    default:
-+        return BadValue;
-     }
- 
-     return Success;
---
-cgit v0.9.0.2-2-gbebe
-From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
-From: Devin J. Pohly <djpohly+xorg@gmail.com>
-Date: Sat, 03 Sep 2011 23:00:07 +0000
-Subject: unify capitalization of joystick properties
-
-the axis keys high/low properties were inconsistently capitalized,
-leading to potential confusion as to why one works but not the other.
-
-Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/include/joystick-properties.h b/include/joystick-properties.h
-index 49ef800..36f4082 100644
---- a/include/joystick-properties.h
-+++ b/include/joystick-properties.h
-@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
- 
- /** Scancodes for axis in high position */
- /* 8 bit, 4 per axis */
--#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)"
-+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)"
- 
- /** Set the mapping of each button to
-     none, x, y, zx, zy, button, key, speed_multiply,
---
-cgit v0.9.0.2-2-gbebe
-From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sat, 15 Oct 2011 22:47:52 +0000
-Subject: label buttons and axes
-
-Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
-Mapping can be changed while running so the labels will be constant.
-
-Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
-data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
-and "Rel Y", representing the aggregated post-calculation data from all axes.
-
-Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
----
-diff --git a/man/joystick.man b/man/joystick.man
-index da92ceb..b401de5 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -140,7 +140,11 @@ Neither
- .B mode
- nor
- .B axis
--needs to be set to generate extra valuator events.
-+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with 
-+.I 1
-+, i.e.
-+.I \*qAxis 1\*q
-+for the first axis (being the 3rd valuator).
- Default: not set.
- .TP 7
- .BI "\*qaxis="[<factor>]<axis> \*q
-@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys
- The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
- The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.
- 
-+.SH "XI2 Events"
-+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons:
-+
-+.nf
-+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=none valuator" \*q
-+\ \ ...
-+.BI "  Option  \*qMapButton1\*q      \*q" "button=1" \*q
-+.BI "  Option  \*qMapButton2\*q      \*q" "button=2" \*q
-+.BI "  Option  \*qMapButton3\*q      \*q" "button=3" \*q
-+.BI "  Option  \*qMapButton4\*q      \*q" "button=4" \*q
-+.BI "  Option  \*qMapButton5\*q      \*q" "button=5" \*q
-+\ \ ...
-+.fi
-+
-+You might also want to set the device "floating" to stop it from reporting core events:
-+.nf
-+.BI "  Option  \*qFloating\*q      \*q" "true" \*q
-+.fi
-+
- .SH "NOTES"
- Configuration through
- .I InputClass
-diff --git a/src/jstk.c b/src/jstk.c
-index 6db0e7c..772683f 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-  * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
-  *                                                                            
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -21,7 +21,6 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-     switch (what) {
-     case DEVICE_INIT: {
-         int m;
-+        char str[32];
-         CARD8 buttonmap[BUTTONMAP_SIZE+1];
-         DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-         /* Probe device and return if error */
-@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-         }
- 
-         for (m=0; m<=BUTTONMAP_SIZE; m++) {
-+            sprintf(str, "Button %d", m);
-+
-             buttonmap[m] = m;
--	}
-+            btn_labels[m] = MakeAtom(str, strlen(str), TRUE);
-+        }
-+
-+
- 
--            
--            
-         if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-             btn_labels,
-             buttonmap) == FALSE) {
-@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-             if (priv->axis[i].valuator != -1)
-         {
-             DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m));
-+            sprintf(str, "Axis %d", i + 1);
-             priv->axis[i].valuator = m++;
-+            axes_labels[i] = MakeAtom(str, strlen(str), TRUE);
-         }
- 
-         if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
-@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec =
-                    /* a tool */
- };
- 
--
- /*
-  ***************************************************************************
-  *
-@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
-     jstkDriverPlug,
-     jstkDriverUnplug
- };
-+
-+/* vim: set filetype=c.doxygen ts=4 et: */
-+
---
-cgit v0.9.0.2-2-gbebe
-From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:27:22 +0000
-Subject: Fix option type for option duplication
-
-xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
-list.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index d699dcd..e842941 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *options;
-     InputOption *iopts = NULL, *tmp;
-     DeviceIntPtr dev;
-+    XF86OptionPtr opts;
- 
-     /* duplicate option list, append to name */
--    options = xf86OptionListDuplicate(pInfo->options);
-+    opts = xf86OptionListDuplicate(pInfo->options);
-     strcpy(name, pInfo->name);
-     strcat(name, " (keys)");
--    options = xf86ReplaceStrOption(options, "Name", name);
--    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");
-+    opts = xf86ReplaceStrOption(opts, "Name", name);
-+    opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
- 
--    while(options)
-+    while(opts)
-     {
-         tmp = calloc(1, sizeof(InputOption));
- 
--        tmp->key = xf86OptionName(options);
--        tmp->value = xf86OptionValue(options);
-+        tmp->key = xf86OptionName(opts);
-+        tmp->value = xf86OptionValue(opts);
-         tmp->next = iopts;
-         iopts = tmp;
--        options = xf86NextOption(options);
-+        opts = xf86NextOption(opts);
-     }
- 
-     /* duplicate attribute list */
---
-cgit v0.9.0.2-2-gbebe
-From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:33:08 +0000
-Subject: Deal with opaque input option types.
-
-ABI 14 made the InputOption type opaque, move the existing code to ifdefs
-and use the new function calls otherwise.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index e842941..a71275a 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-     return Success;
- }
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
-+static InputOption*
-+input_option_new(InputOption* list, char *key, char *value)
-+{
-+    InputOption *tmp;
-+
-+    tmp = calloc(1, sizeof(*tmp));
-+    tmp->key = key;
-+    tmp->value = value;
-+    tmp->next = list;
-+
-+    return tmp;
-+}
-+
-+static void
-+input_option_free_list(InputOption **list)
-+{
-+    InputOption *iopts = *list;
-+
-+    while(iopts)
-+    {
-+        InputOption *tmp = iopts->next;
-+        free(iopts->key);
-+        free(iopts->value);
-+        free(iopts);
-+        iopts = tmp;
-+    }
-+
-+    *list = NULL;
-+}
-+
-+#endif
-+
- InputInfoPtr
- jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- {
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *iopts = NULL, *tmp;
-+    InputOption *iopts = NULL;
-     DeviceIntPtr dev;
-     XF86OptionPtr opts;
- 
-@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     while(opts)
-     {
--        tmp = calloc(1, sizeof(InputOption));
--
--        tmp->key = xf86OptionName(opts);
--        tmp->value = xf86OptionValue(opts);
--        tmp->next = iopts;
--        iopts = tmp;
-+        iopts = input_option_new(iopts,
-+                                 xf86OptionName(opts),
-+                                 xf86OptionValue(opts));
-         opts = xf86NextOption(opts);
-     }
- 
-@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     rc = NewInputDeviceRequest(iopts, attrs, &dev);
- 
--    while(iopts)
--    {
--        tmp = iopts->next;
--        free(iopts->key);
--        free(iopts->value);
--        free(iopts);
--        iopts = tmp;
--    }
-+    input_option_free_list(&iopts);
- 
-     FreeInputAttributes(attrs);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 17:04:25 +0000
-Subject: man: valuators are not added automatically
-
----
-diff --git a/man/joystick.man b/man/joystick.man
-index b401de5..9f38ceb 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -129,9 +129,6 @@ can be one of:
- 
- .B none, relative, accelerated, absolute
- 
--Every axis which's mode is not
--.B none
--will be reported as an additional valuator.
- .TP 7
- .B \*qvaluator\*q
- Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always 
---
-cgit v0.9.0.2-2-gbebe
-From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 19:36:07 +0000
-Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device
-
-udev does copy the Driver line to the list of options, but when manually
-specifying the driver in xorg.conf, the option "Driver" is unset. Because we
-do hotplug a sub-device from within the core device, we need the "Driver"
-option to be present in the list.
-
-This should fix archlinux bug #23577:
-  https://bugs.archlinux.org/task/23577
-
-Thanks to Malek for coming up with a fix.
-
-Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index a71275a..241b15d 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     strcat(name, " (keys)");
-     opts = xf86ReplaceStrOption(opts, "Name", name);
-     opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
-+    opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
- 
-     while(opts)
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-input-keyboard/PKGBUILD b/staging/xf86-input-keyboard/PKGBUILD
deleted file mode 100644
index 1c90218f8..000000000
--- a/staging/xf86-input-keyboard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 148600 2012-02-04 10:18:16Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-keyboard
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="X.Org keyboard input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ef30fecb9e846a5268ae339846401489a785e413')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-mouse/PKGBUILD b/staging/xf86-input-mouse/PKGBUILD
deleted file mode 100644
index 2eaac38c8..000000000
--- a/staging/xf86-input-mouse/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149443 2012-02-07 18:19:16Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-mouse
-pkgver=1.7.1
-pkgrel=3
-pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-synaptics/10-synaptics.conf b/staging/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb81..000000000
--- a/staging/xf86-input-synaptics/10-synaptics.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad catchall"
-        Driver "synaptics"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-EndSection
diff --git a/staging/xf86-input-synaptics/PKGBUILD b/staging/xf86-input-synaptics/PKGBUILD
deleted file mode 100644
index 7a9ea03ab..000000000
--- a/staging/xf86-input-synaptics/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 149904 2012-02-11 13:11:31Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski  <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.5.99
-pkgrel=0.1
-_gitver=e6032c34515a19ebac09090028f806d82ddfb62d
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst')
-makedepends=('xorg-server-devel>=1.11.99.902' 'libxi' 'libx11')
-conflicts=('xorg-server<1.11.99.902')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(#http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-		http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/snapshot/xf86-input-synaptics-${_gitver}.tar.gz
-        10-synaptics.conf)
-md5sums=('82556d741fe2bc45c4ab4648cb77700d'
-         '3b81a81b958dfe3cac3cdef7ee85f1ce')
-
-build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}
diff --git a/staging/xf86-input-void/PKGBUILD b/staging/xf86-input-void/PKGBUILD
deleted file mode 100644
index fd7e05474..000000000
--- a/staging/xf86-input-void/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 148602 2012-02-04 10:29:44Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-void
-pkgver=1.4.0
-pkgrel=3
-pkgdesc="X.org void input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
-
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules
deleted file mode 100644
index f6aa20835..000000000
--- a/staging/xf86-input-wacom/70-wacom.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-ACTION!="add|change", GOTO="wacom_end"
-
-# Match all serial wacom tablets with a serial ID starting with WACf
-# Notes: We assign NAME though we shouldn't, but currently the server requires it
-#        We assign the lot to subsystem pnp too because server reads NAME from
-#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
-#        will do and the ENV{NAME} can be removed.
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-
-LABEL="wacom_end"
-
diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD
deleted file mode 100644
index cb21a8848..000000000
--- a/staging/xf86-input-wacom/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148604 2012-02-04 10:32:20Z andyrtr $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-
-pkgname=xf86-input-wacom
-pkgver=0.13.0
-pkgrel=2
-pkgdesc="X.Org Wacom tablet driver"
-arch=('i686' 'x86_64')
-url="http://linuxwacom.sourceforge.net/"
-license=('GPL')
-backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr' 'libxinerama')
-makedepends=('xorg-server-devel>=1.11.99.902' 'libxext')
-conflicts=('xorg-server<1.11.99.902')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        70-wacom.rules)
-md5sums=('4a426535989e84c4161e3607ea851654'
-         '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/lib/udev/rules.d"
-  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
-}
diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD
deleted file mode 100644
index 070c63729..000000000
--- a/staging/xf86-video-apm/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149743 2012-02-09 21:16:17Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.3
-pkgrel=5
-pkgdesc="X.org Alliance ProMotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        apm-1.2.3-git.patch)
-sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac'
-          'ad9468519eb959bb879ba4e4993d6a83848d5c6f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/apm-1.2.3-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-apm/apm-1.2.3-git.patch b/staging/xf86-video-apm/apm-1.2.3-git.patch
deleted file mode 100644
index 1c6afb29d..000000000
--- a/staging/xf86-video-apm/apm-1.2.3-git.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/apm.h b/src/apm.h
-index bc66714..86c7663 100644
---- a/src/apm.h
-+++ b/src/apm.h
-@@ -109,7 +109,7 @@ typedef struct {
-     char		*MemMap;
-     pointer		BltMap;
-     Bool		UnlockCalled;
--    IOADDRESS		iobase, xport, xbase;
-+    unsigned long	iobase, xport, xbase;
-     unsigned char	savedSR10;
-     CARD8		MiscOut;
-     CARD8		c9, d9, db, Rush;
-diff --git a/src/apm_driver.c b/src/apm_driver.c
-index f172bab..f77bb2b 100644
---- a/src/apm_driver.c
-+++ b/src/apm_driver.c
-@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     hwp = VGAHWPTR(pScrn);
-     vgaHWGetIOBase(hwp);
--    pApm->iobase = hwp->PIOOffset;
--    pApm->xport = hwp->PIOOffset + 0x3C4;
-+#if ABI_VIDEODRV_VERSION < 12
-+#define PIOOFFSET hwp->PIOOffset
-+#else
-+/* FIXME reintroduce domain support */
-+#define PIOOFFSET 0
-+#endif
-+    pApm->iobase = PIOOFFSET;
-+    pApm->xport = PIOOFFSET + 0x3C4;
- 
-     /* Set pScrn->monitor */
-     pScrn->monitor = pScrn->confScreen->monitor;
diff --git a/staging/xf86-video-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD
deleted file mode 100644
index c1239fe1c..000000000
--- a/staging/xf86-video-ark/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149741 2012-02-09 21:12:21Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ark
-pkgver=0.7.4
-pkgrel=1
-pkgdesc="X.org ark video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        #git-fixes.patch
-        )
-sha1sums=('d95cb9aa56e7db542b3ac8fed9cb519b11f77556')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-ark/git-fixes.patch b/staging/xf86-video-ark/git-fixes.patch
deleted file mode 100644
index 2de0f64be..000000000
--- a/staging/xf86-video-ark/git-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
-From: Ondrej Zary <linux@rainbow-software.org>
-Date: Sat, 04 Dec 2010 00:23:51 +0000
-Subject: Don't assume that FB address registers are initialized properly
-
-https://bugs.freedesktop.org/show_bug.cgi?id=28249
-
-ark driver does not work with Hercules Stingray 64 card (ark2000pv).
-X fails to start with:
-
-[...]
-(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is
-0x0000
-(II) ark(0): Creating default Display subsection in Screen section
-        "Default Screen Section" for depth/fbbpp 24/32
-(==) ark(0): Depth 24, (--) framebuffer bpp 32
-(==) ark(0): RGB weight 888
-(==) ark(0): Default visual is TrueColor
-(**) ark(0): Chipset: "ark2000pv"
-(--) ark(0): Framebuffer @ 0xe5e50000
-(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
-(--) ark(0): Detected 2048 bytes video ram
-[...]
-Fatal server error:
-AddScreen/ScreenInit failed for driver 0
-
-Comparing with lspci, the framebuffer address is wrong:
-00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller])
-	Flags: medium devsel
-	Memory at e5000000 (32-bit, prefetchable) [size=4M]
-	[virtual] Expansion ROM at 1c000000 [disabled] [size=64K]
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/ark.h b/src/ark.h
-index de301dc..077f93b 100644
---- a/src/ark.h
-+++ b/src/ark.h
-@@ -34,7 +34,6 @@ typedef struct _ARKRec {
- #endif
- 	EntityInfoPtr		pEnt;
- 	CARD32			IOAddress;
--	CARD32			FBAddress;
- 	unsigned char *		FBBase;
- 	unsigned char *		MMIOBase;
- 	unsigned long		videoRam;
-diff --git a/src/ark_driver.c b/src/ark_driver.c
-index 5de3b9a..fec3e1a 100644
---- a/src/ark_driver.c
-+++ b/src/ark_driver.c
-@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
- 	outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f);
- 	modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
- 
--	/* use membase's later on ??? */
--	pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
--			  (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
--
--	pScrn->memPhysBase = pARK->FBAddress;
-+#ifndef XSERVER_LIBPCIACCESS
-+	pScrn->memPhysBase = pARK->PciInfo->memBase[0];
-+#else
-+	pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr;
-+#endif
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
--		   (unsigned long)pARK->FBAddress);
-+		   (unsigned long)pScrn->memPhysBase);
- 
- 	if (!xf86SetGamma(pScrn, gzeros))
- 		return FALSE;
-@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f;
- 	new->sr10 |= 0x1f;
- 
--	new->sr13 = pARK->FBAddress >> 16;
--	new->sr14 = pARK->FBAddress >> 24;
-+#ifndef XSERVER_LIBPCIACCESS
-+	new->sr13 = pARK->PciInfo->memBase[0] >> 16;
-+	new->sr14 = pARK->PciInfo->memBase[0] >> 24;
-+#else
-+	new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16;
-+	new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24;
-+#endif
- 
- 	new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03;
- 	switch (pScrn->videoRam) {
-@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 					     pARK->PciTag, 0xb8000, 0x8000);
- 
- 	pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
--				     pARK->PciTag, pARK->FBAddress,
-+				     pARK->PciTag, pARK->PciInfo->memBase[0],
- 				     pScrn->videoRam * 1024);
- #else
- 
-@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 	{
- 		void** result = (void**)&pARK->FBBase;
- 		int err = pci_device_map_range(pARK->PciInfo,
--					       pARK->FBAddress,
-+					       pARK->PciInfo->regions[0].base_addr,
- 					       pScrn->videoRam * 1024,
- 					       PCI_DEV_MAP_FLAG_WRITABLE |
- 					       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
- 					       result);
- 		
--		if (err) 
-+		if (err) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+			   "Cound not map framebuffer: %d\n", err);
- 			return FALSE;
-+		}
- 	}
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD
deleted file mode 100644
index ace558327..000000000
--- a/staging/xf86-video-ast/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149790 2012-02-10 21:24:59Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ast
-pkgver=0.93.9
-pkgrel=2
-pkgdesc="X.org ASPEED AST Graphics video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        ast-0.93.9-vga.patch)
-md5sums=('e25c6a55e9d07cc6054d6affc1231296'
-         '9aa9ea4c568b6563389fa634cb0f7cf0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/ast-0.93.9-vga.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-ast/ast-0.93.9-vga.patch b/staging/xf86-video-ast/ast-0.93.9-vga.patch
deleted file mode 100644
index e05a78f56..000000000
--- a/staging/xf86-video-ast/ast-0.93.9-vga.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 16 Nov 2011 20:09:40 +0000
-Subject: Adapt to domain changes in videoabi 12
-
-This is a blind change, I don't have this hardware handy to test with.
-It probably wants the same new API that tdfx wants.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/ast_driver.c b/src/ast_driver.c
-index bd3d338..128538f 100644
---- a/src/ast_driver.c
-+++ b/src/ast_driver.c
-@@ -498,11 +498,20 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
- 	      (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast");
- 
-    /* Resource Allocation */
-+#if ABI_VIDEODRV_VERSION < 12
-     pAST->IODBase = pScrn->domainIOBase;  
-+#else
-+    pAST->IODBase = 0;
-+#endif
-     /* "Patch" the PIOOffset inside vgaHW in order to force
-      * the vgaHW module to use our relocated i/o ports.
-      */
--    VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
-+
-+#if ABI_VIDEODRV_VERSION < 12
-+    VGAHWPTR(pScrn)->PIOOffset = /* ... */
-+#endif
-+       	pAST->PIOOffset =
-+	pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
- 	
-     pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
- 	
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD
deleted file mode 100644
index 028b977ac..000000000
--- a/staging/xf86-video-ati/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 149792 2012-02-10 21:29:58Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-ati
-pkgver=6.14.3
-pkgrel=2
-pkgdesc="X.org ati video driver"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=(libpciaccess libdrm udev pixman ati-dri)
-makedepends=('xorg-server-devel>=1.11.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('db635e2e2858d5db90362f546ac0adad85474bad')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make "DESTDIR=${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-chips/PKGBUILD b/staging/xf86-video-chips/PKGBUILD
deleted file mode 100644
index 971900114..000000000
--- a/staging/xf86-video-chips/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 149794 2012-02-10 21:39:35Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-chips
-pkgver=1.2.4
-pkgrel=4
-pkgdesc="X.org Chips and Technologies video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=(glibc)
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        chips-1.2.4-git.patch)
-sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4'
-          'b13ff000e3f6f06c1a7fd55e9e0ad6078f1b4e5b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/chips-1.2.4-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-chips/chips-1.2.4-git.patch b/staging/xf86-video-chips/chips-1.2.4-git.patch
deleted file mode 100644
index 9d8e856a3..000000000
--- a/staging/xf86-video-chips/chips-1.2.4-git.patch
+++ /dev/null
@@ -1,912 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 225e516..c0ed508 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- 
--# Checks for programs.
--AM_PROG_CC_C_O
--
- AH_TOP([#include "xorg-server.h"])
- 
- # Define a configure option for an alternate module directory
-diff --git a/man/chips.man b/man/chips.man
-index 740af38..0c022ee 100644
---- a/man/chips.man
-+++ b/man/chips.man
-@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
- Force driver to leave centering and stretching registers alone. This
- can fix some laptop suspend/resume problems. Default: off
- .TP
--.BI "Option \*qOverlay\*q"
--Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
--.TP
- .BI "Option \*qColorKey\*q \*q" integer \*q
- Set the colormap index used for the transparency key for the depth 8 plane
- when operating in 8+16 overlay mode.  The value must be in the range
-diff --git a/src/ct_accel.c b/src/ct_accel.c
-index 3920b0a..4b5776a 100644
---- a/src/ct_accel.c
-+++ b/src/ct_accel.c
-@@ -428,19 +428,7 @@ chips_imagewrite:
-         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
- #endif
- 
--
--#ifdef CHIPS_HIQV
--    if (XAAInit(pScreen, infoPtr)) {
--	if (cPtr->Flags & ChipsOverlay8plus16)      
--	    return(XAAInitDualFramebufferOverlay(pScreen,
--						 CTNAME(DepthChange)));
--	else
--	    return TRUE;
--    } else
--	return FALSE;
--#else
-     return(XAAInit(pScreen, infoPtr));
--#endif
- }
- 
- #ifdef CHIPS_HIQV
-@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
- #endif
-     w *= cAcl->BytesPerPixel;
-     ctBLTWAIT;
--#ifdef CHIPS_HIQV
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
--	    (pScrn->depth == 8))
--	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
--#endif
-     ctSETSRCADDR(srcaddr);
-     ctSETDSTADDR(destaddr);
- #ifdef CHIPS_HIQV
-@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
-     patternaddr = (paty * pScrn->displayWidth + 
- 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
-     cAcl->patternyrot = (patx & 0x3F) >> 3;
--#ifdef CHIPS_HIQV
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr += cPtr->FbOffset16;
--#endif
- 
-     ctBLTWAIT;
-     ctSETPATSRCADDR(patternaddr);
-@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
- 
- #ifdef CHIPS_HIQV
-     patternaddr = paty * pScrn->displayWidth + patx;
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
--    else
--	patternaddr *= cAcl->BytesPerPixel;
-+    patternaddr *= cAcl->BytesPerPixel;
- #else
-     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
- #endif
-@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
-     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     destpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	destaddr += cPtr->FbOffset16;
--    else
--	destaddr += cAcl->FbOffset;
-+    destaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
- 
-@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	y++;
- 
- 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    destaddr += cPtr->FbOffset16;
--	else
--	    destaddr += cAcl->FbOffset;
-+	destaddr += cAcl->FbOffset;
- 
- 	ctBLTWAIT;
- 	ctSETDSTADDR(destaddr);
-@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
-     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     srcpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	srcaddr += cPtr->FbOffset16;
--    else
--	srcaddr += cAcl->FbOffset;
-+    srcaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
-     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
-@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	dst += dstwidth;
- 	y++;
- 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    srcaddr += cPtr->FbOffset16;
--	else
--	    srcaddr += cAcl->FbOffset;
-+	srcaddr += cAcl->FbOffset;
- 	ctBLTWAIT;
- 	ctSETSRCADDR(srcaddr);
- 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
-diff --git a/src/ct_driver.c b/src/ct_driver.c
-index 6624b79..a2e5c94 100644
---- a/src/ct_driver.c
-+++ b/src/ct_driver.c
-@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags)
- 		}
- 
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags)
- 		pScrn->ValidMode     = CHIPSValidMode;
- 		foundScreen = TRUE;
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- #endif
-     
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- #endif
-@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
- 
-     hwp = VGAHWPTR(pScrn);
-     vgaHWGetIOBase(hwp);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     cPtr->PIOBase = hwp->PIOOffset;
-+#else
-+    cPtr->PIOBase = 0;
-+#endif
-+
-     /*
-      * Must allow ensure that storage for the 2nd set of vga registers is
-      * allocated for dual channel cards
-@@ -1639,55 +1644,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
-     
--    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
--	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
--	  if (pScrn->bitsPerPixel == 16) {
--	    if (cPtr->Flags & ChipsLinearSupport) {
--		cPtr->Flags |= ChipsOverlay8plus16;
--		if(!xf86GetOptValInteger(
--			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
--		    pScrn->colorKey = TRANSPARENCY_KEY;
--		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
--		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
--			   "PseudoColor overlay enabled.\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"Stretch\" \"ON\".\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
--		if (cPtr->Flags & ChipsShadowFB) {
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
--		           "                             - Disabling \"Shadow Framebuffer\".\n");
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                               Not support with option \"8Plus16\".\n");
--		    cPtr->Flags &= ~ChipsShadowFB;
--		    cPtr->Rotate = 0;
--		}
--	    } else {
--		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
--	    }
--	  } else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"Option \"Overlay\" is not supported in this configuration\n");
--	  }
--	} else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
--	}
--    }
--
--    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
--	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
--		&(cPtr->videoKey))) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
-+    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
-+	&(cPtr->videoKey))) {
-+         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
- 		cPtr->videoKey);
--	} else {
--	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
-+    } else {
-+       cPtr->videoKey =  (1 << pScrn->offset.red) | 
- 			(1 << pScrn->offset.green) |
- 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
- 			<< pScrn->offset.blue); 
--	}
-     }
- 
-     if (cPtr->Flags & ChipsShadowFB) {
-@@ -2335,28 +2300,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
-     /* and 32bits on the others. Thus multiply by a suitable factor      */  
-     if (cPtr->Flags & Chips64BitMemory) {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
-     } else {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
-     }
-@@ -3736,8 +3689,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
-     /* Should we re-save the text mode on each VT enter? */
-     if(!chipsModeInit(pScrn, pScrn->currentMode))
-       return FALSE;
--    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	&& (cPtr->Flags & ChipsVideoSupport)
-+    if ((cPtr->Flags & ChipsVideoSupport)
- 	&& (cPtr->Flags & ChipsLinearSupport)) 
-         CHIPSResetVideo(pScrn); 
- 
-@@ -3788,8 +3740,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-     int i, index, shift ;
-     CHIPSEntPtr cPtrEnt;    
- 
--    shift = ((pScrn->depth == 15) && 
--	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
-+    shift = (pScrn->depth == 15) ? 3 : 0;
- 
-     if (cPtr->UseDualChannel) {
-         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
-@@ -3895,18 +3846,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
-     hwp->disablePalette(hwp);
- }
- 
--static Bool
--cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
--                  int xsize, int ysize, int dpix, int dpiy,
--                  int width16, int width8)
--{
--    return
--        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
--                              dpix, dpiy, width16, width8, 16, 8) &&
--         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
--                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
--}
--
- /* Mandatory */
- static Bool
- CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-@@ -3947,22 +3886,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!chipsMapMem(pScrn))
- 	return FALSE;
- 
--    /* Setup a pointer to the overlay if needed */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
--	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
--	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Too little memory for overlay. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--    }
--
-     /* Setup the MMIO register access functions if need */
-     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
- 	CHIPSSetMmioExtFuncs(cPtr);
-@@ -4035,18 +3958,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     miClearVisualTypes();
- 
-     /* Setup the visuals we support. */
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
--	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
--			      pScrn->rgbBits, PseudoColor))
--		return FALSE;
--	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
--		return FALSE;
--    } else {
--      if (!miSetVisualTypes(pScrn->depth,
-+    if (!miSetVisualTypes(pScrn->depth,
- 			    miGetDefaultVisualMask(pScrn->depth),
- 			    pScrn->rgbBits, pScrn->defaultVisual))
--	return FALSE;
--    }
-+        return FALSE;
-     miSetPixmapDepths ();
- 
-     /*
-@@ -4090,13 +4005,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	break;
- #endif
-     case 16:
--      if (cPtr->Flags & ChipsOverlay8plus16) {
--	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
--				  cPtr->FbOffset16, FBStart, width, 
--				  height, pScrn->xDpi, pScrn->yDpi,
--				  displayWidth, displayWidth);
--	  break;
--      }
-     default:
- 	ret = fbScreenInit(pScreen, FBStart,
-  		        width,height,
-@@ -4223,7 +4131,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	}
- 	if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
- 				 pScrn->displayWidth, pBankInfo)) {
--	    xfree(pBankInfo);
-+	    free(pBankInfo);
- 	    pBankInfo = NULL;
- 	    return FALSE;
- 	}
-@@ -4244,9 +4152,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	if (pScrn->bitsPerPixel < 8)
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY / 2;
--	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
--	    freespace = allocatebase - pScrn->displayWidth * 
--		    pScrn->virtualY - cPtr->FbSize16;
- 	else	
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
-@@ -4369,9 +4274,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	    AvailFBArea.y2 = cAcl->CacheEnd /
- 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
- 
--	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
--		xf86InitFBManager(pScreen, &AvailFBArea); 
--	    }
-+	    xf86InitFBManager(pScreen, &AvailFBArea); 
- 	}
- 	if (cPtr->Flags & ChipsAccelSupport) {
- 	    if (IS_HiQV(cPtr)) {
-@@ -4425,16 +4328,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!miCreateDefColormap(pScreen))
- 	return FALSE;
-     
--    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
--		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
--	    return FALSE;
--    } else {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
-+    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
- 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
- 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
--	    return FALSE;
--    }
-+	return FALSE;
-     
- #ifndef XSERVER_LIBPCIACCESS
-     racflag = RAC_COLORMAP;
-@@ -4448,8 +4345,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	xf86SetSilkenMouse(pScreen);
- #endif
- 
--	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	    && (cPtr->Flags & ChipsVideoSupport)
-+	if ((cPtr->Flags & ChipsVideoSupport)
- 	    && (cPtr->Flags & ChipsLinearSupport)) {
- 	    CHIPSInitVideo(pScreen);
-     }
-@@ -4522,10 +4418,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	Base >>= 3;
- 	break;
-     case 16:
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	   Base >>= 1;
--	else
--	   Base >>= 2;
-+	Base >>= 1;
- 	break;
-     case 24:
- 	if (!IS_HiQV(cPtr))
-@@ -4581,14 +4474,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	cPtr->writeMSS(cPtr, hwp, MSS);
-     }
- 
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	Base = (Base << 3) & ~(unsigned long)0xF;
--
--	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
--	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
--	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
--    }
--
- }
- 
- /* Mandatory */
-@@ -4652,13 +4537,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
- 
--    if (flags & MODECHECK_FINAL) {
--    /* Don't subtract FrambufferSize here as it should be subtracted already */
--    if ((cPtr->Flags & ChipsOverlay8plus16) 
--      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
--	  < 0))
--	return MODE_MEM;
--    }
-     /* The tests here need to be expanded */
-     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
- 	return MODE_NO_INTERLACE;
-@@ -5544,12 +5422,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     } else {
- 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
-     }
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
--	/* Make sure that the overlay isn't visible in the overscan region */
--	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
--	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
--    } else
--	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-+    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
-     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
- 
-@@ -5558,8 +5431,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* set virtual screen width */
-     tmp = pScrn->displayWidth >> 3;
-     if (pScrn->bitsPerPixel == 16) {
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	    tmp <<= 1;		       /* double the width of the buffer */
-+	tmp <<= 1;		       /* double the width of the buffer */
-     } else if (pScrn->bitsPerPixel == 24) {
- 	tmp += tmp << 1;
-     } else if (pScrn->bitsPerPixel == 32) {
-@@ -5688,8 +5560,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
-     /* centering/stretching */
-     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
--	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
--	(cPtr->Flags & ChipsOverlay8plus16)) {
-+	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
- 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
- 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
- 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
-@@ -5709,8 +5580,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	}
-     }
- 
--    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
--		|| (cPtr->Flags & ChipsOverlay8plus16)) {
-+    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
- 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
- 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
-     } else {
-@@ -5723,8 +5593,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	ChipsNew->XR[0x82] |=0x02;
- 
-     /* software mode flag */
--    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
--	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
-+    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
- 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
- 	mode->CrtcHDisplay, mode->CrtcVDisplay);
- #ifdef DEBUG
-@@ -5762,7 +5631,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     	}
-     }	    
-     /* bpp depend */
--    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
-+    if (pScrn->bitsPerPixel == 16) {
- 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
- 	if (cPtr->Flags & ChipsGammaSupport)
- 	    ChipsNew->XR[0x82] |= 0x0C;
-@@ -5915,60 +5784,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* Turn off multimedia by default as it degrades performance */
-     ChipsNew->XR[0xD0] &= 0x0f;	 
-     
--    /* Setup the video/overlay */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
--#ifdef SAR04
--	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
--#endif
--	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
--	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
--	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
--	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
--	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
--	if (pScrn->weight.green == 5)
--	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
--
--	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
--	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
--	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
--	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
--	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
--	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
--
--	/* Left Edge of Overlay */
--	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
--	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
--	/* Right Edge of Overlay */
--	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
--							1) & 0xFF;
--	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
--							1) >> 8) & 0x07;
--	/* Top Edge of Overlay */
--	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
--	ChipsNew->MR[0x2F] &= 0xF8;
--	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
--	/* Bottom Edge of Overlay*/
--	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
--	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
--							1 ) >> 8) & 0x07;
--
--	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
--	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
--	ChipsNew->MR[0x3D] = 0x00;
--	ChipsNew->MR[0x3E] = 0x00;
--	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
--	ChipsNew->MR[0x40] = 0xFF;
--	ChipsNew->MR[0x41] = 0xFF;
--	ChipsNew->MR[0x42] = 0x00;
--    } else if (cPtr->Flags & ChipsVideoSupport) {
-+    if (cPtr->Flags & ChipsVideoSupport) {
- #if 0   /* if we do this even though video isn't playing we kill performance */
- 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
- #endif
-@@ -6877,8 +6693,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
- 	}
- 
- 	/* Set SAR04 multimedia register correctly */
--	if ((cPtr->Flags & ChipsOverlay8plus16)
--	    || (cPtr->Flags & ChipsVideoSupport)) {
-+	if ((cPtr->Flags & ChipsVideoSupport)) {
- #ifdef SAR04
- 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
- 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
-diff --git a/src/ct_driver.h b/src/ct_driver.h
-index d8ce228..9033867 100644
---- a/src/ct_driver.h
-+++ b/src/ct_driver.h
-@@ -114,7 +114,6 @@ typedef struct {
- /* Options flags for the C&T chipsets */
- #define ChipsHWCursor		0x00001000
- #define ChipsShadowFB		0x00002000
--#define ChipsOverlay8plus16	0x00004000
- #define ChipsUseNewFB		0x00008000
- 
- /* Architecture type flags */
-@@ -272,11 +271,13 @@ typedef struct {
- 
- typedef struct _CHIPSRec {
-     pciVideoPtr		PciInfo;
-+#ifndef XSERVER_LIBPCIACCESS
-     PCITAG		PciTag;
-+#endif
-     int			Chipset;
-     EntityInfoPtr       pEnt;
--    IOADDRESS		PIOBase;
--    CARD32		IOAddress;
-+    unsigned long	PIOBase;
-+    unsigned long	IOAddress;
-     unsigned long	FbAddress;
-     unsigned int	IOBase;
-     unsigned char *	FbBase;
-diff --git a/src/ct_video.c b/src/ct_video.c
-index a68acb9..c9e5bb4 100644
---- a/src/ct_video.c
-+++ b/src/ct_video.c
-@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
-     int num_adaptors;
- 	
--    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
--       (cPtr->Flags & ChipsVideoSupport)) {
-+    if ((cPtr->Flags & ChipsVideoSupport)) {
- 	newAdaptor = CHIPSSetupImageVideo(pScreen);
- 	CHIPSInitOffscreenImages(pScreen);
-     }
-diff --git a/util/dRegs.c b/util/dRegs.c
-index b7edc8f..0d2f0cb 100644
---- a/util/dRegs.c
-+++ b/util/dRegs.c
-@@ -1,63 +1,8 @@
--
--
--
--
--
--
--#ifdef __NetBSD__
--#  include <sys/types.h>
--#  include <machine/pio.h>
--#  include <machine/sysarch.h>
--#else
--#  if defined(SVR4) && defined(i386)
--#    include <sys/types.h>
--#    ifdef NCR
--       /* broken NCR <sys/sysi86.h> */
--#      define __STDC
--#      include <sys/sysi86.h>
--#      undef __STDC
--#    else
--#      include <sys/sysi86.h>
--#    endif
--#    ifdef SVR4
--#      if !defined(sun)
--#        include <sys/seg.h>
--#      endif
--#    endif
--#    include <sys/v86.h>
--#    if defined(sun)
--#      include <sys/psw.h>
--#    endif
--#  endif
--#  include "AsmMacros.h"
--#endif /* NetBSD */
--
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- 
--#ifdef __NetBSD__
--#  define SET_IOPL() i386_iopl(3)
--#  define RESET_IOPL() i386_iopl(0)
--#else
--#  if defined(SVR4) && defined(i386)
--#    ifndef SI86IOPL
--#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
--#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
--#    else
--#      define SET_IOPL() sysi86(SI86IOPL,3)
--#      define RESET_IOPL() sysi86(SI86IOPL,0)
--#    endif
--#  else
--#    ifdef linux
--#      define SET_IOPL() iopl(3)
--#      define RESET_IOPL() iopl(0)
--#    else
--#      define SET_IOPL() (void)0
--#      define RESET_IOPL() (void)0
--#    endif
--#  endif
--#endif
-+#include "iopl.h"
- 
- int main(void)
- {
-diff --git a/util/iopl.h b/util/iopl.h
-new file mode 100644
-index 0000000..e08207c
---- /dev/null
-+++ b/util/iopl.h
-@@ -0,0 +1,60 @@
-+#ifdef __NetBSD__
-+#  include <sys/types.h>
-+#  include <machine/pio.h>
-+#  include <machine/sysarch.h>
-+#else
-+#  if defined(__linux__)
-+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
-+ * #    include <sys/io.h>
-+ */
-+int iopl(int level);
-+#  endif
-+#  if defined(SVR4) && defined(i386)
-+#    include <sys/types.h>
-+#    ifdef NCR
-+       /* broken NCR <sys/sysi86.h> */
-+#      define __STDC
-+#      include <sys/sysi86.h>
-+#      undef __STDC
-+#    else
-+#      include <sys/sysi86.h>
-+#    endif
-+#    ifdef SVR4
-+#      if !defined(sun)
-+#        include <sys/seg.h>
-+#      endif
-+#    endif
-+#    include <sys/v86.h>
-+#    if defined(sun)
-+#      include <sys/psw.h>
-+#    endif
-+#  endif
-+#  include "AsmMacros.h"
-+#endif /* NetBSD */
-+
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#ifdef __NetBSD__
-+#  define SET_IOPL() i386_iopl(3)
-+#  define RESET_IOPL() i386_iopl(0)
-+#else
-+#  if defined(SVR4) && defined(i386)
-+#    ifndef SI86IOPL
-+#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
-+#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
-+#    else
-+#      define SET_IOPL() sysi86(SI86IOPL,3)
-+#      define RESET_IOPL() sysi86(SI86IOPL,0)
-+#    endif
-+#  else
-+#    ifdef linux
-+#      define SET_IOPL() iopl(3)
-+#      define RESET_IOPL() iopl(0)
-+#    else
-+#      define SET_IOPL() (void)0
-+#      define RESET_IOPL() (void)0
-+#    endif
-+#  endif
-+#endif
-diff --git a/util/mRegs.c b/util/mRegs.c
-index f359738..843d01d 100644
---- a/util/mRegs.c
-+++ b/util/mRegs.c
-@@ -1,63 +1,8 @@
--
--
--
--
--
--
--#ifdef __NetBSD__
--#  include <sys/types.h>
--#  include <machine/pio.h>
--#  include <machine/sysarch.h>
--#else
--#  if defined(SVR4) && defined(i386)
--#    include <sys/types.h>
--#    ifdef NCR
--       /* broken NCR <sys/sysi86.h> */
--#      define __STDC
--#      include <sys/sysi86.h>
--#      undef __STDC
--#    else
--#      include <sys/sysi86.h>
--#    endif
--#    ifdef SVR4
--#      if !defined(sun)
--#        include <sys/seg.h>
--#      endif
--#    endif
--#    include <sys/v86.h>
--#    if defined(sun)
--#      include <sys/psw.h>
--#    endif
--#  endif
--#  include "AsmMacros.h"
--#endif /* NetBSD */
--
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- 
--#ifdef __NetBSD__
--#  define SET_IOPL() i386_iopl(3)
--#  define RESET_IOPL() i386_iopl(0)
--#else
--#  if defined(SVR4) && defined(i386)
--#    ifndef SI86IOPL
--#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
--#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
--#    else
--#      define SET_IOPL() sysi86(SI86IOPL,3)
--#      define RESET_IOPL() sysi86(SI86IOPL,0)
--#    endif
--#  else
--#    ifdef linux
--#      define SET_IOPL() iopl(3)
--#      define RESET_IOPL() iopl(0)
--#    else
--#      define SET_IOPL() (void)0
--#      define RESET_IOPL() (void)0
--#    endif
--#  endif
--#endif
-+#include "iopl.h"
- 
- int hex2int(char* str);
- 
-diff --git a/util/modClock.c b/util/modClock.c
-index 89a291a..45af19b 100644
---- a/util/modClock.c
-+++ b/util/modClock.c
-@@ -1,61 +1,12 @@
--
--#ifdef __NetBSD__
--#  include <sys/types.h>
--#  include <machine/pio.h>
--#  include <machine/sysarch.h>
--#else
--#  if defined(SVR4) && defined(i386)
--#    include <sys/types.h>
--#    ifdef NCR
--       /* broken NCR <sys/sysi86.h> */
--#      define __STDC
--#      include <sys/sysi86.h>
--#      undef __STDC
--#    else
--#      include <sys/sysi86.h>
--#    endif
--#    ifdef SVR4
--#      if !defined(sun)
--#        include <sys/seg.h>
--#      endif
--#    endif
--#    include <sys/v86.h>
--#    if defined(sun)
--#      include <sys/psw.h>
--#    endif
--#  endif
--#  include "AsmMacros.h"
--#endif /* NetBSD */
--
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+
- #ifndef Lynx
- #include <fnmatch.h>
- #endif
- 
--#ifdef __NetBSD__
--#  define SET_IOPL() i386_iopl(3)
--#  define RESET_IOPL() i386_iopl(0)
--#else
--#  if defined(SVR4) && defined(i386)
--#    ifndef SI86IOPL
--#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
--#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
--#    else
--#      define SET_IOPL() sysi86(SI86IOPL,3)
--#      define RESET_IOPL() sysi86(SI86IOPL,0)
--#    endif
--#  else
--#    ifdef linux
--#      define SET_IOPL() iopl(3)
--#      define RESET_IOPL() iopl(0)
--#    else
--#      define SET_IOPL() (void)0
--#      define RESET_IOPL() (void)0
--#    endif
--#  endif
--#endif
-+#include "iopl.h"
- 
- #define tolerance 0.01 /* +/- 1% */
- 
diff --git a/staging/xf86-video-cirrus/PKGBUILD b/staging/xf86-video-cirrus/PKGBUILD
deleted file mode 100644
index 41513805f..000000000
--- a/staging/xf86-video-cirrus/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149842 2012-02-11 10:22:03Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-cirrus
-pkgver=1.3.2
-pkgrel=8
-pkgdesc="X.org Cirrus Logic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        cirrus-1.3.2-git.patch)
-md5sums=('8195d03ed0be0975c03441e66a9f53b3'
-         '3e3677f330f1c24ce0f570c81f2b9de2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/cirrus-1.3.2-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-cirrus/cirrus-1.3.2-git.patch b/staging/xf86-video-cirrus/cirrus-1.3.2-git.patch
deleted file mode 100644
index 5701a8473..000000000
--- a/staging/xf86-video-cirrus/cirrus-1.3.2-git.patch
+++ /dev/null
@@ -1,846 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index aa89732..7bd8873 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,17 +18,18 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
--EXTRA_DIST = README.multihead ChangeLog
-+EXTRA_DIST = README.multihead
- 
--MAINTAINERCLEANFILES=ChangeLog
-+.PHONY: ChangeLog INSTALL
- 
--.PHONY: ChangeLog
-+INSTALL:
-+	$(INSTALL_CMD)
- 
- ChangeLog:
- 	$(CHANGELOG_CMD)
- 
--dist-hook: ChangeLog
-+dist-hook: ChangeLog INSTALL
- 
-diff --git a/configure.ac b/configure.ac
-index d205eb3..68c3eb3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,47 +20,47 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-cirrus],
--        1.3.2,
-+        [1.3.2],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-cirrus)
--
-+        [xf86-video-cirrus])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
--m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.2)
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
--XORG_CWARNFLAGS
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -78,21 +78,15 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--# Checks for header files.
--AC_HEADER_STDC
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=cirrus
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--XORG_CHANGELOG
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..1ea26b3 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,28 +1,25 @@
- #
--# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
--# 
-+# Copyright (c) 2005, Oracle and/or its affiliates. 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
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
-+#
- 
- drivermandir = $(DRIVER_MAN_DIR)
- 
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/cirrus.man b/man/cirrus.man
-index 009011e..af46248 100644
---- a/man/cirrus.man
-+++ b/man/cirrus.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH CIRRUS __drivermansuffix__ __vendorversion__
-diff --git a/src/CirrusClk.c b/src/CirrusClk.c
-index a3590c9..6fd6270 100644
---- a/src/CirrusClk.c
-+++ b/src/CirrusClk.c
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.8 1998/12/06 06:08:28 dawes Exp $ */
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-diff --git a/src/alp.h b/src/alp.h
-index 01c5301..a182d0c 100644
---- a/src/alp.h
-+++ b/src/alp.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.8 2001/10/01 13:44:05 eich Exp $ */
--
- /* (c) Itai Nahshon */
- 
- #ifndef ALP_H
-diff --git a/src/alp_driver.c b/src/alp_driver.c
-index fe81757..d3d8e4f 100644
---- a/src/alp_driver.c
-+++ b/src/alp_driver.c
-@@ -15,8 +15,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.35 2003/11/03 05:11:09 tsi Exp $ */
--
- /* All drivers should typically include these */
- #include "xf86.h"
- #include "xf86_OSproc.h"
-@@ -29,6 +27,10 @@
- /* Drivers for PCI hardware need this */
- #include "xf86PciInfo.h"
- 
-+#ifndef PCI_CHIP_GD7556  /*  for old xf86PciInfo.h  */
-+#define PCI_CHIP_GD7556            0x004C
-+#endif
-+
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
- 
-@@ -119,6 +121,11 @@ static void AlpOffscreenAccelInit(ScrnInfoPtr pScrn);
- static void	AlpDisplayPowerManagementSet(ScrnInfoPtr pScrn,
- 											int PowerManagementMode, int flags);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+static void PC98CIRRUS755xEnable(ScrnInfoPtr pScrn);
-+static void PC98CIRRUS755xDisable(ScrnInfoPtr pScrn);
-+#endif
-+
- /*
-  * This is intentionally screen-independent.  It indicates the binding
-  * choice made in the first PreInit.
-@@ -153,6 +160,8 @@ static int gd5430_MaxClocks[] = {  85500,  85500,  50000,  28500,      0 };
- static int gd5446_MaxClocks[] = { 135100, 135100,  85500,  85500,      0 };
- static int gd5480_MaxClocks[] = { 135100, 200000, 200000, 135100, 135100 };
- static int gd7548_MaxClocks[] = {  80100,  80100,  80100,  80100,  80100 };
-+static int gd7555_MaxClocks[] = {  80100,  80100,  80100,  80100,  80100 };
-+static int gd7556_MaxClocks[] = {  80100,  80100,  80100,  80100,  80100 };
- 
- #ifdef XFree86LOADER
- 
-@@ -248,7 +257,7 @@ AlpFreeRec(ScrnInfoPtr pScrn)
- {
- 	if (pScrn->driverPrivate == NULL)
- 		return;
--	xfree(pScrn->driverPrivate);
-+	free(pScrn->driverPrivate);
- 	pScrn->driverPrivate = NULL;
- }
- 
-@@ -385,6 +394,11 @@ AlpCountRam(ScrnInfoPtr pScrn)
- 			break;
- 	}
- 	break;
-+
-+    case PCI_CHIP_GD7555:
-+    case PCI_CHIP_GD7556:
-+	videoram = 2048;   /*  for PC-9821 La13 etc.  */
-+	break;
-     }
- 
-     /* UNMap the Alp memory and MMIO areas */
-@@ -407,6 +421,8 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
- {
- 	int *linePitches = NULL;
- 	int i, n = 0;
-+	int max_pitch;
-+
- 	CirPtr pCir = CIRPTR(pScrn);
- 
- 	/* XXX ajv - 512, 576, and 1536 may not be supported
-@@ -423,8 +439,21 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
- 							1280, 1536, 1600, 1920, 2048, 0 };
- #endif
- 
-+	switch (pCir->Chipset) {
-+	case PCI_CHIP_GD5436:
-+	case PCI_CHIP_GD5446:
-+		max_pitch = 0x1ff << 3;
-+		break;
-+
-+	default:
-+		/* FIXME max_pitch for other chipsets? */
-+		max_pitch = (pScrn->bitsPerPixel / 8) * 2048;
-+		break;
-+	}
-+
- 	for (i = 0; accelWidths[i] != 0; i++) {
--		if (accelWidths[i] % pCir->Rounding == 0) {
-+		if ((accelWidths[i] % pCir->Rounding == 0)
-+		 && ((accelWidths[i] * pScrn->bitsPerPixel / 8) <= max_pitch)) {
- 			n++;
- 			linePitches = xnfrealloc(linePitches, n * sizeof(int));
- 			linePitches[n - 1] = accelWidths[i];
-@@ -482,12 +511,17 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	pCir = CIRPTR(pScrn);
- 	pCir->pScrn = pScrn;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
-+#else
-+	pCir->PIOReg = 0x3CE;
-+#endif
- 
- 	/* Get the entity, and make sure it is PCI. */
- 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
- 	if (pCir->pEnt->location.type != BUS_PCI) {
--		xfree(pCir->pEnt);
-+		free(pCir->pEnt);
- 		return FALSE;
- 	}
- 
-@@ -498,7 +532,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 			      PCI_DEV_DEV(pCir->PciInfo),
- 			      PCI_DEV_FUNC(pCir->PciInfo));
- 
--    if (xf86LoadSubModule(pScrn, "int10")) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98() && xf86LoadSubModule(pScrn, "int10")) {
- 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
- 	pInt = xf86InitInt10(pCir->pEnt->index);
- 	xf86FreeInt10(pInt);
-@@ -509,8 +544,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10);
- 	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14);
--	
-     }
-+#endif
- 
-     /* Set pScrn->monitor */
- 	pScrn->monitor = pScrn->confScreen->monitor;
-@@ -574,7 +609,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 	xf86CollectOptions(pScrn, NULL);
- 
- 	/* Process the options */
--	if (!(pCir->Options = xalloc(sizeof(CirOptions))))
-+	if (!(pCir->Options = malloc(sizeof(CirOptions))))
- 		return FALSE;
- 	memcpy(pCir->Options, CirOptions, sizeof(CirOptions));
- 	xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCir->Options);
-@@ -589,6 +624,16 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	from = X_DEFAULT;
- 	pCir->HWCursor = FALSE;
-+
-+	switch (pCir->Chipset) {
-+	case PCI_CHIP_GD7555:
-+	case PCI_CHIP_GD7556:
-+	  pCir->HWCursor = TRUE;
-+	  break;
-+	default:
-+	  break;
-+	}
-+
- 	if (xf86GetOptValBool(pCir->Options, OPTION_HW_CURSOR, &pCir->HWCursor))
- 		from = X_CONFIG;
- 
-@@ -863,10 +908,10 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 		case PCI_CHIP_GD5430:
- 		case PCI_CHIP_GD5434_4:
- 		case PCI_CHIP_GD5434_8:
--		case PCI_CHIP_GD5436:
- 	/*	case PCI_CHIP_GD5440: */
- 			p = gd5430_MaxClocks;
- 			break;
-+		case PCI_CHIP_GD5436:
- 		case PCI_CHIP_GD5446:
- 			p = gd5446_MaxClocks;
- 			break;
-@@ -876,6 +921,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 		case PCI_CHIP_GD7548:
- 		        p = gd7548_MaxClocks;
-                         break;
-+		case PCI_CHIP_GD7555:
-+		        p = gd7555_MaxClocks;
-+                        break;
-+		case PCI_CHIP_GD7556:
-+		        p = gd7556_MaxClocks;
-+                        break;
- 		}
- 		if (!p)
- 			return FALSE;
-@@ -1360,6 +1411,11 @@ AlpModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
- 	vgaHWProtect(pScrn, FALSE);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	if (xf86IsPc98())
-+		PC98CIRRUS755xEnable(pScrn);
-+#endif
-+
- 	return TRUE;
- }
- 
-@@ -1489,7 +1545,7 @@ AlpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	
- 	if(pCir->shadowFB) {
- 	    pCir->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	    pCir->ShadowPtr = xalloc(pCir->ShadowPitch * height);
-+	    pCir->ShadowPtr = malloc(pCir->ShadowPitch * height);
- 	    displayWidth = pCir->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	    FbBase = pCir->ShadowPtr;
- 	} else {
-@@ -1782,6 +1838,11 @@ AlpLeaveVT(int scrnIndex, int flags)
- 
- 	AlpRestore(pScrn);
- 	vgaHWLock(hwp);
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	if (xf86IsPc98())
-+		PC98CIRRUS755xDisable(pScrn);
-+#endif
- }
- 
- 
-@@ -1813,12 +1874,17 @@ AlpCloseScreen(int scrnIndex, ScreenPtr pScreen)
- 		xf86DestroyCursorInfoRec(pCir->CursorInfoRec);
- 	pCir->CursorInfoRec = NULL;
- 	if (pCir->DGAModes)
--		xfree(pCir->DGAModes);
-+		free(pCir->DGAModes);
- 	pCir->DGAnumModes = 0;
- 	pCir->DGAModes = NULL;
- 
- 	pScrn->vtSema = FALSE;
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	if (xf86IsPc98())
-+		PC98CIRRUS755xDisable(pScrn);
-+#endif
-+
- 	pScreen->CloseScreen = pCir->CloseScreen;
- 	return (*pScreen->CloseScreen)(scrnIndex, pScreen);
- }
-@@ -2081,3 +2147,53 @@ AlpOffscreenAccelInit(ScrnInfoPtr pScrn)
- 		   box.y2 - pScrn->virtualY);
-     }
- }
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+static void
-+PC98CIRRUS755xEnable(ScrnInfoPtr pScrn)  /*  enter_aile()  */
-+{
-+   unsigned int  index,data;
-+   vgaHWPtr hwp = VGAHWPTR(pScrn);
-+
-+   outb(0xfac, 0x02);
-+
-+   outb(0x68, 0x0e);
-+   outb(0x6a, 0x07);
-+   outb(0x6a, 0x8f);
-+   outb(0x6a, 0x06);
-+
-+   outw(VGA_SEQ_INDEX, 0x1206);         /*  unlock cirrus special  */
-+
-+   index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET;
-+   data  = hwp->IOBase + VGA_CRTC_DATA_OFFSET;
-+   outb(index, 0x3c);
-+   outb(data,  inb(data) & 0xef);
-+   outb(index, 0x1a);
-+   outb(data,  inb(data) & 0xf3);
-+}
-+
-+static void
-+PC98CIRRUS755xDisable(ScrnInfoPtr pScrn)  /*  leave_aile()  */
-+{
-+   unsigned int  index,data;
-+   vgaHWPtr hwp = VGAHWPTR(pScrn);
-+
-+   outw(VGA_SEQ_INDEX, 0x1206);         /*  unlock cirrus special  */
-+
-+   index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET;
-+   data  = hwp->IOBase + VGA_CRTC_DATA_OFFSET;
-+   outb(index, 0x3c);
-+   outb(data,  0x71);
-+   outb(index, 0x1a);
-+   outb(data,  inb(data) | 0x0c);
-+
-+   outb(0xfac,0x00);
-+
-+   outb(0x68, 0x0f);
-+   outb(0x6a, 0x07);
-+   outb(0x6a, 0x8e);
-+   outb(0x6a, 0x21);
-+   outb(0x6a, 0x69);
-+   outb(0x6a, 0x06);
-+}
-+#endif
-diff --git a/src/alp_hwcurs.c b/src/alp_hwcurs.c
-index 79dfce7..9891eb4 100644
---- a/src/alp_hwcurs.c
-+++ b/src/alp_hwcurs.c
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.4 2000/12/06 15:35:15 eich Exp $ */
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-diff --git a/src/alp_i2c.c b/src/alp_i2c.c
-index 9e6ae67..7365215 100644
---- a/src/alp_i2c.c
-+++ b/src/alp_i2c.c
-@@ -4,8 +4,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.6 1999/02/28 11:19:38 dawes Exp $ */
--
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "compiler.h"
-diff --git a/src/alp_xaa.c b/src/alp_xaa.c
-index 95741fc..7a96e1a 100644
---- a/src/alp_xaa.c
-+++ b/src/alp_xaa.c
-@@ -4,8 +4,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
--
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "compiler.h"
-diff --git a/src/alp_xaam.c b/src/alp_xaam.c
-index 0193a43..3ecc7de 100644
---- a/src/alp_xaam.c
-+++ b/src/alp_xaam.c
-@@ -1,6 +1,5 @@
- /* (c) Itai Nahshon */
- /* #define DEBUG */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff --git a/src/cir.h b/src/cir.h
-index 904d9cc..861966d 100644
---- a/src/cir.h
-+++ b/src/cir.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.20 2002/01/04 21:26:54 tsi Exp $ */
--
- /* (c) Itai Nahshon */
- 
- #ifndef CIR_H
-@@ -23,7 +21,7 @@ typedef struct {
- 	CARD32			properties;
- 	pciVideoPtr		PciInfo;
- 	PCITAG			PciTag;
--	IOADDRESS		PIOReg;
-+	unsigned long		PIOReg;
-     union {
- 	struct lgRec		*lg;
- 	struct alpRec		*alp;
-diff --git a/src/cir_dga.c b/src/cir_dga.c
-index bc98df6..f930231 100644
---- a/src/cir_dga.c
-+++ b/src/cir_dga.c
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.5 2001/02/15 17:39:27 eich Exp $ */
- /*
-  * Copyright 2000 by Egbert Eich
-  *
-@@ -83,9 +82,9 @@ CirDGAInit(ScreenPtr pScreen)
-   if (!pCir->DGAnumModes) {
-     pMode = firstMode = pScrn->modes;
-     while (pMode) {
--      newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec));
-+      newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec));
-       if (!newmodes) {
--	xfree(modes);
-+	free(modes);
- 	return FALSE;
-       }
-       modes = newmodes;
-diff --git a/src/cir_driver.c b/src/cir_driver.c
-index 5466c48..7e470bb 100644
---- a/src/cir_driver.c
-+++ b/src/cir_driver.c
-@@ -15,8 +15,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */
--
- /* All drivers should typically include these */
- #include "xf86.h"
- #include "xf86_OSproc.h"
-@@ -29,6 +27,10 @@
- /* Drivers for PCI hardware need this */
- #include "xf86PciInfo.h"
- 
-+#ifndef PCI_CHIP_GD7556  /*  for old xf86PciInfo.h  */
-+#define PCI_CHIP_GD7556            0x004C
-+#endif
-+
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
- 
-@@ -90,6 +92,8 @@ SymTabRec CIRChipsets[] = {
- 	{ PCI_CHIP_GD5464BD,	"CL-GD5464BD" },
- 	{ PCI_CHIP_GD5465,		"CL-GD5465" },
- 	{ PCI_CHIP_GD7548,              "CL-GD7548" },
-+	{ PCI_CHIP_GD7555,              "CL-GD7555" },
-+	{ PCI_CHIP_GD7556,              "CL-GD7556" },
- 	{-1,					NULL }
- };
- 
-@@ -107,6 +111,8 @@ _X_EXPORT PciChipsets CIRPciChipsets[] = {
- 	{ PCI_CHIP_GD5464BD,PCI_CHIP_GD5464BD,	RES_SHARED_VGA },
- 	{ PCI_CHIP_GD5465,	PCI_CHIP_GD5465,	RES_SHARED_VGA },
- 	{ PCI_CHIP_GD7548,	PCI_CHIP_GD7548,	RES_SHARED_VGA },
-+	{ PCI_CHIP_GD7555,	PCI_CHIP_GD7555,	RES_SHARED_VGA },
-+	{ PCI_CHIP_GD7556,	PCI_CHIP_GD7556,	RES_SHARED_VGA },
- 	{ -1,				-1,					RES_UNDEFINED}
- };
- 
-@@ -238,7 +244,7 @@ CIRProbe(DriverPtr drv, int flags)
- 				    CIRChipsets, CIRPciChipsets, devSections,
-  				    numDevSections, drv, &usedChips);
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
-  	return FALSE;
-     if (flags & PROBE_DETECT)
-@@ -280,7 +286,7 @@ CIRProbe(DriverPtr drv, int flags)
-  	    pScrn->Probe	 = NULL;
-  	}
-     }
--    xfree(usedChips);
-+    free(usedChips);
-      
-     return foundScreen;
- }
-diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h
-index f0f5cf8..669b8fe 100644
---- a/src/cir_pcirename.h
-+++ b/src/cir_pcirename.h
-@@ -34,6 +34,33 @@ enum region_type {
-     REGION_IO 
- };
- 
-+#include "xf86Module.h"
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-+
-+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
-+#define PCI_DOM_MASK    0x01fful
-+#else
-+#define PCI_DOM_MASK 0x0ffu
-+#endif
-+
-+#ifndef PCI_DOM_MASK
-+# define PCI_DOM_MASK 0x0ffu
-+#endif
-+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
-+
-+static inline uint32_t
-+pciTag(int busnum, int devnum, int funcnum)
-+{
-+	uint32_t tag;
-+	tag  = (busnum & (PCI_DOMBUS_MASK)) << 16;
-+	tag |= (devnum & 0x00001fu) << 11;
-+	tag |= (funcnum & 0x000007u) << 8;
-+
-+	return tag;
-+}
-+#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */
-+
- #ifndef XSERVER_LIBPCIACCESS
- 
- /* pciVideoPtr */
-diff --git a/src/cir_shadow.c b/src/cir_shadow.c
-index b89890a..0716a64 100644
---- a/src/cir_shadow.c
-+++ b/src/cir_shadow.c
-@@ -1,5 +1,3 @@
--/* $XFree86: Exp $ */
--
- /*
-    Copyright (c) 1999,2000  The XFree86 Project Inc. 
-    based on code written by Mark Vojkovich <markv@valinux.com>
-diff --git a/src/lg.h b/src/lg.h
-index 9d91053..985f634 100644
---- a/src/lg.h
-+++ b/src/lg.h
-@@ -10,8 +10,6 @@
-  *  Inspired by cir.h
-  */
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.12 2001/05/04 19:05:36 dawes Exp $ */
--
- #ifndef LG_H
- #define LG_H
- #define LG_DEBUG
-diff --git a/src/lg_driver.c b/src/lg_driver.c
-index cfc3e65..fc864f8 100644
---- a/src/lg_driver.c
-+++ b/src/lg_driver.c
-@@ -13,7 +13,6 @@
-  *	David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
-  *	Guy DESBIEF, Itai Nahshon.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.49 2003/11/03 05:11:09 tsi Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-@@ -259,7 +258,7 @@ LgFreeRec(ScrnInfoPtr pScrn)
- {
- 	if (pScrn->driverPrivate == NULL)
- 		return;
--	xfree(pScrn->driverPrivate);
-+	free(pScrn->driverPrivate);
- 	pScrn->driverPrivate = NULL;
- }
- 
-@@ -373,7 +372,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	pCir = CIRPTR(pScrn);
- 	pCir->pScrn = pScrn;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
-+#else
-+	pCir->PIOReg = 0x3CE;
-+#endif
- 
- 	/* Get the entity, and make sure it is PCI. */
- 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
-@@ -454,7 +458,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 	xf86CollectOptions(pScrn, NULL);
- 
- 	/* Process the options */
--	if (!(pCir->Options = xalloc(sizeof(LgOptions))))
-+	if (!(pCir->Options = malloc(sizeof(LgOptions))))
- 		return FALSE;
- 	memcpy(pCir->Options, LgOptions, sizeof(LgOptions));
- 	xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCir->Options);
-@@ -1314,7 +1318,7 @@ LgScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	
- 	if(pCir->shadowFB) {
- 	    pCir->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	    pCir->ShadowPtr = xalloc(pCir->ShadowPitch * height);
-+	    pCir->ShadowPtr = malloc(pCir->ShadowPitch * height);
- 	    displayWidth = pCir->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	    FbBase = pCir->ShadowPtr;
- 	} else {
-@@ -1617,7 +1621,7 @@ LgCloseScreen(int scrnIndex, ScreenPtr pScreen)
- 		xf86DestroyCursorInfoRec(pCir->CursorInfoRec);
- 	pCir->CursorInfoRec = NULL;
- 	if (pCir->DGAModes)
--		xfree(pCir->DGAModes);
-+		free(pCir->DGAModes);
- 	pCir->DGAnumModes = 0;
- 	pCir->DGAModes = NULL;
- 
-diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c
-index b41b79a..381db1c 100644
---- a/src/lg_hwcurs.c
-+++ b/src/lg_hwcurs.c
-@@ -10,7 +10,6 @@
-  * Much of this code is inspired by the HW cursor code from XFree86
-  * 3.3.3.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff --git a/src/lg_i2c.c b/src/lg_i2c.c
-index 05e083c..145cc2e 100644
---- a/src/lg_i2c.c
-+++ b/src/lg_i2c.c
-@@ -1,7 +1,5 @@
- /* (c) Itai Nahshon */
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.1 1998/11/15 04:30:25 dawes Exp $ */
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-diff --git a/src/lg_xaa.c b/src/lg_xaa.c
-index fd8c70a..8bab365 100644
---- a/src/lg_xaa.c
-+++ b/src/lg_xaa.c
-@@ -10,7 +10,6 @@
-  * Much of this code is inspired by the XAA acceleration from XFree86
-  * 3.3.3, laguna_acl.c
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff --git a/src/lg_xaa.h b/src/lg_xaa.h
-index 7359a49..162aa5d 100644
---- a/src/lg_xaa.h
-+++ b/src/lg_xaa.h
-@@ -13,7 +13,6 @@
-  * This header file draws much from the file cir_blitLG.h in version 3.3.3
-  * of XFree86.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.3 2000/02/08 13:13:15 eich Exp $ */
- 
- /* This header file defines the necessary structures, contstants, and
-    variables for using the bitBLT engine on a Laguna family graphics
diff --git a/staging/xf86-video-dummy/PKGBUILD b/staging/xf86-video-dummy/PKGBUILD
deleted file mode 100644
index 0df5bbb57..000000000
--- a/staging/xf86-video-dummy/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149844 2012-02-11 10:27:32Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-dummy
-pkgver=0.3.5
-pkgrel=1
-pkgdesc="X.org dummy video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('41cfcaec986ab13e931d260953c5a3f626fd1d2b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-fbdev/PKGBUILD b/staging/xf86-video-fbdev/PKGBUILD
deleted file mode 100644
index 4b86599d1..000000000
--- a/staging/xf86-video-fbdev/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149846 2012-02-11 10:30:01Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-fbdev
-pkgver=0.4.2
-pkgrel=6
-pkgdesc="X.org framebuffer video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-glint/PKGBUILD b/staging/xf86-video-glint/PKGBUILD
deleted file mode 100644
index edbfd0c2e..000000000
--- a/staging/xf86-video-glint/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149850 2012-02-11 10:35:50Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-glint
-pkgver=1.2.6
-pkgrel=2
-pkgdesc="X.org GLINT/Permedia video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-i128/PKGBUILD b/staging/xf86-video-i128/PKGBUILD
deleted file mode 100644
index a8be76bbf..000000000
--- a/staging/xf86-video-i128/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149852 2012-02-11 10:41:47Z andyrtr $
-# Maintainer:Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i128
-pkgver=1.3.4
-pkgrel=5
-pkgdesc="X.org Number 9 I128 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        i128-1.3.4-git.patch)
-sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775'
-          'c282f9de94ef7225f03034c9c07f40f46bd44bdc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/i128-1.3.4-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-i128/i128-1.3.4-git.patch b/staging/xf86-video-i128/i128-1.3.4-git.patch
deleted file mode 100644
index 581ed7bb7..000000000
--- a/staging/xf86-video-i128/i128-1.3.4-git.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff --git a/man/i128.man b/man/i128.man
-index 920d2ab..a8e2e54 100644
---- a/man/i128.man
-+++ b/man/i128.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH I128 __drivermansuffix__ __vendorversion__
-diff --git a/src/i128_driver.c b/src/i128_driver.c
-index 903a3a8..92f9d58 100644
---- a/src/i128_driver.c
-+++ b/src/i128_driver.c
-@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
- 			numDevSections, drv, &usedChips);
- 
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
- 
-     if (numUsed <= 0)
- 	return FALSE;
- 
-     if (flags & PROBE_DETECT) {
--	xfree(usedChips);
-+	free(usedChips);
- 	return FALSE;
-     }
- 
-@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
- 	foundScreen = TRUE;
-     }
- 
--    xfree(usedChips);
-+    free(usedChips);
- 
-     return foundScreen;
- }
-@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
-     int i;
-     ClockRangePtr clockRanges;
-     MessageType from;
--    IOADDRESS iobase;
-+    unsigned long iobase;
-     char *ramdac = NULL;
-     CARD32 tmpl, tmph, tmp;
-     unsigned char n, m, p, mdc, df;
-@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if (!(pI128->Options = xalloc(sizeof(I128Options))))
-+    if (!(pI128->Options = malloc(sizeof(I128Options))))
- 	return FALSE;
-     memcpy(pI128->Options, I128Options, sizeof(I128Options));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI128->Options);
-@@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
-         xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"%x\"\n",
-     	    PCI_SUB_VENDOR_ID(pI128->PciInfo));
- 
--    iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00) + hwp->PIOOffset;
-+    iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    iobase += hwp->PIOOffset;
-+#endif
-     pI128->RegRec.iobase = iobase;
- 
-     pI128->io.rbase_g = inl(iobase)        & 0xFFFFFF00;
-@@ -1157,7 +1160,7 @@ I128FreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -1704,12 +1707,12 @@ I128CloseScreen(int scrnIndex, ScreenPtr pScreen)
- 	XAADestroyInfoRec(pI128->XaaInfoRec);
-     if (pI128->ExaDriver) {
-         exaDriverFini(pScreen);
--        xfree(pI128->ExaDriver);
-+        free(pI128->ExaDriver);
-     }
-     if (pI128->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pI128->CursorInfoRec);
-     if (pI128->DGAModes)
--    	xfree(pI128->DGAModes);
-+    	free(pI128->DGAModes);
-     pScrn->vtSema = FALSE;
- 
-     pScreen->CloseScreen = pI128->CloseScreen;
-@@ -1804,7 +1807,7 @@ I128DDC1Read(ScrnInfoPtr pScrn)
-   I128Ptr pI128 = I128PTR(pScrn);
-   unsigned char val;
-   unsigned long tmp, ddc;
--  IOADDRESS iobase;
-+  unsigned long iobase;
- 
-   iobase = pI128->RegRec.iobase;
-   ddc = inl(iobase + 0x2C);
-@@ -1839,7 +1842,7 @@ I128I2CGetBits(I2CBusPtr b, int *clock, int *data)
- {
-   I128Ptr pI128 = I128PTR(xf86Screens[b->scrnIndex]);
-   unsigned long ddc;
--  IOADDRESS iobase;
-+  unsigned long iobase;
- #if 0
-   static int lastclock = -1, lastdata = -1;
- #endif
-@@ -1867,7 +1870,7 @@ I128I2CPutBits(I2CBusPtr b, int clock, int data)
-   unsigned char drv, val;
-   unsigned long ddc;
-   unsigned long tmp;
--  IOADDRESS iobase;
-+  unsigned long iobase;
- 
-   iobase = pI128->RegRec.iobase;
-   ddc = inl(iobase + 0x2C);
-@@ -1889,7 +1892,7 @@ I128I2CInit(ScrnInfoPtr pScrn)
- {       
-     I128Ptr pI128 = I128PTR(pScrn);
-     I2CBusPtr I2CPtr;
--    IOADDRESS iobase;
-+    unsigned long iobase;
-     unsigned long soft_sw, ddc;
-      
-     I2CPtr = xf86CreateI2CBusRec();
-@@ -2102,7 +2105,7 @@ void
- I128DumpActiveRegisters(ScrnInfoPtr pScrn)
- {
-     I128Ptr pI128 = I128PTR(pScrn);
--    IOADDRESS iobase;
-+    unsigned long iobase;
-     unsigned long rbase_g, rbase_w, rbase_a, rbase_b, rbase_i, rbase_e;
-     unsigned long id, config1, config2, sgram, soft_sw, ddc, vga_ctl;
-     volatile CARD32 *vrba, *vrbg, *vrbw;
-diff --git a/src/i128dga.c b/src/i128dga.c
-index 48823aa..8bc2fcb 100644
---- a/src/i128dga.c
-+++ b/src/i128dga.c
-@@ -59,15 +59,15 @@ I128DGAInit(ScreenPtr pScreen)
-    while(pMode) {
- 
- 	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
--	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
- 	    oneMore = TRUE;
- 	} else {
--	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- 	    oneMore = FALSE;
- 	}
- 
- 	if(!newmodes) {
--	   xfree(modes);
-+	   free(modes);
- 	   return FALSE;
- 	}
- 	modes = newmodes;
-diff --git a/src/i128reg.h b/src/i128reg.h
-index 56b9c33..a72b525 100644
---- a/src/i128reg.h
-+++ b/src/i128reg.h
-@@ -75,7 +75,7 @@ struct i128mem {
- 
- /* save the registers needed for restoration in this structure */
- typedef struct {
--	IOADDRESS iobase;		/* saved only for iobase indexing    */
-+	unsigned long iobase;		/* saved only for iobase indexing    */
- 	CARD32 config1;			/* iobase+0x1C register              */
- 	CARD32 config2;			/* iobase+0x20 register              */
- 	CARD32 sgram;			/* iobase+0x24 register              */
diff --git a/staging/xf86-video-i740/PKGBUILD b/staging/xf86-video-i740/PKGBUILD
deleted file mode 100644
index c6a19eab2..000000000
--- a/staging/xf86-video-i740/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149854 2012-02-11 10:44:10Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i740
-pkgver=1.3.2
-pkgrel=8
-pkgdesc="X.org Intel i740 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('aadd2168153f780c487778e5fdda5473ed4b243d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-intel/PKGBUILD b/staging/xf86-video-intel/PKGBUILD
deleted file mode 100644
index 1c4e20b71..000000000
--- a/staging/xf86-video-intel/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149856 2012-02-11 10:48:04Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.17.0
-pkgrel=3
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
-conflicts=('xorg-server<1.11.99.903' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-mach64/PKGBUILD b/staging/xf86-video-mach64/PKGBUILD
deleted file mode 100644
index 8619cf6d8..000000000
--- a/staging/xf86-video-mach64/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149858 2012-02-11 10:54:56Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mach64
-pkgver=6.9.0
-pkgrel=3
-pkgdesc="X.org mach64 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-mga/PKGBUILD b/staging/xf86-video-mga/PKGBUILD
deleted file mode 100644
index 0504c895a..000000000
--- a/staging/xf86-video-mga/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149860 2012-02-11 10:57:51Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mga
-pkgver=1.4.13
-pkgrel=5
-pkgdesc="X.org mga video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378'
-          '74782a39533ef475bd02b8b4645775879494e568')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-mga/git-fixes.patch b/staging/xf86-video-mga/git-fixes.patch
deleted file mode 100644
index 3534342e6..000000000
--- a/staging/xf86-video-mga/git-fixes.patch
+++ /dev/null
@@ -1,800 +0,0 @@
-diff --git a/man/Makefile.am b/man/Makefile.am
-index b3688ce..1ea26b3 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,5 +1,5 @@
- #
--# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-+# Copyright (c) 2005, Oracle and/or its affiliates. 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"),
-@@ -19,7 +19,7 @@
- # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- # DEALINGS IN THE SOFTWARE.
--# 
-+#
- 
- drivermandir = $(DRIVER_MAN_DIR)
- 
-diff --git a/man/mga.man b/man/mga.man
-index 3a7a9f8..e1e674f 100644
---- a/man/mga.man
-+++ b/man/mga.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.7 2003/04/03 07:11:03 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH mga __drivermansuffix__ __vendorversion__
-diff --git a/src/binding.h b/src/binding.h
-index 6dcd1e9..57e9b92 100644
---- a/src/binding.h
-+++ b/src/binding.h
-@@ -13,7 +13,6 @@
-  @end
- 
- ***************************************************************************************/
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.3 2000/10/24 22:45:08 dawes Exp $ */
- 
- #ifndef _BINDING
- #define _BINDING
-diff --git a/src/mga.h b/src/mga.h
-index 2cb3d88..c520e86 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.87tsi Exp $ */
- /*
-  * MGA Millennium (MGA2064W) functions
-  *
-@@ -137,6 +136,10 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
- #define PCI_CHIP_MGAG200_EH_PCI 0x0533
- #endif
- 
-+#ifndef PCI_CHIP_MGAG200_ER_PCI
-+#define PCI_CHIP_MGAG200_ER_PCI 0x0534
-+#endif
-+
- /*
-  * Read/write to the DAC via MMIO 
-  */
-@@ -200,7 +203,9 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
- typedef struct {
-     unsigned char	ExtVga[6];
-     unsigned char 	DacClk[6];
--    unsigned char *     DacRegs;
-+    unsigned char	ExtVga_Index24;
-+    unsigned char	Dac_Index90;
-+    unsigned char * DacRegs;
-     unsigned long	crtc2[0x58];
-     unsigned char	dac2[0x21];
-     CARD32		Option;
-@@ -479,6 +484,7 @@ typedef struct {
-     int is_G200WB:1;
-     int is_G200EV:1;
-     int is_G200EH:1;
-+    int is_G200ER:1;
- 
-     int KVM;
- 
-diff --git a/src/mga_common.h b/src/mga_common.h
-index 90f6b37..81be2bc 100644
---- a/src/mga_common.h
-+++ b/src/mga_common.h
-@@ -25,8 +25,6 @@
-  * Converted to common header format:
-  *   Jens Owen <jens@tungstengraphics.com>
-  *
-- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.2 2002/12/16 16:19:18 dawes Exp $
-- *
-  */
- 
- #ifndef _MGA_COMMON_H_
-diff --git a/src/mga_dacG.c b/src/mga_dacG.c
-index df00765..fca1031 100644
---- a/src/mga_dacG.c
-+++ b/src/mga_dacG.c
-@@ -444,6 +444,116 @@ MGAG200WBPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
-     outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
- }
- 
-+#define G200ER_PLLREF 48000
-+#define G200ER_VCOMIN 1056000
-+#define G200ER_VCOMAX 1488000
-+
-+static void MGAG200ERComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *piM, int *piN, int *piP)
-+{
-+
-+    int  ulM;
-+    int  ulN;
-+    int  ulO;
-+    int  ulR;
-+
-+    CARD32 ulComputedFo;
-+    CARD32 ulVco;
-+    CARD32 ulFDelta;
-+    CARD32 ulFTmpDelta;
-+
-+    CARD32 aulMDivValue[] = {1, 2, 4, 8};
-+
-+    CARD32 ulFo   = lFo;
-+
-+    ulFDelta = 0xFFFFFFFF;
-+
-+    for (ulR = 0; ulR < 4;  ulR++)
-+    {
-+    	if(ulFDelta==0) break;
-+        for (ulN = 5; (ulN <= 128) ; ulN++)
-+        {
-+            if(ulFDelta==0) break;
-+            for (ulM = 3; ulM >= 0; ulM--)
-+            {
-+            	if(ulFDelta==0) break;
-+                for (ulO = 5; ulO <= 32; ulO++)
-+                {
-+                	ulVco = (G200ER_PLLREF * (ulN+1)) / (ulR+1);
-+                	// Validate vco
-+                    if (ulVco < G200ER_VCOMIN) continue;
-+					if (ulVco > G200ER_VCOMAX) continue;
-+                	ulComputedFo = ulVco / (aulMDivValue[ulM] * (ulO+1));
-+
-+                    if (ulComputedFo > ulFo)
-+                    {
-+                        ulFTmpDelta = ulComputedFo - ulFo;
-+                    }
-+                    else
-+                    {
-+                        ulFTmpDelta = ulFo - ulComputedFo;
-+                    }
-+
-+                    if (ulFTmpDelta < ulFDelta)
-+                    {
-+                        ulFDelta = ulFTmpDelta;
-+                        // XG200ERPIXPLLCM M<1:0> O<7:3>
-+                        *piM = (CARD8)ulM | (CARD8)(ulO<<3);
-+                        //
-+                        // XG200ERPIXPLLCN N<6:0>
-+                        *piN = (CARD8)ulN;
-+                        //
-+                        // XG200ERPIXPLLCP R<1:0> cg<7:4> (Use R value)
-+                        *piP = (CARD8)ulR | (CARD8)(ulR<<3);
-+
-+                        // Test
-+                        int ftest = (G200ER_PLLREF * (ulN+1)) / ((ulR+1) * aulMDivValue[ulM] * (ulO+1));
-+                        ftest=ftest;
-+                    }
-+                } // End O Loop
-+            } // End M Loop
-+        } // End N Loop
-+    } // End R Loop
-+}
-+
-+static void
-+MGAG200ERPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
-+{
-+    //TODO  G200ER Validate sequence 
-+    CARD8 ucPixCtrl, ucTempByte;
-+    MGAPtr pMga = MGAPTR(pScrn);
-+
-+
-+    // Set pixclkdis to 1
-+    ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
-+    ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
-+    outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
-+
-+    ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
-+    ucTempByte |= MGA1064_REMHEADCTL_CLKDIS;
-+    outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
-+
-+    // Select PLL Set C
-+    ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
-+    ucTempByte |= (0x3<<2) | 0xc0; //select MGA pixel clock
-+    OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
-+
-+    ucPixCtrl &= ~MGA1064_PIX_CLK_CTL_CLK_DIS;
-+    ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
-+    outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
-+
-+    // Wait 500 us
-+    usleep(500);
-+
-+    // Program the Pixel PLL Register
-+    outMGAdac(MGA1064_ER_PIX_PLLC_N, mgaReg->PllN);
-+    outMGAdac(MGA1064_ER_PIX_PLLC_M, mgaReg->PllM);
-+    outMGAdac(MGA1064_ER_PIX_PLLC_P, mgaReg->PllP);
-+
-+        // Wait 50 us
-+    usleep(50);
-+
-+}
-+
- static void
- MGAG200WBPrepareForModeSwitch(ScrnInfoPtr pScrn)
- {
-@@ -768,8 +878,13 @@ MGAGSetPCLK( ScrnInfoPtr pScrn, long f_out )
- 
- 	    pReg->PllM = m;
- 	    pReg->PllN = n;
--	    pReg->PllP = p;
--        } else {
-+	    pReg->PllP = p;		
-+	} else if (pMga->is_G200ER) {
-+	    MGAG200ERComputePLLParam(pScrn, f_out, &m, &n, &p);
-+	    pReg->PllM = m;
-+	    pReg->PllN = n;
-+	    pReg->PllP = p;		
-+    } else {
- 	    /* Do the calculations for m, n, p and s */
- 	    MGAGCalcClock( pScrn, f_out, &m, &n, &p, &s );
- 
-@@ -966,6 +1081,10 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-                 pReg->Option2 = 0x0000b000;
-                 break;
- 
-+		case PCI_CHIP_MGAG200_ER_PCI:
-+			pReg->Dac_Index90 = 0;
-+			break;
-+
-         case PCI_CHIP_MGAG200_EH_PCI:
-                 pReg->DacRegs[MGA1064_MISC_CTL] =
-                     MGA1064_MISC_CTL_VGA8 |
-@@ -1088,6 +1207,7 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-         if (pMga->is_G200WB){
-             pReg->ExtVga[1] |= 0x88;
-         }
-+	pReg->ExtVga_Index24 = 0x05;
- 		
- 	pVga->CRTC[0]	= ht - 4;
- 	pVga->CRTC[1]	= hd;
-@@ -1327,10 +1447,15 @@ MGA_NOT_HAL(
- 	      if ( (pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) &&
- 		   (i >= 0x44) && (i <= 0x4E))
- 	         continue;
--
-+			 
- 	      outMGAdac(i, mgaReg->DacRegs[i]);
- 	   }
- 	   
-+		if (pMga->is_G200ER)
-+        {
-+			outMGAdac(0x90, mgaReg->Dac_Index90);
-+        }
-+   
- 	   if (!MGAISGx50(pMga)) {
- 	       /* restore pci_option register */
- #ifdef XSERVER_LIBPCIACCESS
-@@ -1361,7 +1486,9 @@ MGA_NOT_HAL(
- #endif
- 	   }
- 
--           if (pMga->is_G200EV) {
-+           if (pMga->is_G200ER) {
-+               MGAG200ERPIXPLLSET(pScrn, mgaReg);               
-+           } else  if (pMga->is_G200EV) {
-                MGAG200EVPIXPLLSET(pScrn, mgaReg);
-            } else if (pMga->is_G200WB) {
-                MGAG200WBPIXPLLSET(pScrn, mgaReg);
-@@ -1388,6 +1515,11 @@ MGA_NOT_HAL(
-            for (i = 0; i < 6; i++)
- 	      OUTREG16(MGAREG_CRTCEXT_INDEX, (mgaReg->ExtVga[i] << 8) | i);
- 
-+           if (pMga->is_G200ER) {
-+               OUTREG8(MGAREG_CRTCEXT_INDEX, 0x24);
-+               OUTREG8(MGAREG_CRTCEXT_DATA,  mgaReg->ExtVga_Index24);			   
-+           }
-+
- 	   /* This handles restoring the generic VGA registers. */
- 	   if (pMga->is_G200SE) {
-  	      MGAG200SERestoreMode(pScrn, vgaReg);
-@@ -1404,7 +1536,7 @@ MGA_NOT_HAL(
-                OUTREG16(MGAREG_CRTCEXT_INDEX, 6);
-                OUTREG16(MGAREG_CRTCEXT_DATA, 0);
-            }
--
-+		   
- 	   /*
- 	    * this is needed to properly restore start address
- 	    */
-@@ -1555,6 +1687,11 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg,
-             mgaReg->PllM = inMGAdac(MGA1064_EH_PIX_PLLC_M);
-             mgaReg->PllN = inMGAdac(MGA1064_EH_PIX_PLLC_N);
-             mgaReg->PllP = inMGAdac(MGA1064_EH_PIX_PLLC_P);
-+        } else if (pMga->is_G200ER) {
-+            mgaReg->PllM = inMGAdac(MGA1064_ER_PIX_PLLC_M);
-+            mgaReg->PllN = inMGAdac(MGA1064_ER_PIX_PLLC_N);
-+            mgaReg->PllP = inMGAdac(MGA1064_ER_PIX_PLLC_P);
-+            mgaReg->Dac_Index90 = inMGAdac(0x90);
-         }
- 
-         mgaReg->PIXPLLCSaved = TRUE;
-@@ -1583,6 +1720,11 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg,
- 		OUTREG8(MGAREG_CRTCEXT_INDEX, i);
- 		mgaReg->ExtVga[i] = INREG8(MGAREG_CRTCEXT_DATA);
- 	}
-+	if (pMga->is_G200ER)
-+	{
-+		OUTREG8(MGAREG_CRTCEXT_INDEX, 0x24);
-+		mgaReg->ExtVga_Index24 = INREG8(MGAREG_CRTCEXT_DATA);
-+	}
- 
- #ifdef DEBUG		
- 	ErrorF("Saved values:\nDAC:");
-@@ -1737,7 +1879,7 @@ static const struct mgag_i2c_private {
-     { (1 << 0), (1 << 2) },
-     { (1 << 4), (1 << 5) },
-     { (1 << 0), (1 << 1) },  /* G200SE, G200EV and G200WB I2C bits */
--    { (1 << 1), (1 << 0) },  /* G200EH I2C bits */
-+    { (1 << 1), (1 << 0) },  /* G200EH, G200ER I2C bits */
- };
- 
- 
-@@ -1750,7 +1892,7 @@ MGAG_ddc1Read(ScrnInfoPtr pScrn)
- 
-   if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
-     i2c_index = 3;
--  else if (pMga->is_G200EH)
-+  else if (pMga->is_G200EH || pMga->is_G200ER)
-     i2c_index = 4;
-   else
-     i2c_index = 0;
-@@ -1851,7 +1993,7 @@ MGAG_i2cInit(ScrnInfoPtr pScrn)
- 
-         if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
-             i2c_index = 3;
--        else if (pMga->is_G200EH)
-+        else if (pMga->is_G200EH || pMga->is_G200ER)
-             i2c_index = 4;
-         else
-             i2c_index = 0;
-@@ -1976,7 +2118,7 @@ void MGAGSetupFuncs(ScrnInfoPtr pScrn)
-     pMga->Save = MGAGSave;
-     pMga->Restore = MGAGRestore;
-     pMga->ModeInit = MGAGInit;
--    if (!pMga->is_G200WB){
-+    if ((!pMga->is_G200WB) && (!pMga->is_G200ER)) {
-         pMga->ddc1Read = MGAG_ddc1Read;
-         /* vgaHWddc1SetSpeed will only work if the card is in VGA mode */
-         pMga->DDC1SetSpeed = vgaHWddc1SetSpeedWeak();
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 3fda623..14f342f 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -32,7 +32,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Priv.h"
- 
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
-diff --git a/src/mga_dri.h b/src/mga_dri.h
-index f1afb5d..1984b9c 100644
---- a/src/mga_dri.h
-+++ b/src/mga_dri.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.6 2001/04/10 16:08:01 dawes Exp $ */
--
- /*
-  * Copyright 2000 VA Linux Systems Inc., Fremont, California.
-  * All Rights Reserved.
-diff --git a/src/mga_dripriv.h b/src/mga_dripriv.h
-index 3ddd133..feca134 100644
---- a/src/mga_dripriv.h
-+++ b/src/mga_dripriv.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h,v 1.4 2001/04/10 16:08:01 dawes Exp $ */
--
- /*
-  * Copyright 2000 VA Linux Systems Inc., Fremont, California.
-  * All Rights Reserved.
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 5a1e9b4..b140013 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1,4 +1,3 @@
--/* $XConsortium: mga_driver.c /main/12 1996/10/28 05:13:26 kaleb $ */
- /*
-  * MGA Millennium (MGA2064W) with Ti3026 RAMDAC driver v.1.1
-  *
-@@ -404,6 +403,21 @@ static const struct mga_device_attributes attribs[] = {
- 	8192, 0x4000,          /* Memory probe size & offset values */
-     },
- 
-+    /* G200ER */
-+    [15] = { 0, 1, 0, 0, 1, 0, 0, 0, new_BARs,
-+            (TRANSC_SOLID_FILL | TWO_PASS_COLOR_EXPAND | USE_LINEAR_EXPANSION),
-+	{
-+	    { 50000, 230000 }, /* System VCO frequencies */
-+	    { 50000, 203400 }, /* Pixel VCO frequencies */
-+	    { 0, 0 },          /* Video VCO frequencies */
-+	    45000,            /* Memory clock */
-+	    27050,             /* PLL reference frequency */
-+	    0,                 /* Supports fast bitblt? */
-+	    MGA_HOST_PCI       /* Host interface */
-+	},
-+
-+	16384, 0x4000,          /* Memory probe size & offset values */
-+    }
- };
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -433,6 +447,8 @@ static const struct pci_id_match mga_device_match[] = {
- 
-     MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_EH_PCI, 14 ),
- 
-+	MGA_DEVICE_MATCH(PCI_CHIP_MGAG200_ER_PCI, 15 ),
-+
-     { 0, 0, 0 },
- };
- #endif
-@@ -450,6 +466,7 @@ static SymTabRec MGAChipsets[] = {
-     { PCI_CHIP_MGAG200_SE_A_PCI,	"mgag200 SE A PCI" },
-     { PCI_CHIP_MGAG200_SE_B_PCI,	"mgag200 SE B PCI" },
-     { PCI_CHIP_MGAG200_EV_PCI,	"mgag200 EV Maxim" },
-+    { PCI_CHIP_MGAG200_ER_PCI,	"mgag200 ER SH7757" },	
-     { PCI_CHIP_MGAG200_WINBOND_PCI,	"mgag200 eW Nuvoton" },
-     { PCI_CHIP_MGAG200_EH_PCI,	"mgag200eH" },
-     { PCI_CHIP_MGAG400,		"mgag400" },
-@@ -472,6 +489,8 @@ static PciChipsets MGAPciChipsets[] = {
- 	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG200_EV_PCI, PCI_CHIP_MGAG200_EV_PCI,
- 	RES_SHARED_VGA },
-+    { PCI_CHIP_MGAG200_ER_PCI, PCI_CHIP_MGAG200_ER_PCI,
-+	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI,
- 	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG200_EH_PCI, PCI_CHIP_MGAG200_EH_PCI,
-@@ -913,6 +932,11 @@ MGAProbe(DriverPtr drv, int flags)
-             case PCI_CHIP_MGAG200_EH_PCI:
-                 attrib_no = 14;
-                 break;
-+				
-+            case PCI_CHIP_MGAG200_ER_PCI:
-+                attrib_no = 15;
-+                break;
-+				
- 
- 	    default:
- 		return FALSE;
-@@ -1081,7 +1105,7 @@ MGACountRam(ScrnInfoPtr pScrn)
- 
- 	if (pMga->is_G200SE)
- 	    pMga->reg_1e24 = INREG(0x1e24); /* stash the model for later */
--	if (pMga->reg_1e24 == 0x01) {
-+	if (pMga->reg_1e24 >= 0x01) {
- 	    MGAUnmapMem(pScrn);
- 	    ProbeSize = 16384;
- 	    ProbeSizeOffset = 0x10000;
-@@ -1286,6 +1310,11 @@ MGAdoDDC(ScrnInfoPtr pScrn)
-     MGASave(pScrn);
- 
-     /* It is now safe to talk to the card */
-+    /* Allow access to DDC */
-+    if (pMga->is_G200ER) {
-+	 CARD8 ucData = inMGAdac(MGA1064_GEN_IO_CTL2);
-+     outMGAdac(MGA1064_GEN_IO_CTL2, ucData | 1);        
-+    }
- 
-     /* Initialize I2C buses - used by DDC if available */
-     if (pMga->i2cInit) {
-@@ -1327,6 +1356,12 @@ MGAdoDDC(ScrnInfoPtr pScrn)
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of monitor info\n");
-     }
- 
-+    /* Remove access to DDC */
-+    if (pMga->is_G200ER) {
-+	  CARD8 ucData = inMGAdac(MGA1064_GEN_IO_CTL2);
-+      outMGAdac(MGA1064_GEN_IO_CTL2, ucData & ~1);        
-+    }
-+
-     /* Restore previous state and unmap MGA memory and MMIO areas */
-     MGARestore(pScrn);
-     MGAUnmapMem(pScrn);
-@@ -1620,6 +1655,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     pMga->is_G200EV = (pMga->Chipset == PCI_CHIP_MGAG200_EV_PCI);
-     pMga->is_G200WB = (pMga->Chipset == PCI_CHIP_MGAG200_WINBOND_PCI);
-     pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI);
-+    pMga->is_G200ER = (pMga->Chipset == PCI_CHIP_MGAG200_ER_PCI);
- 
- #ifdef USEMGAHAL
-     if (pMga->chip_attribs->HAL_chipset) {
-@@ -1780,15 +1816,9 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- #ifndef XSERVER_LIBPCIACCESS
-     /*
-      * Find the BIOS base.  Get it from the PCI config if possible.  Otherwise
--     * use the VGA default.  Allow the config file to override this.
-+     * use the VGA default.
-      */
- 
--    pMga->BiosFrom = X_NONE;
--    if (pMga->device->BiosBase != 0) {
--	/* XXX This isn't used */
--	pMga->BiosAddress = pMga->device->BiosBase;
--	pMga->BiosFrom = X_CONFIG;
--    } else {
- 	/* details: rombase sdk pp 4-15 */
- 	if (pMga->PciInfo->biosBase != 0) {
- 	    pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
-@@ -1797,7 +1827,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	    pMga->BiosAddress = 0xc0000;
- 	    pMga->BiosFrom = X_DEFAULT;
- 	}
--    }
-     if (pMga->BiosAddress) {
- 	xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n",
- 		   (unsigned long)pMga->BiosAddress);
-@@ -2142,6 +2171,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+    case PCI_CHIP_MGAG200_ER_PCI:	
-     case PCI_CHIP_MGAG400:
-     case PCI_CHIP_MGAG550:
- 	MGAGSetupFuncs(pScrn);
-@@ -2255,6 +2285,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-           case PCI_CHIP_MGAG200_WINBOND_PCI:
- 	  case PCI_CHIP_MGAG200_EV_PCI:
-       case PCI_CHIP_MGAG200_EH_PCI:
-+	  case PCI_CHIP_MGAG200_ER_PCI:	  
- 	    pMga->SrcOrg = 0;
- 	    pMga->DstOrg = 0;
- 	    break;
-@@ -2432,16 +2463,17 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	   maxPitch = 2048;
- 	   break;
- 	case PCI_CHIP_MGAG200_SE_A_PCI:
--	   if (pScrn->videoRam < 2048){
-+           if (pScrn->videoRam < 2048){
-                maxPitch = 1280;
--	   }
--	   break;
-+           }
-+           break;
- 	case PCI_CHIP_MGAG200:
- 	case PCI_CHIP_MGAG200_PCI:
- 	case PCI_CHIP_MGAG200_SE_B_PCI:
-         case PCI_CHIP_MGAG200_WINBOND_PCI:
- 	case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+	case PCI_CHIP_MGAG200_ER_PCI:	
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
- 	   maxPitch = 4096;
-@@ -3250,15 +3282,71 @@ MGA_HAL(
- 	    outb(0xfac, 0x02);
-     }
- 
--    MGA_NOT_HAL(
--	if (pMga->is_G200SE) {
-+    /* 
-+     This function optimize the Priority Request control
-+     Higher HiPriLvl will reduce drawing performance
-+     We need to give enough bandwith to crtc to avoid visual artifact
-+    */
-+	if (pMga->is_G200SE) 
-+    {
-+        if (pMga->reg_1e24 >= 0x02)
-+        {
-+            /* Calulate CRTC Priority value */
-+            CARD8  ucHiPriLvl;
-+            CARD32 ulBitsPerPixel;
-+            CARD32 ulMemoryBandwidth;
-+
-+            /* uiBitsPerPixel can only be 8,16 or32 */
-+            if (pScrn->bitsPerPixel > 16)
-+            {
-+                ulBitsPerPixel = 32;
-+            }
-+            else if (pScrn->bitsPerPixel >  8) 
-+            {
-+                ulBitsPerPixel = 16;
-+            }
-+            else 
-+            {
-+                ulBitsPerPixel = 8;
-+            }
-+
-+            
-+            ulMemoryBandwidth = (mode->Clock * ulBitsPerPixel) / 1000;
-+
-+            if      (ulMemoryBandwidth    > 3100)  ucHiPriLvl = 0;
-+            else if (ulMemoryBandwidth    > 2600)  ucHiPriLvl = 1;
-+            else if (ulMemoryBandwidth    > 1900)  ucHiPriLvl = 2;
-+            else if (ulMemoryBandwidth    > 1160)  ucHiPriLvl = 3;
-+            else if (ulMemoryBandwidth    > 440)   ucHiPriLvl = 4;
-+            else ucHiPriLvl = 5;
-+
-             OUTREG8(0x1FDE, 0x06);
--	    if (pMga->reg_1e24 == 0x01)
--		OUTREG8(0x1FDF, 0x03);
--	    else 
--		OUTREG8(0x1FDF, 0x14);
-+		    OUTREG8(0x1FDF, ucHiPriLvl);
-+
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock           == %d\n",   mode->Clock);
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "BitsPerPixel    == %d\n",   pScrn->bitsPerPixel);
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MemoryBandwidth == %d\n",   ulMemoryBandwidth);
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl        == %02X\n", ucHiPriLvl);
-         }
--    );
-+        else
-+        {
-+            MGA_NOT_HAL(
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock           == %d\n",   mode->Clock);
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO, "BitsPerPixel    == %d\n",   pScrn->bitsPerPixel);
-+                OUTREG8(0x1FDE, 0x06);
-+	            if (pMga->reg_1e24 >= 0x01)
-+                {
-+		            OUTREG8(0x1FDF, 0x03);
-+                    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl        == 03\n");
-+                }
-+	            else 
-+                {
-+		            OUTREG8(0x1FDF, 0x14);
-+                    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl        == 14h\n");
-+                }
-+            );
-+        }
-+    }
- 
-     pMga->CurrentLayout.mode = mode;
- 
-@@ -4322,13 +4410,23 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     if (pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) {
--	if (mode->HDisplay > 1600)
--	    return MODE_VIRTUAL_X;
--	if (mode->VDisplay > 1200)
--	    return MODE_VIRTUAL_Y;
--	if (pMga->reg_1e24 == 0x01 &&
--	    xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244)
--	    return MODE_BANDWIDTH;
-+    	if (pMga->reg_1e24 == 0x01) {
-+	        if (mode->HDisplay > 1600)
-+	            return MODE_VIRTUAL_X;
-+	        if (mode->VDisplay > 1200)
-+	            return MODE_VIRTUAL_Y;
-+	        if (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244)
-+	            return MODE_BANDWIDTH;
-+        } else {
-+            if (pMga->reg_1e24 >= 0x02) {
-+	            if (mode->HDisplay > 1920)
-+	                return MODE_VIRTUAL_X;
-+	            if (mode->VDisplay > 1200)
-+	                return MODE_VIRTUAL_Y;
-+	            if (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 301)
-+	                return MODE_BANDWIDTH;
-+            }
-+        }
-     } else if (pMga->is_G200WB){
-         if (mode->Flags & V_DBLSCAN)
-             return MODE_NO_DBLESCAN;
-@@ -4340,10 +4438,13 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
- 	    return MODE_BANDWIDTH;
-     } else if (pMga->is_G200EV
- 	       && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 327)) {
--        return MODE_BANDWIDTH;
-+	return MODE_BANDWIDTH;
-     } else if (pMga->is_G200EH
-                && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 375)) {
-         return MODE_BANDWIDTH;
-+    } else if (pMga->is_G200ER
-+               && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 550)) {
-+        return MODE_BANDWIDTH;
-     }
- 
-     lace = 1 + ((mode->Flags & V_INTERLACE) != 0);
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index 69dc8e3..bffd063 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.21 2001/09/26 12:59:17 alanh Exp $ */
--
- #ifndef _MGA_MACROS_H_
- #define _MGA_MACROS_H_
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 753f752..1fd0572 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -363,6 +363,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+	case PCI_CHIP_MGAG200_ER_PCI:
-     case PCI_CHIP_MGAG400:
-     case PCI_CHIP_MGAG550:
- 	MGAGSetupFuncs(pScrn);
-@@ -518,6 +519,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-         case PCI_CHIP_MGAG200_WINBOND_PCI:
-         case PCI_CHIP_MGAG200_EV_PCI:
-         case PCI_CHIP_MGAG200_EH_PCI:
-+	case PCI_CHIP_MGAG200_ER_PCI:		
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
- 	   maxPitch = 4096;
-diff --git a/src/mga_reg.h b/src/mga_reg.h
-index 6251976..5a37db6 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -1,11 +1,3 @@
--/* $XConsortium: mgareg.h /main/2 1996/10/25 10:33:21 kaleb $ */
--
--
--
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h,v 1.18 2001/09/26 12:59:18 alanh Exp $ */
--
--
--
- /*
-  * MGA Millennium (MGA2064W) functions
-  * MGA Mystique (MGA1064SG) functions
-@@ -377,6 +369,7 @@
- #define MGA1064_MISC_CTL_VGA8   		( 0x01 << 3 )
- #define MGA1064_MISC_CTL_DAC_RAM_CS   		( 0x01 << 4 )
- 
-+#define MGA1064_GEN_IO_CTL2	0x29
- #define MGA1064_GEN_IO_CTL	0x2a
- #define MGA1064_GEN_IO_DATA	0x2b
- #define MGA1064_SYS_PLL_M	0x2c
-@@ -437,6 +430,10 @@
- #define MGA1064_EH_PIX_PLLC_N   0xb7
- #define MGA1064_EH_PIX_PLLC_P   0xb8
- 
-+/* Modified PLL for G200 Maxim (G200ER) */
-+#define MGA1064_ER_PIX_PLLC_M	0xb7
-+#define MGA1064_ER_PIX_PLLC_N	0xb6
-+#define MGA1064_ER_PIX_PLLC_P	0xb8
- 
- #define MGA1064_DISP_CTL        0x8a
- #define MGA1064_DISP_CTL_DAC1OUTSEL_MASK       0x01
-diff --git a/src/mga_sarea.h b/src/mga_sarea.h
-index c5ffbbc..16fc9ce 100644
---- a/src/mga_sarea.h
-+++ b/src/mga_sarea.h
-@@ -1,5 +1,3 @@
--/* $XFree86$ */
--
- /*
-  * Copyright 2000 Gareth Hughes
-  * All Rights Reserved.
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index 87473c8..db7fae7 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -1131,6 +1131,7 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn )
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+    case PCI_CHIP_MGAG200_ER_PCI:	
- 	pMga->SrcOrg = 0;
- 	OUTREG(MGAREG_SRCORG, pMga->realSrcOrg);
- 	OUTREG(MGAREG_DSTORG, pMga->DstOrg);
-diff --git a/src/mgareg_flags.h b/src/mgareg_flags.h
-index 69050fc..548af86 100644
---- a/src/mgareg_flags.h
-+++ b/src/mgareg_flags.h
-@@ -19,7 +19,6 @@
-  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mgareg_flags.h,v 1.2 2003/01/12 03:55:47 tsi Exp $ */
- 
- #ifndef _MGAREGS_H_
- #define _MGAREGS_H_
-diff --git a/util/stormdwg.c b/util/stormdwg.c
-index 99f76cc..b43cc32 100644
---- a/util/stormdwg.c
-+++ b/util/stormdwg.c
-@@ -1,8 +1,3 @@
--/* $XConsortium: dwg.c /main/2 1996/10/28 06:57:55 kaleb $ */
--
--
--
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/util/stormdwg.c,v 1.1 1997/04/12 14:11:29 hohndel Exp $ */
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/staging/xf86-video-neomagic/PKGBUILD b/staging/xf86-video-neomagic/PKGBUILD
deleted file mode 100644
index 2436e4092..000000000
--- a/staging/xf86-video-neomagic/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149862 2012-02-11 10:59:39Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.5
-pkgrel=6
-pkgdesc="X.org neomagic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index 256dd69fd..000000000
--- a/staging/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 149767 2012-02-10 14:54:11Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=xf86-video-nouveau
-_gitdate=20120210
-pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=1
-pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/wiki/"
-license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('libdrm' 'udev')
-optdepends=('nouveau-dri:	experimental gallium3d features')
-makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('f35c12d64542d0ea792a9e5af63a2e5a')
-
-# source PKGBUILD && mksource
-mksource() {
-	mkdir /tmp/$pkgname-${_gitdate}
-	pushd /tmp/$pkgname-${_gitdate}
-	git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
-	cd xf86-video-nouveau
-	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2
-	popd
-}
-
-build() {
-  cd $srcdir/xf86-video-nouveau-${_gitdate}
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/xf86-video-nouveau-${_gitdate}
-  make DESTDIR=$pkgdir install
-}
diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install
deleted file mode 100644
index 027154ff3..000000000
--- a/staging/xf86-video-nouveau/xf86-video-nouveau.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
-    cat << _EOF
-  ==> ATTENTION: Usermode support has been dropped
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
- fi
-}
diff --git a/staging/xf86-video-nv/PKGBUILD b/staging/xf86-video-nv/PKGBUILD
deleted file mode 100644
index f9ff6cd10..000000000
--- a/staging/xf86-video-nv/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 149864 2012-02-11 11:01:18Z andyrtr $
-# Maintainer:Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-nv
-pkgver=2.1.18
-pkgrel=5
-pkgdesc="X.org nv video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-openchrome/PKGBUILD b/staging/xf86-video-openchrome/PKGBUILD
deleted file mode 100644
index ae49965b8..000000000
--- a/staging/xf86-video-openchrome/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 149786 2012-02-10 20:52:27Z andyrtr $
-# Contributor: Paul Mattal <paul@mattal.com>
-# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
-
-pkgname=xf86-video-openchrome
-pkgver=0.2.905
-pkgrel=1
-pkgdesc="X.Org Openchrome drivers"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.openchrome.org"
-depends=('libdrm' 'libxvmc')
-makedepends=('xorg-server-devel>=1.11.99.902' 'libx11' 'xf86driproto' 'mesa') #'glproto' 'libgl')
-replaces=('openchrome' 'xf86-video-via')
-options=('!libtool' '!emptydirs' '!makeflags')
-conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri')
-source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('51871431a4a9204ab8ec79335c0cc041')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr # --disable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-r128/PKGBUILD b/staging/xf86-video-r128/PKGBUILD
deleted file mode 100644
index 5f5568b7c..000000000
--- a/staging/xf86-video-r128/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 149866 2012-02-11 11:05:08Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-r128
-pkgver=6.8.1
-pkgrel=8
-pkgdesc="X.org ati Rage128 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86driproto' 'libdrm' 'mesa') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-md5sums=('2b90854a62a4d45d652062f582dc8d13'
-         '3937776d4427861d0797e47119ac327d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  autoreconf -fi
-  ./configure --prefix=/usr  #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-r128/git-fixes.patch b/staging/xf86-video-r128/git-fixes.patch
deleted file mode 100644
index 933e8fb2a..000000000
--- a/staging/xf86-video-r128/git-fixes.patch
+++ /dev/null
@@ -1,842 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..05bcb74 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,91 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright 2007 George Sapountzis
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
-+                     Precision Insight, Inc., Cedar Park, Texas, and
-+                     VA Linux Systems Inc., Fremont, California.
-+
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation on the rights to use, copy, modify, merge,
-+publish, distribute, sublicense, and/or sell copies of the Software,
-+and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the
-+next paragraph) shall be included in all copies or substantial
-+portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
-+SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+OTHER DEALINGS IN THE SOFTWARE.
-+
-+Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
-+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+DEALINGS IN THE SOFTWARE.
-+
-+Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-+
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation, and
-+that the name of Marc Aurele La France not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Marc Aurele La France makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/Makefile.am b/Makefile.am
-index 1f4c3c4..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,21 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
--if BUILD_LINUXDOC
--README.r128: README.r128.sgml
--	$(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
-+.PHONY: ChangeLog INSTALL
- 
--endif
--
--EXTRA_DIST = README.r128 README.r128.sgml ChangeLog
--CLEANFILES = ChangeLog
--
--.PHONY: ChangeLog
-+INSTALL:
-+	$(INSTALL_CMD)
- 
- ChangeLog:
- 	$(CHANGELOG_CMD)
- 
--dist-hook: ChangeLog
-+dist-hook: ChangeLog INSTALL
-diff --git a/README b/README
-index cb61870..5c6f59d 100644
---- a/README
-+++ b/README
-@@ -1,4 +1,161 @@
--xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
-+  Information for ATI Rage 128 Users
-+  Precision Insight, Inc., SuSE GmbH
-+  13 June 2000
-+  ____________________________________________________________
-+
-+  Table of Contents
-+
-+
-+  1. Supported Hardware
-+  2. Features
-+  3. Technical Notes
-+  4. Reported Working Video Cards
-+  5. Configuration
-+  6. Driver Options
-+  7. Known Limitations
-+  8. Authors
-+
-+
-+  ______________________________________________________________________
-+
-+  1.  Supported Hardware
-+
-+
-+  o  ATI Rage 128 based cards
-+
-+
-+
-+  2.  Features
-+
-+
-+  o  Full support (including hardware accelerated 2D drawing) for 8, 15,
-+     16, 24 bit pixel depths.
-+
-+  o  Hardware cursor support to reduce sprite flicker.
-+
-+  o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
-+
-+  o  Support for doublescan video modes (e.g., 320x200 and 320x240).
-+
-+  o  Support for gamma correction at all pixel depths.
-+
-+  o  Fully programmable clock supported.
-+
-+  o  Robust text mode restore for VT switching.
-+
-+
-+
-+  3.  Technical Notes
-+
-+
-+  o  None
-+
-+
-+
-+  4.  Reported Working Video Cards
-+
-+
-+  o  Rage Fury AGP 32MB
-+
-+  o  XPERT 128 AGP 16MB
-+
-+  o  XPERT 99 AGP 8MB
-+
-+
-+
-+  5.  Configuration
-+
-+  The driver auto-detects all device information necessary to initialize
-+  the card. The only lines you need in the "Device" section of your
-+  xorg.conf file are:
-+
-+         Section "Device"
-+             Identifier "Rage 128"
-+             Driver     "r128"
-+         EndSection
-+
-+
-+  or let xorgconfig do this for you.
-+
-+  However, if you have problems with auto-detection, you can specify:
-+
-+  o  VideoRam - in kilobytes
-+
-+  o  MemBase - physical address of the linear framebuffer
-+
-+  o  IOBase - physical address of the memory mapped IO registers
-+
-+  o  ChipID - PCI DEVICE ID
-+
-+
-+
-+  6.  Driver Options
-+
-+
-+  o  "hw_cursor" - request hardware cursor (default)
-+
-+  o  "sw_cursor" - software cursor only
-+
-+  o  "no_accel" - software rendering only
-+
-+  o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
-+
-+  o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
-+
-+
-+
-+  7.  Known Limitations
-+
-+
-+  o  None
-+
-+
-+
-+  8.  Authors
-+
-+  The X11R7.5 driver was originally part of XFree86 4.4 rc2.
-+
-+  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+  The XFree86 4 driver was funded by ATI and was donated to The XFree86
-+  Project by:
-+
-+      Precision Insight, Inc.
-+      Cedar Park, TX
-+      USA
-+
-+
-+  The XFree86 3.3.x driver used for the port was written by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+     The XFree86 3.3.x driver was funded by ATI and was donated to The
-+     XFree86 Project by Precision Insight, Inc. It was based in part on
-+     an earlier driver that was written by:
-+
-+  o  Alan Hourihane  <mailto:alanh@fairlite.demon.co.uk>
-+
-+  o  Dirk Hohndel  <mailto:hohndel@suse.de>
-+
-+  This early driver was funded and donated to The XFree86 Project by:
-+
-+      SuSE GmbH
-+      Schanzaekerstr. 10
-+      90443 Nuernberg
-+      Germany
-+
-+
-+
-+  http://www.precisioninsight.com
-+
-+  http://www.suse.com
-+
- 
- Please submit bugs & patches to the Xorg bugzilla:
- 
-diff --git a/README.r128 b/README.r128
-deleted file mode 100644
-index dcc2715..0000000
---- a/README.r128
-+++ /dev/null
-@@ -1,160 +0,0 @@
--  Information for ATI Rage 128 Users
--  Precision Insight, Inc., SuSE GmbH
--  13 June 2000
--  ____________________________________________________________
--
--  Table of Contents
--
--
--  1. Supported Hardware
--  2. Features
--  3. Technical Notes
--  4. Reported Working Video Cards
--  5. Configuration
--  6. Driver Options
--  7. Known Limitations
--  8. Authors
--
--
--  ______________________________________________________________________
--
--  1.  Supported Hardware
--
--
--  +o  ATI Rage 128 based cards
--
--
--
--  2.  Features
--
--
--  +o  Full support (including hardware accelerated 2D drawing) for 8, 15,
--     16, 24 bit pixel depths.
--
--  +o  Hardware cursor support to reduce sprite flicker.
--
--  +o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
--
--  +o  Support for doublescan video modes (e.g., 320x200 and 320x240).
--
--  +o  Support for gamma correction at all pixel depths.
--
--  +o  Fully programmable clock supported.
--
--  +o  Robust text mode restore for VT switching.
--
--
--
--  3.  Technical Notes
--
--
--  +o  None
--
--
--
--  4.  Reported Working Video Cards
--
--
--  +o  Rage Fury AGP 32MB
--
--  +o  XPERT 128 AGP 16MB
--
--  +o  XPERT 99 AGP 8MB
--
--
--
--  5.  Configuration
--
--  The driver auto-detects all device information necessary to initialize
--  the card.  The only lines you need in the "Device" section of your
--  xorg.conf file are:
--
--         Section "Device"
--             Identifier "Rage 128"
--             Driver     "r128"
--         EndSection
--
--
--  or let xorgconfig do this for you.
--
--  However, if you have problems with auto-detection, you can specify:
--
--  +o  VideoRam - in kilobytes
--
--  +o  MemBase  - physical address of the linear framebuffer
--
--  +o  IOBase   - physical address of the memory mapped IO registers
--
--  +o  ChipID   - PCI DEVICE ID
--
--
--
--  6.  Driver Options
--
--
--  +o  "hw_cursor" - request hardware cursor (default)
--
--  +o  "sw_cursor" - software cursor only
--
--  +o  "no_accel"  - software rendering only
--
--  +o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
--
--  +o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
--
--
--
--  7.  Known Limitations
--
--
--  +o  None
--
--
--
--  8.  Authors
--
--  The X11R6.8 driver was originally part of XFree86 4.4 rc2.
--
--  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
--
--  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
--
--  +o  Kevin E. Martin  <kevin@precisioninsight.com>
--
--  The XFree86 4 driver was funded by ATI and was donated to The XFree86
--  Project by:
--
--      Precision Insight, Inc.
--      Cedar Park, TX
--      USA
--
--
--  The XFree86 3.3.x driver used for the port was written by:
--
--  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
--
--  +o  Kevin E. Martin  <kevin@precisioninsight.com>
--
--     The XFree86 3.3.x driver was funded by ATI and was donated to The
--     XFree86 Project by Precision Insight, Inc.  It was based in part on
--     an earlier driver that was written by:
--
--  +o  Alan Hourihane  <alanh@fairlite.demon.co.uk>
--
--  +o  Dirk Hohndel  <hohndel@suse.de>
--
--  This early driver was funded and donated to The XFree86 Project by:
--
--      SuSE GmbH
--      Schanzaekerstr. 10
--      90443 Nuernberg
--      Germany
--
--
--
--  http://www.precisioninsight.com
--
--  http://www.suse.com
--
--
--
-diff --git a/README.r128.sgml b/README.r128.sgml
-deleted file mode 100644
-index 8d7f448..0000000
---- a/README.r128.sgml
-+++ /dev/null
-@@ -1,138 +0,0 @@
--<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
--<!ENTITY % defs SYSTEM "defs.ent"> %defs;
--]>
--
--<article>
--<title>Information for ATI Rage 128 Users
--<author>Precision Insight, Inc., SuSE GmbH
--<date>13 June 2000
--
--<ident>
--</ident>
--
--<toc>
--
--<sect>Supported Hardware
--<p>
--<itemize>
--  <item>ATI Rage 128 based cards
--</itemize>
--
--
--<sect>Features
--<p>
--<itemize>
--  <item>Full support (including hardware accelerated 2D drawing) for 8, 15,
--        16, 24 bit pixel depths.
--  <item>Hardware cursor support to reduce sprite flicker.
--  <item>Support for high resolution video modes up to 1800x1440 @ 70Hz.
--  <item>Support for doublescan video modes (e.g., 320x200 and 320x240).
--  <item>Support for gamma correction at all pixel depths.
--  <item>Fully programmable clock supported.
--  <item>Robust text mode restore for VT switching.
--</itemize>
--
--
--<sect>Technical Notes
--<p>
--<itemize>
--  <item>None
--</itemize>
--
--
--<sect>Reported Working Video Cards
--<p>
--<itemize>
--  <item>Rage Fury AGP 32MB
--  <item>XPERT 128 AGP 16MB
--  <item>XPERT 99 AGP 8MB
--</itemize>
--
--
--<sect>Configuration
--<p>
--The driver auto-detects all device information necessary to
--initialize the card.  The only lines you need in the "Device"
--section of your xorg.conf file are:
--<verb>
--       Section "Device"
--           Identifier "Rage 128"
--           Driver     "r128"
--       EndSection
--</verb>
--or let <tt>xorgconfig</tt> do this for you.
--
--However, if you have problems with auto-detection, you can specify:
--<itemize>
--  <item>VideoRam - in kilobytes
--  <item>MemBase  - physical address of the linear framebuffer
--  <item>IOBase   - physical address of the memory mapped IO registers
--  <item>ChipID   - PCI DEVICE ID
--</itemize>
--
--
--<sect>Driver Options
--<p>
--<itemize>
--  <item>"hw_cursor" - request hardware cursor (default)
--  <item>"sw_cursor" - software cursor only
--  <item>"no_accel"  - software rendering only
--  <item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default)
--  <item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
--</itemize>
--
--
--<sect>Known Limitations
--<p>
--<itemize>
--  <item>None
--</itemize>
--
--
--<sect>Authors
--<p>
--The X11R&relvers; driver was originally part of XFree86 4.4 rc2.
--
--The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
--<itemize>
--   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
--   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
--</itemize>
--<p>
--The XFree86 4 driver was funded by ATI and was donated to The XFree86
--Project by:
--<verb>
--    Precision Insight, Inc.
--    Cedar Park, TX
--    USA
--</verb>
--<p>
--The XFree86 3.3.x driver used for the port was written by:
--<itemize>
--   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
--   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
--</itemize>
--The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86
--Project by Precision Insight, Inc.  It was based in part on an earlier
--driver that was written by:
--<itemize>
--   <item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email>
--   <item>Dirk Hohndel <email>hohndel@suse.de</email>
--</itemize>
--<p>This early driver was funded and donated to The XFree86 Project by:
--<verb>
--    SuSE GmbH
--    Schanzaekerstr. 10
--    90443 Nuernberg
--    Germany
--</verb>
--
--<p>
--<htmlurl name="http://www.precisioninsight.com"
--          url="http://www.precisioninsight.com">
--<p>
--<htmlurl name="http://www.suse.com"
--          url="http://www.suse.com">
--
--
--</article>
-diff --git a/configure.ac b/configure.ac
-index 4e0f463..d5a0821 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,28 +20,30 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-r128],
--        6.8.1,
-+        [6.8.1],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-r128)
--
-+        [xf86-video-r128])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
--# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
--m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.2)
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
- 
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- if test "x$GCC" = "xyes"; then
- 	CPPFLAGS="$CPPFLAGS -Wall"
-@@ -49,38 +51,35 @@ fi
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-                                   [Disable DRI support [[default=auto]]]),
-               [DRI="$enableval"],
-               [DRI=auto])
- 
--# Checks for extensions
--XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
- AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "$DRI" != no; then
- 	AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-@@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
--AC_SUBST([DRI_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=r128
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--XORG_CHECK_LINUXDOC
--XORG_CHANGELOG
--
- AC_MSG_NOTICE(
- [Please change the Driver line in xorg.conf from "ati" to "r128" or install]
- [the ati wrapper as well:]
- [    git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
- )
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 858ba62..4e22d61 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = r128.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/r128.man b/man/r128.man
-index 5c7c4fe..4ba933d 100644
---- a/man/r128.man
-+++ b/man/r128.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH R128 __drivermansuffix__ __vendorversion__
-diff --git a/src/r128_driver.c b/src/r128_driver.c
-index d6448b6..9d08d77 100644
---- a/src/r128_driver.c
-+++ b/src/r128_driver.c
-@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
- 				/* BIOS */
-     from              = X_PROBED;
-     info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
--    if (dev->BiosBase) {
--	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--		   "BIOS address override, using 0x%08lx instead of 0x%08lx\n",
--		   dev->BiosBase,
--		   info->BIOSAddr);
--	info->BIOSAddr = dev->BiosBase;
--	from           = X_CONFIG;
--    }
-     if (info->BIOSAddr) {
- 	xf86DrvMsg(pScrn->scrnIndex, from,
- 		   "BIOS at 0x%08lx\n", info->BIOSAddr);
diff --git a/staging/xf86-video-rendition/PKGBUILD b/staging/xf86-video-rendition/PKGBUILD
deleted file mode 100644
index 70c36cc79..000000000
--- a/staging/xf86-video-rendition/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 149868 2012-02-11 11:08:44Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-rendition
-pkgver=4.2.4
-pkgrel=6
-pkgdesc="X.org Rendition video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool' '!strip')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        rendition-4.2.4-git.patch)
-sha1sums=('16148c25183f7829c22bc9dfdb588c1a16bf4565'
-          'e023650fa418be9a92d159acd8ac0bc23704dfb3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/rendition-4.2.4-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so"
-}
diff --git a/staging/xf86-video-rendition/rendition-4.2.4-git.patch b/staging/xf86-video-rendition/rendition-4.2.4-git.patch
deleted file mode 100644
index 26cff2fd3..000000000
--- a/staging/xf86-video-rendition/rendition-4.2.4-git.patch
+++ /dev/null
@@ -1,809 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5091e50..f74b912 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,45 +20,45 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-rendition],
--        4.2.4,
-+        [4.2.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-rendition)
--
-+        [xf86-video-rendition])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- 
- # Checks for libraries.
-@@ -78,17 +78,16 @@ fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
- # Checks for header files.
--AC_HEADER_STDC
- AC_CHECK_HEADERS([elf.h] [elf_abi.h])
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=rendition
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/rendition.man b/man/rendition.man
-index 3658ab0..afeee91 100644
---- a/man/rendition.man
-+++ b/man/rendition.man
-@@ -1,4 +1,3 @@
--.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH RENDITION __drivermansuffix__ __vendorversion__
-diff --git a/src/accelX.c b/src/accelX.c
-index a499c56..ed4964e 100644
---- a/src/accelX.c
-+++ b/src/accelX.c
-@@ -289,7 +289,7 @@ int
- RENDITIONInitUcode(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
-     if (0 == verite_getstride(pScreenInfo, NULL,
- 			 &pRendition->board.mode.stride0, 
-@@ -367,7 +367,7 @@ void
- RENDITIONRestoreUcode(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
-     vu8 memend;
- 
-@@ -410,7 +410,7 @@ void
- RENDITIONSaveUcode(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
-     vu8 memend;
- 
- #ifdef DEBUG
-@@ -445,7 +445,7 @@ void
- RENDITIONSyncV1000(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
-     int c;
- 
-@@ -555,7 +555,7 @@ RENDITIONSubsequentScreenToScreenCopy(ScrnInfoPtr pScreenInfo,
- 					   int w, int h)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
- 
- #ifdef DEBUG
-@@ -607,7 +607,7 @@ RENDITIONSubsequentSolidFillRect(ScrnInfoPtr pScreenInfo,
- 				      int x, int y, int w, int h)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
- 
- #ifdef DEBUG
-@@ -639,7 +639,7 @@ RENDITIONSubsequentTwoPointLine(ScrnInfoPtr pScreenInfo,
- 				     int bias)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
- 
- #ifdef DEBUG
-diff --git a/src/rendition.c b/src/rendition.c
-index 7a9e18b..3202b49 100644
---- a/src/rendition.c
-+++ b/src/rendition.c
-@@ -330,7 +330,7 @@ renditionProbe(DriverPtr drv, int flags)
-                     renditionChipsets, renditionPCIchipsets, 
-                     devSections, numDevSections, drv, &usedChips);
- 
--	xfree(devSections);
-+	free(devSections);
- 	if (numUsed <= 0)
- 	    return FALSE;
- 
-@@ -359,7 +359,7 @@ renditionProbe(DriverPtr drv, int flags)
- 		foundScreen=TRUE;
- 	    }
-         }
--	xfree(usedChips);
-+	free(usedChips);
-     }
-     return foundScreen;
- }
-@@ -400,7 +400,7 @@ renditionGetRec(ScrnInfoPtr pScreenInfo)
-     sleep(1);
- #endif
-     if (!pScreenInfo->driverPrivate)
--        pScreenInfo->driverPrivate=xcalloc(sizeof(renditionRec), 1);
-+        pScreenInfo->driverPrivate=calloc(sizeof(renditionRec), 1);
- 
-     /* perhaps some initialization? <ml> */
- 
-@@ -421,7 +421,7 @@ renditionFreeRec(ScrnInfoPtr pScreenInfo)
- #endif
-     if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
- 	vgaHWFreeHWRec(pScreenInfo);
--    xfree(pScreenInfo->driverPrivate);
-+    free(pScreenInfo->driverPrivate);
-     pScreenInfo->driverPrivate=NULL;
- 
- #ifdef DEBUG
-@@ -596,7 +596,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
-     /* collect all of the options flags and process them */
- 
-     xf86CollectOptions(pScreenInfo, NULL);
--    if (!(pRendition->Options = xalloc(sizeof(renditionOptions))))
-+    if (!(pRendition->Options = malloc(sizeof(renditionOptions))))
- 	return FALSE;
-     memcpy(pRendition->Options, renditionOptions, sizeof(renditionOptions));
-     xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options, 
-@@ -663,7 +663,11 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
-     vgaHWGetIOBase(pvgaHW);             /* Get VGA I/O base */
- 
-     pRendition->board.accel=0;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     pRendition->board.vgaio_base = pvgaHW->PIOOffset;
-+#else
-+    pRendition->board.vgaio_base = 0;
-+#endif
-     pRendition->board.io_base = pRendition->board.vgaio_base 
- #ifdef XSERVER_LIBPCIACCESS
- 	+ pRendition->PciInfo->regions[1].base_addr;
-@@ -1167,7 +1171,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	pRendition->board.shadowPitch 
- 	    = BitmapBytePad(pScreenInfo->bitsPerPixel * width);
- 	pRendition->board.shadowPtr 
--	    = xalloc(pRendition->board.shadowPitch * height);
-+	    = malloc(pRendition->board.shadowPitch * height);
- 	displayWidth = pRendition->board.shadowPitch 
- 	    / (pScreenInfo->bitsPerPixel >> 3);
- 	FBBase = pRendition->board.shadowPtr;
-@@ -1484,7 +1488,7 @@ static xf86MonPtr
- renditionDDC (ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS iob=pRendition->board.io_base;
-+  unsigned long iob=pRendition->board.io_base;
-   vu32 temp;
- 
-   xf86MonPtr MonInfo = NULL;
-@@ -1517,7 +1521,7 @@ static unsigned int
- renditionDDC1Read (ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS iob=pRendition->board.io_base;
-+  unsigned long iob=pRendition->board.io_base;
-   vu32 value = 0;
- 
-   /* wait for Vsync */
-diff --git a/src/v1krisc.c b/src/v1krisc.c
-index 2554263..9b7b4e2 100644
---- a/src/v1krisc.c
-+++ b/src/v1krisc.c
-@@ -83,20 +83,20 @@
-  * local function prototypes
-  */
- 
--static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask);
--static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask);
-+static void verite_iopoll(unsigned long port, vu32 data, vu32 mask);
-+static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask);
- 
--static vu32 readRF(IOADDRESS io_base, vu8 index);
--static void writeRF(IOADDRESS io_base, vu8 index, vu32 data);
-+static vu32 readRF(unsigned long io_base, vu8 index);
-+static void writeRF(unsigned long io_base, vu8 index, vu32 data);
- 
--static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type);
--static void risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type);
-+static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type);
-+static void risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type);
- 
- #if 0
--static void risc_step(IOADDRESS io_base, vu32 count);
-+static void risc_step(unsigned long io_base, vu32 count);
- #endif
--static void risc_forcestep(IOADDRESS io_base, vu32 instruction);
--static void risc_continue(IOADDRESS io_base);
-+static void risc_forcestep(unsigned long io_base, vu32 instruction);
-+static void risc_continue(unsigned long io_base);
- 
- 
- 
-@@ -113,7 +113,7 @@ void
- v1k_start(ScrnInfoPtr pScreenInfo, vu32 pc)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
- 
-   v1k_stop(pScreenInfo);
-   risc_forcestep(io_base, NOP_INSTR);
-@@ -152,7 +152,7 @@ v1k_stop(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
-   vu8	debugreg, statusreg;
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
-   vu16 STATUS = 0x4A;   /* v2x00 io register offset */
-   int c;
- 
-@@ -207,7 +207,7 @@ v1k_flushicache(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
-   vu32 c, p1, p2;
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
- 
-   /* first flush store accumulation buffers so data is all in memory */
-   p1=risc_readmem(io_base, 0, READ_WORD);
-@@ -255,7 +255,7 @@ void
- v1k_softreset(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
- 
-   verite_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC);
-   verite_out8(io_base+STATEINDEX, STATEINDEX_PC);
-@@ -300,12 +300,12 @@ v1k_getriscprocs(verite_board_desc *boardDesc)
-  */
- 
- /* 
-- * static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
-+ * static void verite_iopoll(unsigned long port, vu32 data, vu32 mask)
-  *
-  * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
-  */
- static void
--verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
-+verite_iopoll(unsigned long port, vu32 data, vu32 mask)
- {
-   vu32 c;
- 
-@@ -320,12 +320,12 @@ verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
- 
- 
- /* 
-- * static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
-+ * static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask)
-  *
-  * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
-  */
- static void
--verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
-+verite_iopoll8(unsigned long port, vu8 data, vu8 mask)
- {
-   vu32 c;
- 
-@@ -340,12 +340,12 @@ verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
- 
- 
- /*
-- * static vu32 readRF(IOADDRESS io_base, vu8 index)
-+ * static vu32 readRF(unsigned long io_base, vu8 index)
-  *
-  * Reads data from register file.
-  */
- static vu32
--readRF(IOADDRESS io_base, vu8 index)
-+readRF(unsigned long io_base, vu8 index)
- {
-   vu32 data, instr;
-   vu8 debug, stateindex;
-@@ -378,12 +378,12 @@ readRF(IOADDRESS io_base, vu8 index)
- 
- 
- /*
-- * static void writeRF(IOADDRESS io_base, vu8 index, vu32 data)
-+ * static void writeRF(unsigned long io_base, vu8 index, vu32 data)
-  *
-  * Set RF register, being careful on how to set regs below 64.
-  */
- static void
--writeRF(IOADDRESS io_base, vu8 index, vu32 data)
-+writeRF(unsigned long io_base, vu8 index, vu32 data)
- {
-   vu8 special=0;
- 
-@@ -417,12 +417,12 @@ writeRF(IOADDRESS io_base, vu8 index, vu32 data)
- 
- 
- /*
-- * static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
-+ * static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type)
-  *
-  * NOTE: Assumes RISC is in hold mode.
-  */
- static vu32
--risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
-+risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type)
- {
-   vu32 data;
- 
-@@ -445,12 +445,12 @@ risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
- 
- 
- /*
-- * static vu32 risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
-+ * static vu32 risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type)
-  *
-  * NOTE: Assumes RISC is in hold mode.
-  */
- static void
--risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
-+risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type)
- {
-   writeRF(io_base, RISC_RA, addr);          /* point to memory */
-   writeRF(io_base, RISC_FP, data);          /* set data */
-@@ -466,12 +466,12 @@ risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
- 
- #if 0
- /*
-- * static void risc_step(IOADDRESS io_base, vu32 count)
-+ * static void risc_step(unsigned long io_base, vu32 count)
-  *
-  * Single step the RISC. NOTE: Do not force instruction into RISCIR!
-  */
- static void
--risc_step(IOADDRESS io_base, vu32 count)
-+risc_step(unsigned long io_base, vu32 count)
- {
-   vu32 c, d;
-   vu8 debugreg;
-@@ -494,12 +494,12 @@ risc_step(IOADDRESS io_base, vu32 count)
- 
- 
- /*
-- * static void risc_forcestep(IOADDRESS io_base, vu32 instruction)
-+ * static void risc_forcestep(unsigned long io_base, vu32 instruction)
-  *
-  * Single step RISC; force instruction; assumes RISC held.
-  */
- static void
--risc_forcestep(IOADDRESS io_base, vu32 instruction)
-+risc_forcestep(unsigned long io_base, vu32 instruction)
- {
-   vu32 c;
-   vu8 debugreg, stateindex;
-@@ -525,12 +525,12 @@ risc_forcestep(IOADDRESS io_base, vu32 instruction)
- 
- 
- /*
-- * static void risc_continue(IOADDRESS io_base)
-+ * static void risc_continue(unsigned long io_base)
-  *
-  * Turn off hold bit.    
-  */
- static void
--risc_continue(IOADDRESS io_base)
-+risc_continue(unsigned long io_base)
- {
-   vu8 debugreg;
- 
-diff --git a/src/vboard.c b/src/vboard.c
-index 49499e2..622715f 100644
---- a/src/vboard.c
-+++ b/src/vboard.c
-@@ -38,7 +38,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
- 
--    IOADDRESS iob=pRendition->board.io_base;
-+    unsigned long iob=pRendition->board.io_base;
-     vu8 *vmb;
-     vu32 offset;
-     vu8 memendian;
-@@ -207,7 +207,7 @@ void
- verite_check_csucode(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS iob=pRendition->board.io_base;
-+  unsigned long iob=pRendition->board.io_base;
-   vu8 *vmb;
-   vu32 offset;
-   int c;
-diff --git a/src/vgafont-std.data b/src/vgafont-std.data
-index db63ea8..c47983f 100644
---- a/src/vgafont-std.data
-+++ b/src/vgafont-std.data
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.3 1999/10/13 04:21:22 dawes Exp $ */
- #ifndef __VGAFONT_STD__
- #define __VGAFONT_STD__
- 
-diff --git a/src/vgafont-vrx.data b/src/vgafont-vrx.data
-index ad34582..23b5908 100644
---- a/src/vgafont-vrx.data
-+++ b/src/vgafont-vrx.data
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
- #ifndef __VGAFONT_VRX__
- #define __VGAFONT_VRX__
- 
-diff --git a/src/vgapalette.data b/src/vgapalette.data
-index 5267608..106028d 100644
---- a/src/vgapalette.data
-+++ b/src/vgapalette.data
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
- #ifndef __VGAPALETTE__
- #define __VGAPALETTE__
- 
-diff --git a/src/vloaduc.c b/src/vloaduc.c
-index 67bf901..5c6aab0 100644
---- a/src/vloaduc.c
-+++ b/src/vloaduc.c
-@@ -103,7 +103,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-   sz=SW16(ehdr.e_phentsize);
-   num=SW16(ehdr.e_phnum);
-   if (0!=sz && 0!=num) {
--	orig_pphdr=pphdr=(Elf32_Phdr *)xalloc(sz*num);
-+	orig_pphdr=pphdr=(Elf32_Phdr *)malloc(sz*num);
- 	if (!pphdr) {
- 	  ErrorF("RENDITION: Cannot allocate global memory (1)\n"); 
- 	  close(fd);
-@@ -125,7 +125,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-     sz=SW16(ehdr.e_shentsize);
-     num=SW16(ehdr.e_shnum);
-     if (0!=sz && 0!=num) {
--      orig_pshdr=pshdr=(Elf32_Shdr *)xalloc(sz*num);
-+      orig_pshdr=pshdr=(Elf32_Shdr *)malloc(sz*num);
-       if (!pshdr) {
-         ErrorF("RENDITION: Cannot allocate global memory (2)\n"); 
-         close(fd);
-@@ -148,7 +148,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-         loadSegment2board(pScreenInfo, fd, pphdr);
-         pphdr=(Elf32_Phdr *)(((char *)pphdr)+sz);
-       } while (--num);
--      xfree(orig_pphdr);
-+      free(orig_pphdr);
-   }
-   else {
-     do {
-@@ -158,7 +158,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-         loadSection2board(pScreenInfo, fd, pshdr);
- 	  pshdr=(Elf32_Shdr *)(((char *)pshdr)+sz);
- 	} while (--num) ;
--	xfree(orig_pshdr);
-+	free(orig_pshdr);
-   }
-   close(fd);
- 
-@@ -195,7 +195,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
-     return;
-   }
- 
--  data=(vu8 *)xalloc(size);
-+  data=(vu8 *)malloc(size);
-   if (NULL == data){
- 	ErrorF("RENDITION: GlobalAllocPtr couldn't allocate %lx bytes",
- 		(unsigned long)size);
-@@ -210,7 +210,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
- 
-   mmve(pScreenInfo, size, data, physAddr);
- 
--  xfree(data);
-+  free(data);
- }
- 
- 
-diff --git a/src/vmodes.c b/src/vmodes.c
-index c0bd0df..f2dae0b 100644
---- a/src/vmodes.c
-+++ b/src/vmodes.c
-@@ -20,6 +20,7 @@
- #include "v1kregs.h"
- #include "v2kregs.h"
- 
-+#include <unistd.h>
- 
- #undef DEBUG
- 
-@@ -201,7 +202,7 @@ struct V1000ClocksStr {
-  * local function prototypes
-  */
- 
--static void set_PLL(IOADDRESS iob, vu32 value);
-+static void set_PLL(unsigned long iob, vu32 value);
- static double V1000CalcClock(double target, int *M, int *N, int *P);
- static double V2200CalcClock(double target, int *m, int *n, int *p);
- 
-@@ -509,13 +510,13 @@ verite_getstride(ScrnInfoPtr pScreenInfo, int *width,
-  */
- 
- /*
-- * void set_PLL(IOADDRESS iob, vu32 value)
-+ * void set_PLL(unsigned long iob, vu32 value)
-  *
-  * Set PLL clock to desired frequency for the V1000.
-  */
- 
- void
--set_PLL(IOADDRESS iob, vu32 value)
-+set_PLL(unsigned long iob, vu32 value)
- {
-     vu32 ulD;
-     int b;
-diff --git a/src/vos.h b/src/vos.h
-index 7b55f77..999c870 100644
---- a/src/vos.h
-+++ b/src/vos.h
-@@ -23,18 +23,18 @@
- /*
-  * function prototypes
-  */
--#define /*void*/ verite_out8(/*IOADDRESS*/ port, /*vu8*/ data) \
-+#define /*void*/ verite_out8(/*unsigned long*/ port, /*vu8*/ data) \
-                    outb(port, data)
- 
--#define /*void*/ verite_out16(/*IOADDRESS*/ port, /*vu16*/ data) \
-+#define /*void*/ verite_out16(/*unsigned long*/ port, /*vu16*/ data) \
-                    outw(port, data)
- 
--#define /*void*/ verite_out32(/*IOADDRESS*/ port, /*vu32*/ data) \
-+#define /*void*/ verite_out32(/*unsigned long*/ port, /*vu32*/ data) \
-                    outl(port, data)
- 
--#define /*vu8*/  verite_in8(/*IOADDRESS*/ io_base)  ((vu8)inb(io_base))
--#define /*vu16*/ verite_in16(/*IOADDRESS*/ io_base) ((vu16)inw(io_base))
--#define /*vu32*/ verite_in32(/*IOADDRESS*/ io_base) ((vu32)inl(io_base))
-+#define /*vu8*/  verite_in8(/*unsigned long*/ io_base)  ((vu8)inb(io_base))
-+#define /*vu16*/ verite_in16(/*unsigned long*/ io_base) ((vu16)inw(io_base))
-+#define /*vu32*/ verite_in32(/*unsigned long*/ io_base) ((vu32)inl(io_base))
- 
- /* memory accesses */
- #define verite_read_memory32(base, offset) MMIO_IN32(base, offset)
-diff --git a/src/vramdac.c b/src/vramdac.c
-index 7c8acbd..21c1df7 100644
---- a/src/vramdac.c
-+++ b/src/vramdac.c
-@@ -93,11 +93,11 @@
-  * local function prototypes
-  */
- 
--static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data);
--static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data);
-+static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data);
-+static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data);
- #if 0
--static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask);
--static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask);
-+static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask);
-+static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask);
- #endif
- 
- /*
-@@ -159,7 +159,7 @@ int
- verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
-     vu8 cmd0,cmd1,cmd2;
-     vu8 cmd3_data=0;
- 
-@@ -271,7 +271,7 @@ verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size)
-                       BT485_3_COLOR_CURSOR, BT485_X_WINDOW_CURSOR };
-     static vu8 csizes[]={ BT485_32_BY_32_CURSOR, BT485_64_BY_64_CURSOR };
-   
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
- 
- #ifdef DEBUG
-     ErrorF ("Rendition: Debug verite_enablecursor called type=0x%x\n",type);
-@@ -304,7 +304,7 @@ void
- verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
- 
-     x+=Cursor_size-xo;
-     y+=Cursor_size-yo;
-@@ -327,7 +327,7 @@ void
- verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 fg, vu32 bg)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
- 
- #ifdef DEBUG
-     ErrorF ("Rendition: Debug verite_setcursorcolor called FG=0x%x BG=0x%x\n",
-@@ -374,7 +374,7 @@ verite_loadcursor(ScrnInfoPtr pScreenInfo, vu8 size, vu8 *cursorimage)
-     int c, bytes, row;
-     vu8 *src = cursorimage;
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
-     vu8 tmp;
-     vu8 memend; /* Added for byte-swap fix */
- 
-@@ -454,7 +454,7 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
- 		LOCO *colors, VisualPtr pVisual)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base;
-+    unsigned long iob=pRendition->board.io_base;
-     vu32 crtc_status;
-     int i, index;
- 
-@@ -485,12 +485,12 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
-  */
- 
- /*
-- * static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
-+ * static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data)
-  *
-  *
-  */
- static void
--Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
-+Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data)
- {
-     vu8 tmp;
- 
-@@ -501,12 +501,12 @@ Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
- 
- 
- /*
-- * static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
-+ * static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data)
-  *
-  *
-  */
- static void
--Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
-+Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data)
- {
- /*
-  *   Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x80);
-@@ -522,24 +522,24 @@ Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
- 
- #if 0
- /*
-- * static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask)
-+ * static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask)
-  *
-  *
-  */
- static vu8
--Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask)
-+Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask)
- {
-     return verite_in8(port+reg)&mask;
- }
- 
- 
- /*
-- * static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask)
-+ * static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask)
-  *
-  *
-  */
- static vu8
--Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask)
-+Bt485_read_cmd3_masked(unsigned long port, vu8 mask)
- {
-     vu8 value;
- 
-diff --git a/src/vtypes.h b/src/vtypes.h
-index 257870b..e4ad468 100644
---- a/src/vtypes.h
-+++ b/src/vtypes.h
-@@ -123,7 +123,7 @@ struct verite_board_t {
-     vu16  chip;
- 
-     /* */
--    IOADDRESS io_base, vgaio_base;
-+    unsigned long io_base, vgaio_base;
-     vu32 mmio_base;
-     vu32 vmmio_base;
-     vu32 mem_size;
diff --git a/staging/xf86-video-s3/LICENSE b/staging/xf86-video-s3/LICENSE
deleted file mode 100644
index a4c8d5dd4..000000000
--- a/staging/xf86-video-s3/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
-
-     XFree86 4.x driver for S3 chipsets
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation and
-that the name of Ani Joshi not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Ani Joshi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/staging/xf86-video-s3/PKGBUILD b/staging/xf86-video-s3/PKGBUILD
deleted file mode 100644
index 1bc6e2bd4..000000000
--- a/staging/xf86-video-s3/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 149870 2012-02-11 11:10:56Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-s3
-pkgver=0.6.3
-pkgrel=7
-pkgdesc="X.org S3 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-md5sums=('5eb06d88533fb327d067928faeb20860'
-         '77a455ce7e254c73b1cbd408c7f4ecf4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/xf86-video-s3/git-fixes.patch b/staging/xf86-video-s3/git-fixes.patch
deleted file mode 100644
index 712b3c9c0..000000000
--- a/staging/xf86-video-s3/git-fixes.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..458ab5f 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,70 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+     XFree86 4.x driver for S3 chipsets
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation and
-+that the name of Ani Joshi not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Ani Joshi makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+Copyright 2007 George Sapountzis
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+of the Software, and to permit persons to whom the Software is furnished to do
-+so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall not
-+be used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from the XFree86 Project.
-+
-+
-+Copyright 1995-1997 The XFree86 Project, Inc.
-+Copyright (c) 1999,2000  The XFree86 Project Inc.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index ad0b227..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,133 +0,0 @@
--2009-06-25  Evgeny M. zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	Revert the old behaviour when the BIOS settings are used for
--	intialization of DRAM/VRAM timings, i. e. we don't touch the
--	timings during initialization phase until any memory option (like
--	slow_edodram) is specified.
--	
--	Add manual page.	
--
--2009-05-25  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--	
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	
--	Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for 
--	testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
--	overriding Chipset with "Trio64UV+" but not on real hardware).
--
--	S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
--	as Trio32/64 but only with chip revision greater or eq 0x40. So if 
--	you have problems with NewMMIO, you may override ChipRev in "Device" 
-- 	section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO 
--	also disables overlay video (Xv) because it isn't implemented for
--	Old MMIO yet.
--	
--2009-05-04  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	* src/s3_shadow.c:
--
--	Add shadowFB option. It can be used to speedup drawing when
--	hardware acceleration is undesirable or unavailable (for colour depth
--	24 with 24 bpp framebuffer, for example). shadowFB is disabled by
--	default. Enabling shadowFB option disables HW acceleration. Thanks
--	to Egor Ivanov for initial porting of shadowFB from s3virge.
--
--	Interlace mode support.
--
--	Close bug #14999.
--	
--2008-07-06  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_video.c: 
--
--	Streams Processor initialization.
--
--	XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
--
--	* src/s3_driver.c: 
--
--	Add XVideo option (enabled by default).
--
--	Replace "swcursor" by "hwcursor" option (HW cursor 
--	not implemented yet for all chipsets).
--
--	Close bug #5527: 24-bit colour depth support (24bpp and 
--	32bpp framebuffer) for TRIOs. Acceleration doesn't work
--	with packed colour mode (24 bpp FB) but works with 32bpp 
--	framebuffer mode (hardware limitation? -- need data).
--
--	Fix system hang-up when switching between console and X session.
--
--	Some minor changes of driver messages.
--
--2008-02-23  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
--	others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
--	* src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
--	the 1024x768@16bpp mode work.
--	Thanks to Richard Driscoll for these patches.
--	
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	Bump to 0.4.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/s3_video.c: (S3PutImage):
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	* src/s3_IBMRGB.c:
--	* src/s3_Ti.c:
--	* src/s3_Trio64DAC.c:
--	* src/s3_bios.c:
--	* src/s3_cursor.c:
--	* src/s3_dga.c:
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.4.0.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 7052905..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,5 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
-+
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index 0eecc87..0ac34f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,42 +20,50 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-s3],
--        0.6.3,
-+        [0.6.3],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-s3)
--
-+        [xf86-video-s3])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
-+
-+# Checks for programs.
-+AM_PROG_CC_C_O
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-               [#include "xorg-server.h"])
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=s3
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--XORG_CHECK_LINUXDOC
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/src/s3.h b/src/s3.h
-index 49b8a54..0875fc9 100644
---- a/src/s3.h
-+++ b/src/s3.h
-@@ -113,7 +113,6 @@ typedef struct _S3Rec {
-         XAAInfoRecPtr           pXAA;
- 	xf86CursorInfoPtr	pCurs;
- 	xf86Int10InfoPtr	pInt10;
--	vbeInfoPtr		pVBE;
-         XF86VideoAdaptorPtr     adaptor;
-         S3PortPrivPtr           portPrivate;
- 
-diff --git a/src/s3_driver.c b/src/s3_driver.c
-index 29e343d..4519b33 100644
---- a/src/s3_driver.c
-+++ b/src/s3_driver.c
-@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	S3Ptr pS3;
- 	vgaHWPtr hwp;
- 	ClockRangePtr clockRanges;
-+	vbeInfoPtr pVBE;
- 	rgb zeros = {0, 0, 0};
- 	Gamma gzeros = {0.0, 0.0, 0.0};
- 	int i, vgaCRIndex, vgaCRReg;
-@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	}
- 
- 	if (xf86LoadSubModule(pScrn, "vbe")) {
--		pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		vbeFree(pVBE);
- 	}
- 	
- 	if (pS3->shadowFB) {
diff --git a/staging/xf86-video-s3virge/PKGBUILD b/staging/xf86-video-s3virge/PKGBUILD
deleted file mode 100644
index d1af0b5e1..000000000
--- a/staging/xf86-video-s3virge/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 149875 2012-02-11 11:17:48Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-s3virge
-pkgver=1.10.4
-pkgrel=7
-pkgdesc="X.org S3 Virge video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        copyright.patch
-        s3virge-1.10.4-vga.patch)
-md5sums=('6517bbbf808c700502d51acdc44662f8'
-         'f91fb259e3632fb9130fcbe69ecd9d6a'
-         '45c7d912734c9f7dfc1f42077827cb8e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/copyright.patch"
-  patch -Np1 -i ${srcdir}/s3virge-1.10.4-vga.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-s3virge/copyright.patch b/staging/xf86-video-s3virge/copyright.patch
deleted file mode 100644
index ba988c6d6..000000000
--- a/staging/xf86-video-s3virge/copyright.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From c26da404906258951341c4c4ace793f2dfdc47f8 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun, 13 Jun 2010 14:26:32 +0000
-Subject: COPYING: update file with Copyright notices from source code.
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..727ca51 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,60 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+of the Software, and to permit persons to whom the Software is furnished to do
-+so, subject to the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall not
-+be used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from the XFree86 Project.
-+
-+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry,
-+NH - All Rights Reserved
-+
-+This code may be freely incorporated in any program without royalty, as long
-+as the copyright notice stays intact.
-+
-+Additions by Kevin E. Martin (martin@cs.unc.edu)
-+
-+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+EVENT SHALL KEVIN E. MARTIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+
-+Copyright 2007 George Sapountzis
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-s3virge/s3virge-1.10.4-vga.patch b/staging/xf86-video-s3virge/s3virge-1.10.4-vga.patch
deleted file mode 100644
index 3fb1fd6cf..000000000
--- a/staging/xf86-video-s3virge/s3virge-1.10.4-vga.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 16 Nov 2011 19:58:29 +0000
-Subject: Adapt to missing PIOOffset in videoabi 12
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/s3v_driver.c b/src/s3v_driver.c
-index 2ced9ac..0f754dd 100644
---- a/src/s3v_driver.c
-+++ b/src/s3v_driver.c
-@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-   S3VPtr ps3v;
-   IOADDRESS vgaCRIndex, vgaCRReg;
-   unsigned char val;
--  
-+  unsigned int PIOOffset = 0;
-+
-   PVERB5("	S3VEnableMmio\n");
-   
-   hwp = VGAHWPTR(pScrn);
-   ps3v = S3VPTR(pScrn);
-+
-+#if ABI_VIDEODRV_VERSION < 12
-+  PIOOffset = hwp->PIOOffset;
-+#endif
-+  
-   /*
-    * enable chipset (seen on uninitialized secondary cards)
-    * might not be needed once we use the VGA softbooter
-@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-    * to be set correctly already and MMIO _has_ to be
-    * enabled.
-    */
--  val = inb(hwp->PIOOffset + 0x3C3);               /*@@@EE*/
--  outb(hwp->PIOOffset + 0x3C3, val | 0x01);
-+  val = inb(PIOOffset + 0x3C3);               /*@@@EE*/
-+  outb(PIOOffset + 0x3C3, val | 0x01);
-   /*
-    * set CR registers to color mode
-    * in mono mode extended CR registers
-    * are not accessible. (EE 05/04/99)
-    */
--  val = inb(hwp->PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
--  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
-+  val = inb(PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
-+  outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
-   vgaHWGetIOBase(hwp);             	/* Get VGA I/O base */
--  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
-+  vgaCRIndex = PIOOffset + hwp->IOBase + 4;
-   vgaCRReg = vgaCRIndex + 1;
- #if 1
-   /*
-@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-   			      	/* Enable new MMIO, if TRIO mmio is already */
- 				/* enabled, then it stays enabled. */
-   outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
--  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
-+  outb(PIOOffset + VGA_MISC_OUT_W, val);
-   if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
-     outb(vgaCRIndex, 0x40);
-     val = inb(vgaCRReg);
-@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
-   hwp = VGAHWPTR(pScrn);
-   ps3v = S3VPTR(pScrn);
- 
--  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
-+  vgaCRIndex = hwp->IOBase + 4;
-+#if ABI_VIDEODRV_VERSION < 12
-+  vgaCRIndex += hwp->PIOOffset;
-+#endif
-   vgaCRReg = vgaCRIndex + 1;
-   outb(vgaCRIndex, 0x53);
- 				/* Restore register's original state */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-savage/PKGBUILD b/staging/xf86-video-savage/PKGBUILD
deleted file mode 100644
index 2b1628c62..000000000
--- a/staging/xf86-video-savage/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 149878 2012-02-11 11:24:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-savage
-pkgver=2.3.3
-pkgrel=2
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
-options=(!libtool !makeflags)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-siliconmotion/PKGBUILD b/staging/xf86-video-siliconmotion/PKGBUILD
deleted file mode 100644
index a4a7a3b68..000000000
--- a/staging/xf86-video-siliconmotion/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 149880 2012-02-11 11:30:03Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-siliconmotion
-pkgver=1.7.5
-pkgrel=4
-pkgdesc="X.org siliconmotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        smi-1.7.5-vga.patch)
-sha1sums=('946acae0822d51da57abe8b7ed049691bd731589'
-          '50b0e4aa858d7f8eb6f7e826f62fde23f01afe48')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/smi-1.7.5-vga.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch b/staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch
deleted file mode 100644
index ef353f0df..000000000
--- a/staging/xf86-video-siliconmotion/smi-1.7.5-vga.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 16 Nov 2011 20:03:25 +0000
-Subject: Adapt to missing PIOOffset in videoabi 12
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/smi_driver.c b/src/smi_driver.c
-index 9c10e46..86644c7 100644
---- a/src/smi_driver.c
-+++ b/src/smi_driver.c
-@@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
- 	    LEAVE(FALSE);
- 
- 	hwp = VGAHWPTR(pScrn);
-+#if ABI_VIDEODRV_VERSION < 12
- 	pSmi->PIOBase = hwp->PIOOffset;
-+#else
-+	pSmi->PIOBase = 0;
-+#endif
- 
- 	xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, "
- 		       "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-sis/PKGBUILD b/staging/xf86-video-sis/PKGBUILD
deleted file mode 100644
index 30b67cd30..000000000
--- a/staging/xf86-video-sis/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149882 2012-02-11 11:34:48Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sis
-pkgver=0.10.3
-pkgrel=6
-pkgdesc="X.org SiS video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        sis-0.10.3-git.patch)
-sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5'
-          '9078c02e9d10384cafb75d675bade8644726c811')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/sis-0.10.3-git.patch
-  ./configure --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-sis/sis-0.10.3-git.patch b/staging/xf86-video-sis/sis-0.10.3-git.patch
deleted file mode 100644
index d355e15b1..000000000
--- a/staging/xf86-video-sis/sis-0.10.3-git.patch
+++ /dev/null
@@ -1,1460 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 33c0d65..036a448 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,54 +20,53 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-sis],
--        0.10.3,
-+        [0.10.3],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-sis)
--
-+        [xf86-video-sis])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
--XORG_PROG_RAWCPP
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-                                   [Disable DRI support [[default=auto]]]),
-               [DRI="$enableval"],
-               [DRI=auto])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
-+# Obtain compiler/linker options for the driver dependencies
-+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto >= 2.1 $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
-@@ -76,9 +75,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "$DRI" != no; then
-         AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-@@ -118,20 +114,19 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
--    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
-+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
-     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([DRI_CFLAGS])
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=sis
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 1b26ac2..9ceb36f 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MANDEFS =  \
--	-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
--	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
--	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
--	-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
--	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
--	-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
--	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
--	-D__xconfigfile__=xorg.conf \
--	-D__xservername__=Xorg
--
--# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
--# to cpp, because that trick does not work on all ANSI C preprocessors.
--# Delete line numbers from the cpp output (-P is not portable, I guess).
--# Allow XCOMM to be preceded by whitespace and provide a means of generating
--# output lines with trailing backslashes.
--# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
--
--CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
--                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
--                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
--                       -e '/\@\@$$/s/\@\@$$/\\/'
--
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- .man.$(DRIVER_MAN_SUFFIX):
--	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
- 
-diff --git a/man/sis.man b/man/sis.man
-index 9ae4a1b..578bb68 100644
---- a/man/sis.man
-+++ b/man/sis.man
-@@ -1,17 +1,5 @@
--.\" $XFree86$
--.\" $XdotOrg$
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
--#ifdef __xservername__
--#define __myservername__ __xservername__
--#else
--#define __myservername__ XFree86
--#endif
--#ifdef __xconfigfile__
--#define __myxconfigfile__ __xconfigfile__
--#else
--#define __myxconfigfile__ XF86Config
--#endif
- .TH SIS __drivermansuffix__ __vendorversion__
- .SH NAME
- sis \- SiS and XGI video driver
-@@ -25,7 +13,7 @@ sis \- SiS and XGI video driver
- .fi
- .SH DESCRIPTION
- .B sis
--is an __myservername__ driver for SiS (Silicon Integrated Systems) and XGI video
-+is an __xservername__ driver for SiS (Silicon Integrated Systems) and XGI video
- chips. The driver is accelerated and provides support for colordepths of 8, 16
- and 24 bpp. XVideo, Render and other extensions are supported as well.
- .SH SUPPORTED HARDWARE
-@@ -60,7 +48,7 @@ for SiS315, 55x, 330, 661/741/76x (plus M, FX, MX, GX variants thereof), 340
- and all XGI chips.
- .PP
- .SH CONFIGURATION DETAILS
--Please refer to __myxconfigfile__(__filemansuffix__) for general configuration
-+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details.  This section only covers configuration details specific to this
- driver.
- .PP
-@@ -428,11 +416,7 @@ The amount is to be specified in megabyte, the default is 8.
- .SH "KNOWN BUGS"
- none.
- .SH "SEE ALSO"
--#ifdef __xservername__
- __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
--#else
--XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
--#endif
- .PP
- .B "http://www.winischhofer.eu/linuxsisvga.shtml"
- for more information and updates
-diff --git a/src/initextx.c b/src/initextx.c
-index 5c00398..1e84d0f 100644
---- a/src/initextx.c
-+++ b/src/initextx.c
-@@ -238,10 +238,10 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 	 continue;
-       }
- 
--      if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+      if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
-       memset(new, 0, sizeof(DisplayModeRec));
--      if(!(new->name = xalloc(10))) {
--	 xfree(new);
-+      if(!(new->name = malloc(10))) {
-+	 free(new);
- 	 return first;
-       }
-       if(!first) first = new;
-@@ -385,11 +385,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 		     }
- 		  }
- 
--		  if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+		  if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
- 
- 		  memset(new, 0, sizeof(DisplayModeRec));
--		  if(!(new->name = xalloc(12))) {
--		     xfree(new);
-+		  if(!(new->name = malloc(12))) {
-+		     free(new);
- 		     return first;
- 		  }
- 		  if(!first) first = new;
-@@ -470,11 +470,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 
- 	 if(pSiS->SiS_Pr->CP_DataValid[i]) {
- 
--	    if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+	    if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
- 
- 	    memset(new, 0, sizeof(DisplayModeRec));
--	    if(!(new->name = xalloc(10))) {
--	       xfree(new);
-+	    if(!(new->name = malloc(10))) {
-+	       free(new);
- 	       return first;
- 	    }
- 	    if(!first) first = new;
-diff --git a/src/osdef.h b/src/osdef.h
-index cd6b907..5776910 100644
---- a/src/osdef.h
-+++ b/src/osdef.h
-@@ -110,12 +110,12 @@
- #warning sisfb will not work!
- #endif
- 
--#define OutPortByte(p,v) outb((u8)(v),(IOADDRESS)(p))
--#define OutPortWord(p,v) outw((u16)(v),(IOADDRESS)(p))
--#define OutPortLong(p,v) outl((u32)(v),(IOADDRESS)(p))
--#define InPortByte(p)    inb((IOADDRESS)(p))
--#define InPortWord(p)    inw((IOADDRESS)(p))
--#define InPortLong(p)    inl((IOADDRESS)(p))
-+#define OutPortByte(p,v) outb((u8)(v),(unsigned long)(p))
-+#define OutPortWord(p,v) outw((u16)(v),(unsigned long)(p))
-+#define OutPortLong(p,v) outl((u32)(v),(unsigned long)(p))
-+#define InPortByte(p)    inb((unsigned long)(p))
-+#define InPortWord(p)    inw((unsigned long)(p))
-+#define InPortLong(p)    inl((unsigned long)(p))
- #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)
- 
- #endif /* LINUX_KERNEL */
-@@ -129,12 +129,12 @@
- #define SIS300
- #define SIS315H
- 
--#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v))
--#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v))
--#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v))
--#define InPortByte(p)    inSISREG((IOADDRESS)(p))
--#define InPortWord(p)    inSISREGW((IOADDRESS)(p))
--#define InPortLong(p)    inSISREGL((IOADDRESS)(p))
-+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v))
-+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v))
-+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v))
-+#define InPortByte(p)    inSISREG((unsigned long)(p))
-+#define InPortWord(p)    inSISREGW((unsigned long)(p))
-+#define InPortLong(p)    inSISREGL((unsigned long)(p))
- #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
- 
- #endif /* XF86 */
-diff --git a/src/sis.h b/src/sis.h
-index 400b83f..9af31a5 100644
---- a/src/sis.h
-+++ b/src/sis.h
-@@ -86,6 +86,14 @@
- #include "xf86cmap.h"
- #include "vbe.h"
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+#define _swapl(x, n) swapl(x,n)
-+#define _swaps(x, n) swaps(x,n)
-+#else
-+#define _swapl(x, n) swapl(x)
-+#define _swaps(x, n) swaps(x)
-+#endif
-+
- #define SIS_HaveDriverFuncs 0
- 
- #undef SISISXORG6899900
-@@ -251,7 +259,6 @@
- #endif
- 
- /* Need that for SiSCtrl and Pseudo-Xinerama */
--#define NEED_REPLIES				/* ? */
- #define EXTENSION_PROC_ARGS void *
- #include "extnsionst.h" 			/* required */
- #include <X11/extensions/panoramiXproto.h> 	/* required */
-@@ -971,7 +978,7 @@ typedef struct {
-     void 		*RealFbBase;	/* Real VRAM virtual linear address (for DHM and SiS76x UMA skipping) */
-     CARD32		IOAddress;	/* MMIO physical address */
-     void		*IOBase;	/* MMIO linear address */
--    IOADDRESS		IODBase;	/* Base of PIO memory area */
-+    unsigned long	IODBase;	/* Base of PIO memory area */
- #ifdef __alpha__
-     void		*IOBaseDense;	/* MMIO for Alpha platform */
- #endif
-@@ -1348,7 +1355,7 @@ typedef struct {
-     Bool		skipswitchcheck;
-     unsigned int	VBFlagsInit;
-     DisplayModePtr	currentModeLast;
--    IOADDRESS		MyPIOOffset;
-+    unsigned long	MyPIOOffset;
-     Bool		OverruleRanges;
-     Bool		BenchMemCpy;
-     Bool		NeedCopyFastVidCpy;
-diff --git a/src/sis6326_video.c b/src/sis6326_video.c
-index c6b18e2..66352b7 100644
---- a/src/sis6326_video.c
-+++ b/src/sis6326_video.c
-@@ -170,7 +170,7 @@ void SIS6326InitVideo(ScreenPtr pScreen)
- 		adaptors = &newAdaptor;
- 	} else {
- 		/* need to free this someplace */
--		newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+		newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- 		if(newAdaptors) {
- 			memcpy(newAdaptors, adaptors, num_adaptors *
- 				sizeof(XF86VideoAdaptorPtr));
-@@ -185,7 +185,7 @@ void SIS6326InitVideo(ScreenPtr pScreen)
- 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
-@@ -531,7 +531,7 @@ SIS6326SetupImageVideo(ScreenPtr pScreen)
-        return NULL;
- #endif
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISPortPrivRec) +
-                             sizeof(DevUnion))))
-        return NULL;
-diff --git a/src/sis_dga.c b/src/sis_dga.c
-index d358645..16b0ee4 100644
---- a/src/sis_dga.c
-+++ b/src/sis_dga.c
-@@ -150,18 +150,18 @@ SISSetupDGAMode(
- 
- 	if(pMode->HDisplay != otherPitch) {
- 
--	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
- 	    oneMore  = TRUE;
- 
- 	} else {
- 
--	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
- 	    oneMore  = FALSE;
- 
- 	}
- 
- 	if(!newmodes) {
--	    xfree(modes);
-+	    free(modes);
- 	    return NULL;
- 	}
- 	modes = newmodes;
-diff --git a/src/sis_dri.c b/src/sis_dri.c
-index 3a476a2..97ed951 100644
---- a/src/sis_dri.c
-+++ b/src/sis_dri.c
-@@ -149,19 +149,19 @@ SISInitVisualConfigs(ScreenPtr pScreen)
-   case 32:
-     numConfigs = (useZ16) ? 8 : 16;
- 
--    if(!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
-+    if(!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
- 						   numConfigs))) {
-        return FALSE;
-     }
--    if(!(pSISConfigs = (SISConfigPrivPtr)xcalloc(sizeof(SISConfigPrivRec),
-+    if(!(pSISConfigs = (SISConfigPrivPtr)calloc(sizeof(SISConfigPrivRec),
- 						    numConfigs))) {
--       xfree(pConfigs);
-+       free(pConfigs);
-        return FALSE;
-     }
--    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)xcalloc(sizeof(SISConfigPrivPtr),
-+    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)calloc(sizeof(SISConfigPrivPtr),
- 							  numConfigs))) {
--       xfree(pConfigs);
--       xfree(pSISConfigs);
-+       free(pConfigs);
-+       free(pSISConfigs);
-        return FALSE;
-     }
-     for(i=0; i<numConfigs; i++) pSISConfigPtrs[i] = &pSISConfigs[i];
-@@ -319,7 +319,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
-      pDRIInfo->busIdString = DRICreatePCIBusID(pSIS->PciInfo);
-   } else {
- #endif
--     pDRIInfo->busIdString = xalloc(64);
-+     pDRIInfo->busIdString = malloc(64);
-      sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
- 	     pSIS->PciBus, pSIS->PciDevice, pSIS->PciFunc);
- #ifdef SISHAVECREATEBUSID
-@@ -383,7 +383,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
-   pDRIInfo->SAREASize = SAREA_MAX;
- #endif
- 
--  if(!(pSISDRI = (SISDRIPtr)xcalloc(sizeof(SISDRIRec), 1))) {
-+  if(!(pSISDRI = (SISDRIPtr)calloc(sizeof(SISDRIRec), 1))) {
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-      pSIS->pDRIInfo = 0;
-      return FALSE;
-@@ -401,7 +401,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
- 
-   if(!DRIScreenInit(pScreen, pDRIInfo, &pSIS->drmSubFD)) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] DRIScreenInit failed. Disabling the DRI.\n");
--     xfree(pDRIInfo->devPrivate);
-+     free(pDRIInfo->devPrivate);
-      pDRIInfo->devPrivate = 0;
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-      pSIS->pDRIInfo = 0;
-@@ -794,7 +794,7 @@ SISDRICloseScreen(ScreenPtr pScreen)
- 
-   if(pSIS->pDRIInfo) {
-      if(pSIS->pDRIInfo->devPrivate) {
--	xfree(pSIS->pDRIInfo->devPrivate);
-+	free(pSIS->pDRIInfo->devPrivate);
- 	pSIS->pDRIInfo->devPrivate = NULL;
-      }
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-@@ -802,12 +802,12 @@ SISDRICloseScreen(ScreenPtr pScreen)
-   }
- 
-   if(pSIS->pVisualConfigs) {
--     xfree(pSIS->pVisualConfigs);
-+     free(pSIS->pVisualConfigs);
-      pSIS->pVisualConfigs = NULL;
-   }
- 
-   if(pSIS->pVisualConfigsPriv) {
--     xfree(pSIS->pVisualConfigsPriv);
-+     free(pSIS->pVisualConfigsPriv);
-      pSIS->pVisualConfigsPriv = NULL;
-   }
- 
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index d95b5f1..7ac9487 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -74,8 +74,7 @@
- 
- #include "sis_driver.h"
- 
--#define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- 
- #include "globals.h"
- 
-@@ -91,6 +90,26 @@
- #include "dri.h"
- #endif
- 
-+/*
-+ * LookupWindow was removed with video abi 11.
-+ */
-+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
-+#ifndef DixGetAttrAccess
-+#define DixGetAttrAccess   (1<<4)
-+#endif
-+#endif
-+
-+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 2)
-+static inline int
-+dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
-+{
-+    *pWin = LookupWindow(id, client);
-+    if (!*pWin)
-+	return BadWindow;
-+    return Success;
-+}
-+#endif
-+
- /* Globals (yes, these ARE really required to be global) */
- 
- #ifdef SISUSEDEVPORT
-@@ -299,9 +318,9 @@ SISFreeRec(ScrnInfoPtr pScrn)
-     pSiSEnt = pSiS->entityPrivate;
- #endif
- 
--    if(pSiS->pstate) xfree(pSiS->pstate);
-+    if(pSiS->pstate) free(pSiS->pstate);
-     pSiS->pstate = NULL;
--    if(pSiS->fonts) xfree(pSiS->fonts);
-+    if(pSiS->fonts) free(pSiS->fonts);
-     pSiS->fonts = NULL;
- 
- #ifdef SISDUALHEAD
-@@ -312,11 +331,11 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	   * and we need the BIOS image and SiS_Private for the first
- 	   * head.
- 	   */
--	  if(pSiSEnt->BIOS) xfree(pSiSEnt->BIOS);
-+	  if(pSiSEnt->BIOS) free(pSiSEnt->BIOS);
- 	  pSiSEnt->BIOS = pSiS->BIOS = NULL;
--	  if(pSiSEnt->SiS_Pr) xfree(pSiSEnt->SiS_Pr);
-+	  if(pSiSEnt->SiS_Pr) free(pSiSEnt->SiS_Pr);
- 	  pSiSEnt->SiS_Pr = pSiS->SiS_Pr = NULL;
--	  if(pSiSEnt->RenderAccelArray) xfree(pSiSEnt->RenderAccelArray);
-+	  if(pSiSEnt->RenderAccelArray) free(pSiSEnt->RenderAccelArray);
- 	  pSiSEnt->RenderAccelArray = pSiS->RenderAccelArray = NULL;
- 	  pSiSEnt->pScrn_1 = NULL;
-        } else {
-@@ -327,21 +346,21 @@ SISFreeRec(ScrnInfoPtr pScrn)
-        }
-     } else {
- #endif
--       if(pSiS->BIOS) xfree(pSiS->BIOS);
-+       if(pSiS->BIOS) free(pSiS->BIOS);
-        pSiS->BIOS = NULL;
--       if(pSiS->SiS_Pr) xfree(pSiS->SiS_Pr);
-+       if(pSiS->SiS_Pr) free(pSiS->SiS_Pr);
-        pSiS->SiS_Pr = NULL;
--       if(pSiS->RenderAccelArray) xfree(pSiS->RenderAccelArray);
-+       if(pSiS->RenderAccelArray) free(pSiS->RenderAccelArray);
-        pSiS->RenderAccelArray = NULL;
- #ifdef SISDUALHEAD
-     }
- #endif
- #ifdef SISMERGED
--    if(pSiS->CRT2HSync) xfree(pSiS->CRT2HSync);
-+    if(pSiS->CRT2HSync) free(pSiS->CRT2HSync);
-     pSiS->CRT2HSync = NULL;
--    if(pSiS->CRT2VRefresh) xfree(pSiS->CRT2VRefresh);
-+    if(pSiS->CRT2VRefresh) free(pSiS->CRT2VRefresh);
-     pSiS->CRT2VRefresh = NULL;
--    if(pSiS->MetaModes) xfree(pSiS->MetaModes);
-+    if(pSiS->MetaModes) free(pSiS->MetaModes);
-     pSiS->MetaModes = NULL;
-     if(pSiS->CRT2pScrn) {
-        if(pSiS->CRT2pScrn->modes) {
-@@ -353,10 +372,10 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	     while(pSiS->CRT2pScrn->monitor->Modes)
- 	        xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
- 	  }
--	  if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC);
--	  xfree(pSiS->CRT2pScrn->monitor);
-+	  if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC);
-+	  free(pSiS->CRT2pScrn->monitor);
-        }
--       xfree(pSiS->CRT2pScrn);
-+       free(pSiS->CRT2pScrn);
-        pSiS->CRT2pScrn = NULL;
-     }
-     if(pSiS->CRT1Modes) {
-@@ -366,8 +385,8 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	     do {
- 	        DisplayModePtr p = pScrn->currentMode->next;
- 	        if(pScrn->currentMode->Private)
--	 	  xfree(pScrn->currentMode->Private);
--	        xfree(pScrn->currentMode);
-+	 	  free(pScrn->currentMode->Private);
-+	        free(pScrn->currentMode);
- 	        pScrn->currentMode = p;
- 	     } while(pScrn->currentMode != pScrn->modes);
- 	  }
-@@ -380,7 +399,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- #endif
-     while(pSiS->SISVESAModeList) {
-        sisModeInfoPtr mp = pSiS->SISVESAModeList->next;
--       xfree(pSiS->SISVESAModeList);
-+       free(pSiS->SISVESAModeList);
-        pSiS->SISVESAModeList = mp;
-     }
-     if(pSiS->pVbe) vbeFree(pSiS->pVbe);
-@@ -392,7 +411,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 
-     if(pScrn->driverPrivate == NULL)
-         return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -501,7 +520,7 @@ SISProbe(DriverPtr drv, int flags)
- 			numDevSections, drv, &usedChipsXGI);
- 
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
- 
-     numUsed = numUsedSiS + numUsedXGI;
- 
-@@ -577,8 +596,8 @@ SISProbe(DriverPtr drv, int flags)
- 
-     }
- 
--    if(usedChipsSiS) xfree(usedChipsSiS);
--    if(usedChipsXGI) xfree(usedChipsXGI);
-+    if(usedChipsSiS) free(usedChipsSiS);
-+    if(usedChipsXGI) free(usedChipsXGI);
- 
-     return foundScreen;
- }
-@@ -642,10 +661,10 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
-    if(!(nramp = xf86GetGammaRampSize(pScreen))) return;
- 
-    for(i=0; i<3; i++) {
--      ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort));
-+      ramp[i] = (UShort *)malloc(nramp * sizeof(UShort));
-       if(!ramp[i]) {
--	 if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; }
--	 if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; }
-+	 if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; }
-+	 if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; }
- 	 return;
-       }
-    }
-@@ -705,9 +724,9 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
- 
-    xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]);
- 
--   xfree(ramp[0]);
--   xfree(ramp[1]);
--   xfree(ramp[2]);
-+   free(ramp[0]);
-+   free(ramp[1]);
-+   free(ramp[2]);
-    ramp[0] = ramp[1] = ramp[2] = NULL;
- }
- #endif
-@@ -1135,10 +1154,10 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-     DisplayModePtr mode;
-     int dx = 0,dy = 0;
- 
--    if(!((mode = xalloc(sizeof(DisplayModeRec))))) return dest;
-+    if(!((mode = malloc(sizeof(DisplayModeRec))))) return dest;
-     memcpy(mode, i, sizeof(DisplayModeRec));
--    if(!((mode->Private = xalloc(sizeof(SiSMergedDisplayModeRec))))) {
--       xfree(mode);
-+    if(!((mode->Private = malloc(sizeof(SiSMergedDisplayModeRec))))) {
-+       free(mode);
-        return dest;
-     }
-     ((SiSMergedDisplayModePtr)mode->Private)->CRT1 = i;
-@@ -1223,8 +1242,8 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		"Skipped \"%s\" (%dx%d), not enough video RAM or beyond hardware specs\n",
- 		mode->name, mode->HDisplay, mode->VDisplay);
--       xfree(mode->Private);
--       xfree(mode);
-+       free(mode->Private);
-+       free(mode);
- 
-        return dest;
-     }
-@@ -2131,10 +2150,10 @@ SiSProcXineramaQueryVersion(ClientPtr client)
-     rep.majorVersion = SIS_XINERAMA_MAJOR_VERSION;
-     rep.minorVersion = SIS_XINERAMA_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -2147,19 +2166,20 @@ SiSProcXineramaGetState(ClientPtr client)
-     WindowPtr			pWin;
-     xPanoramiXGetStateReply	rep;
-     register int		n;
-+    int				rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
--    pWin = LookupWindow(stuff->window, client);
--    if(!pWin) return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-     rep.sequenceNumber = client->sequence;
-     rep.state = !SiSnoPanoramiXExtension;
-     if(client->swapped) {
--       swaps (&rep.sequenceNumber, n);
--       swapl (&rep.length, n);
--       swaps (&rep.state, n);
-+       _swaps (&rep.sequenceNumber, n);
-+       _swapl (&rep.length, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
-     return client->noClientException;
-@@ -2172,19 +2192,20 @@ SiSProcXineramaGetScreenCount(ClientPtr client)
-     WindowPtr				pWin;
-     xPanoramiXGetScreenCountReply	rep;
-     register int			n;
-+    int					rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
--    pWin = LookupWindow(stuff->window, client);
--    if(!pWin) return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-     rep.sequenceNumber = client->sequence;
-     rep.ScreenCount = SiSXineramaNumScreens;
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swaps(&rep.ScreenCount, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
-     return client->noClientException;
-@@ -2197,10 +2218,12 @@ SiSProcXineramaGetScreenSize(ClientPtr client)
-     WindowPtr				pWin;
-     xPanoramiXGetScreenSizeReply	rep;
-     register int			n;
-+    int					rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
--    pWin = LookupWindow (stuff->window, client);
--    if(!pWin)  return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-@@ -2208,10 +2231,10 @@ SiSProcXineramaGetScreenSize(ClientPtr client)
-     rep.width  = SiSXineramadataPtr[stuff->screen].width;
-     rep.height = SiSXineramadataPtr[stuff->screen].height;
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swaps(&rep.width, n);
--       swaps(&rep.height, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.width, n);
-+       _swapl(&rep.height, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
-     return client->noClientException;
-@@ -2230,9 +2253,9 @@ SiSProcXineramaIsActive(ClientPtr client)
-     rep.state = !SiSnoPanoramiXExtension;
-     if(client->swapped) {
- 	register int n;
--	swaps(&rep.sequenceNumber, n);
--	swapl(&rep.length, n);
--	swapl(&rep.state, n);
-+	_swaps(&rep.sequenceNumber, n);
-+	_swapl(&rep.length, n);
-+	_swapl(&rep.state, n);
-     }
-     WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
-     return client->noClientException;
-@@ -2251,9 +2274,9 @@ SiSProcXineramaQueryScreens(ClientPtr client)
-     rep.length = rep.number * sz_XineramaScreenInfo >> 2;
-     if(client->swapped) {
-        register int n;
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.number, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.number, n);
-     }
-     WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
- 
-@@ -2268,10 +2291,10 @@ SiSProcXineramaQueryScreens(ClientPtr client)
- 	  scratch.height = SiSXineramadataPtr[i].height;
- 	  if(client->swapped) {
- 	     register int n;
--	     swaps(&scratch.x_org, n);
--	     swaps(&scratch.y_org, n);
--	     swaps(&scratch.width, n);
--	     swaps(&scratch.height, n);
-+	     _swaps(&scratch.x_org, n);
-+	     _swaps(&scratch.y_org, n);
-+	     _swaps(&scratch.width, n);
-+	     _swaps(&scratch.height, n);
- 	  }
- 	  WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch);
-        }
-@@ -2308,7 +2331,7 @@ SiSSProcXineramaQueryVersion (ClientPtr client)
- {
-     REQUEST(xPanoramiXQueryVersionReq);
-     register int n;
--    swaps(&stuff->length,n);
-+    _swaps(&stuff->length,n);
-     REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
-     return SiSProcXineramaQueryVersion(client);
- }
-@@ -2318,7 +2341,7 @@ SiSSProcXineramaGetState(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetStateReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-     return SiSProcXineramaGetState(client);
- }
-@@ -2328,7 +2351,7 @@ SiSSProcXineramaGetScreenCount(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetScreenCountReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-     return SiSProcXineramaGetScreenCount(client);
- }
-@@ -2338,7 +2361,7 @@ SiSSProcXineramaGetScreenSize(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetScreenSizeReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-     return SiSProcXineramaGetScreenSize(client);
- }
-@@ -2348,7 +2371,7 @@ SiSSProcXineramaIsActive(ClientPtr client)
- {
-     REQUEST(xXineramaIsActiveReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
-     return SiSProcXineramaIsActive(client);
- }
-@@ -2358,7 +2381,7 @@ SiSSProcXineramaQueryScreens(ClientPtr client)
- {
-     REQUEST(xXineramaQueryScreensReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-     return SiSProcXineramaQueryScreens(client);
- }
-@@ -2389,7 +2412,7 @@ SiSXineramaResetProc(ExtensionEntry* extEntry)
- {
-     /* Called by CloseDownExtensions() */
-     if(SiSXineramadataPtr) {
--       Xfree(SiSXineramadataPtr);
-+       free(SiSXineramadataPtr);
-        SiSXineramadataPtr = NULL;
-     }
- }
-@@ -2454,7 +2477,7 @@ SiSXineramaExtensionInit(ScrnInfoPtr pScrn)
- 	  if(!pSiS->XineramaExtEntry) break;
- 
- 	  if(!(SiSXineramadataPtr = (SiSXineramaData *)
--	        xcalloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
-+	        calloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
- 
- 	  SiSXineramaGeneration = serverGeneration;
- 	  success = TRUE;
-@@ -2493,10 +2516,10 @@ SiSFreeCRT2Structs(SISPtr pSiS)
- 	     while(pSiS->CRT2pScrn->monitor->Modes)
- 		xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
- 	  }
--	  if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC);
--	  xfree(pSiS->CRT2pScrn->monitor);
-+	  if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC);
-+	  free(pSiS->CRT2pScrn->monitor);
-        }
--       xfree(pSiS->CRT2pScrn);
-+       free(pSiS->CRT2pScrn);
-        pSiS->CRT2pScrn = NULL;
-    }
- }
-@@ -2902,22 +2925,22 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 	     Bool gotit = FALSE;
- 
-  	     if(!ioctl(fd, SISFB_GET_INFO_SIZE, &sisfbinfosize)) {
-- 		if((mysisfbinfo = xalloc(sisfbinfosize))) {
-+ 		if((mysisfbinfo = malloc(sisfbinfosize))) {
-  		   if(!ioctl(fd, (SISFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) {
-  		      gotit = TRUE;
-  		   } else {
-- 		      xfree(mysisfbinfo);
-+ 		      free(mysisfbinfo);
-  		      mysisfbinfo = NULL;
-  		   }
-  		}
-  	     } else {
-- 		if((mysisfbinfo = xalloc(sizeof(*mysisfbinfo) + 16))) {
-+ 		if((mysisfbinfo = malloc(sizeof(*mysisfbinfo) + 16))) {
-  		   if(!ioctl(fd, SISFB_GET_INFO_OLD, mysisfbinfo)) {
-  		      gotit = TRUE;
- 		      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 				"Possibly old version of sisfb detected. Please update.\n");
- 		   } else {
--		      xfree(mysisfbinfo);
-+		      free(mysisfbinfo);
- 		      mysisfbinfo = NULL;
- 		   }
- 		}
-@@ -3056,7 +3079,7 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 		      }
- 		   }
- 	        }
--		xfree(mysisfbinfo);
-+		free(mysisfbinfo);
- 		mysisfbinfo = NULL;
- 	     }
- 	     close (fd);
-@@ -3216,7 +3239,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     pSiS->pInt = NULL;
- 
-     /* Save PCI Domain Base */
--#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
-+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) || GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-     pSiS->IODBase = 0;
- #else
-     pSiS->IODBase = pScrn->domainIOBase;
-@@ -4078,7 +4101,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        }
- #endif
-        if(!pSiS->BIOS) {
--	  if(!(pSiS->BIOS = xcalloc(1, BIOS_SIZE))) {
-+	  if(!(pSiS->BIOS = calloc(1, BIOS_SIZE))) {
- 	     xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		"Could not allocate memory for video BIOS image\n");
- 	  } else {
-@@ -4173,7 +4196,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	     } else {
- 	        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 			 "Could not find/read video BIOS\n");
--		xfree(pSiS->BIOS);
-+		free(pSiS->BIOS);
- 		pSiS->BIOS = NULL;
- 	     }
-           }
-@@ -5559,7 +5582,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     /* Do some MergedFB mode initialisation */
- #ifdef SISMERGED
-     if(pSiS->MergedFB) {
--       pSiS->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
-+       pSiS->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
-        if(!pSiS->CRT2pScrn) {
-           SISErrorLog(pScrn, "Failed to allocate memory for 2nd pScrn, %s\n", mergeddisstr);
- 	  pSiS->MergedFB = FALSE;
-@@ -5592,7 +5615,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 		} else {
- 		   SISErrorLog(pScrn, mergednocrt1, mergeddisstr);
- 		}
--		if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+		if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 		pSiS->CRT2pScrn = NULL;
- 		pSiS->MergedFB = FALSE;
- 	     }
-@@ -5639,7 +5662,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 		} else {
- 		   SISErrorLog(pScrn, mergednocrt2, mergeddisstr);
- 		}
--		if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+		if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 		pSiS->CRT2pScrn = NULL;
- 		pSiS->MergedFB = FALSE;
- 	     }
-@@ -6016,7 +6039,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 
- #ifdef SISMERGED
-     if(pSiS->MergedFB) {
--       pSiS->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
-+       pSiS->CRT2pScrn->monitor = malloc(sizeof(MonRec));
-        if(pSiS->CRT2pScrn->monitor) {
- 	  DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
- 	  memcpy(pSiS->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
-@@ -6025,10 +6048,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	  pSiS->CRT2pScrn->monitor->id = (char *)crt2monname;
- 	  tempm = pScrn->monitor->Modes;
- 	  while(tempm) {
--	     if(!(newm = xalloc(sizeof(DisplayModeRec)))) break;
-+	     if(!(newm = malloc(sizeof(DisplayModeRec)))) break;
- 	     memcpy(newm, tempm, sizeof(DisplayModeRec));
--	     if(!(newm->name = xalloc(strlen(tempm->name) + 1))) {
--	        xfree(newm);
-+	     if(!(newm->name = malloc(strlen(tempm->name) + 1))) {
-+	        free(newm);
- 		break;
- 	     }
- 	     strcpy(newm->name, tempm->name);
-@@ -6070,7 +6093,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        } else {
- 	  SISErrorLog(pScrn, "Failed to allocate memory for CRT2 monitor, %s.\n",
- 	  		mergeddisstr);
--	  if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+	  if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 	  pSiS->CRT2pScrn = NULL;
- 	  pSiS->MergedFB = FALSE;
-        }
-@@ -7454,7 +7477,7 @@ SISVESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
- 	     (function == MODE_SAVE)) {
- 	     /* don't rely on the memory not being touched */
- 	     if(!pSiS->pstate) {
--		pSiS->pstate = xalloc(pSiS->stateSize);
-+		pSiS->pstate = malloc(pSiS->stateSize);
- 	     }
- 	     memcpy(pSiS->pstate, pSiS->state, pSiS->stateSize);
- 	  }
-@@ -8675,7 +8698,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pSiS->ShadowFB) {
-        pSiS->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--       pSiS->ShadowPtr = xalloc(pSiS->ShadowPitch * height);
-+       pSiS->ShadowPtr = malloc(pSiS->ShadowPitch * height);
-        displayWidth = pSiS->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-        FBStart = pSiS->ShadowPtr;
-     } else {
-@@ -8849,14 +8872,14 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
- 	  pSiS->CRT2ColNum = 1 << pScrn->rgbBits;
- 
--	  if((pSiS->crt2gcolortable = xalloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
-+	  if((pSiS->crt2gcolortable = malloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
- 	     pSiS->crt2colors = &pSiS->crt2gcolortable[pSiS->CRT2ColNum];
--	     if((pSiS->crt2cindices = xalloc(256 * sizeof(int)))) {
-+	     if((pSiS->crt2cindices = malloc(256 * sizeof(int)))) {
- 		int i = pSiS->CRT2ColNum;
- 		SISCalculateGammaRampCRT2(pScrn);
- 		while(i--) pSiS->crt2cindices[i] = i;
- 	     } else {
--		xfree(pSiS->crt2gcolortable);
-+		free(pSiS->crt2gcolortable);
- 		pSiS->crt2gcolortable = NULL;
- 		pSiS->CRT2SepGamma = FALSE;
- 	     }
-@@ -9941,7 +9964,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     if(pSiS->useEXA) {
-        if(pSiS->EXADriverPtr) {
-           exaDriverFini(pScreen);
--          xfree(pSiS->EXADriverPtr);
-+          free(pSiS->EXADriverPtr);
-           pSiS->EXADriverPtr = NULL;
-           pSiS->exa_scratch = NULL;
-        }
-@@ -9954,33 +9977,33 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
- 
-     if(pSiS->ShadowPtr) {
--       xfree(pSiS->ShadowPtr);
-+       free(pSiS->ShadowPtr);
-        pSiS->ShadowPtr = NULL;
-     }
- 
-     if(pSiS->DGAModes) {
--       xfree(pSiS->DGAModes);
-+       free(pSiS->DGAModes);
-        pSiS->DGAModes = NULL;
-     }
- 
-     if(pSiS->adaptor) {
--       xfree(pSiS->adaptor);
-+       free(pSiS->adaptor);
-        pSiS->adaptor = NULL;
-        pSiS->ResetXv = pSiS->ResetXvGamma = pSiS->ResetXvDisplay = NULL;
-     }
- 
-     if(pSiS->blitadaptor) {
--       xfree(pSiS->blitadaptor);
-+       free(pSiS->blitadaptor);
-        pSiS->blitadaptor = NULL;
-     }
- 
-     if(pSiS->crt2gcolortable) {
--       xfree(pSiS->crt2gcolortable);
-+       free(pSiS->crt2gcolortable);
-        pSiS->crt2gcolortable = NULL;
-     }
- 
-     if(pSiS->crt2cindices) {
--       xfree(pSiS->crt2cindices);
-+       free(pSiS->crt2cindices);
-        pSiS->crt2cindices = NULL;
-     }
- 
-diff --git a/src/sis_memcpy.c b/src/sis_memcpy.c
-index 6ad62e8..3634401 100644
---- a/src/sis_memcpy.c
-+++ b/src/sis_memcpy.c
-@@ -638,13 +638,13 @@ SiS_AllocBuffers(ScrnInfoPtr pScrn, UChar **buf1, UChar **buf2, UChar **buf3)
-     (*buf1) = (UChar *)pSiS->FbBase + offset;
-     (*buf1) = (UChar *)(((ULong)(*buf1) + 31) & ~31);
- 
--    if(!((*buf2) = (UChar *)xalloc(BUFFERSIZE + 15))) {
-+    if(!((*buf2) = (UChar *)malloc(BUFFERSIZE + 15))) {
-        SISFreeFBMemory(pScrn, &handle);
-        return NULL;
-     }
- 
--    if(!((*buf3) = (UChar *)xalloc(BUFFERSIZE + 15))) {
--       xfree((*buf2));
-+    if(!((*buf3) = (UChar *)malloc(BUFFERSIZE + 15))) {
-+       free((*buf2));
-        SISFreeFBMemory(pScrn, &handle);
-        return NULL;
-     }
-@@ -1098,8 +1098,8 @@ SiSVidCopyInitGen(ScreenPtr pScreen, SISMCFuncData *MCFunctions, vidCopyFunc *UM
- 
-     /* Free buffers */
-     SISFreeFBMemory(pScrn, &fbhandle);
--    xfree(buf2);
--    xfree(buf3);
-+    free(buf2);
-+    free(buf3);
- 
-     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- 	       "Using %s method for aligned data transfers %s video RAM\n",
-diff --git a/src/sis_opt.c b/src/sis_opt.c
-index 3517549..d39ff6e 100644
---- a/src/sis_opt.c
-+++ b/src/sis_opt.c
-@@ -448,7 +448,7 @@ SiSOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if(!(pSiS->Options = xalloc(sizeof(SISOptions)))) return;
-+    if(!(pSiS->Options = malloc(sizeof(SISOptions)))) return;
- 
-     memcpy(pSiS->Options, SISOptions, sizeof(SISOptions));
- 
-@@ -888,7 +888,7 @@ SiSOptions(ScrnInfoPtr pScrn)
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2POS))) {
- 	     int result;
- 	     Bool valid = FALSE;
--	     char *tempstr = xalloc(strlen(strptr) + 1);
-+	     char *tempstr = malloc(strlen(strptr) + 1);
- 	     result = sscanf(strptr, "%s %d", tempstr, &ival);
- 	     if(result >= 1) {
- 		if(!xf86NameCmp(tempstr,"LeftOf")) {
-@@ -946,18 +946,18 @@ SiSOptions(ScrnInfoPtr pScrn)
- 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 		    "Except for \"Clone\", the parameter may be followed by an integer.\n");
- 	     }
--	     xfree(tempstr);
-+	     free(tempstr);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_METAMODES))) {
--	     pSiS->MetaModes = xalloc(strlen(strptr) + 1);
-+	     pSiS->MetaModes = malloc(strlen(strptr) + 1);
- 	     if(pSiS->MetaModes) memcpy(pSiS->MetaModes, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2HSYNC))) {
--	     pSiS->CRT2HSync = xalloc(strlen(strptr) + 1);
-+	     pSiS->CRT2HSync = malloc(strlen(strptr) + 1);
- 	     if(pSiS->CRT2HSync) memcpy(pSiS->CRT2HSync, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2VREFRESH))) {
--	     pSiS->CRT2VRefresh = xalloc(strlen(strptr) + 1);
-+	     pSiS->CRT2VRefresh = malloc(strlen(strptr) + 1);
- 	     if(pSiS->CRT2VRefresh) memcpy(pSiS->CRT2VRefresh, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_MERGEDDPI))) {
-diff --git a/src/sis_utility.c b/src/sis_utility.c
-index a9bcd2b..eda194f 100644
---- a/src/sis_utility.c
-+++ b/src/sis_utility.c
-@@ -34,8 +34,6 @@
- #endif
- 
- #include "sis.h"
--#define NEED_REPLIES
--#define NEED_EVENTS
- #include <X11/X.h>
- #include "dixstruct.h"
- 
-@@ -1882,10 +1880,10 @@ SiSProcSiSCtrlQueryVersion(ClientPtr client)
-     rep.majorVersion = SISCTRL_MAJOR_VERSION;
-     rep.minorVersion = SISCTRL_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -1926,15 +1924,15 @@ SiSProcSiSCtrlCommand(ClientPtr client)
-     rep.sequenceNumber = client->sequence;
- 
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.screen, n);
--       swapl(&rep.sdc_id, n);
--       swapl(&rep.sdc_command, n);
--       swapl(&rep.sdc_result_header, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.screen, n);
-+       _swapl(&rep.sdc_id, n);
-+       _swapl(&rep.sdc_command, n);
-+       _swapl(&rep.sdc_result_header, n);
-        for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--	  swapl(&rep.sdc_parm[i], n);
--	  swapl(&rep.sdc_result[i], n);
-+	  _swapl(&rep.sdc_parm[i], n);
-+	  _swapl(&rep.sdc_result[i], n);
-        }
-     }
-     WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep);
-@@ -1961,7 +1959,7 @@ SiSSProcSiSCtrlQueryVersion(ClientPtr client)
- {
-     REQUEST(xSiSCtrlQueryVersionReq);
-     register int n;
--    swaps(&stuff->length, n);
-+    _swaps(&stuff->length, n);
-     REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq);
-     return SiSProcSiSCtrlQueryVersion(client);
- }
-@@ -1972,14 +1970,14 @@ SiSSProcSiSCtrlCommand(ClientPtr client)
-     REQUEST(xSiSCtrlCommandReq);
-     register int n;
-     int i;
--    swaps(&stuff->length, n);
--    swapl(&stuff->screen, n);
--    swapl(&stuff->sdc_id, n);
--    swapl(&stuff->sdc_command, n);
--    swapl(&stuff->sdc_result_header, n);
-+    _swaps(&stuff->length, n);
-+    _swapl(&stuff->screen, n);
-+    _swapl(&stuff->sdc_id, n);
-+    _swapl(&stuff->sdc_command, n);
-+    _swapl(&stuff->sdc_result_header, n);
-     for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--       swapl(&stuff->sdc_parm[i], n);
--       swapl(&stuff->sdc_result[i], n);
-+       _swapl(&stuff->sdc_parm[i], n);
-+       _swapl(&stuff->sdc_result[i], n);
-     }
-     REQUEST_SIZE_MATCH(xSiSCtrlCommandReq);
-     return SiSProcSiSCtrlCommand(client);
-@@ -2007,7 +2005,7 @@ SiSCtrlResetProc(ExtensionEntry* extEntry)
-      * in SiSCtrlExtUnregister())
-      */
-     if(extEntry->extPrivate) {
--       xfree(extEntry->extPrivate);
-+       free(extEntry->extPrivate);
-        extEntry->extPrivate = NULL;
-     }
- }
-@@ -2028,7 +2026,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn)
- 
-    if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) {
- 
--      if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1)))
-+      if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
-          return;
- 
-       if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0,
-@@ -2038,7 +2036,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn)
- 				StandardMinorOpcode))) {
-          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 	 		"Failed to add SISCTRL extension\n");
--	 xfree(myctrl);
-+	 free(myctrl);
- 	 return;
-       }
- 
-diff --git a/src/sis_vga.c b/src/sis_vga.c
-index 3f6219b..4c887b8 100644
---- a/src/sis_vga.c
-+++ b/src/sis_vga.c
-@@ -1429,7 +1429,7 @@ SiSVGASaveFonts(ScrnInfoPtr pScrn)
-     attr10 = SiS_ReadAttr(pSiS, 0x10);
-     if(attr10 & 0x01) return;
- 
--    if(!(pSiS->fonts = xalloc(SIS_FONTS_SIZE * 2))) {
-+    if(!(pSiS->fonts = malloc(SIS_FONTS_SIZE * 2))) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		"Could not save console fonts, mem allocation failed\n");
-        return;
-@@ -1716,8 +1716,8 @@ SiSVGAMapMem(ScrnInfoPtr pScrn)
- 
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
- #if XSERVER_LIBPCIACCESS
--    pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
--			pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize);
-+    (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize,
-+                                 PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase);
- #else
-     pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
- 			pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize);
-@@ -1737,7 +1737,12 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn)
- 
-     if(pSiS->VGAMemBase == NULL) return;
- 
-+#if XSERVER_LIBPCIACCESS
-+    (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#else
-     xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#endif
-+
-     pSiS->VGAMemBase = NULL;
- }
- #endif
-diff --git a/src/sis_video.c b/src/sis_video.c
-index 7322efb..2006858 100644
---- a/src/sis_video.c
-+++ b/src/sis_video.c
-@@ -326,7 +326,7 @@ SISInitVideo(ScreenPtr pScreen)
-        if(newAdaptor)     size++;
-        if(newBlitAdaptor) size++;
- 
--       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
-+       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
-        if(newAdaptors) {
-           if(num_adaptors) {
-              memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
-@@ -356,7 +356,7 @@ SISInitVideo(ScreenPtr pScreen)
-     }
- 
-     if(newAdaptors) {
--       xfree(newAdaptors);
-+       free(newAdaptors);
-     }
- }
- 
-@@ -877,7 +877,7 @@ SISSetupImageVideo(ScreenPtr pScreen)
-     }
- #endif
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISPortPrivRec) +
-                             sizeof(DevUnion)))) {
-        return NULL;
-@@ -4067,7 +4067,7 @@ SISSetupBlitVideo(ScreenPtr pScreen)
-    }
- #endif
- 
--   if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+   if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-     			   (sizeof(DevUnion) * NUM_BLIT_PORTS) +
-                            sizeof(SISBPortPrivRec)))) {
-       return NULL;
-diff --git a/src/sispcirename.h b/src/sispcirename.h
-index c4beac6..54cc07f 100644
---- a/src/sispcirename.h
-+++ b/src/sispcirename.h
-@@ -29,11 +29,35 @@
- #ifndef SISPCIRENAME_H
- #define SISPCIRENAME_H
- 
-+#include <stdint.h>
-+
- enum region_type {
-     REGION_MEM,
-     REGION_IO 
- };
- 
-+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
-+#define PCI_DOM_MASK    0x01fful
-+#else
-+#define PCI_DOM_MASK 0x0ffu
-+#endif
-+
-+#ifndef PCI_DOM_MASK
-+# define PCI_DOM_MASK 0x0ffu
-+#endif
-+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
-+
-+static inline uint32_t
-+pciTag(int busnum, int devnum, int funcnum)
-+{
-+	uint32_t tag;
-+	tag  = (busnum & (PCI_DOMBUS_MASK)) << 16;
-+	tag |= (devnum & 0x00001fu) << 11;
-+	tag |= (funcnum & 0x000007u) << 8;
-+
-+	return tag;
-+}
-+
- #ifndef XSERVER_LIBPCIACCESS
- 
- /* pciVideoPtr */
-diff --git a/src/vgatypes.h b/src/vgatypes.h
-index 4be31e4..d6e7b6e 100644
---- a/src/vgatypes.h
-+++ b/src/vgatypes.h
-@@ -69,8 +69,9 @@ typedef unsigned int BOOLEAN;
- 
- #define SISIOMEMTYPE
- 
--#ifdef SIS_LINUX_KERNEL
- typedef unsigned long SISIOADDRESS;
-+
-+#ifdef SIS_LINUX_KERNEL
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
- #include <linux/types.h>  /* Need __iomem */
- #undef SISIOMEMTYPE
-@@ -78,15 +79,6 @@ typedef unsigned long SISIOADDRESS;
- #endif
- #endif
- 
--#ifdef SIS_XORG_XF86
--#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
--typedef unsigned long IOADDRESS;
--typedef unsigned long SISIOADDRESS;
--#else
--typedef IOADDRESS SISIOADDRESS;
--#endif
--#endif
--
- typedef enum _SIS_CHIP_TYPE {
-     SIS_VGALegacy = 0,
-     SIS_530,
diff --git a/staging/xf86-video-sisusb/PKGBUILD b/staging/xf86-video-sisusb/PKGBUILD
deleted file mode 100644
index 02929949f..000000000
--- a/staging/xf86-video-sisusb/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149884 2012-02-11 11:45:36Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sisusb
-pkgver=0.9.4
-pkgrel=6
-pkgdesc="X.org SiS USB video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        sisusb-0.9.4-git.patch)
-sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e'
-          'd74ce7732889c7a00d9d2dcd2bfc8be05c6eb912')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/sisusb-0.9.4-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-sisusb/sisusb-0.9.4-git.patch b/staging/xf86-video-sisusb/sisusb-0.9.4-git.patch
deleted file mode 100644
index 24474954a..000000000
--- a/staging/xf86-video-sisusb/sisusb-0.9.4-git.patch
+++ /dev/null
@@ -1,794 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 86c6ac5..725d6cb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,49 +20,48 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-sisusb],
--        0.9.4,
-+        [0.9.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-sisusb)
--
-+        [xf86-video-sisusb])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
--XORG_PROG_RAWCPP
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
-+# Obtain compiler/linker options for the driver dependencies
-+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto pciaccess $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
-@@ -70,17 +69,14 @@ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=sisusb
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 1b26ac2..9ceb36f 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MANDEFS =  \
--	-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
--	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
--	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
--	-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
--	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
--	-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
--	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
--	-D__xconfigfile__=xorg.conf \
--	-D__xservername__=Xorg
--
--# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
--# to cpp, because that trick does not work on all ANSI C preprocessors.
--# Delete line numbers from the cpp output (-P is not portable, I guess).
--# Allow XCOMM to be preceded by whitespace and provide a means of generating
--# output lines with trailing backslashes.
--# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
--
--CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
--                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
--                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
--                       -e '/\@\@$$/s/\@\@$$/\\/'
--
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- .man.$(DRIVER_MAN_SUFFIX):
--	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
- 
-diff --git a/man/sisusb.man b/man/sisusb.man
-index 7817cb5..6eafb8e 100644
---- a/man/sisusb.man
-+++ b/man/sisusb.man
-@@ -1,17 +1,5 @@
--.\" $XFree86$
--.\" $XdotOrg$
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
--#ifdef __xservername__
--#define __myservername__ __xservername__
--#else
--#define __myservername__ XFree86
--#endif
--#ifdef __xconfigfile__
--#define __myxconfigfile__ __xconfigfile__
--#else
--#define __myxconfigfile__ XF86Config
--#endif
- .TH SISUSB __drivermansuffix__ __vendorversion__
- .SH NAME
- sisusb \- SiS USB video driver
-@@ -25,7 +13,7 @@ sisusb \- SiS USB video driver
- .fi
- .SH DESCRIPTION
- .B sisusb
--is an __myservername__ driver for SiS (Silicon Integrated Systems) video chips that
-+is an __xservername__ driver for SiS (Silicon Integrated Systems) video chips that
- are connected via a Net2280-based USB dongle. The driver is not accelerated, but
- provides support for colordepths of 8, 16 and 24 bpp as well as Render and other
- extensions.
-@@ -39,7 +27,7 @@ driver supports USB video cards based on the following chipsets:
- The SiS315E/PRO features two CRT controllers. However, in its USB version, only
- the first output, referred to as "CRT1", is being used.
- .SH CONFIGURATION DETAILS
--Please refer to __myxconfigfile__(__filemansuffix__) for general configuration
-+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details and to sis(__drivermansuffix__) for more information. This manpage only
- covers a subset of the supported options.
- .PP
-@@ -81,11 +69,7 @@ for device reconnection).
- .SH "KNOWN BUGS"
- none.
- .SH "SEE ALSO"
--#ifdef __xservername__
- __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__)
--#else
--XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__), sis(__drivermansuffix__)
--#endif
- .PP
- .B "http://www.winischhofer.at/linuxsisvga.shtml"
- for more information and updates
-diff --git a/src/sisusb.h b/src/sisusb.h
-index b9992ac..82ed509 100644
---- a/src/sisusb.h
-+++ b/src/sisusb.h
-@@ -113,6 +113,14 @@
- #include <X11/extensions/Xv.h>
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+#define _swapl(x, n) swapl(x,n)
-+#define _swaps(x, n) swaps(x,n)
-+#else
-+#define _swapl(x, n) swapl(x)
-+#define _swaps(x, n) swaps(x)
-+#endif
-+
- /* Platform/architecture related definitions: */
- 
- #undef SIS_PC_PLATFORM
-@@ -141,7 +149,6 @@
- #define UNLOCK_ALWAYS		/* Always unlock the registers (should be set!) */
- 
- /* Need that for SiSCtrl */
--#define NEED_REPLIES		/* ? */
- #define EXTENSION_PROC_ARGS void *
- #include "extnsionst.h" 			/* required */
- #include <X11/extensions/panoramiXproto.h>	/* required */
-@@ -732,7 +739,7 @@ typedef struct {
-     Bool		skipswitchcheck;
-     ULong		VBFlagsInit;
-     DisplayModePtr	currentModeLast;
--    IOADDRESS		MyPIOOffset;
-+    unsigned long		MyPIOOffset;
- 
-     char		messagebuffer[64];
-     unsigned int	VGAMapSize;		/* SiSVGA stuff */
-diff --git a/src/sisusb_dac.c b/src/sisusb_dac.c
-index 5e3eb7f..b5c4dce 100644
---- a/src/sisusb_dac.c
-+++ b/src/sisusb_dac.c
-@@ -672,7 +672,7 @@ SiSUSBMemCopyToVideoRam(SISUSBPtr pSiSUSB, UChar *to, UChar *from, int size)
-    int num, retry = 3;
-    if(pSiSUSB->sisusbfatalerror) return;
-    do {
--      lseek(pSiSUSB->sisusbdev, (int)to, SEEK_SET);
-+      lseek(pSiSUSB->sisusbdev, (uintptr_t)to, SEEK_SET);
-       num = write(pSiSUSB->sisusbdev, from, size);
-    } while((num != size) && --retry);
-    if(!retry) SiSLostConnection(pSiSUSB);
-@@ -958,7 +958,7 @@ void sisclearvram(SISUSBPtr pSiSUSB, UChar *where, unsigned int howmuch)
-    if(pSiSUSB->sisusbfatalerror) return;
-    do {
-       x.operation = SUCMD_CLRSCR;
--      x.data3 = (CARD32)where;
-+      x.data3 = (CARD32)(uintptr_t)where;
-       x.data0 = (howmuch >> 16) & 0xff;
-       x.data1 = (howmuch >> 8) & 0xff;
-       x.data2 = howmuch & 0xff;
-@@ -990,7 +990,7 @@ void SIS_MMIO_OUT8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD8 va
-     int num, retry = 3;
-     if(pSiSUSB->sisusbfatalerror) return;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = write(pSiSUSB->sisusbdev, &val, 1);
-     } while((num != 1) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1002,7 +1002,7 @@ void SIS_MMIO_OUT16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD16
-     CARD16 buf = sisusb_cpu_to_le16(val);
-     if(pSiSUSB->sisusbfatalerror) return;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = write(pSiSUSB->sisusbdev, &buf, 2);
-     } while((num != 2) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1014,7 +1014,7 @@ void SIS_MMIO_OUT32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD32
-     CARD32 buf = sisusb_cpu_to_le32(val);
-     if(pSiSUSB->sisusbfatalerror) return;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = write(pSiSUSB->sisusbdev, &buf, 4);
-     } while((num != 4) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1026,7 +1026,7 @@ CARD8 SIS_MMIO_IN8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset)
-     CARD8 tmp;
-     if(pSiSUSB->sisusbfatalerror) return 0;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = read(pSiSUSB->sisusbdev, &tmp, 1);
-     } while((num != 1) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1039,7 +1039,7 @@ CARD16 SIS_MMIO_IN16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset)
-     CARD16 tmp;
-     if(pSiSUSB->sisusbfatalerror) return 0;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = read(pSiSUSB->sisusbdev, &tmp, 2);
-     } while((num != 2) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1052,7 +1052,7 @@ CARD32 SIS_MMIO_IN32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset)
-     CARD32 tmp;
-     if(pSiSUSB->sisusbfatalerror) return 0;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = read(pSiSUSB->sisusbdev, &tmp, 4);
-     } while((num != 4) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
-index 8ba2c33..032225c 100644
---- a/src/sisusb_driver.c
-+++ b/src/sisusb_driver.c
-@@ -186,12 +186,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn)
-     /* Just to make sure... */
-     if(!pSiSUSB) return;
- 
--    if(pSiSUSB->pstate) xfree(pSiSUSB->pstate);
-+    if(pSiSUSB->pstate) free(pSiSUSB->pstate);
-     pSiSUSB->pstate = NULL;
--    if(pSiSUSB->fonts) xfree(pSiSUSB->fonts);
-+    if(pSiSUSB->fonts) free(pSiSUSB->fonts);
-     pSiSUSB->fonts = NULL;
- 
--    if(pSiSUSB->SiS_Pr) xfree(pSiSUSB->SiS_Pr);
-+    if(pSiSUSB->SiS_Pr) free(pSiSUSB->SiS_Pr);
-     pSiSUSB->SiS_Pr = NULL;
- 
-     if(pSiSUSB->sisusbdevopen) {
-@@ -200,12 +200,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn)
-     }
- 
-     if(pScrn->chipset) {
--       xfree(pScrn->chipset);
-+       free(pScrn->chipset);
-        pScrn->chipset = NULL;
-     }
- 
-     if(pScrn->driverPrivate) {
--       xfree(pScrn->driverPrivate);
-+       free(pScrn->driverPrivate);
-        pScrn->driverPrivate = NULL;
-     }
- }
-@@ -217,14 +217,14 @@ SISUSBErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
-     static const char *str = "**************************************************\n";
- 
-     va_start(ap, format);
--    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
-+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
-     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-     	"                      ERROR:\n");
-     xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
-     va_end(ap);
-     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-     	"                  END OF MESSAGE\n");
--    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
-+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
- }
- 
- static int
-@@ -248,7 +248,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle)
- 
-     if((myfile = open(filename, O_RDWR, 0)) != -1) {
-        if(!ioctl(myfile, SISUSB_GET_CONFIG_SIZE, &sisusbinfosize)) {
--	  if((mysisusbinfo = xalloc(sisusbinfosize))) {
-+	  if((mysisusbinfo = malloc(sisusbinfosize))) {
- 	     if(!ioctl(myfile, (SISUSB_GET_CONFIG | (sisusbinfosize << 16)), mysisusbinfo)) {
- 		if(mysisusbinfo->sisusb_id == SISUSB_ID) {
- 		   sisusbversion = (mysisusbinfo->sisusb_version  << 16) |
-@@ -280,7 +280,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle)
- 		   retval = mysisusbinfo->sisusb_minor;
- 		}
- 	     }
--	     xfree(mysisusbinfo);
-+	     free(mysisusbinfo);
- 	     mysisusbinfo = NULL;
- 	  }
-        }
-@@ -307,13 +307,13 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam
-        }
-        if((p) && (*p) && (*p == '/')) {
-           gotdev = 1;
--	  *nameptr = xalloc(strlen(p) + 1);
-+	  *nameptr = malloc(strlen(p) + 1);
-           strcpy(*nameptr, p);
- 	  retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL);
-        } else if((p) && (*p) && (sscanf(p, "%d", &i) == 1)) {
-           if(i >= 0 && i <= 31) {
-              gotdev = 1;
--	     *nameptr = xalloc(32);
-+	     *nameptr = malloc(32);
-              sprintf(*nameptr, "/dev/sisusbvga%d", i);
-              retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL);
- 	     if(retval < 0) {
-@@ -324,7 +324,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam
-        }
-     }
-     if(!gotdev) {
--       *nameptr = xalloc(32);
-+       *nameptr = malloc(32);
-        for(i = 0; i < 64; i++) {
-           if(i < 32) sprintf(*nameptr, "/dev/sisusbvga%d", i);
- 	  else       sprintf(*nameptr, "/dev/usb/sisusbvga%d", i);
-@@ -338,7 +338,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam
-     if(retval >= 0) {
-        xf86Msg(X_INFO, "Found SiSUSB dongle (node %s, minor %d)\n", *nameptr, retval);
-     } else if((*nameptr)) {
--       xfree(*nameptr);
-+       free(*nameptr);
-        *nameptr = NULL;
-     }
- 
-@@ -401,14 +401,14 @@ SISUSBProbe(DriverPtr drv, int flags)
-      */
- 
-     /* Allocate and initialize an array of ints for storing the minors */
--    if(!(minorArray = (int *)xalloc(numDevSections * sizeof(int)))) {
-+    if(!(minorArray = (int *)malloc(numDevSections * sizeof(int)))) {
-        return FALSE;
-     }
-     for(i = 0; i < numDevSections; i++) minorArray[i] = -1;
- 
-     /* Allocate an array of char ptrs for storing the device node names */
--    if(!(devnameArray = (char **)xalloc(numDevSections * sizeof(char *)))) {
--       xfree(minorArray);
-+    if(!(devnameArray = (char **)malloc(numDevSections * sizeof(char *)))) {
-+       free(minorArray);
-        return FALSE;
-     }
- 
-@@ -420,20 +420,20 @@ SISUSBProbe(DriverPtr drv, int flags)
-        if((myminor = SiSUSBFindUSBDongle(devSections[i], minorArray, numDevSections, &nameptr)) >= 0) {
-           if(!SiSUSBFindDuplicate(myminor, minorArray, numDevSections)) {
- 	     minorArray[numUsed] = myminor;
--	     devnameArray[numUsed] = xalloc(strlen(nameptr) + 1);
-+	     devnameArray[numUsed] = malloc(strlen(nameptr) + 1);
- 	     strcpy(devnameArray[numUsed], nameptr);
-              numUsed++;
- 	  }
--	  xfree(nameptr);
-+	  free(nameptr);
-        }
-     }
- 
-     /* Free the minor array, we don't need it anymore */
--    xfree(minorArray);
-+    free(minorArray);
- 
-     if(numUsed <= 0) {
--       xfree(devSections);
--       xfree(devnameArray);
-+       free(devSections);
-+       free(devnameArray);
-        return FALSE;
-     }
- 
-@@ -470,8 +470,8 @@ SISUSBProbe(DriverPtr drv, int flags)
- 
-     }
- 
--    xfree(devSections);
--    xfree(devnameArray);
-+    free(devSections);
-+    free(devnameArray);
-     return foundScreen;
- }
- 
-@@ -622,10 +622,10 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
-    if(!(nramp = xf86GetGammaRampSize(pScreen))) return;
- 
-    for(i=0; i<3; i++) {
--      ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort));
-+      ramp[i] = (UShort *)malloc(nramp * sizeof(UShort));
-       if(!ramp[i]) {
--         if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; }
--	 if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; }
-+         if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; }
-+	 if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; }
-          return;
-       }
-    }
-@@ -685,9 +685,9 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
- 
-    xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]);
- 
--   xfree(ramp[0]);
--   xfree(ramp[1]);
--   xfree(ramp[2]);
-+   free(ramp[0]);
-+   free(ramp[1]);
-+   free(ramp[2]);
-    ramp[0] = ramp[1] = ramp[2] = NULL;
- }
- #endif
-@@ -906,11 +906,11 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
- 	     Bool gotit = FALSE;
- 
- 	     if(!ioctl(fd, SISUSBFB_GET_INFO_SIZE, &sisfbinfosize)) {
--		if((mysisfbinfo = xalloc(sisfbinfosize))) {
-+		if((mysisfbinfo = malloc(sisfbinfosize))) {
- 		   if(!ioctl(fd, (SISUSBFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) {
- 		      gotit = TRUE;
- 		   } else {
--		      xfree(mysisfbinfo);
-+		      free(mysisfbinfo);
- 		      mysisfbinfo = NULL;
- 		   }
- 		}
-@@ -944,7 +944,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 		   }
- 	        }
--		xfree(mysisfbinfo);
-+		free(mysisfbinfo);
- 		mysisfbinfo = NULL;
- 	     }
- 	     close (fd);
-@@ -1147,7 +1147,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- 
-     if(pSiSUSB->HWCursor) {
--       if(!(pSiSUSB->USBCursorBuf = xcalloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE;
-+       if(!(pSiSUSB->USBCursorBuf = calloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE;
- 
-        pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2);
-        if(pSiSUSB->OptUseColorCursor) pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2);
-@@ -1456,8 +1456,8 @@ SISUSBMapMem(ScrnInfoPtr pScrn)
- {
-     SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
- 
--    pSiSUSB->FbBase = (UChar *)pSiSUSB->FbAddress;
--    pSiSUSB->IOBase = (UChar *)pSiSUSB->IOAddress;
-+    pSiSUSB->FbBase = (UChar *)(uintptr_t)pSiSUSB->FbAddress;
-+    pSiSUSB->IOBase = (UChar *)(uintptr_t)pSiSUSB->IOAddress;
- 
-     return TRUE;
- }
-@@ -1811,7 +1811,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pSiSUSB->ShadowFB) {
-        pSiSUSB->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * displayWidth);
--       pSiSUSB->ShadowPtr = xalloc(pSiSUSB->ShadowPitch * height);
-+       pSiSUSB->ShadowPtr = malloc(pSiSUSB->ShadowPitch * height);
-        if(!(FBStart = pSiSUSB->ShadowPtr)) {
-           SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF);
-           SISUSBErrorLog(pScrn, "Failed to allocate shadow framebuffer\n");
-@@ -1820,7 +1820,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- #if X_BYTE_ORDER == X_BIG_ENDIAN
-        if(pScrn->bitsPerPixel == 16) {
-           /* For 16bpp, we need to swap the bytes in the framebuffer */
--          if(!(pSiSUSB->ShadowPtrSwap = xalloc(pSiSUSB->ShadowPitch * height))) {
-+          if(!(pSiSUSB->ShadowPtrSwap = malloc(pSiSUSB->ShadowPitch * height))) {
- 	     SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF);
-              SISUSBErrorLog(pScrn, "Failed to allocate swap buffer for shadow framebuffer\n");
-              return FALSE;
-@@ -2238,24 +2238,24 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
- 
-     if(pSiSUSB->USBCursorBuf) {
--       xfree(pSiSUSB->USBCursorBuf);
-+       free(pSiSUSB->USBCursorBuf);
-        pSiSUSB->USBCursorBuf = NULL;
-     }
- 
-     if(pSiSUSB->ShadowPtr) {
--       xfree(pSiSUSB->ShadowPtr);
-+       free(pSiSUSB->ShadowPtr);
-        pSiSUSB->ShadowPtr = NULL;
-     }
- 
- #if 0
-     if(pSiSUSB->PreAllocMem) {
--       xfree(pSiSUSB->PreAllocMem);
-+       free(pSiSUSB->PreAllocMem);
-        pSiSUSB->PreAllocMem = NULL;
-     }
- #endif
- 
-     if(pSiSUSB->adaptor) {
--       xfree(pSiSUSB->adaptor);
-+       free(pSiSUSB->adaptor);
-        pSiSUSB->adaptor = NULL;
-        pSiSUSB->ResetXv = pSiSUSB->ResetXvGamma = NULL;
-     }
-diff --git a/src/sisusb_init.c b/src/sisusb_init.c
-index ba44431..99ec519 100644
---- a/src/sisusb_init.c
-+++ b/src/sisusb_init.c
-@@ -1301,10 +1301,10 @@ SiSUSBBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN i
- 	 }
-       }
- 
--      if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+      if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
-       memset(new, 0, sizeof(DisplayModeRec));
--      if(!(new->name = xalloc(10))) {
--      	 xfree(new);
-+      if(!(new->name = malloc(10))) {
-+      	 free(new);
- 	 return first;
-       }
-       if(!first) first = new;
-diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c
-index d4612b0..4d5cfa3 100644
---- a/src/sisusb_opt.c
-+++ b/src/sisusb_opt.c
-@@ -228,7 +228,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if(!(pSiSUSB->Options = xalloc(sizeof(SISUSBOptions)))) return;
-+    if(!(pSiSUSB->Options = malloc(sizeof(SISUSBOptions)))) return;
- 
-     memcpy(pSiSUSB->Options, SISUSBOptions, sizeof(SISUSBOptions));
- 
-diff --git a/src/sisusb_osdef.h b/src/sisusb_osdef.h
-index 2d938ad..500bffb 100644
---- a/src/sisusb_osdef.h
-+++ b/src/sisusb_osdef.h
-@@ -77,11 +77,11 @@
- 
- #define SIS315H
- 
--#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v))
--#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v))
--#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v))
--#define InPortByte(p)    inSISREG((IOADDRESS)(p))
--#define InPortWord(p)    inSISREGW((IOADDRESS)(p))
--#define InPortLong(p)    inSISREGL((IOADDRESS)(p))
-+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v))
-+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v))
-+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v))
-+#define InPortByte(p)    inSISREG((unsigned long)(p))
-+#define InPortWord(p)    inSISREGW((unsigned long)(p))
-+#define InPortLong(p)    inSISREGL((unsigned long)(p))
- 
- #endif  /* _SISUSB_OSDEF_H_ */
-diff --git a/src/sisusb_types.h b/src/sisusb_types.h
-index 04c7a7a..9fc6b41 100644
---- a/src/sisusb_types.h
-+++ b/src/sisusb_types.h
-@@ -51,6 +51,8 @@
- #ifndef _VGATYPES_
- #define _VGATYPES_
- 
-+#include <xf86Pci.h>
-+
- #ifndef FALSE
- #define FALSE   0
- #endif
-@@ -93,7 +95,7 @@ typedef unsigned char BOOLEAN;
- 
- #define SISIOMEMTYPE
- 
--typedef IOADDRESS SISIOADDRESS;
-+typedef unsigned long SISIOADDRESS;
- 
- typedef enum _SIS_CHIP_TYPE {
-     SIS_VGALegacy = 0,
-diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c
-index 8c03d63..a9c1ee1 100644
---- a/src/sisusb_utility.c
-+++ b/src/sisusb_utility.c
-@@ -34,8 +34,6 @@
- #endif
- 
- #include "sisusb.h"
--#define NEED_REPLIES
--#define NEED_EVENTS
- #include <X11/X.h>
- #include "dixstruct.h"
- 
-@@ -789,10 +787,10 @@ SiSUSBProcSiSCtrlQueryVersion(ClientPtr client)
-     rep.majorVersion = SISCTRL_MAJOR_VERSION;
-     rep.minorVersion = SISCTRL_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -834,15 +832,15 @@ SiSUSBProcSiSCtrlCommand(ClientPtr client)
-     rep.sequenceNumber = client->sequence;
- 
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.screen, n);
--       swapl(&rep.sdc_id, n);
--       swapl(&rep.sdc_command, n);
--       swapl(&rep.sdc_result_header, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.screen, n);
-+       _swapl(&rep.sdc_id, n);
-+       _swapl(&rep.sdc_command, n);
-+       _swapl(&rep.sdc_result_header, n);
-        for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--	  swapl(&rep.sdc_parm[i], n);
--	  swapl(&rep.sdc_result[i], n);
-+	  _swapl(&rep.sdc_parm[i], n);
-+	  _swapl(&rep.sdc_result[i], n);
-        }
-     }
-     WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep);
-@@ -869,7 +867,7 @@ SiSUSBSProcSiSCtrlQueryVersion(ClientPtr client)
- {
-     REQUEST(xSiSCtrlQueryVersionReq);
-     register int n;
--    swaps(&stuff->length, n);
-+    _swaps(&stuff->length, n);
-     REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq);
-     return SiSUSBProcSiSCtrlQueryVersion(client);
- }
-@@ -880,14 +878,14 @@ SiSUSBSProcSiSCtrlCommand(ClientPtr client)
-     REQUEST(xSiSCtrlCommandReq);
-     register int n;
-     int i;
--    swaps(&stuff->length, n);
--    swapl(&stuff->screen, n);
--    swapl(&stuff->sdc_id, n);
--    swapl(&stuff->sdc_command, n);
--    swapl(&stuff->sdc_result_header, n);
-+    _swaps(&stuff->length, n);
-+    _swapl(&stuff->screen, n);
-+    _swapl(&stuff->sdc_id, n);
-+    _swapl(&stuff->sdc_command, n);
-+    _swapl(&stuff->sdc_result_header, n);
-     for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--       swapl(&stuff->sdc_parm[i], n);
--       swapl(&stuff->sdc_result[i], n);
-+       _swapl(&stuff->sdc_parm[i], n);
-+       _swapl(&stuff->sdc_result[i], n);
-     }
-     REQUEST_SIZE_MATCH(xSiSCtrlCommandReq);
-     return SiSUSBProcSiSCtrlCommand(client);
-@@ -911,7 +909,7 @@ SiSUSBCtrlResetProc(ExtensionEntry* extEntry)
- {
-     /* Called by CloseDownExtensions() */
-     if(extEntry->extPrivate) {
--       xfree(extEntry->extPrivate);
-+       free(extEntry->extPrivate);
-        extEntry->extPrivate = NULL;
-     }
- }
-@@ -928,7 +926,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn)
- 
-    if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) {
- 
--      if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1)))
-+      if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
-          return;
- 
-       if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0,
-@@ -938,7 +936,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn)
- 				StandardMinorOpcode))) {
-          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 	 		"Failed to add SISCTRL extension\n");
--	 xfree(myctrl);
-+	 free(myctrl);
- 	 return;
-       }
- 
-diff --git a/src/sisusb_video.c b/src/sisusb_video.c
-index bc469b0..1dbf4f1 100644
---- a/src/sisusb_video.c
-+++ b/src/sisusb_video.c
-@@ -216,7 +216,7 @@ void SISUSBInitVideo(ScreenPtr pScreen)
- 
-        if(newAdaptor) size++;
- 
--       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
-+       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
-        if(newAdaptors) {
-           if(num_adaptors) {
-              memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
-@@ -234,7 +234,7 @@ void SISUSBInitVideo(ScreenPtr pScreen)
-     }
- 
-     if(newAdaptors) {
--       xfree(newAdaptors);
-+       free(newAdaptors);
-     }
- }
- 
-@@ -377,7 +377,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen)
-     XF86VideoAdaptorPtr adapt;
-     SISUSBPortPrivPtr pPriv;
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISUSBPortPrivRec) +
-                             sizeof(DevUnion))))
-     	return NULL;
diff --git a/staging/xf86-video-tdfx/PKGBUILD b/staging/xf86-video-tdfx/PKGBUILD
deleted file mode 100644
index e07fb4505..000000000
--- a/staging/xf86-video-tdfx/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 149906 2012-02-11 15:05:23Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tdfx
-pkgver=1.4.3
-pkgrel=8
-_gitver=a985b54c8559d7ff8f5481004d54989ed7499237
-pkgdesc="X.org tdfx video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto')
-conflicts=('xorg-server<1.11.99.902')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        http://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx/snapshot/xf86-video-tdfx-${_gitver}.tar.gz)
-sha1sums=('01c13cdec926c1aaa9c8c8855995c6cc38149ab2')
-
-build() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  autoreconf -fi
-  ./configure --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-trident/PKGBUILD b/staging/xf86-video-trident/PKGBUILD
deleted file mode 100644
index f94206494..000000000
--- a/staging/xf86-video-trident/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149886 2012-02-11 11:56:00Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-trident
-pkgver=1.3.4
-pkgrel=6
-pkgdesc="X.org Trident video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        trident-1.3.4-git.patch)
-sha1sums=('7c40f5c02bddf399862782b708941e79302318af'
-          'cba17aad6cf2f051d89e65ffe26242ed62ea4454')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/trident-1.3.4-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-trident/trident-1.3.4-git.patch b/staging/xf86-video-trident/trident-1.3.4-git.patch
deleted file mode 100644
index 4e0cc27b2..000000000
--- a/staging/xf86-video-trident/trident-1.3.4-git.patch
+++ /dev/null
@@ -1,523 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index be54427..0fc2066 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,47 +20,47 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-trident],
--        1.3.4,
-+        [1.3.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-trident)
--
-+        [xf86-video-trident])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-@@ -90,17 +90,14 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=trident
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/trident.man b/man/trident.man
-index 8d04ed0..f461e10 100644
---- a/man/trident.man
-+++ b/man/trident.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH TRIDENT __drivermansuffix__ __vendorversion__
-diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c
-index 80e3f23..3129623 100644
---- a/src/blade_accel_exa.c
-+++ b/src/blade_accel_exa.c
-@@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker)
-     }
- }
- 
--static Bool PrepareAccess(PixmapPtr pPix, int index)
--{
--}
--
--static void FinishAccess(PixmapPtr pPix, int index)
--{
--}
--
- static void BladeInitializeAccelerator(ScrnInfoPtr pScrn)
- {
-     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-diff --git a/src/trident.h b/src/trident.h
-index c15d39c..a28c9fc 100644
---- a/src/trident.h
-+++ b/src/trident.h
-@@ -70,7 +70,7 @@ typedef struct {
- typedef struct {
-     ScrnInfoPtr		pScrn;
-     pciVideoPtr		PciInfo;
--    PCITAG		PciTag;
-+    uint32_t		PciTag;
-     EntityInfoPtr	pEnt;
-     ExaDriverPtr	EXADriverPtr;
-     int			useEXA;
-@@ -85,7 +85,7 @@ typedef struct {
-     unsigned char *     IOBase;
-     unsigned char *	FbBase;
-     long		FbMapSize;
--    IOADDRESS		PIOBase;
-+    unsigned long		PIOBase;
-     Bool		NoAccel;
-     Bool		HWCursor;
-     Bool		UsePCIRetry;
-diff --git a/src/trident_dga.c b/src/trident_dga.c
-index 78fa8f4..dd836a6 100644
---- a/src/trident_dga.c
-+++ b/src/trident_dga.c
-@@ -83,15 +83,15 @@ TRIDENTDGAInit(ScreenPtr pScreen)
-    while(pMode) {
- 
- 	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
--	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
- 	    oneMore = TRUE;
- 	} else {
--	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- 	    oneMore = FALSE;
- 	}
- 
- 	if(!newmodes) {
--	   xfree(modes);
-+	   free(modes);
- 	   return FALSE;
- 	}
- 	modes = newmodes;
-diff --git a/src/trident_driver.c b/src/trident_driver.c
-index 31cbb83..472c9b7 100644
---- a/src/trident_driver.c
-+++ b/src/trident_driver.c
-@@ -63,7 +63,7 @@
- 
- #ifdef XFreeXDGA
- #define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- #endif
- 
- #include "globals.h"
-@@ -560,7 +560,7 @@ TRIDENTFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -900,7 +900,7 @@ TRIDENTProbe(DriverPtr drv, int flags)
- 		    foundScreen = TRUE;
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -933,11 +933,11 @@ TRIDENTProbe(DriverPtr drv, int flags)
- 		foundScreen = TRUE;
- 	    }
- 	}
--	xfree(usedChips);
-+	free(usedChips);
-     }
- #endif    
- 
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 	
-@@ -1109,7 +1109,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
-     hwp = VGAHWPTR(pScrn);
-     vgaHWGetIOBase(hwp);
-     vgaIOBase = hwp->IOBase;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     pTrident->PIOBase = hwp->PIOOffset;
-+#else
-+    pTrident->PIOBase = 0;
-+#endif
- 
- #ifndef XSERVER_LIBPCIACCESS
-     xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr);
-@@ -1163,7 +1168,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if (!(pTrident->Options = xalloc(sizeof(TRIDENTOptions))))
-+    if (!(pTrident->Options = malloc(sizeof(TRIDENTOptions))))
- 	return FALSE;
-     memcpy(pTrident->Options, TRIDENTOptions, sizeof(TRIDENTOptions));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTrident->Options);
-@@ -2617,7 +2622,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-     TRIDENTRegPtr tridentReg;
- 
--    if (!xf86IsPc98()) WAITFORVSYNC;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98())
-+#endif
-+        WAITFORVSYNC;
- 
-     TridentFindClock(pScrn,mode->Clock);
- 
-@@ -2709,8 +2717,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
-     vgaHWProtect(pScrn, FALSE);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (xf86IsPc98())
- 	PC98TRIDENTEnable(pScrn);
-+#endif
- 
-     if (pTrident->TVChipset != 0)
-        VIA_TVInit(pScrn);
-@@ -2782,7 +2792,10 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!TRIDENTMapMem(pScrn))
- 	return FALSE;
- 
--    if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98())
-+#endif
-+    {
- #ifdef VBE_INFO
- 	if (pTrident->vbeModes) {
- 	    pTrident->pVbe = VBEInit(NULL,pTrident->pEnt->index);
-@@ -2796,7 +2809,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	    }
- 	}
-     }
--    
-+
-     hwp = VGAHWPTR(pScrn);
- 
-     if (IsPciCard && UseMMIO) {
-@@ -2813,9 +2826,12 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-      * Some Trident chip on PC-9821 needs setup,
-      * because VGA chip is not initialized by VGA BIOS.
-      */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (IsPciCard && xf86IsPc98()) {
- 	 PC98TRIDENTInit(pScrn);
--    } else tridentSetModeBIOS(pScrn,pScrn->currentMode);
-+    } else
-+#endif
-+    tridentSetModeBIOS(pScrn,pScrn->currentMode);
- 
-     /* Initialise the first mode */
-     if (!TRIDENTModeInit(pScrn, pScrn->currentMode))
-@@ -2868,7 +2884,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pTrident->ShadowFB) {
-  	pTrident->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--        pTrident->ShadowPtr = xalloc(pTrident->ShadowPitch * height);
-+        pTrident->ShadowPtr = malloc(pTrident->ShadowPitch * height);
- 	displayWidth = pTrident->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-         FBStart = pTrident->ShadowPtr;
-     } else {
-@@ -2958,7 +2974,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 		(miBankProcPtr)TVGA8900SetReadWrite;
- 	if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
- 				 pScrn->displayWidth, pBankInfo)) {
--	    xfree(pBankInfo);
-+	    free(pBankInfo);
- 	    pBankInfo = NULL;
- 	    if (pTrident->pVbe)
- 	    	vbeFree(pTrident->pVbe);
-@@ -3200,8 +3216,10 @@ TRIDENTLeaveVT(int scrnIndex, int flags)
-     TRIDENTRestore(pScrn);
-     vgaHWLock(hwp);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (xf86IsPc98())
- 	PC98TRIDENTDisable(pScrn);
-+#endif
- 
-     if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
- }
-@@ -3225,28 +3243,31 @@ TRIDENTCloseScreen(int scrnIndex, ScreenPtr pScreen)
- 	pTrident->AccelInfoRec->Sync(pScrn);
-     else if (!pTrident->NoAccel && pTrident->useEXA)
- 	pTrident->EXADriverPtr->WaitMarker(pScreen, 0);
--	
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (xf86IsPc98())
- 	PC98TRIDENTDisable(pScrn);
-+#endif
- 
-     	TRIDENTRestore(pScrn);
-     	vgaHWLock(hwp);
- 	if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
-     	TRIDENTUnmapMem(pScrn);
-     }
-+
-     if (pTrident->AccelInfoRec)
- 	XAADestroyInfoRec(pTrident->AccelInfoRec);
-     if (pTrident->EXADriverPtr) {
- 	exaDriverFini(pScreen);
--	xfree(pTrident->EXADriverPtr);
-+	free(pTrident->EXADriverPtr);
- 	pTrident->EXADriverPtr = NULL;
-     }	
-     if (pTrident->CursorInfoRec)
- 	xf86DestroyCursorInfoRec(pTrident->CursorInfoRec);
-     if (pTrident->ShadowPtr)
--	xfree(pTrident->ShadowPtr);
-+	free(pTrident->ShadowPtr);
-     if (pTrident->DGAModes)
--	xfree(pTrident->DGAModes);
-+	free(pTrident->DGAModes);
-     pScrn->vtSema = FALSE;
- 
-     if(pTrident->BlockHandler)
-@@ -3317,15 +3338,17 @@ static void
- TRIDENTEnableMMIO(ScrnInfoPtr pScrn)
- {
-     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
--    IOADDRESS vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
-+    unsigned long vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
-     CARD8 temp = 0, protect = 0;
- 
-     /*
-      * Skip MMIO Enable in PC-9821 PCI Trident Card!!
-      * Because of lack of non PCI VGA port
-      */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (IsPciCard && xf86IsPc98())
-       return;
-+#endif
- 
-     /* Goto New Mode */
-     outb(pTrident->PIOBase + 0x3C4, 0x0B);
-@@ -3366,8 +3389,10 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
-      * Skip MMIO Disable in PC-9821 PCI Trident Card!!
-      * Because of lack of non PCI VGA port
-      */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (IsPciCard && xf86IsPc98())
-       return;
-+#endif
- 
-     /* Goto New Mode */
-     OUTB(0x3C4, 0x0B); temp = INB(0x3C5);
-@@ -3395,6 +3420,7 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
-     outb(pTrident->PIOBase + 0x3C5, temp);
- }
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- /* Initialize VGA Block for Trident Chip on PC-98x1 */
- static void
- PC98TRIDENTInit(ScrnInfoPtr pScrn)
-@@ -3637,7 +3663,7 @@ PC98TRIDENT96xxDisable(ScrnInfoPtr pScrn)
-     outb(0x6A, 0x06);
-     outb(0x68, 0x0F);
- }
--
-+#endif
- 
- /* 
-  * This is a terrible hack! If we are on a notebook in a stretched
-diff --git a/src/trident_video.c b/src/trident_video.c
-index 0c5497b..0ae1d14 100644
---- a/src/trident_video.c
-+++ b/src/trident_video.c
-@@ -125,7 +125,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
- 	    adaptors = &newAdaptor;
- 	} else {
- 	    newAdaptors =  /* need to free this someplace */
--		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+		malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- 	    if(newAdaptors) {
- 		memcpy(newAdaptors, adaptors, num_adaptors * 
- 					sizeof(XF86VideoAdaptorPtr));
-@@ -140,7 +140,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- 
-     if (pTrident->videoFlags)
- 	xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,3,
-@@ -321,7 +321,7 @@ TRIDENTSetupImageVideo(ScreenPtr pScreen)
-     XF86VideoAdaptorPtr adapt;
-     TRIDENTPortPrivPtr pPriv;
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
- 			    sizeof(TRIDENTPortPrivRec) +
- 			    sizeof(DevUnion))))
- 	return NULL;
-@@ -978,18 +978,18 @@ TRIDENTAllocateSurface(
-     surface->width = w;
-     surface->height = h;
- 
--    if(!(surface->pitches = xalloc(sizeof(int)))) {
-+    if(!(surface->pitches = malloc(sizeof(int)))) {
- 	xf86FreeOffscreenLinear(linear);
- 	return BadAlloc;
-     }
--    if(!(surface->offsets = xalloc(sizeof(int)))) {
--	xfree(surface->pitches);
-+    if(!(surface->offsets = malloc(sizeof(int)))) {
-+	free(surface->pitches);
- 	xf86FreeOffscreenLinear(linear);
- 	return BadAlloc;
-     }
--    if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
-+	free(surface->pitches);
-+	free(surface->offsets);
- 	xf86FreeOffscreenLinear(linear);
- 	return BadAlloc;
-     }
-@@ -1034,9 +1034,9 @@ TRIDENTFreeSurface(
-     if(pPriv->isOn)
- 	TRIDENTStopSurface(surface);
-     xf86FreeOffscreenLinear(pPriv->linear);
--    xfree(surface->pitches);
--    xfree(surface->offsets);
--    xfree(surface->devPrivate.ptr);
-+    free(surface->pitches);
-+    free(surface->offsets);
-+    free(surface->devPrivate.ptr);
- 
-     return Success;
- }
-@@ -1128,7 +1128,7 @@ TRIDENTInitOffscreenImages(ScreenPtr pScreen)
-     XF86OffscreenImagePtr offscreenImages;
- 
-     /* need to free this someplace */
--    if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
-+    if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
- 	return;
- 
-     offscreenImages[0].image = &Images[0];
-@@ -1342,7 +1342,10 @@ WaitForVBlank(ScrnInfoPtr pScrn)
-      * full vblank has passed. 
-      * - Alan.
-      */
--    if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98())
-+#endif
-+    {
-        WAITFORVSYNC;
-        WAITFORVSYNC;
-     }
diff --git a/staging/xf86-video-tseng/PKGBUILD b/staging/xf86-video-tseng/PKGBUILD
deleted file mode 100644
index 411415341..000000000
--- a/staging/xf86-video-tseng/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149888 2012-02-11 11:59:32Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tseng
-pkgver=1.2.4
-pkgrel=6
-pkgdesc="X.org tseng video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        tseng-1.2.4-git.patch)
-sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7'
-          'd84bb75d62888096da7477b38e8b13f9c23d4e3a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/tseng-1.2.4-git.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-tseng/tseng-1.2.4-git.patch b/staging/xf86-video-tseng/tseng-1.2.4-git.patch
deleted file mode 100644
index 082b2cb0b..000000000
--- a/staging/xf86-video-tseng/tseng-1.2.4-git.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 62cc318..8458c06 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,46 +20,46 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-tseng],
--        1.2.4,
-+        [1.2.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-tseng)
--
-+        [xf86-video-tseng])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- 
- # Checks for libraries.
-@@ -78,17 +78,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=tseng
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/tseng.man b/man/tseng.man
-index 403782f..984c8e7 100644
---- a/man/tseng.man
-+++ b/man/tseng.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH TSENG __drivermansuffix__ __vendorversion__
-diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c
-index d4fb847..2412b31 100644
---- a/src/tseng_cursor.c
-+++ b/src/tseng_cursor.c
-@@ -159,7 +159,7 @@ TsengSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
-     }
- }
- 
--void 
-+static void 
- TsengLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
- {
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
-diff --git a/src/tseng_dga.c b/src/tseng_dga.c
-index 70ebe23..528ba4c 100644
---- a/src/tseng_dga.c
-+++ b/src/tseng_dga.c
-@@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen)
-   if (!pTseng->DGAnumModes) {
-     pMode = firstMode = pScrn->modes;
-     while (pMode) {
--      newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec));
-+      newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec));
-       if (!newmodes) {
--	xfree(modes);
-+	free(modes);
- 	return FALSE;
-       }
-       modes = newmodes;
-@@ -135,7 +135,7 @@ Tseng_OpenFramebuffer(
-     TsengPtr pTseng = TsengPTR(pScrn);
- 
-     *name = NULL; 		/* no special device */
--    *mem = (unsigned char*)pTseng->FbAddress;
-+    *mem = (unsigned char*)(uintptr_t)pTseng->FbAddress;
-     *size = pTseng->FbMapSize;
-     *offset = 0;                /* Always */
-     *flags = 0;                 /* Root permissions OS-dependent */
-diff --git a/src/tseng_driver.c b/src/tseng_driver.c
-index 445c17e..d36b62c 100644
---- a/src/tseng_driver.c
-+++ b/src/tseng_driver.c
-@@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn)
-     pTseng = TsengPTR(pScrn);
-     
-     if (pTseng->SavedReg.RAMDAC)
--        xfree(pTseng->SavedReg.RAMDAC);
-+        free(pTseng->SavedReg.RAMDAC);
- 
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags)
-                 foundScreen = TRUE;
-             }
-         }
--        xfree(usedChips);
-+        free(usedChips);
-     }
-     
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 
-@@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if (!(pTseng->Options = xalloc(sizeof(TsengOptions))))
-+    if (!(pTseng->Options = malloc(sizeof(TsengOptions))))
- 	return FALSE;
-     memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options);
-@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
-     PDEBUG("	TsengGetFbAddress\n");
- 
-     /* base0 is the framebuffer and base1 is the PCI IO space. */
--    if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
-+    if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                    "No valid Framebuffer address in PCI config space;\n");
-         return FALSE;
-diff --git a/src/tseng_mode.c b/src/tseng_mode.c
-index f075226..a3ff87d 100644
---- a/src/tseng_mode.c
-+++ b/src/tseng_mode.c
-@@ -41,7 +41,11 @@ vgaHWWriteBank(vgaHWPtr hwp, CARD8 value)
-     if (hwp->MMIOBase)
- 	MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK, value);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	outb(hwp->PIOOffset + VGA_BANK, value);
-+#else
-+	pci_io_write8(hwp->io, VGA_BANK, value);
-+#endif
- }
- 
- CARD8
-@@ -50,7 +54,11 @@ vgaHWReadBank(vgaHWPtr hwp)
-     if (hwp->MMIOBase)
- 	return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	return inb(hwp->PIOOffset + VGA_BANK);
-+#else
-+	return pci_io_read8(hwp->io, VGA_BANK);
-+#endif
- }
- 
- #define VGA_SEGMENT 0x3CD
-@@ -61,7 +69,11 @@ vgaHWWriteSegment(vgaHWPtr hwp, CARD8 value)
-     if (hwp->MMIOBase)
- 	MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT, value);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	outb(hwp->PIOOffset + VGA_SEGMENT, value);
-+#else
-+	pci_io_write8(hwp->io, VGA_SEGMENT, value);
-+#endif
- }
- 
- CARD8
-@@ -70,7 +82,11 @@ vgaHWReadSegment(vgaHWPtr hwp)
-     if (hwp->MMIOBase)
- 	return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	return inb(hwp->PIOOffset + VGA_SEGMENT);
-+#else
-+	return pci_io_read8(hwp->io, VGA_SEGMENT);
-+#endif
- }
- 
- /*
-@@ -84,8 +100,12 @@ vgaHWWriteModeControl(vgaHWPtr hwp, CARD8 value)
-     if (hwp->MMIOBase)
-         MMIO_OUT8(hwp->MMIOBase,
-                   hwp->MMIOOffset + hwp->IOBase + VGA_MODE_CONTROL, value);
--    else  
--        outb(hwp->IOBase + hwp->PIOOffset + VGA_MODE_CONTROL, value);
-+    else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	outb(hwp->PIOOffset + VGA_MODE_CONTROL, value);
-+#else
-+	pci_io_write8(hwp->io, VGA_MODE_CONTROL, value);
-+#endif
- }
- 
- /*
-@@ -110,14 +130,22 @@ vgaHWHerculesSecondPage(vgaHWPtr hwp, Bool Enable)
- 
-         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_HERCULES, tmp);
-     } else {
--        tmp = inb(hwp->PIOOffset + VGA_HERCULES);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	tmp = inb(hwp->PIOOffset + VGA_HERCULES);
-+#else
-+	tmp = pci_io_read8(hwp->io, VGA_HERCULES);
-+#endif
- 
-         if (Enable)
-             tmp |= 0x02;
-         else
-             tmp &= ~0x02;
- 
--        outb(hwp->PIOOffset + VGA_HERCULES, tmp);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	outb(hwp->PIOOffset + VGA_HERCULES, tmp);
-+#else
-+	pci_io_write8(hwp->io, VGA_HERCULES, tmp);
-+#endif
-     }
- }
- 
-@@ -1502,7 +1530,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode)
- 
-     /* clean up */
-     if (new->RAMDAC)
--        xfree(new->RAMDAC);
-+        free(new->RAMDAC);
- 
-     return TRUE;
- }
diff --git a/staging/xf86-video-unichrome/LICENSE b/staging/xf86-video-unichrome/LICENSE
deleted file mode 100644
index f4007667b..000000000
--- a/staging/xf86-video-unichrome/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved.
-Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved.
-Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/staging/xf86-video-unichrome/PKGBUILD b/staging/xf86-video-unichrome/PKGBUILD
deleted file mode 100644
index 05903b22a..000000000
--- a/staging/xf86-video-unichrome/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149894 2012-02-11 12:05:14Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-unichrome
-pkgver=0.2.7
-pkgrel=7
-_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
-pkgdesc="Unichrome video drivers for X.Org"
-arch=(i686 x86_64)
-url="http://unichrome.sf.net/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc') # 'glproto')
-options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.11.99.903')
-source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2)
-md5sums=('f7adef052de08a01af86e245d1932239')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_gitversion}"
-  ./autogen.sh --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_gitversion}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/staging/xf86-video-v4l/LICENSE b/staging/xf86-video-v4l/LICENSE
deleted file mode 100644
index 535595b88..000000000
--- a/staging/xf86-video-v4l/LICENSE
+++ /dev/null
@@ -1,826 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-                                  Licenses
-
-                            The X.Org Foundation
-
-                                 March 2004
-
-1.  Introduction
-
-The X.org Foundation X Window System distribution is a compilation of code
-and documentation from many sources.  This document is intended primarily as
-a guide to the licenses used in the distribution: you must check each file
-and/or package for precise redistribution terms. None-the-less, this summary
-may be useful to many users.  No software incorporating the XFree86 1.1
-license has been incorporated.
-
-This document is based on the compilation from XFree86.
-
-2.  XFree86 License
-
-XFree86 code without an explicit copyright is covered by the following copy-
-right/license:
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
-
-3.  Other Licenses
-
-Portions of code are covered by the following licenses/copyrights.  See indi-
-vidual files for the copyright dates.
-
-3.1  X/MIT Copyrights
-
-3.1.1  X Consortium
-
-Copyright (C) <date> X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2  The Open Group
-
-Copyright <date>  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-3.2  Berkeley-based copyrights:
-
-o
-
-3.2.1  General
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.2  UCB/LBL
-
-Copyright (c) 1993 The Regents of the University of California.  All rights
-reserved.
-
-This software was developed by the Computer Systems Engineering group at
-Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
-Berkeley.
-
-All advertising materials mentioning features or use of this software must
-display the following acknowledgement: This product includes software devel-
-oped by the University of California, Lawrence Berkeley Laboratory.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the University of California, Berkeley and its con-
-      tributors.
-
-  4.  Neither the name of the University nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS-
-CLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.3  The NetBSD Foundation, Inc.
-
-Copyright (c) 2003 The NetBSD Foundation, Inc.  All rights reserved.
-
-This code is derived from software contributed to The NetBSD Foundation by
-Ben Collver <collver1@attbi.com>
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the NetBSD Foundation, Inc. and its contributors.
-
-  4.   Neither the name of The NetBSD Foundation nor the names of its con-
-      tributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE-
-QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM-
-AGE.
-
-3.2.4  Theodore Ts'o.
-
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      and the entire permission notice in its entirety, including the dis-
-      claimer of warranties.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  he name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.5  Theo de Raadt and Damien Miller
-
-Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.  Copyright (c)
-2001-2002 Damien Miller.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.6  Todd C. Miller
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON-
-TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-3.2.7  Thomas Winischhofer
-
-Copyright (C) 2001-2004 Thomas Winischhofer
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.3  NVIDIA Corp
-
-Copyright (c) 1996 NVIDIA, Corp.  All rights reserved.
-
-NOTICE TO USER: The source code is copyrighted under U.S. and international
-laws.  NVIDIA, Corp. of Sunnyvale, California owns the copyright and as
-design patents pending on the design and interface of the NV chips.  Users
-and possessors of this source code are hereby granted a nonexclusive, roy-
-alty-free copyright and design patent license to use this code in individual
-and commercial software.
-
-Any use of this source code must include, in the user documentation and
-internal comments to the code, notices to the end user as follows:
-
-Copyright (c) 1996 NVIDIA, Corp.  NVIDIA design patents pending in the U.S.
-and foreign countries.
-
-NVIDIA, CORP.  MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
-CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR-
-RANTY OF ANY KIND.  NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL NVIDIA, CORP.  BE LIABLE
-FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM-
-AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-
-3.4  GLX Public License
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below), and to permit persons to whom the Subject Software is furnished in
-accordance with this License to do the same, subject to all of the following
-terms and conditions, which Recipient accepts by engaging in any such use,
-copying, modifying, merging, publishing, distributing, sublicensing or sell-
-ing:
-
-1. Definitions.
-
-     (a) "Original Software" means source code of computer software code
-     which is described in Exhibit A as Original Software.
-
-     (b) "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     (c) "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     (d) "Recipient" means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License.
-     For legal entities, "Recipient" includes any entity which controls,
-     is controlled by, or is under common control with Recipient. For
-     purposes of this definition, "control" of an entity means (a) the
-     power, direct or indirect, to direct or manage such entity, or (b)
-     ownership of fifty percent (50%) or more of the outstanding shares
-     or beneficial ownership of such entity.
-
-2. Redistribution of Source Code Subject to These Terms. Redistributions of
-Subject Software in source code form must retain the notice set forth in
-Exhibit A, below, in every file. A copy of this License must be included in
-any documentation for such Subject Software where the recipients' rights
-relating to Subject Software are described. Recipient may distribute the
-source code version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13
-of this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the source code version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-3. Redistribution in Executable Form. The notice set forth in Exhibit A must
-be conspicuously included in any notice in an executable version of Subject
-Software, related documentation or collateral in which Recipient describes
-the user's rights relating to the Subject Software. Recipient may distribute
-the executable version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of
-this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the executable version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-4. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software which is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-5. No Trademark Rights. This License does not grant any rights to use any
-trade name, trademark or service mark whatsoever. No trade name, trademark or
-service mark of SGI may be used to endorse or promote products derived from
-the Subject Software without prior written permission of SGI.
-
-6. No Other Rights. This License does not grant any rights with respect to
-the OpenGL API or to any software or hardware implementation thereof or to
-any other software whatsoever, nor shall any other rights or licenses not
-expressly granted hereunder arise by implication, estoppel or otherwise with
-respect to the Subject Software. Title to and ownership of the Original Soft-
-ware at all times remains with SGI. All rights in the Original Software not
-expressly granted under this License are reserved.
-
-7. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-8. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Exhibit A notice required under Sec-
-tions 2 and 3, above, and in the text of any related documentation, license
-agreement or collateral in which Recipient describes end user's rights relat-
-ing to the Subject Software. If Recipient obtains such knowledge after it
-makes Subject Software available to any other person or entity, Recipient
-shall take other steps (such as notifying appropriate mailing lists or news-
-groups) reasonably calculated to inform those who received the Subject Soft-
-ware that new knowledge has been obtained.
-
-9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE-
-ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA-
-BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO
-THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc.
-from and against any loss, liability, damages, costs or expenses (including
-the payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Subject Software or out of
-any representation or warranty made by Recipient.
-
-12. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S.  Government End
-Users acquire only the rights set forth in this License and are subject to
-the terms of this License.
-
-13. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable, such provision shall be reformed so as to achieve as nearly as
-possible the same economic effect as the original provision and the remainder
-of this License will remain in effect. This License shall be governed by and
-construed in accordance with the laws of the United States and the State of
-California as applied to agreements entered into and to be performed entirely
-within California between California residents. Any litigation relating to
-this License shall be subject to the exclusive jurisdiction of the Federal
-Courts of the Northern District of California (or, absent subject matter
-jurisdiction in such courts, the courts of the State of California), with
-venue lying exclusively in Santa Clara County, California, with the losing
-party responsible for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is expressly
-excluded. Any law or regulation which provides that the language of a con-
-tract shall be construed against the drafter shall not apply to this License.
-
-Exhibit A
-
-The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and
-13 of the GLX Public License Version 1.0 (the "License"). You may not use
-this file except in compliance with those sections of the License. You may
-obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services,
-2011 N. Shoreline Blvd., Mountain View, CA 94043 or at
-http://www.sgi.com/software/opensource/glx/license.html.
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software is GLX version 1.2 source code, released February,
-1999. The developer of the Original Software is Silicon Graphics, Inc.  Those
-portions of the Subject Software created by Silicon Graphics, Inc.  are Copy-
-right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-3.5  CID Font Code Public License
-
-CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
-
-Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI")
-hereby grants permission to Recipient (defined below), under SGI's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below) in both source code and executable form, and to permit persons to whom
-the Subject Software is furnished in accordance with this License to do the
-same, subject to all of the following terms and conditions, which Recipient
-accepts by engaging in any such use, copying, modifying, merging, publica-
-tion, distributing, sublicensing or selling:
-
-1. Definitions.
-
-     a. "Original Software" means source code of computer software code
-     that is described in Exhibit A as Original Software.
-
-     b. "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     c. "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     d. "Recipient" means an individual or a legal entity exercising
-     rights under the terms of this License. For legal entities, "Recip-
-     ient" includes any entity that controls, is controlled by, or is
-     under common control with Recipient. For purposes of this defini-
-     tion, "control" of an entity means (i) the power, direct or indi-
-     rect, to direct or manage such entity, or (ii) ownership of fifty
-     percent (50%) or more of the outstanding shares or beneficial own-
-     ership of such entity.
-
-     e. "Required Notice" means the notice set forth in Exhibit A to
-     this License.
-
-     f. "Accompanying Technology" means any software or other technology
-     that is not a Modification and that is distributed or made publicly
-     available by Recipient with the Subject Software.  Separate soft-
-     ware files that do not contain any Original Software or any previ-
-     ous Modification shall not be deemed a Modification, even if such
-     software files are aggregated as part of a product, or in any
-     medium of storage, with any file that does contain Original Soft-
-     ware or any previous Modification.
-
-2. License Terms. All distribution of the Subject Software must be made sub-
-ject to the terms of this License. A copy of this License and the Required
-Notice must be included in any documentation for Subject Software where
-Recipient's rights relating to Subject Software and/or any Accompanying Tech-
-nology are described. Distributions of Subject Software in source code form
-must also include the Required Notice in every file distributed. In addition,
-a ReadMe file entitled "Important Legal Notice" must be distributed with each
-distribution of one or more files that incorporate Subject Software. That
-file must be included with distributions made in both source code and exe-
-cutable form. A copy of the License and the Required Notice must be included
-in that file.  Recipient may distribute Accompanying Technology under a
-license of Recipient's choice, which may contain terms different from this
-License, provided that (i) Recipient is in compliance with the terms of this
-License, (ii) such other license terms do not modify or supersede the terms
-of this License as applicable to the Subject Software, (iii) Recipient hereby
-indemnifies SGI for any liability incurred by SGI as a result of the distri-
-bution of Accompanying Technology or the use of other license terms.
-
-3. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software that is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-4. Trademark Rights. This License does not grant any rights to use any trade
-name, trademark or service mark whatsoever. No trade name, trademark or ser-
-vice mark of SGI may be used to endorse or promote products derived from or
-incorporating any Subject Software without prior written permission of SGI.
-
-5. No Other Rights. No rights or licenses not expressly granted hereunder
-shall arise by implication, estoppel or otherwise. Title to and ownership of
-the Original Software at all times remains with SGI. All rights in the Origi-
-nal Software not expressly granted under this License are reserved.
-
-6. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity, or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-7. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Required Notice, and in the text of
-any related documentation, license agreement or collateral in which Recipient
-describes end user's rights relating to the Subject Software. If Recipient
-obtains such knowledge after it makes Subject Software available to any other
-person or entity, Recipient shall take other steps (such as notifying appro-
-priate mailing lists or newsgroups) reasonably calculated to provide such
-knowledge to those who received the Subject Software.
-
-8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
-CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED.
-
-10. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold SGI and its successors and assigns
-harmless from and against any loss, liability, damages, costs or expenses
-(including the payment of reasonable attorneys fees) arising out of (Recipi-
-ent's use, modification, reproduction and distribution of the Subject Soft-
-ware or out of any representation or warranty made by Recipient.
-
-11. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End Users
-acquire only the rights set forth in this License and are subject to the
-terms of this License.
-
-12. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable by any judicial or administrative authority having proper jurisdic-
-tion with respect thereto, such provision shall be reformed so as to achieve
-as nearly as possible the same economic effect as the original provision and
-the remainder of this License will remain in effect. This License shall be
-governed by and construed in accordance with the laws of the United States
-and the State of California as applied to agreements entered into and to be
-performed entirely within California between California residents. Any liti-
-gation relating to this License shall be subject to the exclusive jurisdic-
-tion of the Federal Courts of the Northern District of California (or, absent
-subject matter jurisdiction in such courts, the courts of the State of Cali-
-fornia), with venue lying exclusively in Santa Clara County, California, with
-the losing party responsible for costs, including without limitation, court
-costs and reasonable attorneys fees and expenses. The application of the
-United Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation that provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-Exhibit A
-
-Copyright (c) 1994-1999 Silicon Graphics, Inc.
-
-The contents of this file are subject to the CID Font Code Public License
-Version 1.0 (the "License"). You may not use this file except in compliance
-with the License. You may obtain a copy of the License at Silicon Graphics,
-Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-or at http://www.sgi.com/software/opensource/cid/license.html
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software (as defined in the License) is CID font code that was
-developed by Silicon Graphics, Inc. Those portions of the Subject Software
-(as defined in the License) that were created by Silicon Graphics, Inc. are
-Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
-
-[NOTE: When using this text in connection with Subject Software delivered
-solely in object code form, Recipient may replace the words "this file" with
-"this software" in both the first and second sentences.]
-
-3.6  Bitstream Vera Fonts Copyright
-
-The fonts have a generous copyright, allowing derivative works (as long as
-"Bitstream" or "Vera" are not in the names), and full redistribution (so long
-as they are not *sold* by themselves). They can be be bundled, redistributed
-and sold with any software.
-
-The fonts are distributed under the following copyright:
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated documentation
-files (the "Font Software"), to reproduce and distribute the Font Software,
-including without limitation the rights to use, copy, merge, publish, dis-
-tribute, and/or sell copies of the Font Software, and to permit persons to
-whom the Font Software is furnished to do so, subject to the following condi-
-tions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and addi-
-tional glyphs or characters may be added to the Fonts, only if the fonts are
-renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream Vera"
-names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA-
-TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome Foundation,
-and Bitstream Inc., shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Font Software without prior written
-authorization from the Gnome Foundation or Bitstream Inc., respectively. For
-further information, contact: fonts at gnome dot org.
-
-3.7  Bigelow & Holmes Inc and URW++ GmbH Luxi font license
-
-Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction
-code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis-
-tered trademark of Bigelow & Holmes Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of these Fonts and associated documentation files (the "Font Software"), to
-deal in the Font Software, including without limitation the rights to use,
-copy, merge, publish, distribute, sublicense, and/or sell copies of the Font
-Software, and to permit persons to whom the Font Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software.
-
-The Font Software may not be modified, altered, or added to, and in particu-
-lar the designs of glyphs or characters in the Fonts may not be modified nor
-may additional glyphs or characters be added to the Fonts. This License
-becomes null and void when the Fonts or Font Software have been modified.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++
-GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Bigelow & Holmes Inc. and
-URW++ GmbH. shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Font Software without prior written
-authorization from Bigelow & Holmes Inc. and URW++ GmbH.
-
-For further information, contact:
-
-info@urwpp.de or design@bigelowandholmes.com
-
-     $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $
diff --git a/staging/xf86-video-v4l/PKGBUILD b/staging/xf86-video-v4l/PKGBUILD
deleted file mode 100644
index 07abf4e35..000000000
--- a/staging/xf86-video-v4l/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 149896 2012-02-11 12:07:49Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-v4l
-pkgver=0.2.0
-pkgrel=10
-pkgdesc="X.org v4l video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch
-        LICENSE)
-md5sums=('2251ae2a0a905764941cd7b098e85ad1'
-         'cdb7113a9564ea9202e847de88440540'
-         '7d4d018f6bbff7e42672d1aabc75c5cf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-v4l/git-fixes.patch b/staging/xf86-video-v4l/git-fixes.patch
deleted file mode 100644
index 2f752fc8c..000000000
--- a/staging/xf86-video-v4l/git-fixes.patch
+++ /dev/null
@@ -1,4362 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index 02fc6fa..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,57 +0,0 @@
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/v4l.c:
--	Bump to 0.1.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/v4l.c: (V4lPutVideo), (V4lPutStill):
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/v4l.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.1.0.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* man/Makefile.am:
--	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 3ae2692..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
--EXTRA_DIST = README
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
-+
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index d9ac542..c490919 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,57 +20,56 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-v4l],
--        0.2.0,
-+        [0.2.0],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-v4l)
--
-+        [xf86-video-v4l])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=v4l
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/v4l.man b/man/v4l.man
-index 7d35b86..dc1e201 100644
---- a/man/v4l.man
-+++ b/man/v4l.man
-@@ -34,6 +34,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details.  This section only covers configuration details specific to this
- driver.
- .SH "SEE ALSO"
--__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
-+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
- .SH AUTHORS
- Authors include: Gerd Knorr <kraxel@bytesex.org>
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ed30a80..08afe60 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,7 +28,6 @@ v4l_drv_la_LTLIBRARIES = v4l_drv.la
- v4l_drv_la_LDFLAGS = -module -avoid-version
- v4l_drv_ladir = @moduledir@/drivers
- 
--v4l_drv_la_SOURCES = \
--         v4l.c
--
--EXTRA_DIST = videodev.h
-+v4l_drv_la_SOURCES =	\
-+	v4l.c		\
-+	videodev.h
-diff --git a/src/v4l.c b/src/v4l.c
-index b827f80..10e782b 100644
---- a/src/v4l.c
-+++ b/src/v4l.c
-@@ -1,6 +1,9 @@
- /*
-- *  video4linux Xv Driver 
-+ *  video4linux Xv Driver
-  *  based on Michael Schimek's permedia 2 driver.
-+ *
-+ * Copyright (c) 2011 Mauro Carvalho Chehab <mchehab@redhat.com> for:
-+ *	- Major rewrite, as driver got ported to V4L2 API
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -9,12 +12,16 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <ctype.h>
-+
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-+#include <unistd.h>
-+#include <sys/ioctl.h>
- 
--#include "videodev.h"
-+#include "videodev2.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "xf86Pci.h"
-@@ -25,8 +32,9 @@
- #include "regionstr.h"
- #include "dgaproc.h"
- #include "xf86str.h"
-+#include "fourcc.h"
- 
--#include <asm/ioctl.h>		/* _IORW(xxx) #defines are here */
-+#include <asm/ioctl.h>          /* _IORW(xxx) #defines are here */
- 
- #if 0
- # define DEBUG(x) (x)
-@@ -34,20 +42,22 @@
- # define DEBUG(x)
- #endif
- 
-+/***************************************************************************/
-+
- static void     V4LIdentify(int flags);
- static Bool     V4LProbe(DriverPtr drv, int flags);
- static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid);
- 
- _X_EXPORT DriverRec V4L = {
--        40000,
--        "v4l",
--        V4LIdentify, /* Identify*/
--        V4LProbe, /* Probe */
--	V4LAvailableOptions,
--        NULL,
--        0
--};    
--
-+    .driverVersion = 50000,
-+    .driverName = "v4l",
-+    .Identify = V4LIdentify,
-+    .Probe = V4LProbe,
-+    .AvailableOptions = V4LAvailableOptions,
-+    .module = NULL,
-+    .refCount = 0,
-+    .driverFunc = NULL,   /* FIXME: Need to implement for new probing mode */
-+};
- 
- #ifdef XFree86LOADER
- 
-@@ -55,16 +65,16 @@ static MODULESETUPPROTO(v4lSetup);
- 
- static XF86ModuleVersionInfo v4lVersRec =
- {
--        "v4l",
--        MODULEVENDORSTRING,
--        MODINFOSTRING1,
--        MODINFOSTRING2,
--        XORG_VERSION_CURRENT,
--        0, 1, 1,
--        ABI_CLASS_VIDEODRV,
--        ABI_VIDEODRV_VERSION,
--        MOD_CLASS_NONE,
--        {0,0,0,0}
-+    "v4l",
-+    MODULEVENDORSTRING,
-+    MODINFOSTRING1,
-+    MODINFOSTRING2,
-+    XORG_VERSION_CURRENT,
-+    0, 1, 1,
-+    ABI_CLASS_VIDEODRV,
-+    ABI_VIDEODRV_VERSION,
-+    MOD_CLASS_NONE,
-+    {0,0,0,0}
- };
- 
- _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
-@@ -72,32 +82,32 @@ _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
- static pointer
- v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- {
--        const char *osname;
--	static Bool setupDone = FALSE;
--
--	if (setupDone) {
--	    if (errmaj)
--		*errmaj = LDR_ONCEONLY;
--	    return NULL;             
--	}
--	
--	setupDone = TRUE;
--
--        /* Check that we're being loaded on a Linux system */
--        LoaderGetOS(&osname, NULL, NULL, NULL);
--        if (!osname || strcmp(osname, "linux") != 0) {
--                if (errmaj)
--                        *errmaj = LDR_BADOS;
--                if (errmin)
--                        *errmin = 0;
--                return NULL;
--        } else {
--                /* OK */
--
--	        xf86AddDriver (&V4L, module, 0);   
--	  
--                return (pointer)1;
--        }
-+    const char *osname;
-+    static Bool setupDone = FALSE;
-+
-+    if (setupDone) {
-+        if (errmaj)
-+            *errmaj = LDR_ONCEONLY;
-+        return NULL;
-+    }
-+
-+    setupDone = TRUE;
-+
-+    /* Check that we're being loaded on a Linux system */
-+    LoaderGetOS(&osname, NULL, NULL, NULL);
-+    if (!osname || strcmp(osname, "linux") != 0) {
-+        if (errmaj)
-+            *errmaj = LDR_BADOS;
-+        if (errmin)
-+            *errmin = 0;
-+        return NULL;
-+    } else {
-+        /* OK */
-+
-+        xf86AddDriver (&V4L, module, 0);
-+
-+        return (pointer)1;
-+    }
- }
- 
- #else
-@@ -112,25 +122,28 @@ v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- #define VIDEO_YUV     2  /* yuv overlay (to offscreen memory + hw scaling) */
- #define VIDEO_RECLIP  3  /* temporarly off, window clipping changes */
- 
-+typedef struct _XvV4LCtrlRec {
-+    struct v4l2_queryctrl       qctrl;
-+    Atom                        xv;
-+} XvV4LCtrlRec, *XvV4LCtrlPtr;
-+
- typedef struct _PortPrivRec {
-     ScrnInfoPtr                 pScrn;
--    FBAreaPtr			pFBArea[2];
--    int				VideoOn;
--    Bool			StreamOn;
-+    FBAreaPtr                   pFBArea[2];
-+    int                         VideoOn;
-+    Bool                        StreamOn;
- 
-     /* file handle */
--    int 			nr;
--    struct video_capability     cap;
-+    int                         nr;
-+    struct v4l2_capability      cap;
- 
-     /* RGB overlay */
--    struct video_buffer		rgb_fbuf;
--    struct video_window		rgb_win;
--    int                         rgbpalette;
-+    struct v4l2_framebuffer     rgb_fbuf;
-+    struct v4l2_window          rgb_win;
-     int                         rgbdepth;
- 
-     /* attributes */
--    struct video_picture	pict;
--    struct video_audio          audio;
-+    CARD32                      pixelformat;
- 
-     XF86VideoEncodingPtr        enc;
-     int                         *input;
-@@ -145,24 +158,21 @@ typedef struct _PortPrivRec {
- 
-     int                         yuv_width,yuv_height;
-     XF86SurfacePtr              surface;
--    struct video_buffer		yuv_fbuf;
--    struct video_window		yuv_win;
--} PortPrivRec, *PortPrivPtr;
-+    struct v4l2_framebuffer     yuv_fbuf;
-+    struct v4l2_window          yuv_win;
-+
-+    struct v4l2_standard        *standard; /* FIXME: can be removed */
- 
--#define XV_ENCODING	"XV_ENCODING"
--#define XV_BRIGHTNESS  	"XV_BRIGHTNESS"
--#define XV_CONTRAST 	"XV_CONTRAST"
--#define XV_SATURATION  	"XV_SATURATION"
--#define XV_HUE		"XV_HUE"
-+    XvV4LCtrlPtr                XvV4LCtrl;
-+    int                         n_qctrl;
-+} PortPrivRec, *PortPrivPtr;
- 
--#define XV_FREQ		"XV_FREQ"
--#define XV_MUTE		"XV_MUTE"
--#define XV_VOLUME      	"XV_VOLUME"
-+#define XV_ENCODING "XV_ENCODING"
-+#define XV_FREQ     "XV_FREQ"
- 
--#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
-+#define MAKE_ATOM(a) MakeAtom(a, strlen(a), TRUE)
- 
--static Atom xvEncoding, xvBrightness, xvContrast, xvSaturation, xvHue;
--static Atom xvFreq, xvMute, xvVolume;
-+static Atom xvEncoding, xvFreq;
- 
- static XF86VideoFormatRec
- InputVideoFormats[] = {
-@@ -176,16 +186,8 @@ InputVideoFormats[] = {
- 
- static const XF86AttributeRec Attributes[] = {
-     {XvSettable | XvGettable, -1000,    1000, XV_ENCODING},
--    {XvSettable | XvGettable, -1000,    1000, XV_BRIGHTNESS},
--    {XvSettable | XvGettable, -1000,    1000, XV_CONTRAST},
--    {XvSettable | XvGettable, -1000,    1000, XV_SATURATION},
--    {XvSettable | XvGettable, -1000,    1000, XV_HUE},
- };
--static const XF86AttributeRec VolumeAttr = 
--    {XvSettable | XvGettable, -1000,    1000, XV_VOLUME};
--static const XF86AttributeRec MuteAttr = 
--    {XvSettable | XvGettable,     0,       1, XV_MUTE};
--static const XF86AttributeRec FreqAttr = 
-+static const XF86AttributeRec FreqAttr =
-     {XvSettable | XvGettable,     0, 16*1000, XV_FREQ};
- 
- 
-@@ -206,59 +208,247 @@ static struct V4L_DEVICE {
- };
- 
- /* ---------------------------------------------------------------------- */
--/* forward decl */
- 
--static void V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
--		 short vid_w, short vid_h, short drw_w, short drw_h,
--		 unsigned int *p_w, unsigned int *p_h, pointer data);
-+static int SetV4LFmt(int fd, CARD32 pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+    char *p = (char *)&pixelformat;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+    if (fbuf.fmt.pixelformat != pixelformat) {
-+        fbuf.fmt.pixelformat = pixelformat;
-+        if (ioctl(fd, VIDIOC_S_FBUF, &fbuf) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't set FBUF to %c%c%c%c\n",
-+                    errno, p[0], p[1], p[2], p[3]);
-+            return errno;
-+        }
-+    }
-+    DEBUG(xf86Msg(X_INFO, "v4l: Set overlay format to %c%c%c%c\n",
-+                  p[0], p[1], p[2], p[3]));
-+    return 0;
-+}
-+static int GetV4LFmt(int fd, CARD32 *pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+
-+    *pixelformat = fbuf.fmt.pixelformat;
-+
-+    return 0;
-+}
-+
-+#define ATTR_NAME_PREFIX "XV_"
-+static int AddControl(PortPrivPtr p, XF86AttributeRec **list, int *count,
-+                      struct v4l2_queryctrl *qctrl, int *n)
-+{
-+    char *ptr;
-+
-+/* v4l_add_attr */
-+    if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)
-+        return 0;
-+    switch (qctrl->type) {
-+    case V4L2_CTRL_TYPE_INTEGER:
-+    case V4L2_CTRL_TYPE_BOOLEAN:
-+    case V4L2_CTRL_TYPE_MENU:
-+    case V4L2_CTRL_TYPE_BUTTON:
-+        break;
-+    default:
-+        return 0;
-+    }
-+
-+    p->XvV4LCtrl = realloc(p->XvV4LCtrl, sizeof(XvV4LCtrlRec) * (*n + 1));
-+    if (!p->XvV4LCtrl) {
-+        if (*list) {
-+            free (*list);
-+            *count = 0;
-+            *n = 0;
-+        }
-+        return -1;
-+    }
-+
-+    *list = realloc(*list, sizeof(XF86AttributeRec) * (*count + 1));
-+    if (NULL == *list) {
-+        if (p->XvV4LCtrl)
-+            free (p->XvV4LCtrl);
-+        *count = 0;
-+        return -1;
-+    }
-+
-+    memset(*list + *count, 0, sizeof(XF86AttributeRec));
-+    (*list)[*count].flags = XvSettable | XvGettable;
-+
-+    if (qctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
-+        (*list)[*count].flags &= ~XvSettable;
-+    if (qctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY)
-+        (*list)[*count].flags &= ~XvGettable;
-+    (*list)[*count].min_value = qctrl->minimum;
-+    (*list)[*count].max_value = qctrl->maximum;
-+    (*list)[*count].name = malloc(strlen((char *)qctrl->name) + 1 + sizeof (ATTR_NAME_PREFIX));
-+    strcpy((*list)[*count].name, ATTR_NAME_PREFIX);
-+    strcat((*list)[*count].name, (char *)qctrl->name);
-+    for (ptr = (*list)[*count].name; *ptr; ptr++) {
-+        *ptr = toupper(*ptr);
-+        if (*ptr == ' ')
-+            *ptr = '_';
-+    }
-+
-+    p->XvV4LCtrl[*n].xv = MAKE_ATOM((*list)[*count].name);
-+    memcpy(&p->XvV4LCtrl[*n].qctrl, qctrl, sizeof(*qctrl));
-+
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            (*list)[*count].name, (int)p->XvV4LCtrl[*n].xv,
-+            p->XvV4LCtrl[*n].qctrl.minimum,
-+            p->XvV4LCtrl[*n].qctrl.maximum);
-+
-+    (*count)++;
-+    (*n)++;
-+
-+    return 0;
-+}
-+
-+static void AddAllV4LControls(PortPrivPtr p, XF86AttributeRec **list,
-+                              int *count, int fd)
-+{
-+    int entries = 0;
-+    CARD32 id;
-+    struct v4l2_queryctrl qctrl;
-+
-+    memset(&qctrl, 0, sizeof(qctrl));
-+    qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
-+    }
-+    if (qctrl.id != V4L2_CTRL_FLAG_NEXT_CTRL)
-+        return;
-+    for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) {
-+        qctrl.id = id;
-+        if (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+            if (AddControl(p, list, count, &qctrl, &entries))
-+                return;
-+        }
-+    }
-+    qctrl.id = V4L2_CID_PRIVATE_BASE;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id++;
-+    }
-+    p->n_qctrl = entries;
-+}
- 
- /* ---------------------------------------------------------------------- */
- 
-+/* setup yuv overlay + hw scaling: look if we find some common video
-+   format which both v4l driver and the X-Server can handle */
-+static int v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
-+                          char *dev, int fd)
-+{
-+    static const struct {
-+        CARD32        v4l_palette;
-+        unsigned int  xv_id;
-+        unsigned int  xv_format;
-+    } yuvlist[] = {
-+        { V4L2_PIX_FMT_YUYV, FOURCC_YUY2, XvPacked },
-+        { V4L2_PIX_FMT_UYVY, FOURCC_UYVY, XvPacked },
-+        { 0 /* end of list */ },
-+    };
-+    /* FIXME: Why pScrn->scrnIndex? */
-+    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+    int fmt,i;
-+
-+    pPPriv->format = xf86XVQueryOffscreenImages(pScreen, &pPPriv->nformat);
-+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                   "v4l: Number of Xv formats: %d\n", pPPriv->nformat);
-+    if (!pPPriv->nformat)
-+        return FALSE;
-+
-+    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
-+        pPPriv->pixelformat = yuvlist[fmt].v4l_palette;
-+        if (-1 == SetV4LFmt(fd, pPPriv->pixelformat))
-+            continue;
-+        GetV4LFmt(fd, &pPPriv->pixelformat);
-+        if (pPPriv->pixelformat != yuvlist[fmt].v4l_palette)
-+            continue;
-+        /* ... works, check available offscreen image formats now ... */
-+        for (i = 0; i < pPPriv->nformat; i++) {
-+            if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id &&
-+                pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
-+                /* ... match found, good. */
-+                pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
-+                pPPriv->myfmt = pPPriv->format+i;
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+                           "v4l[%s]: using hw video scaling [%4.4s].\n",
-+                           dev,(char*)&(pPPriv->format[i].image->id));
-+                return TRUE;
-+            }
-+        }
-+    }
-+    return TRUE;
-+}
-+
- static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     static int first = 1;
- 
-+#if 0
-+    /*
-+     * It may be a good idea to probe here, but this would break
-+     * some things, as initialization uses yuv_format
-+     */
-+    if (!pPPriv->yuv_format && first)
-+        v4l_check_yuv(pScrn, pPPriv, V4L_NAME, V4L_FD);
-+#endif
-     if (-1 == V4L_FD) {
--	V4L_FD = open(V4L_NAME, O_RDWR, 0);
--
--	pPPriv->rgb_fbuf.width        = pScrn->virtualX;
--	pPPriv->rgb_fbuf.height       = pScrn->virtualY;
--	pPPriv->rgb_fbuf.depth        = pScrn->bitsPerPixel;
--	pPPriv->rgb_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
--	pPPriv->rgb_fbuf.base         = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
--	if (first) {
--	    first = 0;
--	    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
--	}
--
--	switch (pScrn->bitsPerPixel) {
--	case 16:
--	    if (pScrn->weight.green == 5) {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB555;
--		pPPriv->rgbdepth   = 16;
--	    } else {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB565;
--		pPPriv->rgbdepth   = 16;
--	    }
--	    break;
--	case 24:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB24;
--	    pPPriv->rgbdepth   = 24;
--	    break;
--	case 32:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB32;
--	    pPPriv->rgbdepth   = 32;
--	    break;
--	}
-+        V4L_FD = open(V4L_NAME, O_RDWR, 0);
-+
-+        if (-1 == V4L_FD)
-+            return errno;
-+
-+        if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->rgb_fbuf)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+            return errno;
-+        }
-+        pPPriv->rgb_fbuf.fmt.width        = pScrn->virtualX;
-+        pPPriv->rgb_fbuf.fmt.height       = pScrn->virtualY;
-+        pPPriv->rgb_fbuf.fmt.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
-+        pPPriv->rgb_fbuf.base             = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
-+        if (first) {
-+            xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                           "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
-+            first = 0;
-+        }
-+
-+        switch (pScrn->bitsPerPixel) {
-+        case 16:
-+            if (pScrn->weight.green == 5) {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB555;
-+            } else {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB565;
-+            }
-+            break;
-+        case 24:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR24;
-+            break;
-+        case 32:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR32;
-+            break;
-+        }
-     }
- 
--    if (-1 == V4L_FD)
--	return errno;
--    
-     V4L_REF++;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/open: refcount=%d\n",V4L_REF));
-+                         "Xv/open: refcount=%d\n",V4L_REF));
- 
-     return 0;
- }
-@@ -267,10 +457,10 @@ static void V4lCloseDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     V4L_REF--;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/close: refcount=%d\n",V4L_REF));
-+                         "Xv/close: refcount=%d\n",V4L_REF));
-     if (0 == V4L_REF && -1 != V4L_FD) {
--	close(V4L_FD);
--	V4L_FD = -1;
-+        close(V4L_FD);
-+        V4L_FD = -1;
-     }
- }
- 
-@@ -280,8 +470,10 @@ V4lPutVideo(ScrnInfoPtr pScrn,
-     short vid_w, short vid_h, short drw_w, short drw_h,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
-+    struct v4l2_format fmt;
-+
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    struct video_clip *clip;
-+    struct v4l2_clip *clip;
-     BoxPtr pBox;
-     RegionRec newReg;
-     BoxRec    newBox;
-@@ -291,179 +483,214 @@ V4lPutVideo(ScrnInfoPtr pScrn,
- 
-     /* Open a file handle to the device */
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	if (V4lOpenDevice(pPPriv, pScrn))
--	    return Success;
-+        if (V4lOpenDevice(pPPriv, pScrn))
-+            return Success;
-     }
- 
-     if (0 != pPPriv->yuv_format) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
--	width  = pPPriv->enc[pPPriv->cenc].width;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
-+        width  = pPPriv->enc[pPPriv->cenc].width;
-         height = pPPriv->enc[pPPriv->cenc].height/2; /* no interlace */
--	if (drw_w < width)
--	    width = drw_w;
--	if (drw_h < height)
--	    height = drw_h;
--	if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
--	    /* new size -- free old surface */
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
--	    if (pPPriv->surface) {
--		pPPriv->VideoOn = VIDEO_OFF;
--		pPPriv->myfmt->stop(pPPriv->surface);
--		pPPriv->myfmt->free_surface(pPPriv->surface);
--		xfree(pPPriv->surface);
--		pPPriv->surface    = NULL;
--	    }
--	    pPPriv->yuv_width  = width;
--	    pPPriv->yuv_height = height;
--	}
--	if (!pPPriv->surface) {
--	    /* allocate + setup offscreen surface */
--	    if (NULL == (pPPriv->surface = xalloc(sizeof(XF86SurfaceRec))))
--		return FALSE;
--	    if (Success != pPPriv->myfmt->alloc_surface
--		(pScrn,pPPriv->myfmt->image->id,
--		 pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
--		xfree(pPPriv->surface);
--		pPPriv->surface = NULL;
--		goto fallback_to_rgb;
--	    }
--	    pPPriv->yuv_fbuf.width        = pPPriv->surface->width;
--	    pPPriv->yuv_fbuf.height       = pPPriv->surface->height;
--	    pPPriv->yuv_fbuf.depth        = 16;
--	    pPPriv->yuv_fbuf.bytesperline = pPPriv->surface->pitches[0];
--	    pPPriv->yuv_fbuf.base         =
--		(pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface: %p+%d = %p, %dx%d, pitch %d\n",
--				 pScrn->memPhysBase,pPPriv->surface->offsets[0],
--				 pScrn->memPhysBase+pPPriv->surface->offsets[0],
--				 pPPriv->surface->width,pPPriv->surface->height,
--				 pPPriv->surface->pitches[0]));
--	    pPPriv->yuv_win.width         = pPPriv->surface->width;
--	    pPPriv->yuv_win.height        = pPPriv->surface->height;
--	}
--
--	/* program driver */
--	if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->yuv_fbuf)))
--	    perror("ioctl VIDIOCSFBUF");
--	if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCGPICT");
--	pPPriv->pict.palette = pPPriv->yuv_format;
--	pPPriv->pict.depth   = 16;
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--	if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->yuv_win)))
--	    perror("ioctl VIDIOCSWIN");
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	    perror("ioctl VIDIOCCAPTURE(1)");
--
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    /* invert cliplist */
--	    newBox.x1 = drw_x;
--	    newBox.y1 = drw_y;
--	    newBox.x2 = drw_x + drw_w;
--	    newBox.y2 = drw_y + drw_h;
--
--	    if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
--		/* trim to the viewport */
--		if(newBox.x1 < pScrn->frameX0)
--		    newBox.x1 = pScrn->frameX0;
--		if(newBox.x2 > pScrn->frameX1)
--		    newBox.x2 = pScrn->frameX1;
--		
--		if(newBox.y1 < pScrn->frameY0)
--		    newBox.y1 = pScrn->frameY0;
--		if(newBox.y2 > pScrn->frameY1)
--		    newBox.y2 = pScrn->frameY1;
--	    }
-+        if (drw_w < width)
-+            width = drw_w;
-+        if (drw_h < height)
-+            height = drw_h;
-+        if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
-+            /* new size -- free old surface */
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
-+            if (pPPriv->surface) {
-+                pPPriv->VideoOn = VIDEO_OFF;
-+                pPPriv->myfmt->stop(pPPriv->surface);
-+                pPPriv->myfmt->free_surface(pPPriv->surface);
-+                free(pPPriv->surface);
-+                pPPriv->surface    = NULL;
-+            }
-+            pPPriv->yuv_width  = width;
-+            pPPriv->yuv_height = height;
-+        }
-+        if (!pPPriv->surface) {
-+            /* allocate + setup offscreen surface */
-+            if (NULL == (pPPriv->surface = malloc(sizeof(XF86SurfaceRec))))
-+                return FALSE;
-+            if (Success != pPPriv->myfmt->alloc_surface
-+                (pScrn,pPPriv->myfmt->image->id,
-+                pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
-+                free(pPPriv->surface);
-+                pPPriv->surface = NULL;
-+                goto fallback_to_rgb;
-+            }
-+
-+            if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->yuv_fbuf)) {
-+                xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return errno;
-+            }
-+            pPPriv->yuv_fbuf.fmt.width        = pPPriv->surface->width;
-+            pPPriv->yuv_fbuf.fmt.height       = pPPriv->surface->height;
-+            pPPriv->yuv_fbuf.fmt.bytesperline = pPPriv->surface->pitches[0];
-+            pPPriv->yuv_fbuf.fmt.pixelformat = pPPriv->yuv_format;
-+            pPPriv->yuv_fbuf.base         =
-+                (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                                 "  surface: %p+%d = %p, %dx%d, pitch %d\n",
-+                                (void *)pScrn->memPhysBase, pPPriv->surface->offsets[0],
-+                                (void *)pScrn->memPhysBase+pPPriv->surface->offsets[0],
-+                                pPPriv->surface->width, pPPriv->surface->height,
-+                                pPPriv->surface->pitches[0]));
-+            memset(&pPPriv->yuv_win, 0, sizeof(pPPriv->yuv_win));
-+            pPPriv->yuv_win.w.left    = 0;
-+            pPPriv->yuv_win.w.top     = 0;
-+            pPPriv->yuv_win.w.width  = pPPriv->surface->width;
-+            pPPriv->yuv_win.w.height = pPPriv->surface->height;
-+        }
- 
--	    REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
--	    REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
--	    clipBoxes = &newReg;
--	}
--	
--	/* start overlay */
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			     "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
--			     drw_x, drw_y,
--			     drw_x+drw_w, drw_y+drw_h,
--			     drw_w, drw_h,
--			     pPPriv->surface->width,pPPriv->surface->height));
--	pPPriv->myfmt->display(pPPriv->surface,
--			       0, 0, drw_x, drw_y,
--			       pPPriv->surface->width,
--			       pPPriv->surface->height,
--			       drw_w, drw_h,
--			       clipBoxes);
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    REGION_UNINIT(pScrn->pScreen, &newReg); 
--	}
--	pPPriv->VideoOn = VIDEO_YUV;
--	return Success;
-+        /* program driver */
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->yuv_fbuf)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+            return BadValue;
-+        }
-+        pPPriv->pixelformat = pPPriv->yuv_format;
-+        if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat))
-+            return BadValue;
-+
-+        memset(&fmt, 0, sizeof(fmt));
-+        fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+        memcpy(&fmt.fmt.win, &pPPriv->yuv_win, sizeof(pPPriv->yuv_win));
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+            return BadValue;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+            return BadValue;
-+        }
-+
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            /* invert cliplist */
-+            newBox.x1 = drw_x;
-+            newBox.y1 = drw_y;
-+            newBox.x2 = drw_x + drw_w;
-+            newBox.y2 = drw_y + drw_h;
-+
-+            if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
-+                /* trim to the viewport */
-+                if(newBox.x1 < pScrn->frameX0)
-+                    newBox.x1 = pScrn->frameX0;
-+                if(newBox.x2 > pScrn->frameX1)
-+                    newBox.x2 = pScrn->frameX1;
-+
-+                if(newBox.y1 < pScrn->frameY0)
-+                    newBox.y1 = pScrn->frameY0;
-+                if(newBox.y2 > pScrn->frameY1)
-+                    newBox.y2 = pScrn->frameY1;
-+            }
-+
-+            REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
-+            REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
-+            clipBoxes = &newReg;
-+        }
-+
-+        /* start overlay */
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                             "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
-+                             drw_x, drw_y,
-+                             drw_x+drw_w, drw_y+drw_h,
-+                             drw_w, drw_h,
-+                             pPPriv->surface->width,pPPriv->surface->height));
-+        pPPriv->myfmt->display(pPPriv->surface,
-+                               0, 0, drw_x, drw_y,
-+                               pPPriv->surface->width,
-+                               pPPriv->surface->height,
-+                               drw_w, drw_h,
-+                               clipBoxes);
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            REGION_UNINIT(pScrn->pScreen, &newReg);
-+        }
-+        pPPriv->VideoOn = VIDEO_YUV;
-+        return Success;
-     }
- 
-- fallback_to_rgb:
-+fallback_to_rgb:
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV rgb\n"));
-     /* FIXME: vid-* is ignored for now, not supported by v4l */
- 
-     dw = (drw_w < pPPriv->enc[pPPriv->cenc].width) ?
--	drw_w : pPPriv->enc[pPPriv->cenc].width;
-+        drw_w : pPPriv->enc[pPPriv->cenc].width;
-     dh = (drw_h < pPPriv->enc[pPPriv->cenc].height) ?
--	drw_h : pPPriv->enc[pPPriv->cenc].height;
-+        drw_h : pPPriv->enc[pPPriv->cenc].height;
-     /* if the window is too big, center the video */
-     dx = drw_x + (drw_w - dw)/2;
-     dy = drw_y + (drw_h - dh)/2;
-     /* bttv prefeares aligned addresses */
-     dx &= ~3;
--    if (dx < drw_x) dx += 4;
--    if (dx+dw > drw_x+drw_w) dw -= 4;
-+    if (dx < drw_x)
-+        dx += 4;
-+    if (dx+dw > drw_x+drw_w)
-+        dw -= 4;
- 
-     /* window */
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  win: %dx%d+%d+%d\n",
--		drw_w,drw_h,drw_x,drw_y));
-+                         drw_w,drw_h,drw_x,drw_y));
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  use: %dx%d+%d+%d\n",
--		dw,dh,dx,dy));
--    pPPriv->rgb_win.x      = dx;
--    pPPriv->rgb_win.y      = dy;
--    pPPriv->rgb_win.width  = dw;
--    pPPriv->rgb_win.height = dh;
--    pPPriv->rgb_win.flags  = 0;
-- 
-+                         dw,dh,dx,dy));
-+    memset(&pPPriv->rgb_win, 0, sizeof(pPPriv->rgb_win));
-+    pPPriv->rgb_win.w.left   = dx;
-+    pPPriv->rgb_win.w.top    = dy;
-+    pPPriv->rgb_win.w.width  = dw;
-+    pPPriv->rgb_win.w.height = dh;
-+
-     /* clipping */
-     if (pPPriv->rgb_win.clips) {
--	xfree(pPPriv->rgb_win.clips);
--	pPPriv->rgb_win.clips = NULL;
-+        free(pPPriv->rgb_win.clips);
-+        pPPriv->rgb_win.clips = NULL;
-     }
-     pPPriv->rgb_win.clipcount = REGION_NUM_RECTS(clipBoxes);
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,"  clip: have #%d\n",
--		pPPriv->rgb_win.clipcount));
-+                         pPPriv->rgb_win.clipcount));
-     if (0 != pPPriv->rgb_win.clipcount) {
--	pPPriv->rgb_win.clips = xalloc(pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	if (NULL != pPPriv->rgb_win.clips) {
--	    memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	    pBox = REGION_RECTS(clipBoxes);
--	    clip = pPPriv->rgb_win.clips;
--	    for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
--		clip->x	 = pBox->x1 - dx;
--		clip->y      = pBox->y1 - dy;
--		clip->width  = pBox->x2 - pBox->x1;
--		clip->height = pBox->y2 - pBox->y1;
--	    }
--	}
-+        pPPriv->rgb_win.clips = malloc(pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+        if (NULL != pPPriv->rgb_win.clips) {
-+            memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+            pBox = REGION_RECTS(clipBoxes);
-+            clip = pPPriv->rgb_win.clips;
-+
-+            /*
-+             * FIXME: This code currently does nothing, as we don't emulate
-+             * The V4L1 clipping stuff
-+             */
-+            for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
-+                clip->c.left   = pBox->x1 - dx;
-+                clip->c.top    = pBox->y1 - dy;
-+                clip->c.width  = pBox->x2 - pBox->x1;
-+                clip->c.height = pBox->y2 - pBox->y1;
-+            }
-+        }
-     }
- 
-     /* start */
--    if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->rgb_fbuf)))
--	perror("ioctl VIDIOCSFBUF");
--    if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCGPICT");
--    pPPriv->pict.palette = pPPriv->rgbpalette;
--    pPPriv->pict.depth   = pPPriv->rgbdepth;
--    if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCSPICT");
--    if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->rgb_win)))
--	perror("ioctl VIDIOCSWIN");
--    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	perror("ioctl VIDIOCCAPTURE(1)");
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->rgb_fbuf)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == GetV4LFmt(V4L_FD, &pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    pPPriv->pixelformat = pPPriv->rgb_fbuf.fmt.pixelformat;
-+    if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    memset(&fmt, 0, sizeof(fmt));
-+    fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+    memcpy(&fmt.fmt.win, &pPPriv->rgb_win, sizeof(pPPriv->rgb_win));
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+        xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+        return BadValue;
-+    }
-     pPPriv->VideoOn = VIDEO_RGB;
- 
-     return Success;
-@@ -476,7 +703,7 @@ V4lPutStill(ScrnInfoPtr pScrn,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
- #if 0
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
- #endif
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PS\n"));
-@@ -488,177 +715,152 @@ V4lPutStill(ScrnInfoPtr pScrn,
- static void
- V4lStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-     int zero=0;
- 
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--	      "Xv/StopVideo called with video already off\n"));
--	return;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+              "Xv/StopVideo called with video already off\n"));
-+        return;
-     }
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo shutdown=%d\n",shutdown));
- 
-     if (!shutdown) {
--	/* just reclipping, we have to stop DMA transfers to the visible screen */
--	if (VIDEO_RGB == pPPriv->VideoOn) {
--	    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--		perror("ioctl VIDIOCCAPTURE(0)");
--	    pPPriv->VideoOn = VIDEO_RECLIP;
--	}
-+        /* just reclipping, we have to stop DMA transfers to the visible screen */
-+        if (VIDEO_RGB == pPPriv->VideoOn) {
-+            if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+                xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
-+            pPPriv->VideoOn = VIDEO_RECLIP;
-+        }
-     } else {
--	/* video stop - turn off and free everything */
--	if (VIDEO_YUV == pPPriv->VideoOn) {
--	    pPPriv->myfmt->stop(pPPriv->surface);
--	    pPPriv->myfmt->free_surface(pPPriv->surface);
--	    xfree(pPPriv->surface);
--	    pPPriv->surface = NULL;
--	}
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--	    perror("ioctl VIDIOCCAPTURE(0)");
--	
--	V4lCloseDevice(pPPriv,pScrn);
--	pPPriv->VideoOn = VIDEO_OFF;
--    }
--}
-+        /* video stop - turn off and free everything */
-+        if (VIDEO_YUV == pPPriv->VideoOn) {
-+            pPPriv->myfmt->stop(pPPriv->surface);
-+            pPPriv->myfmt->free_surface(pPPriv->surface);
-+            free(pPPriv->surface);
-+            pPPriv->surface = NULL;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+            xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
- 
--/* v4l uses range 0 - 65535; Xv uses -1000 - 1000 */
--static int
--v4l_to_xv(int val) {
--    val = val * 2000 / 65536 - 1000;
--    if (val < -1000) val = -1000;
--    if (val >  1000) val =  1000;
--    return val;
--}
--static int
--xv_to_v4l(int val) {
--    val = val * 65536 / 2000 + 32768;
--    if (val <    -0) val =     0;
--    if (val > 65535) val = 65535;
--    return val;
-+        V4lCloseDevice(pPPriv,pScrn);
-+        pPPriv->VideoOn = VIDEO_OFF;
-+    }
- }
- 
- static int
- V4lSetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 value, pointer data)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data; 
--    struct video_channel chan;
--    int ret = Success;
-+    struct v4l2_control ctrl;
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n",
--			 attribute, value));
-+                        (int)attribute, (int)value));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	if (value >= 0 && value < pPPriv->nenc) {
--	    pPPriv->cenc = value;
--	    chan.channel = pPPriv->input[value];
--	    chan.norm    = pPPriv->norm[value];
--	    if (-1 == ioctl(V4L_FD,VIDIOCSCHAN,&chan))
--		perror("ioctl VIDIOCSCHAN");
--	} else {
--	    ret = BadValue;
--	}
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) pPPriv->pict.brightness = xv_to_v4l(value);
--	if (attribute == xvContrast)   pPPriv->pict.contrast   = xv_to_v4l(value);
--	if (attribute == xvSaturation) pPPriv->pict.colour     = xv_to_v4l(value);
--	if (attribute == xvHue)        pPPriv->pict.hue        = xv_to_v4l(value);
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    if (value)
--		pPPriv->audio.flags |= VIDEO_AUDIO_MUTE;
--	    else
--		pPPriv->audio.flags &= ~VIDEO_AUDIO_MUTE;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		pPPriv->audio.volume = xv_to_v4l(value);
--	} else {
--	    ret = BadValue;
--	}
--	if (ret != BadValue)
--	    if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
--		perror("ioctl VIDIOCSAUDIO");
-+        if (value < 0 || value >= pPPriv->nenc)
-+            goto err;
-+        if (ioctl(V4L_FD, VIDIOC_S_INPUT, &pPPriv->input[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting input\n", errno);
-+            goto err;
-+        }
-+        if (ioctl(V4L_FD, VIDIOC_S_STD, &pPPriv->norm[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting standard\n", errno);
-+            goto err;
-+        }
-+        pPPriv->cenc = value;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq = value;
--	if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
--	    perror("ioctl VIDIOCSFREQ");
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->setAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq);
-+        freq.frequency = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_FREQUENCY, &freq) == -1)
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting frequency\n", errno);
-+        else
-+            ret = Success;
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format && pPPriv->myfmt->setAttribute)
-+                ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        ctrl.value = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_CTRL, &ctrl) != 1)
-+            ret = Success;
-     }
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
- 
- static int
--V4lGetPortAttribute(ScrnInfoPtr pScrn, 
-+V4lGetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 *value, pointer data)
- {
-+    struct v4l2_control ctrl;
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    int ret = Success;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d\n",
--			 attribute));
-+                        (int)attribute));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	*value = pPPriv->cenc;
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) *value = v4l_to_xv(pPPriv->pict.brightness);
--	if (attribute == xvContrast)   *value = v4l_to_xv(pPPriv->pict.contrast);
--	if (attribute == xvSaturation) *value = v4l_to_xv(pPPriv->pict.colour);
--	if (attribute == xvHue)        *value = v4l_to_xv(pPPriv->pict.hue);
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    *value = (pPPriv->audio.flags & VIDEO_AUDIO_MUTE) ? 1 : 0;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		*value = v4l_to_xv(pPPriv->audio.volume);
--	} else {
--	    ret = BadValue;
--	}
-+        *value = pPPriv->cenc;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq;
--	ioctl(V4L_FD,VIDIOCGFREQ,&freq);
--	*value = freq;
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->getAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        if (ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq) != -1) {
-+            *value = freq.frequency;
-+            ret = Success;
-+        }
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format &&  pPPriv->myfmt->getAttribute)
-+                ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        if (ioctl(V4L_FD, VIDIOC_G_CTRL, &ctrl) != -1) {
-+            *value = ctrl.value;
-+            ret = Success;
-+        }
-     }
--
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d, %d\n",
--	attribute, *value));
-+        (int)attribute, (int)*value));
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
-@@ -673,15 +875,15 @@ V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
-     int maxy = pPPriv->enc[pPPriv->cenc].height;
- 
-     if (0 != pPPriv->yuv_format) {
--	*p_w = pPPriv->myfmt->max_width;
--	*p_h = pPPriv->myfmt->max_height;
-+        *p_w = pPPriv->myfmt->max_width;
-+        *p_h = pPPriv->myfmt->max_height;
-     } else {
--	*p_w = (drw_w < maxx) ? drw_w : maxx;
--	*p_h = (drw_h < maxy) ? drw_h : maxy;
-+        *p_w = (drw_w < maxx) ? drw_w : maxx;
-+        *p_h = (drw_h < maxy) ? drw_h : maxy;
-     }
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/BS %d %dx%d %dx%d\n",
--			 pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
-+                         pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
- }
- 
- static const OptionInfoRec *
-@@ -693,132 +895,198 @@ V4LAvailableOptions(int chipid, int busid)
- static void
- V4LIdentify(int flags)
- {
--    xf86Msg(X_INFO, "v4l driver for Video4Linux\n");
--}        
-+    xf86Msg(X_INFO, "v4l driver for Video4Linux overlay mode (V4L2)\n");
-+}
- 
- static char*
- fixname(char *str)
- {
-     int s,d;
-     for (s=0, d=0;; s++) {
--	if (str[s] == '-')
--	    continue;
--	str[d++] = tolower(str[s]);
--	if (0 == str[s])
--	    break;
-+        if (str[s] == '-')
-+            continue;
-+        str[d++] = tolower(str[s]);
-+        if (0 == str[s])
-+            break;
-     }
-     return str;
- }
- 
- static int
--v4l_add_enc(XF86VideoEncodingPtr enc, int i,
--	    char *norm, char *input, int width, int height, int n, int d)
-+AddV4LEnc(XF86VideoEncodingPtr enc, int entry,
-+            char *norm, char *input, int width, int height, int n, int d)
- {
--    enc[i].id     = i;
--    enc[i].name   = xalloc(strlen(norm)+strlen(input)+2);
--    if (NULL == enc[i].name)
--	return -1;
--    enc[i].width  = width;
--    enc[i].height = height;
--    enc[i].rate.numerator   = n;
--    enc[i].rate.denominator = d;
--    sprintf(enc[i].name,"%s-%s",norm,fixname(input));
-+    enc->id     = entry;
-+    enc->name   = malloc(strlen(norm) + strlen(input) + 2);
-+    if (!enc->name)
-+        return -1;
-+
-+    enc->width  = width;
-+    enc->height = height;
-+    enc->rate.numerator   = n;
-+    enc->rate.denominator = d * 2; /* Refresh rate is twice, due to interlace */
-+    sprintf(enc->name,"%s-%s",norm,fixname(input));
-+
-+    xf86Msg(X_INFO, "v4l: adding input %s, %dx%d %d fps\n",
-+            enc->name, enc->width, enc->height, (d + n - 1)/n);
-+
-     return 0;
- }
- 
-+static int
-+V4LGetStd(PortPrivPtr p, int fd)
-+{
-+    struct v4l2_standard standard;
-+    int entries = 0;
-+
-+    /*
-+     * 128 is just an arbitrary large number. There aren't that many video stds
-+     * The max value is there just to avoid an endless loop, if the driver is
-+     * broken.
-+     */
-+    for (entries = 0; entries < 128; entries++) {
-+        memset(&standard, 0, sizeof(standard));
-+        standard.index = entries;
-+        if (-1 == ioctl(fd,VIDIOC_ENUMSTD, &standard))
-+            break;
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        memcpy(&p->standard[entries], &standard, sizeof(standard));
-+    }
-+
-+    /*
-+     * Some webcam drivers don't implement VIDIOC_ENUMSTD. Fake it
-+     * This is currently unused, as no webcam driver allows OVERLAY mode,
-+     * but the code is here, in the case some webcam driver starts allowing
-+     * overlay.
-+     * FIXME: Webcam drivers may use VIDIOC_ENUM_FRAMESIZES and
-+     * VIDIOC_ENUM_FRAMEINTERVALS ioctl's that may help to fine-tune
-+     * their needs. Those ioctl's could be used here in order to better
-+     * support webcams.
-+     */
-+    if (!entries) {
-+        xf86Msg(X_INFO, "v4l: VIDIOC_ENUMSTD error %d.\n",errno);
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        p->standard[0].id = V4L2_STD_ALL;
-+        strcpy((char *)p->standard[0].name, "CAMERA");
-+        p->standard[0].frameperiod.numerator = 1001;
-+        p->standard[0].frameperiod.denominator = 300001;
-+        p->standard[0].framelines = 480;
-+        entries++;
-+    }
-+    return entries;
-+}
-+
- static void
--V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
-+V4LBuildEncodings(PortPrivPtr p, int fd)
- {
--    static struct video_channel     channel;
--    int i,entries,have_bttv,bttv_ver;
--
--#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
--    have_bttv = 0;
--    if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
--	have_bttv = 1;
--	
--    entries = (have_bttv ? 7 : 3) * channels;
--    p->enc = xalloc(sizeof(XF86VideoEncodingRec) * entries);
--    if (NULL == p->enc)
--	goto fail;
--    memset(p->enc,0,sizeof(XF86VideoEncodingRec) * entries);
--    p->norm = xalloc(sizeof(int) * entries);
--    if (NULL == p->norm)
--	goto fail;
--    memset(p->norm,0,sizeof(int) * entries);
--    p->input = xalloc(sizeof(int) * entries);
--    if (NULL == p->input)
--	goto fail;
--    memset(p->input,0,sizeof(int) * entries);
-+    unsigned int inp, std, num_std;
-+
-+    num_std =  V4LGetStd(p, fd);
- 
-     p->nenc = 0;
--    for (i = 0; i < channels; i++) {
--	channel.channel = i;
--	if (-1 == ioctl(fd,VIDIOCGCHAN,&channel)) {
--	    perror("ioctl VIDIOCGCHAN");
--	    continue;
--	}
--	
--	v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_PAL;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000);
--	p->norm[p->nenc]  = VIDEO_MODE_NTSC;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_SECAM;
--	p->input[p->nenc] = i;
--	p->nenc++;
--
--	if (have_bttv) {
--	    /* workaround for a v4l design flaw:  The v4l API knows just pal,
--	       ntsc and secam.  But there are a few more norms (pal versions
--	       with a different timings used in south america for example).
--	       The bttv driver can handle these too. */
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 3;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 4;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name,
--				 768,576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 5;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	    
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name,
--				 640,480, 1001,60000))
--		goto fail;
--	    p->norm[p->nenc]  = 6;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	}
-+
-+    /*
-+     * 256 is just an arbitrary large number. There aren't that many video
-+     * inputs on any driver. The max value is there just to avoid an endless
-+     * loop, if the driver is broken.
-+     */
-+    for (inp = 0; inp < 256; inp++) {
-+        struct v4l2_input       input;
-+
-+        memset(&input, 0, sizeof(input));
-+        input.index = inp;
-+        if (ioctl(fd, VIDIOC_ENUMINPUT, &input) == -1)
-+            break;
-+
-+        for (std = 0; std < num_std; std++) {
-+            int width, height;
-+
-+	    /*
-+	     * Currently, this code is not reliable, due to driver
-+	     * non-compliance on both saa7134 and bttv. So, instead,
-+	     * just use the video standard information
-+	     */
-+#if 0
-+	    struct v4l2_framebuffer fbuf;
-+
-+            /* Some webcam drivers will fail here, but that's OK */
-+            ioctl(fd, VIDIOC_S_STD, &p->standard[std].id);
-+
-+            memset(&fbuf, 0, sizeof(fbuf));
-+            if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+                xf86Msg(X_INFO, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return;
-+            }
-+            height = fbuf.fmt.height;
-+            width = fbuf.fmt.width;
-+
-+            /*
-+             * If the overlay method fails, get the resolution
-+             * via checking V4L2_BUF_TYPE_VIDEO_CAPTURE
-+             */
-+            if (!height || !width) {
-+                struct v4l2_format format;
-+
-+                format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                if (ioctl(fd, VIDIOC_G_FMT, &format) == -1) {
-+                    /* Hmm... device doesn't support capture. */
-+                    height = p->standard[std].framelines;
-+                    if (height == 480)
-+                        width = 640;
-+                    else if (height == 576)
-+                        width = 768;
-+                    else
-+                        continue;
-+                } else {
-+                    height = format.fmt.pix.height;
-+                    width = format.fmt.pix.width;
-+                }
-+            }
-+#else
-+	    if (p->standard[std].id & V4L2_STD_525_60) {
-+		height = 480;
-+		width = 640;
-+	    } else {
-+		height = 576;
-+		width = 768;
-+	    }
-+
-+#endif
-+            /* Fixup for some driver bug */
-+            if ((p->standard[std].id & V4L2_STD_525_60) && (height == 576))
-+                height = 480;
-+
-+            p->enc = realloc(p->enc, sizeof(XF86VideoEncodingRec) * (p->nenc + 1));
-+            p->norm = realloc(p->norm, sizeof(int) * (p->nenc + 1));
-+            p->input = realloc(p->input, sizeof(int) * (p->nenc + 1));
-+            if (!p->enc || !p->norm || !p->input)
-+                goto fail;
-+            if (AddV4LEnc(&p->enc[p->nenc], p->nenc,
-+                          (char *)p->standard[std].name,
-+                          (char *)input.name, width, height,
-+                          p->standard[std].frameperiod.numerator,
-+                          p->standard[std].frameperiod.denominator))
-+                goto fail;
-+            p->norm[p->nenc]  = p->standard[std].id;
-+            p->input[p->nenc] = inp;
-+            p->nenc++;
-+        }
-     }
-+
-+    if (!p->nenc)
-+        xf86Msg(X_ERROR, "v4l: couldn't detect any valid input/standard\n");
-     return;
--    
-- fail:
-+
-+fail:
-+    xf86Msg(X_ERROR, "v4l: Fail to get standards: %d\n", errno);
-     if (p->input)
--	xfree(p->input);
-+        free(p->input);
-     p->input = NULL;
-     if (p->norm)
--	xfree(p->norm);
-+        free(p->norm);
-     p->norm = NULL;
-     if (p->enc)
--	xfree(p->enc);
-+        free(p->enc);
-     p->enc = NULL;
-     p->nenc = 0;
- }
-@@ -826,73 +1094,33 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
- /* add a attribute a list */
- static void
- v4l_add_attr(XF86AttributeRec **list, int *count,
--	     const XF86AttributeRec *attr)
-+             const XF86AttributeRec *attr)
- {
-     XF86AttributeRec *oldlist = *list;
-     int i;
-+    Atom gpa;
- 
-     for (i = 0; i < *count; i++) {
--	if (0 == strcmp((*list)[i].name,attr->name)) {
--	    DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
--	    return;
--	}
-+        if (0 == strcmp((*list)[i].name,attr->name)) {
-+            DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
-+            return;
-+        }
-     }
--    
--    DEBUG(xf86Msg(X_INFO, "v4l: add attr %s\n",attr->name));
--    *list = xalloc((*count + 1) * sizeof(XF86AttributeRec));
-+
-+    *list = malloc((*count + 1) * sizeof(XF86AttributeRec));
-     if (NULL == *list) {
--	*count = 0;
--	return;
-+        *count = 0;
-+        return;
-     }
-     if (*count)
--	memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-+        memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-     memcpy(*list + *count, attr, sizeof(XF86AttributeRec));
--    (*count)++;
--}
- 
--/* setup yuv overlay + hw scaling: look if we find some common video
--   format which both v4l driver and the X-Server can handle */
--static void v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
--			  char *dev, int fd)
--{
--    static const struct {
--	unsigned int  v4l_palette;
--	unsigned int  v4l_depth;
--	unsigned int  xv_id;
--	unsigned int  xv_format;
--    } yuvlist[] = {
--	{ VIDEO_PALETTE_YUV422, 16, 0x32595559, XvPacked },
--	{ VIDEO_PALETTE_UYVY,   16, 0x59565955, XvPacked },
--	{ 0 /* end of list */ },
--    };
--    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
--    int fmt,i;
-+    gpa = MAKE_ATOM((*list)[*count].name);
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            attr->name, (int)gpa, attr->min_value, attr->max_value);
- 
--    pPPriv->format = xf86XVQueryOffscreenImages(pScreen,&pPPriv->nformat);
--    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
--	/* check v4l ... */
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	pPPriv->pict.palette = yuvlist[fmt].v4l_palette;
--	pPPriv->pict.depth   = yuvlist[fmt].v4l_depth;
--	if (-1 == ioctl(fd,VIDIOCSPICT,&pPPriv->pict))
--	    continue;
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	if (pPPriv->pict.palette != yuvlist[fmt].v4l_palette)
--	    continue;
--	/* ... works, check available offscreen image formats now ... */
--	for (i = 0; i < pPPriv->nformat; i++) {
--	    if (pPPriv->format[i].image->id     == yuvlist[fmt].xv_id &&
--		pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
--		/* ... match found, good. */
--		pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
--		pPPriv->myfmt = pPPriv->format+i;
--		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--			   "v4l[%s]: using hw video scaling [%4.4s].\n",
--			   dev,(char*)&(pPPriv->format[i].image->id));
--		return;
--	    }
--	}
--    }
-+    (*count)++;
- }
- 
- static int
-@@ -904,118 +1132,114 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
-     char dev[18];
-     int  fd,i,j,d;
- 
--    DEBUG(xf86Msg(X_INFO, "v4l: init start\n"));
--
-     for (i = 0, d = 0; d < MAX_V4L_DEVICES; d++) {
--	sprintf(dev, "/dev/video%d", d);
--	fd = open(dev, O_RDWR, 0);
--	if (fd == -1) {
--	    sprintf(dev, "/dev/v4l/video%d", d);
--	    fd = open(dev, O_RDWR, 0);
--	    if (fd == -1)
--		break;
--	}
--	DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
--
--	/* our private data */
--	pPPriv = xalloc(sizeof(PortPrivRec));
--	if (!pPPriv)
--	    return FALSE;
--	memset(pPPriv,0,sizeof(PortPrivRec));
--	pPPriv->nr = d;
--
--	/* check device */
--	if (-1 == ioctl(fd,VIDIOCGCAP,&pPPriv->cap) ||
--	    0 == (pPPriv->cap.type & VID_TYPE_OVERLAY)) {
--	    DEBUG(xf86Msg(X_INFO,  "v4l: %s: no overlay support\n",dev));
--	    xfree(pPPriv);
--	    close(fd);
--	    continue;
--	}
--	strncpy(V4L_NAME, dev, 16);
--	V4LBuildEncodings(pPPriv,fd,pPPriv->cap.channels);
--	if (NULL == pPPriv->enc)
--	    return FALSE;
--	v4l_check_yuv(pScrn,pPPriv,dev,fd);
--	
--	/* alloc VideoAdaptorRec */
--	VAR = xrealloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
--	VAR[i] = xalloc(sizeof(XF86VideoAdaptorRec));
--	if (!VAR[i])
--	    return FALSE;
--	memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
--
--
--	/* build attribute list */
--	for (j = 0; j < V4L_ATTR; j++) {
--	    /* video attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &Attributes[j]);
--	}
--	if (0 == ioctl(fd,VIDIOCGAUDIO,&pPPriv->audio)) {
--	    /* audio attributes */
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &VolumeAttr);
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_MUTABLE)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &MuteAttr);
--	}
--	if (pPPriv->cap.type & VID_TYPE_TUNER) {
--	    /* tuner attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &FreqAttr);
--	}
--	if (0 != pPPriv->yuv_format) {
--	    /* pass throuth scaler attributes */
--	    for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     pPPriv->myfmt->attributes+j);
--	    }
--	}
--	
--	
--	/* hook in private data */
--	Private = xalloc(sizeof(DevUnion));
--	if (!Private)
--	    return FALSE;
--	memset(Private,0,sizeof(DevUnion));
--	Private->ptr = (pointer)pPPriv;
--	VAR[i]->pPortPrivates = Private;
--	VAR[i]->nPorts = 1;
--
--	/* init VideoAdaptorRec */
--	VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
--	VAR[i]->name  = "video4linux";
--	VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
--
--	VAR[i]->PutVideo = V4lPutVideo;
--	VAR[i]->PutStill = V4lPutStill;
--	VAR[i]->StopVideo = V4lStopVideo;
--	VAR[i]->SetPortAttribute = V4lSetPortAttribute;
--	VAR[i]->GetPortAttribute = V4lGetPortAttribute;
--	VAR[i]->QueryBestSize = V4lQueryBestSize;
--
--	VAR[i]->nEncodings = pPPriv->nenc;
--	VAR[i]->pEncodings = pPPriv->enc;
--	VAR[i]->nFormats =
--		sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
--	VAR[i]->pFormats = InputVideoFormats;
--
--	if (fd != -1)
--	    close(fd);
--	i++;
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
-+
-+        /* our private data */
-+        pPPriv = malloc(sizeof(PortPrivRec));
-+        if (!pPPriv)
-+            return FALSE;
-+        memset(pPPriv,0,sizeof(PortPrivRec));
-+        pPPriv->nr = d;
-+
-+        /* check device capabilities */
-+        memset(&pPPriv->cap, 0, sizeof(&pPPriv->cap));
-+        if (-1 == ioctl(fd, VIDIOC_QUERYCAP, &pPPriv->cap) ||
-+            0 == (pPPriv->cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) {
-+            xf86Msg(X_ERROR, "v4l: %s: no overlay support\n",dev);
-+            free(pPPriv);
-+            close(fd);
-+            continue;
-+        }
-+
-+        if (v4l_check_yuv(pScrn, pPPriv, dev, fd) == FALSE) {
-+                xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                               "Xv Overlay not supported. Can't use v4l driver\n");
-+                free(pPPriv);
-+                close(fd);
-+                continue;
-+        }
-+
-+        xf86Msg(X_INFO, "v4l: enabling overlay mode for %s.\n", dev);
-+        strncpy(V4L_NAME, dev, 16);
-+        V4LBuildEncodings(pPPriv, fd);
-+        if (NULL == pPPriv->enc)
-+            return FALSE;
-+
-+        /* alloc VideoAdaptorRec */
-+        VAR = realloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
-+        VAR[i] = malloc(sizeof(XF86VideoAdaptorRec));
-+        if (!VAR[i])
-+            return FALSE;
-+        memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
-+
-+        /* build attribute list */
-+        AddAllV4LControls(pPPriv, &VAR[i]->pAttributes, &VAR[i]->nAttributes, fd);
-+
-+        for (j = 0; j < V4L_ATTR; j++) {
-+            /* Other video attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &Attributes[j]);
-+        }
-+        if (pPPriv->cap.capabilities & V4L2_CAP_TUNER) {
-+            /* tuner attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &FreqAttr);
-+        }
-+
-+        /* Initialize yuv_format */
-+        if (0 != pPPriv->yuv_format) {
-+            /* pass throuth scaler attributes */
-+            for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
-+                v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                             pPPriv->myfmt->attributes+j);
-+            }
-+        }
-+
-+        DEBUG(xf86Msg(X_INFO, "v4l: saving config into driver data\n"));
-+        /* hook in private data */
-+        Private = malloc(sizeof(DevUnion));
-+        if (!Private)
-+            return FALSE;
-+        memset(Private,0,sizeof(DevUnion));
-+        Private->ptr = (pointer)pPPriv;
-+        VAR[i]->pPortPrivates = Private;
-+        VAR[i]->nPorts = 1;
-+
-+        /* init VideoAdaptorRec */
-+        VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
-+        VAR[i]->name  = "video4linux";
-+        VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
-+
-+        VAR[i]->PutVideo = V4lPutVideo;
-+        VAR[i]->PutStill = V4lPutStill;
-+        VAR[i]->StopVideo = V4lStopVideo;
-+        VAR[i]->SetPortAttribute = V4lSetPortAttribute;
-+        VAR[i]->GetPortAttribute = V4lGetPortAttribute;
-+        VAR[i]->QueryBestSize = V4lQueryBestSize;
-+
-+        VAR[i]->nEncodings = pPPriv->nenc;
-+        VAR[i]->pEncodings = pPPriv->enc;
-+        VAR[i]->nFormats = sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
-+        VAR[i]->pFormats = InputVideoFormats;
-+
-+        if (fd != -1) {
-+            DEBUG(xf86Msg(X_INFO,  "v4l: %s init finished.\n",dev));
-+            close(fd);
-+        }
-+        i++;
-     }
- 
-     xvEncoding   = MAKE_ATOM(XV_ENCODING);
--    xvHue        = MAKE_ATOM(XV_HUE);
--    xvSaturation = MAKE_ATOM(XV_SATURATION);
--    xvBrightness = MAKE_ATOM(XV_BRIGHTNESS);
--    xvContrast   = MAKE_ATOM(XV_CONTRAST);
--
-     xvFreq       = MAKE_ATOM(XV_FREQ);
--    xvMute       = MAKE_ATOM(XV_MUTE);
--    xvVolume     = MAKE_ATOM(XV_VOLUME);
- 
-     DEBUG(xf86Msg(X_INFO, "v4l: init done, %d device(s) found\n",i));
- 
-@@ -1024,10 +1248,43 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
- }
- 
- static Bool
-+V4LDetect(void)
-+{
-+    struct v4l2_capability cap;
-+    int fd, d, n = 0;
-+    char dev[18];
-+
-+    for (d = 0; d < MAX_V4L_DEVICES; d++) {
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        close (fd);
-+        memset(&cap, 0, sizeof(cap));
-+        if (!ioctl(fd, VIDIOC_QUERYCAP, &cap) &&
-+            (cap.capabilities & V4L2_CAP_VIDEO_OVERLAY))
-+            n++;
-+    }
-+    xf86Msg(X_INFO, "v4l: %d video adapters with overlay support detected\n", n);
-+
-+    return (n > 0) ? TRUE : FALSE;
-+}
-+
-+static Bool
- V4LProbe(DriverPtr drv, int flags)
- {
--    if (flags & PROBE_DETECT)
--	return TRUE;
-+    /*
-+     * Don't try to register adapter at the detection phase, as Xv
-+     * extensions won't be there
-+     */
-+    if (flags == PROBE_DETECT)
-+        return V4LDetect();
-+
-+    DEBUG(xf86Msg(X_INFO, "v4l: Initiating device probe\n"));
- 
-     xf86XVRegisterGenericAdaptorDriver(V4LInit);
-     drv->refCount++;
-diff --git a/src/videodev.h b/src/videodev.h
-deleted file mode 100644
-index 3c9a7d8..0000000
---- a/src/videodev.h
-+++ /dev/null
-@@ -1,254 +0,0 @@
--#ifndef __LINUX_VIDEODEV_H
--#define __LINUX_VIDEODEV_H
--
--/* Linux V4L API, Version 1
-- * videodev.h from v4l driver in Linux 2.2.3 
-- *
-- * Used here with the explicit permission of the original author, Alan Cox.
-- *				<alan@lxorguk.ukuu.org.uk>
-- */
--
--#include <X11/Xmd.h>
--
--#define VID_TYPE_CAPTURE	1	/* Can capture */
--#define VID_TYPE_TUNER		2	/* Can tune */
--#define VID_TYPE_TELETEXT	4	/* Does teletext */
--#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
--#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
--#define VID_TYPE_CLIPPING	32	/* Can clip */
--#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
--#define VID_TYPE_SCALES		128	/* Scalable */
--#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
--#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
--
--struct video_capability
--{
--	char name[32];
--	int type;
--	int channels;	/* Num channels */
--	int audios;	/* Num audio devices */
--	int maxwidth;	/* Supported width */
--	int maxheight;	/* And height */
--	int minwidth;	/* Supported width */
--	int minheight;	/* And height */
--};
--
--
--struct video_channel
--{
--	int channel;
--	char name[32];
--	int tuners;
--	CARD32  flags;
--#define VIDEO_VC_TUNER		1	/* Channel has a tuner */
--#define VIDEO_VC_AUDIO		2	/* Channel has audio */
--	CARD16  type;
--#define VIDEO_TYPE_TV		1
--#define VIDEO_TYPE_CAMERA	2	
--	CARD16 norm;			/* Norm set by channel */
--};
--
--struct video_tuner
--{
--	int tuner;
--	char name[32];
--	unsigned long rangelow, rangehigh;	/* Tuner range */
--	CARD32 flags;
--#define VIDEO_TUNER_PAL		1
--#define VIDEO_TUNER_NTSC	2
--#define VIDEO_TUNER_SECAM	4
--#define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
--#define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
--#define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
--	CARD16 mode;			/* PAL/NTSC/SECAM/OTHER */
--#define VIDEO_MODE_PAL		0
--#define VIDEO_MODE_NTSC		1
--#define VIDEO_MODE_SECAM	2
--#define VIDEO_MODE_AUTO		3
--	CARD16 signal;			/* Signal strength 16bit scale */
--};
--
--struct video_picture
--{
--	CARD16	brightness;
--	CARD16	hue;
--	CARD16	colour;
--	CARD16	contrast;
--	CARD16	whiteness;	/* Black and white only */
--	CARD16	depth;		/* Capture depth */
--	CARD16   palette;	/* Palette in use */
--#define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
--#define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
--#define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
--#define VIDEO_PALETTE_RGB24	4	/* 24bit RGB */
--#define VIDEO_PALETTE_RGB32	5	/* 32bit RGB */	
--#define VIDEO_PALETTE_RGB555	6	/* 555 15bit RGB */
--#define VIDEO_PALETTE_YUV422	7	/* YUV422 capture */
--#define VIDEO_PALETTE_YUYV	8
--#define VIDEO_PALETTE_UYVY	9	/* The great thing about standards is ... */
--#define VIDEO_PALETTE_YUV420	10
--#define VIDEO_PALETTE_YUV411	11	/* YUV411 capture */
--#define VIDEO_PALETTE_RAW	12	/* RAW capture (BT848) */
--#define VIDEO_PALETTE_YUV422P	13	/* YUV 4:2:2 Planar */
--#define VIDEO_PALETTE_YUV411P	14	/* YUV 4:1:1 Planar */
--#define VIDEO_PALETTE_YUV420P	15	/* YUV 4:2:0 Planar */
--#define VIDEO_PALETTE_YUV410P	16	/* YUV 4:1:0 Planar */
--#define VIDEO_PALETTE_PLANAR	13	/* start of planar entries */
--#define VIDEO_PALETTE_COMPONENT 7	/* start of component entries */
--};
--
--struct video_audio
--{
--	int	audio;		/* Audio channel */
--	CARD16	volume;		/* If settable */
--	CARD16	bass, treble;
--	CARD32	flags;
--#define VIDEO_AUDIO_MUTE	1
--#define VIDEO_AUDIO_MUTABLE	2
--#define VIDEO_AUDIO_VOLUME	4
--#define VIDEO_AUDIO_BASS	8
--#define VIDEO_AUDIO_TREBLE	16	
--	char    name[16];
--#define VIDEO_SOUND_MONO	1
--#define VIDEO_SOUND_STEREO	2
--#define VIDEO_SOUND_LANG1	4
--#define VIDEO_SOUND_LANG2	8
--        CARD16   mode;
--        CARD16	balance;	/* Stereo balance */
--        CARD16	step;		/* Step actual volume uses */
--};
--
--struct video_clip
--{
--	INT32	x,y;
--	INT32	width, height;
--	struct	video_clip *next;	/* For user use/driver use only */
--};
--
--struct video_window
--{
--	CARD32	x,y;			/* Position of window */
--	CARD32	width,height;		/* Its size */
--	CARD32	chromakey;
--	CARD32	flags;
--	struct	video_clip *clips;	/* Set only */
--	int	clipcount;
--#define VIDEO_WINDOW_INTERLACE	1
--#define VIDEO_CLIP_BITMAP	-1
--/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
--#define VIDEO_CLIPMAP_SIZE	(128 * 625)
--};
--
--struct video_capture
--{
--	CARD32 	x,y;			/* Offsets into image */
--	CARD32	width, height;		/* Area to capture */
--	CARD16	decimation;		/* Decimation divder */
--	CARD16	flags;			/* Flags for capture */
--#define VIDEO_CAPTURE_ODD		0	/* Temporal */
--#define VIDEO_CAPTURE_EVEN		1
--};
--
--struct video_buffer
--{
--	void	*base;
--	int	height,width;
--	int	depth;
--	int	bytesperline;
--};
--
--struct video_mmap
--{
--	unsigned	int frame;		/* Frame (0 - n) for double buffer */
--	int		height,width;
--	unsigned	int format;		/* should be VIDEO_PALETTE_* */
--};
--
--struct video_key
--{
--	CARD8	key[8];
--	CARD32	flags;
--};
--
--
--#define VIDEO_MAX_FRAME		32
--
--struct video_mbuf
--{
--	int	size;		/* Total memory to map */
--	int	frames;		/* Frames */
--	int	offsets[VIDEO_MAX_FRAME];
--};
--	
--
--#define 	VIDEO_NO_UNIT	(-1)
--
--	
--struct video_unit
--{
--	int 	video;		/* Video minor */
--	int	vbi;		/* VBI minor */
--	int	radio;		/* Radio minor */
--	int	audio;		/* Audio minor */
--	int	teletext;	/* Teletext minor */
--};
--
--#define VIDIOCGCAP		_IOR('v',1,struct video_capability)	/* Get capabilities */
--#define VIDIOCGCHAN		_IOWR('v',2,struct video_channel)	/* Get channel info (sources) */
--#define VIDIOCSCHAN		_IOW('v',3,struct video_channel)	/* Set channel 	*/
--#define VIDIOCGTUNER		_IOWR('v',4,struct video_tuner)		/* Get tuner abilities */
--#define VIDIOCSTUNER		_IOW('v',5,struct video_tuner)		/* Tune the tuner for the current channel */
--#define VIDIOCGPICT		_IOR('v',6,struct video_picture)	/* Get picture properties */
--#define VIDIOCSPICT		_IOW('v',7,struct video_picture)	/* Set picture properties */
--#define VIDIOCCAPTURE		_IOW('v',8,int)				/* Start, end capture */
--#define VIDIOCGWIN		_IOR('v',9, struct video_window)	/* Set the video overlay window */
--#define VIDIOCSWIN		_IOW('v',10, struct video_window)	/* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
--#define VIDIOCGFBUF		_IOR('v',11, struct video_buffer)	/* Get frame buffer */
--#define VIDIOCSFBUF		_IOW('v',12, struct video_buffer)	/* Set frame buffer - root only */
--#define VIDIOCKEY		_IOR('v',13, struct video_key)		/* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
--#define VIDIOCGFREQ		_IOR('v',14, unsigned long)		/* Set tuner */
--#define VIDIOCSFREQ		_IOW('v',15, unsigned long)		/* Set tuner */
--#define VIDIOCGAUDIO		_IOR('v',16, struct video_audio)	/* Get audio info */
--#define VIDIOCSAUDIO		_IOW('v',17, struct video_audio)	/* Audio source, mute etc */
--#define VIDIOCSYNC		_IOW('v',18, int)			/* Sync with mmap grabbing */
--#define VIDIOCMCAPTURE		_IOW('v',19, struct video_mmap)		/* Grab frames */
--#define VIDIOCGMBUF		_IOR('v', 20, struct video_mbuf)	/* Memory map buffer info */
--#define VIDIOCGUNIT		_IOR('v', 21, struct video_unit)	/* Get attached units */
--#define VIDIOCGCAPTURE		_IOR('v',22, struct video_capture)	/* Get frame buffer */
--#define VIDIOCSCAPTURE		_IOW('v',23, struct video_capture)	/* Set frame buffer - root only */
--
--#define BASE_VIDIOCPRIVATE	192		/* 192-255 are private */
--
--
--#define VID_HARDWARE_BT848	1
--#define VID_HARDWARE_QCAM_BW	2
--#define VID_HARDWARE_PMS	3
--#define VID_HARDWARE_QCAM_C	4
--#define VID_HARDWARE_PSEUDO	5
--#define VID_HARDWARE_SAA5249	6
--#define VID_HARDWARE_AZTECH	7
--#define VID_HARDWARE_SF16MI	8
--#define VID_HARDWARE_RTRACK	9
--#define VID_HARDWARE_ZOLTRIX	10
--#define VID_HARDWARE_SAA7146    11
--#define VID_HARDWARE_VIDEUM	12	/* Reserved for Winnov videum */
--#define VID_HARDWARE_RTRACK2	13
--#define VID_HARDWARE_PERMEDIA2	14	/* Reserved for Permedia2 */
--#define VID_HARDWARE_RIVA128	15	/* Reserved for RIVA 128 */
--#define VID_HARDWARE_PLANB	16	/* PowerMac motherboard video-in */
--#define VID_HARDWARE_BROADWAY	17	/* Broadway project */
--#define VID_HARDWARE_GEMTEK	18
--#define VID_HARDWARE_TYPHOON	19
--#define VID_HARDWARE_VINO	20	/* Reserved for SGI Indy Vino */
--
--/*
-- *	Initialiser list
-- */
-- 
--struct video_init
--{
--	char *name;
--	int (*init)(struct video_init *);
--};
--
--#endif
-diff --git a/src/videodev2.h b/src/videodev2.h
-new file mode 100644
-index 0000000..bf6dde2
---- /dev/null
-+++ b/src/videodev2.h
-@@ -0,0 +1,1929 @@
-+/*
-+ *  Video for Linux Two header file
-+ *
-+ *  Copyright (C) 1999-2007 the contributors
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  Alternatively you can redistribute this file under the terms of the
-+ *  BSD license as stated below:
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in
-+ *     the documentation and/or other materials provided with the
-+ *     distribution.
-+ *  3. The names of its contributors may not be used to endorse or promote
-+ *     products derived from this software without specific prior written
-+ *     permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *	Header file for v4l or V4L2 drivers and applications
-+ * with public API.
-+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
-+ * no #if __KERNEL tests are allowed here
-+ *
-+ *	See http://linuxtv.org for more info
-+ *
-+ *	Author: Bill Dirks <bill@thedirks.org>
-+ *		Justin Schoeman
-+ *              Hans Verkuil <hverkuil@xs4all.nl>
-+ *		et al.
-+ */
-+#ifndef __LINUX_VIDEODEV2_H
-+#define __LINUX_VIDEODEV2_H
-+
-+#include <linux/ioctl.h>
-+#include <linux/types.h>
-+#include <sys/time.h>
-+
-+/*
-+ * Common stuff for both V4L1 and V4L2
-+ * Moved from videodev.h
-+ */
-+#define VIDEO_MAX_FRAME               32
-+#define VIDEO_MAX_PLANES               8
-+
-+/* These defines are V4L1 specific and should not be used with the V4L2 API!
-+   They will be removed from this header in the future. */
-+
-+#define VID_TYPE_CAPTURE	1	/* Can capture */
-+#define VID_TYPE_TUNER		2	/* Can tune */
-+#define VID_TYPE_TELETEXT	4	/* Does teletext */
-+#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
-+#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
-+#define VID_TYPE_CLIPPING	32	/* Can clip */
-+#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
-+#define VID_TYPE_SCALES		128	/* Scalable */
-+#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
-+#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
-+#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
-+#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
-+#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
-+#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
-+
-+/*
-+ *	M I S C E L L A N E O U S
-+ */
-+
-+/*  Four-character-code (FOURCC) */
-+#define v4l2_fourcc(a, b, c, d)\
-+	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
-+
-+/*
-+ *	E N U M S
-+ */
-+enum v4l2_field {
-+	V4L2_FIELD_ANY           = 0, /* driver can choose from none,
-+					 top, bottom, interlaced
-+					 depending on whatever it thinks
-+					 is approximate ... */
-+	V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
-+	V4L2_FIELD_TOP           = 2, /* top field only */
-+	V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
-+	V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
-+	V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
-+					 buffer, top-bottom order */
-+	V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
-+	V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
-+					 separate buffers */
-+	V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
-+					 first and the top field is
-+					 transmitted first */
-+	V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
-+					 first and the bottom field is
-+					 transmitted first */
-+};
-+#define V4L2_FIELD_HAS_TOP(field)	\
-+	((field) == V4L2_FIELD_TOP 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTTOM(field)	\
-+	((field) == V4L2_FIELD_BOTTOM 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTH(field)	\
-+	((field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB ||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+
-+enum v4l2_buf_type {
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
-+	V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
-+	V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
-+	V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
-+	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
-+	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
-+#if 1
-+	/* Experimental */
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
-+#endif
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
-+	V4L2_BUF_TYPE_PRIVATE              = 0x80,
-+};
-+
-+#define V4L2_TYPE_IS_MULTIPLANAR(type)			\
-+	((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE	\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-+
-+#define V4L2_TYPE_IS_OUTPUT(type)				\
-+	((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY	\
-+	 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
-+
-+enum v4l2_tuner_type {
-+	V4L2_TUNER_RADIO	     = 1,
-+	V4L2_TUNER_ANALOG_TV	     = 2,
-+	V4L2_TUNER_DIGITAL_TV	     = 3,
-+};
-+
-+enum v4l2_memory {
-+	V4L2_MEMORY_MMAP             = 1,
-+	V4L2_MEMORY_USERPTR          = 2,
-+	V4L2_MEMORY_OVERLAY          = 3,
-+};
-+
-+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-+enum v4l2_colorspace {
-+	/* ITU-R 601 -- broadcast NTSC/PAL */
-+	V4L2_COLORSPACE_SMPTE170M     = 1,
-+
-+	/* 1125-Line (US) HDTV */
-+	V4L2_COLORSPACE_SMPTE240M     = 2,
-+
-+	/* HD and modern captures. */
-+	V4L2_COLORSPACE_REC709        = 3,
-+
-+	/* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
-+	V4L2_COLORSPACE_BT878         = 4,
-+
-+	/* These should be useful.  Assume 601 extents. */
-+	V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-+	V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-+
-+	/* I know there will be cameras that send this.  So, this is
-+	 * unspecified chromaticities and full 0-255 on each of the
-+	 * Y'CbCr components
-+	 */
-+	V4L2_COLORSPACE_JPEG          = 7,
-+
-+	/* For RGB colourspaces, this is probably a good start. */
-+	V4L2_COLORSPACE_SRGB          = 8,
-+};
-+
-+enum v4l2_priority {
-+	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-+	V4L2_PRIORITY_BACKGROUND  = 1,
-+	V4L2_PRIORITY_INTERACTIVE = 2,
-+	V4L2_PRIORITY_RECORD      = 3,
-+	V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-+};
-+
-+struct v4l2_rect {
-+	__s32   left;
-+	__s32   top;
-+	__s32   width;
-+	__s32   height;
-+};
-+
-+struct v4l2_fract {
-+	__u32   numerator;
-+	__u32   denominator;
-+};
-+
-+/*
-+ *	D R I V E R   C A P A B I L I T I E S
-+ */
-+struct v4l2_capability {
-+	__u8	driver[16];	/* i.e. "bttv" */
-+	__u8	card[32];	/* i.e. "Hauppauge WinTV" */
-+	__u8	bus_info[32];	/* "PCI:" + pci_name(pci_dev) */
-+	__u32   version;        /* should use KERNEL_VERSION() */
-+	__u32	capabilities;	/* Device capabilities */
-+	__u32	reserved[4];
-+};
-+
-+/* Values for 'capabilities' field */
-+#define V4L2_CAP_VIDEO_CAPTURE		0x00000001  /* Is a video capture device */
-+#define V4L2_CAP_VIDEO_OUTPUT		0x00000002  /* Is a video output device */
-+#define V4L2_CAP_VIDEO_OVERLAY		0x00000004  /* Can do video overlay */
-+#define V4L2_CAP_VBI_CAPTURE		0x00000010  /* Is a raw VBI capture device */
-+#define V4L2_CAP_VBI_OUTPUT		0x00000020  /* Is a raw VBI output device */
-+#define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
-+#define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
-+#define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
-+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
-+#define V4L2_CAP_HW_FREQ_SEEK		0x00000400  /* Can do hardware frequency seek  */
-+#define V4L2_CAP_RDS_OUTPUT		0x00000800  /* Is an RDS encoder */
-+
-+/* Is a video capture device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE	0x00001000
-+/* Is a video output device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE	0x00002000
-+
-+#define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
-+#define V4L2_CAP_AUDIO			0x00020000  /* has audio support */
-+#define V4L2_CAP_RADIO			0x00040000  /* is a radio device */
-+#define V4L2_CAP_MODULATOR		0x00080000  /* has a modulator */
-+
-+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
-+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
-+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
-+
-+/*
-+ *	V I D E O   I M A G E   F O R M A T
-+ */
-+struct v4l2_pix_format {
-+	__u32         		width;
-+	__u32			height;
-+	__u32			pixelformat;
-+	enum v4l2_field  	field;
-+	__u32            	bytesperline;	/* for padding, zero if unused */
-+	__u32          		sizeimage;
-+	enum v4l2_colorspace	colorspace;
-+	__u32			priv;		/* private data, depends on pixelformat */
-+};
-+
-+/*      Pixel format         FOURCC                          depth  Description  */
-+
-+/* RGB formats */
-+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
-+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
-+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
-+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
-+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
-+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
-+#define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6	  */
-+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
-+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
-+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
-+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
-+
-+/* Grey formats */
-+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
-+#define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
-+#define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
-+#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
-+#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
-+
-+/* Palette formats */
-+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
-+
-+/* Luminance+Chrominance formats */
-+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
-+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
-+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
-+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
-+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
-+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
-+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
-+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
-+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
-+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
-+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
-+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
-+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
-+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
-+
-+/* two planes -- one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
-+#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
-+#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
-+
-+/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
-+
-+/* three non contiguous planes - Y, Cb, Cr */
-+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
-+
-+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
-+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
-+	/* 10bit raw bayer DPCM compressed to 8 bits */
-+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
-+	/*
-+	 * 10bit raw bayer, expanded to 16 bits
-+	 * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
-+	 */
-+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
-+
-+/* compressed formats */
-+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
-+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
-+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
-+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4    */
-+
-+/*  Vendor-specific formats   */
-+#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
-+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
-+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
-+#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
-+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
-+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
-+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
-+#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
-+#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
-+#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
-+#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
-+#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
-+#define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
-+#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
-+#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
-+#define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
-+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
-+#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
-+
-+/*
-+ *	F O R M A T   E N U M E R A T I O N
-+ */
-+struct v4l2_fmtdesc {
-+	__u32		    index;             /* Format number      */
-+	enum v4l2_buf_type  type;              /* buffer type        */
-+	__u32               flags;
-+	__u8		    description[32];   /* Description string */
-+	__u32		    pixelformat;       /* Format fourcc      */
-+	__u32		    reserved[4];
-+};
-+
-+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-+#define V4L2_FMT_FLAG_EMULATED   0x0002
-+
-+#if 1
-+	/* Experimental Frame Size and frame rate enumeration */
-+/*
-+ *	F R A M E   S I Z E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmsizetypes {
-+	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
-+	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmsize_discrete {
-+	__u32			width;		/* Frame width [pixel] */
-+	__u32			height;		/* Frame height [pixel] */
-+};
-+
-+struct v4l2_frmsize_stepwise {
-+	__u32			min_width;	/* Minimum frame width [pixel] */
-+	__u32			max_width;	/* Maximum frame width [pixel] */
-+	__u32			step_width;	/* Frame width step size [pixel] */
-+	__u32			min_height;	/* Minimum frame height [pixel] */
-+	__u32			max_height;	/* Maximum frame height [pixel] */
-+	__u32			step_height;	/* Frame height step size [pixel] */
-+};
-+
-+struct v4l2_frmsizeenum {
-+	__u32			index;		/* Frame size number */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			type;		/* Frame size type the device supports. */
-+
-+	union {					/* Frame size */
-+		struct v4l2_frmsize_discrete	discrete;
-+		struct v4l2_frmsize_stepwise	stepwise;
-+	};
-+
-+	__u32   reserved[2];			/* Reserved space for future use */
-+};
-+
-+/*
-+ *	F R A M E   R A T E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmivaltypes {
-+	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
-+	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmival_stepwise {
-+	struct v4l2_fract	min;		/* Minimum frame interval [s] */
-+	struct v4l2_fract	max;		/* Maximum frame interval [s] */
-+	struct v4l2_fract	step;		/* Frame interval step size [s] */
-+};
-+
-+struct v4l2_frmivalenum {
-+	__u32			index;		/* Frame format index */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			width;		/* Frame width */
-+	__u32			height;		/* Frame height */
-+	__u32			type;		/* Frame interval type the device supports. */
-+
-+	union {					/* Frame interval */
-+		struct v4l2_fract		discrete;
-+		struct v4l2_frmival_stepwise	stepwise;
-+	};
-+
-+	__u32	reserved[2];			/* Reserved space for future use */
-+};
-+#endif
-+
-+/*
-+ *	T I M E C O D E
-+ */
-+struct v4l2_timecode {
-+	__u32	type;
-+	__u32	flags;
-+	__u8	frames;
-+	__u8	seconds;
-+	__u8	minutes;
-+	__u8	hours;
-+	__u8	userbits[4];
-+};
-+
-+/*  Type  */
-+#define V4L2_TC_TYPE_24FPS		1
-+#define V4L2_TC_TYPE_25FPS		2
-+#define V4L2_TC_TYPE_30FPS		3
-+#define V4L2_TC_TYPE_50FPS		4
-+#define V4L2_TC_TYPE_60FPS		5
-+
-+/*  Flags  */
-+#define V4L2_TC_FLAG_DROPFRAME		0x0001 /* "drop-frame" mode */
-+#define V4L2_TC_FLAG_COLORFRAME		0x0002
-+#define V4L2_TC_USERBITS_field		0x000C
-+#define V4L2_TC_USERBITS_USERDEFINED	0x0000
-+#define V4L2_TC_USERBITS_8BITCHARS	0x0008
-+/* The above is based on SMPTE timecodes */
-+
-+struct v4l2_jpegcompression {
-+	int quality;
-+
-+	int  APPn;              /* Number of APP segment to be written,
-+				 * must be 0..15 */
-+	int  APP_len;           /* Length of data in JPEG APPn segment */
-+	char APP_data[60];      /* Data in the JPEG APPn segment. */
-+
-+	int  COM_len;           /* Length of data in JPEG COM segment */
-+	char COM_data[60];      /* Data in JPEG COM segment */
-+
-+	__u32 jpeg_markers;     /* Which markers should go into the JPEG
-+				 * output. Unless you exactly know what
-+				 * you do, leave them untouched.
-+				 * Inluding less markers will make the
-+				 * resulting code smaller, but there will
-+				 * be fewer applications which can read it.
-+				 * The presence of the APP and COM marker
-+				 * is influenced by APP_len and COM_len
-+				 * ONLY, not by this property! */
-+
-+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-+					* allways use APP0 */
-+};
-+
-+/*
-+ *	M E M O R Y - M A P P I N G   B U F F E R S
-+ */
-+struct v4l2_requestbuffers {
-+	__u32			count;
-+	enum v4l2_buf_type      type;
-+	enum v4l2_memory        memory;
-+	__u32			reserved[2];
-+};
-+
-+/**
-+ * struct v4l2_plane - plane info for multi-planar buffers
-+ * @bytesused:		number of bytes occupied by data in the plane (payload)
-+ * @length:		size of this plane (NOT the payload) in bytes
-+ * @mem_offset:		when memory in the associated struct v4l2_buffer is
-+ *			V4L2_MEMORY_MMAP, equals the offset from the start of
-+ *			the device memory for this plane (or is a "cookie" that
-+ *			should be passed to mmap() called on the video node)
-+ * @userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
-+ *			pointing to this plane
-+ * @data_offset:	offset in the plane to the start of data; usually 0,
-+ *			unless there is a header in front of the data
-+ *
-+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
-+ * with two planes can have one plane for Y, and another for interleaved CbCr
-+ * components. Each plane can reside in a separate memory buffer, or even in
-+ * a completely separate memory node (e.g. in embedded devices).
-+ */
-+struct v4l2_plane {
-+	__u32			bytesused;
-+	__u32			length;
-+	union {
-+		__u32		mem_offset;
-+		unsigned long	userptr;
-+	} m;
-+	__u32			data_offset;
-+	__u32			reserved[11];
-+};
-+
-+/**
-+ * struct v4l2_buffer - video buffer info
-+ * @index:	id number of the buffer
-+ * @type:	buffer type (type == *_MPLANE for multiplanar buffers)
-+ * @bytesused:	number of bytes occupied by data in the buffer (payload);
-+ *		unused (set to 0) for multiplanar buffers
-+ * @flags:	buffer informational flags
-+ * @field:	field order of the image in the buffer
-+ * @timestamp:	frame timestamp
-+ * @timecode:	frame timecode
-+ * @sequence:	sequence count of this frame
-+ * @memory:	the method, in which the actual video data is passed
-+ * @offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
-+ *		offset from the start of the device memory for this plane,
-+ *		(or a "cookie" that should be passed to mmap() as offset)
-+ * @userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
-+ *		a userspace pointer pointing to this buffer
-+ * @planes:	for multiplanar buffers; userspace pointer to the array of plane
-+ *		info structs for this buffer
-+ * @length:	size in bytes of the buffer (NOT its payload) for single-plane
-+ *		buffers (when type != *_MPLANE); number of elements in the
-+ *		planes array for multi-plane buffers
-+ * @input:	input number from which the video data has has been captured
-+ *
-+ * Contains data exchanged by application and driver using one of the Streaming
-+ * I/O methods.
-+ */
-+struct v4l2_buffer {
-+	__u32			index;
-+	enum v4l2_buf_type      type;
-+	__u32			bytesused;
-+	__u32			flags;
-+	enum v4l2_field		field;
-+	struct timeval		timestamp;
-+	struct v4l2_timecode	timecode;
-+	__u32			sequence;
-+
-+	/* memory location */
-+	enum v4l2_memory        memory;
-+	union {
-+		__u32           offset;
-+		unsigned long   userptr;
-+		struct v4l2_plane *planes;
-+	} m;
-+	__u32			length;
-+	__u32			input;
-+	__u32			reserved;
-+};
-+
-+/*  Flags for 'flags' field */
-+#define V4L2_BUF_FLAG_MAPPED	0x0001  /* Buffer is mapped (flag) */
-+#define V4L2_BUF_FLAG_QUEUED	0x0002	/* Buffer is queued for processing */
-+#define V4L2_BUF_FLAG_DONE	0x0004	/* Buffer is ready */
-+#define V4L2_BUF_FLAG_KEYFRAME	0x0008	/* Image is a keyframe (I-frame) */
-+#define V4L2_BUF_FLAG_PFRAME	0x0010	/* Image is a P-frame */
-+#define V4L2_BUF_FLAG_BFRAME	0x0020	/* Image is a B-frame */
-+/* Buffer is ready, but the data contained within is corrupted. */
-+#define V4L2_BUF_FLAG_ERROR	0x0040
-+#define V4L2_BUF_FLAG_TIMECODE	0x0100	/* timecode field is valid */
-+#define V4L2_BUF_FLAG_INPUT     0x0200  /* input field is valid */
-+
-+/*
-+ *	O V E R L A Y   P R E V I E W
-+ */
-+struct v4l2_framebuffer {
-+	__u32			capability;
-+	__u32			flags;
-+/* FIXME: in theory we should pass something like PCI device + memory
-+ * region + offset instead of some physical address */
-+	void                    *base;
-+	struct v4l2_pix_format	fmt;
-+};
-+/*  Flags for the 'capability' field. Read only */
-+#define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
-+#define V4L2_FBUF_CAP_CHROMAKEY		0x0002
-+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-+#define V4L2_FBUF_CAP_BITMAP_CLIPPING	0x0008
-+#define V4L2_FBUF_CAP_LOCAL_ALPHA	0x0010
-+#define V4L2_FBUF_CAP_GLOBAL_ALPHA	0x0020
-+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA	0x0040
-+#define V4L2_FBUF_CAP_SRC_CHROMAKEY	0x0080
-+/*  Flags for the 'flags' field. */
-+#define V4L2_FBUF_FLAG_PRIMARY		0x0001
-+#define V4L2_FBUF_FLAG_OVERLAY		0x0002
-+#define V4L2_FBUF_FLAG_CHROMAKEY	0x0004
-+#define V4L2_FBUF_FLAG_LOCAL_ALPHA	0x0008
-+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA	0x0010
-+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA	0x0020
-+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY	0x0040
-+
-+struct v4l2_clip {
-+	struct v4l2_rect        c;
-+	struct v4l2_clip	*next;
-+};
-+
-+struct v4l2_window {
-+	struct v4l2_rect        w;
-+	enum v4l2_field  	field;
-+	__u32			chromakey;
-+	struct v4l2_clip	*clips;
-+	__u32			clipcount;
-+	void			*bitmap;
-+	__u8                    global_alpha;
-+};
-+
-+/*
-+ *	C A P T U R E   P A R A M E T E R S
-+ */
-+struct v4l2_captureparm {
-+	__u32		   capability;	  /*  Supported modes */
-+	__u32		   capturemode;	  /*  Current mode */
-+	struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
-+	__u32		   extendedmode;  /*  Driver-specific extensions */
-+	__u32              readbuffers;   /*  # of buffers for read */
-+	__u32		   reserved[4];
-+};
-+
-+/*  Flags for 'capability' and 'capturemode' fields */
-+#define V4L2_MODE_HIGHQUALITY	0x0001	/*  High quality imaging mode */
-+#define V4L2_CAP_TIMEPERFRAME	0x1000	/*  timeperframe field is supported */
-+
-+struct v4l2_outputparm {
-+	__u32		   capability;	 /*  Supported modes */
-+	__u32		   outputmode;	 /*  Current mode */
-+	struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-+	__u32		   extendedmode; /*  Driver-specific extensions */
-+	__u32              writebuffers; /*  # of buffers for write */
-+	__u32		   reserved[4];
-+};
-+
-+/*
-+ *	I N P U T   I M A G E   C R O P P I N G
-+ */
-+struct v4l2_cropcap {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        bounds;
-+	struct v4l2_rect        defrect;
-+	struct v4l2_fract       pixelaspect;
-+};
-+
-+struct v4l2_crop {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        c;
-+};
-+
-+/*
-+ *      A N A L O G   V I D E O   S T A N D A R D
-+ */
-+
-+typedef __u64 v4l2_std_id;
-+
-+/* one bit for each */
-+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-+
-+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-+
-+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
-+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
-+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
-+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)
-+
-+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
-+
-+/* ATSC/HDTV */
-+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-+
-+/* FIXME:
-+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
-+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
-+   this value to 32 bits.
-+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
-+   it should work fine. However, if needed to add more than two standards,
-+   v4l2-common.c should be fixed.
-+ */
-+
-+/* some merged standards */
-+#define V4L2_STD_MN	(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
-+#define V4L2_STD_B	(V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
-+#define V4L2_STD_GH	(V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
-+#define V4L2_STD_DK	(V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
-+
-+/* some common needed stuff */
-+#define V4L2_STD_PAL_BG		(V4L2_STD_PAL_B		|\
-+				 V4L2_STD_PAL_B1	|\
-+				 V4L2_STD_PAL_G)
-+#define V4L2_STD_PAL_DK		(V4L2_STD_PAL_D		|\
-+				 V4L2_STD_PAL_D1	|\
-+				 V4L2_STD_PAL_K)
-+#define V4L2_STD_PAL		(V4L2_STD_PAL_BG	|\
-+				 V4L2_STD_PAL_DK	|\
-+				 V4L2_STD_PAL_H		|\
-+				 V4L2_STD_PAL_I)
-+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M	|\
-+				 V4L2_STD_NTSC_M_JP     |\
-+				 V4L2_STD_NTSC_M_KR)
-+#define V4L2_STD_SECAM_DK      	(V4L2_STD_SECAM_D	|\
-+				 V4L2_STD_SECAM_K	|\
-+				 V4L2_STD_SECAM_K1)
-+#define V4L2_STD_SECAM		(V4L2_STD_SECAM_B	|\
-+				 V4L2_STD_SECAM_G	|\
-+				 V4L2_STD_SECAM_H	|\
-+				 V4L2_STD_SECAM_DK	|\
-+				 V4L2_STD_SECAM_L       |\
-+				 V4L2_STD_SECAM_LC)
-+
-+#define V4L2_STD_525_60		(V4L2_STD_PAL_M		|\
-+				 V4L2_STD_PAL_60	|\
-+				 V4L2_STD_NTSC		|\
-+				 V4L2_STD_NTSC_443)
-+#define V4L2_STD_625_50		(V4L2_STD_PAL		|\
-+				 V4L2_STD_PAL_N		|\
-+				 V4L2_STD_PAL_Nc	|\
-+				 V4L2_STD_SECAM)
-+#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
-+				 V4L2_STD_ATSC_16_VSB)
-+
-+#define V4L2_STD_UNKNOWN        0
-+#define V4L2_STD_ALL            (V4L2_STD_525_60	|\
-+				 V4L2_STD_625_50)
-+
-+struct v4l2_standard {
-+	__u32		     index;
-+	v4l2_std_id          id;
-+	__u8		     name[24];
-+	struct v4l2_fract    frameperiod; /* Frames, not fields */
-+	__u32		     framelines;
-+	__u32		     reserved[4];
-+};
-+
-+/*
-+ *	V I D E O	T I M I N G S	D V	P R E S E T
-+ */
-+struct v4l2_dv_preset {
-+	__u32	preset;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ *	D V	P R E S E T S	E N U M E R A T I O N
-+ */
-+struct v4l2_dv_enum_preset {
-+	__u32	index;
-+	__u32	preset;
-+	__u8	name[32]; /* Name of the preset timing */
-+	__u32	width;
-+	__u32	height;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ * 	D V	P R E S E T	V A L U E S
-+ */
-+#define		V4L2_DV_INVALID		0
-+#define		V4L2_DV_480P59_94	1 /* BT.1362 */
-+#define		V4L2_DV_576P50		2 /* BT.1362 */
-+#define		V4L2_DV_720P24		3 /* SMPTE 296M */
-+#define		V4L2_DV_720P25		4 /* SMPTE 296M */
-+#define		V4L2_DV_720P30		5 /* SMPTE 296M */
-+#define		V4L2_DV_720P50		6 /* SMPTE 296M */
-+#define		V4L2_DV_720P59_94	7 /* SMPTE 274M */
-+#define		V4L2_DV_720P60		8 /* SMPTE 274M/296M */
-+#define		V4L2_DV_1080I29_97	9 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I30		10 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I25		11 /* BT.1120 */
-+#define		V4L2_DV_1080I50		12 /* SMPTE 296M */
-+#define		V4L2_DV_1080I60		13 /* SMPTE 296M */
-+#define		V4L2_DV_1080P24		14 /* SMPTE 296M */
-+#define		V4L2_DV_1080P25		15 /* SMPTE 296M */
-+#define		V4L2_DV_1080P30		16 /* SMPTE 296M */
-+#define		V4L2_DV_1080P50		17 /* BT.1120 */
-+#define		V4L2_DV_1080P60		18 /* BT.1120 */
-+
-+/*
-+ *	D V 	B T	T I M I N G S
-+ */
-+
-+/* BT.656/BT.1120 timing data */
-+struct v4l2_bt_timings {
-+	__u32	width;		/* width in pixels */
-+	__u32	height;		/* height in lines */
-+	__u32	interlaced;	/* Interlaced or progressive */
-+	__u32	polarities;	/* Positive or negative polarity */
-+	__u64	pixelclock;	/* Pixel clock in HZ. Ex. 74.25MHz->74250000 */
-+	__u32	hfrontporch;	/* Horizpontal front porch in pixels */
-+	__u32	hsync;		/* Horizontal Sync length in pixels */
-+	__u32	hbackporch;	/* Horizontal back porch in pixels */
-+	__u32	vfrontporch;	/* Vertical front porch in pixels */
-+	__u32	vsync;		/* Vertical Sync length in lines */
-+	__u32	vbackporch;	/* Vertical back porch in lines */
-+	__u32	il_vfrontporch;	/* Vertical front porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vsync;	/* Vertical sync length for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vbackporch;	/* Vertical back porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	reserved[16];
-+} __attribute__ ((packed));
-+
-+/* Interlaced or progressive format */
-+#define	V4L2_DV_PROGRESSIVE	0
-+#define	V4L2_DV_INTERLACED	1
-+
-+/* Polarities. If bit is not set, it is assumed to be negative polarity */
-+#define V4L2_DV_VSYNC_POS_POL	0x00000001
-+#define V4L2_DV_HSYNC_POS_POL	0x00000002
-+
-+
-+/* DV timings */
-+struct v4l2_dv_timings {
-+	__u32 type;
-+	union {
-+		struct v4l2_bt_timings	bt;
-+		__u32	reserved[32];
-+	};
-+} __attribute__ ((packed));
-+
-+/* Values for the type field */
-+#define V4L2_DV_BT_656_1120	0	/* BT.656/1120 timing type */
-+
-+/*
-+ *	V I D E O   I N P U T S
-+ */
-+struct v4l2_input {
-+	__u32	     index;		/*  Which input */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of input */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32        tuner;             /*  Associated tuner */
-+	v4l2_std_id  std;
-+	__u32	     status;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+
-+/*  Values for the 'type' field */
-+#define V4L2_INPUT_TYPE_TUNER		1
-+#define V4L2_INPUT_TYPE_CAMERA		2
-+
-+/* field 'status' - general */
-+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-+#define V4L2_IN_ST_NO_COLOR    0x00000004
-+
-+/* field 'status' - sensor orientation */
-+/* If sensor is mounted upside down set both bits */
-+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
-+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
-+
-+/* field 'status' - analog */
-+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-+
-+/* field 'status' - digital */
-+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-+
-+/* field 'status' - VCR and set-top box */
-+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-+
-+/* capabilities flags */
-+#define V4L2_IN_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_IN_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_IN_CAP_STD			0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	V I D E O   O U T P U T S
-+ */
-+struct v4l2_output {
-+	__u32	     index;		/*  Which output */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of output */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32	     modulator;         /*  Associated modulator */
-+	v4l2_std_id  std;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_OUTPUT_TYPE_MODULATOR		1
-+#define V4L2_OUTPUT_TYPE_ANALOG			2
-+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY	3
-+
-+/* capabilities flags */
-+#define V4L2_OUT_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_OUT_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_OUT_CAP_STD		0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	C O N T R O L S
-+ */
-+struct v4l2_control {
-+	__u32		     id;
-+	__s32		     value;
-+};
-+
-+struct v4l2_ext_control {
-+	__u32 id;
-+	__u32 size;
-+	__u32 reserved2[1];
-+	union {
-+		__s32 value;
-+		__s64 value64;
-+		char *string;
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_ext_controls {
-+	__u32 ctrl_class;
-+	__u32 count;
-+	__u32 error_idx;
-+	__u32 reserved[2];
-+	struct v4l2_ext_control *controls;
-+};
-+
-+/*  Values for ctrl_class field */
-+#define V4L2_CTRL_CLASS_USER 0x00980000	/* Old-style 'user' controls */
-+#define V4L2_CTRL_CLASS_MPEG 0x00990000	/* MPEG-compression controls */
-+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000	/* Camera class controls */
-+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000	/* FM Modulator control class */
-+
-+#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
-+#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
-+
-+enum v4l2_ctrl_type {
-+	V4L2_CTRL_TYPE_INTEGER	     = 1,
-+	V4L2_CTRL_TYPE_BOOLEAN	     = 2,
-+	V4L2_CTRL_TYPE_MENU	     = 3,
-+	V4L2_CTRL_TYPE_BUTTON	     = 4,
-+	V4L2_CTRL_TYPE_INTEGER64     = 5,
-+	V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
-+	V4L2_CTRL_TYPE_STRING        = 7,
-+};
-+
-+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-+struct v4l2_queryctrl {
-+	__u32		     id;
-+	enum v4l2_ctrl_type  type;
-+	__u8		     name[32];	/* Whatever */
-+	__s32		     minimum;	/* Note signedness */
-+	__s32		     maximum;
-+	__s32		     step;
-+	__s32		     default_value;
-+	__u32                flags;
-+	__u32		     reserved[2];
-+};
-+
-+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-+struct v4l2_querymenu {
-+	__u32		id;
-+	__u32		index;
-+	__u8		name[32];	/* Whatever */
-+	__u32		reserved;
-+};
-+
-+/*  Control flags  */
-+#define V4L2_CTRL_FLAG_DISABLED		0x0001
-+#define V4L2_CTRL_FLAG_GRABBED		0x0002
-+#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
-+#define V4L2_CTRL_FLAG_UPDATE 		0x0008
-+#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
-+#define V4L2_CTRL_FLAG_SLIDER 		0x0020
-+#define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
-+
-+/*  Query flag, to be ORed with the control ID */
-+#define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
-+
-+/*  User-class control IDs defined by V4L2 */
-+#define V4L2_CID_BASE			(V4L2_CTRL_CLASS_USER | 0x900)
-+#define V4L2_CID_USER_BASE 		V4L2_CID_BASE
-+/*  IDs reserved for driver specific controls */
-+#define V4L2_CID_PRIVATE_BASE		0x08000000
-+
-+#define V4L2_CID_USER_CLASS 		(V4L2_CTRL_CLASS_USER | 1)
-+#define V4L2_CID_BRIGHTNESS		(V4L2_CID_BASE+0)
-+#define V4L2_CID_CONTRAST		(V4L2_CID_BASE+1)
-+#define V4L2_CID_SATURATION		(V4L2_CID_BASE+2)
-+#define V4L2_CID_HUE			(V4L2_CID_BASE+3)
-+#define V4L2_CID_AUDIO_VOLUME		(V4L2_CID_BASE+5)
-+#define V4L2_CID_AUDIO_BALANCE		(V4L2_CID_BASE+6)
-+#define V4L2_CID_AUDIO_BASS		(V4L2_CID_BASE+7)
-+#define V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)
-+#define V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)
-+#define V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)
-+#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11) /* Deprecated */
-+#define V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)
-+#define V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)
-+#define V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)
-+#define V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)
-+#define V4L2_CID_GAMMA			(V4L2_CID_BASE+16)
-+#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* Deprecated */
-+#define V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)
-+#define V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)
-+#define V4L2_CID_GAIN			(V4L2_CID_BASE+19)
-+#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)
-+#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
-+
-+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
-+#define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)
-+#define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)
-+
-+#define V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)
-+enum v4l2_power_line_frequency {
-+	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,
-+	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,
-+	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,
-+};
-+#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)
-+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)
-+#define V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27)
-+#define V4L2_CID_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)
-+#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
-+#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
-+#define V4L2_CID_COLORFX			(V4L2_CID_BASE+31)
-+enum v4l2_colorfx {
-+	V4L2_COLORFX_NONE	= 0,
-+	V4L2_COLORFX_BW		= 1,
-+	V4L2_COLORFX_SEPIA	= 2,
-+	V4L2_COLORFX_NEGATIVE = 3,
-+	V4L2_COLORFX_EMBOSS = 4,
-+	V4L2_COLORFX_SKETCH = 5,
-+	V4L2_COLORFX_SKY_BLUE = 6,
-+	V4L2_COLORFX_GRASS_GREEN = 7,
-+	V4L2_COLORFX_SKIN_WHITEN = 8,
-+	V4L2_COLORFX_VIVID = 9,
-+};
-+#define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
-+#define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)
-+
-+#define V4L2_CID_ROTATE				(V4L2_CID_BASE+34)
-+#define V4L2_CID_BG_COLOR			(V4L2_CID_BASE+35)
-+
-+#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
-+
-+#define V4L2_CID_ILLUMINATORS_1			(V4L2_CID_BASE+37)
-+#define V4L2_CID_ILLUMINATORS_2			(V4L2_CID_BASE+38)
-+
-+/* last CID + 1 */
-+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+39)
-+
-+/*  MPEG-class control IDs defined by V4L2 */
-+#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
-+#define V4L2_CID_MPEG_CLASS 			(V4L2_CTRL_CLASS_MPEG | 1)
-+
-+/*  MPEG streams */
-+#define V4L2_CID_MPEG_STREAM_TYPE 		(V4L2_CID_MPEG_BASE+0)
-+enum v4l2_mpeg_stream_type {
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
-+};
-+#define V4L2_CID_MPEG_STREAM_PID_PMT 		(V4L2_CID_MPEG_BASE+1)
-+#define V4L2_CID_MPEG_STREAM_PID_AUDIO 		(V4L2_CID_MPEG_BASE+2)
-+#define V4L2_CID_MPEG_STREAM_PID_VIDEO 		(V4L2_CID_MPEG_BASE+3)
-+#define V4L2_CID_MPEG_STREAM_PID_PCR 		(V4L2_CID_MPEG_BASE+4)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO 	(V4L2_CID_MPEG_BASE+5)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO 	(V4L2_CID_MPEG_BASE+6)
-+#define V4L2_CID_MPEG_STREAM_VBI_FMT 		(V4L2_CID_MPEG_BASE+7)
-+enum v4l2_mpeg_stream_vbi_fmt {
-+	V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
-+	V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
-+};
-+
-+/*  MPEG audio */
-+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ 	(V4L2_CID_MPEG_BASE+100)
-+enum v4l2_mpeg_audio_sampling_freq {
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_ENCODING 		(V4L2_CID_MPEG_BASE+101)
-+enum v4l2_mpeg_audio_encoding {
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-+	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
-+enum v4l2_mpeg_audio_l1_bitrate {
-+	V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE 		(V4L2_CID_MPEG_BASE+103)
-+enum v4l2_mpeg_audio_l2_bitrate {
-+	V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE 		(V4L2_CID_MPEG_BASE+104)
-+enum v4l2_mpeg_audio_l3_bitrate {
-+	V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE 		(V4L2_CID_MPEG_BASE+105)
-+enum v4l2_mpeg_audio_mode {
-+	V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
-+	V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
-+	V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
-+	V4L2_MPEG_AUDIO_MODE_MONO         = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION 	(V4L2_CID_MPEG_BASE+106)
-+enum v4l2_mpeg_audio_mode_extension {
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_EMPHASIS 		(V4L2_CID_MPEG_BASE+107)
-+enum v4l2_mpeg_audio_emphasis {
-+	V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
-+	V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
-+	V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_CRC 		(V4L2_CID_MPEG_BASE+108)
-+enum v4l2_mpeg_audio_crc {
-+	V4L2_MPEG_AUDIO_CRC_NONE  = 0,
-+	V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MUTE 		(V4L2_CID_MPEG_BASE+109)
-+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE		(V4L2_CID_MPEG_BASE+110)
-+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE		(V4L2_CID_MPEG_BASE+111)
-+enum v4l2_mpeg_audio_ac3_bitrate {
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
-+};
-+
-+/*  MPEG video */
-+#define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
-+enum v4l2_mpeg_video_encoding {
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
-+};
-+#define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
-+enum v4l2_mpeg_video_aspect {
-+	V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
-+	V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
-+	V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
-+	V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
-+};
-+#define V4L2_CID_MPEG_VIDEO_B_FRAMES 		(V4L2_CID_MPEG_BASE+202)
-+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE 		(V4L2_CID_MPEG_BASE+203)
-+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE 	(V4L2_CID_MPEG_BASE+204)
-+#define V4L2_CID_MPEG_VIDEO_PULLDOWN 		(V4L2_CID_MPEG_BASE+205)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE 	(V4L2_CID_MPEG_BASE+206)
-+enum v4l2_mpeg_video_bitrate_mode {
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
-+};
-+#define V4L2_CID_MPEG_VIDEO_BITRATE 		(V4L2_CID_MPEG_BASE+207)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK 	(V4L2_CID_MPEG_BASE+208)
-+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-+#define V4L2_CID_MPEG_VIDEO_MUTE 		(V4L2_CID_MPEG_BASE+210)
-+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV 		(V4L2_CID_MPEG_BASE+211)
-+
-+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-+#define V4L2_CID_MPEG_CX2341X_BASE 				(V4L2_CTRL_CLASS_MPEG | 0x1000)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+0)
-+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+1)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+2)
-+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+3)
-+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+4)
-+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+5)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE 		(V4L2_CID_MPEG_CX2341X_BASE+6)
-+enum v4l2_mpeg_cx2341x_video_median_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM 	(V4L2_CID_MPEG_CX2341X_BASE+7)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+8)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM	(V4L2_CID_MPEG_CX2341X_BASE+9)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+10)
-+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS 	(V4L2_CID_MPEG_CX2341X_BASE+11)
-+
-+/*  Camera class control IDs */
-+#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)
-+#define V4L2_CID_CAMERA_CLASS 		(V4L2_CTRL_CLASS_CAMERA | 1)
-+
-+#define V4L2_CID_EXPOSURE_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+1)
-+enum  v4l2_exposure_auto_type {
-+	V4L2_EXPOSURE_AUTO = 0,
-+	V4L2_EXPOSURE_MANUAL = 1,
-+	V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
-+	V4L2_EXPOSURE_APERTURE_PRIORITY = 3
-+};
-+#define V4L2_CID_EXPOSURE_ABSOLUTE		(V4L2_CID_CAMERA_CLASS_BASE+2)
-+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY		(V4L2_CID_CAMERA_CLASS_BASE+3)
-+
-+#define V4L2_CID_PAN_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+4)
-+#define V4L2_CID_TILT_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+5)
-+#define V4L2_CID_PAN_RESET			(V4L2_CID_CAMERA_CLASS_BASE+6)
-+#define V4L2_CID_TILT_RESET			(V4L2_CID_CAMERA_CLASS_BASE+7)
-+
-+#define V4L2_CID_PAN_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+8)
-+#define V4L2_CID_TILT_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+9)
-+
-+#define V4L2_CID_FOCUS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+10)
-+#define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
-+#define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
-+
-+#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
-+#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
-+#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
-+
-+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
-+
-+#define V4L2_CID_IRIS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+17)
-+#define V4L2_CID_IRIS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+18)
-+
-+/* FM Modulator class control IDs */
-+#define V4L2_CID_FM_TX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_TX | 0x900)
-+#define V4L2_CID_FM_TX_CLASS			(V4L2_CTRL_CLASS_FM_TX | 1)
-+
-+#define V4L2_CID_RDS_TX_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 1)
-+#define V4L2_CID_RDS_TX_PI			(V4L2_CID_FM_TX_CLASS_BASE + 2)
-+#define V4L2_CID_RDS_TX_PTY			(V4L2_CID_FM_TX_CLASS_BASE + 3)
-+#define V4L2_CID_RDS_TX_PS_NAME			(V4L2_CID_FM_TX_CLASS_BASE + 5)
-+#define V4L2_CID_RDS_TX_RADIO_TEXT		(V4L2_CID_FM_TX_CLASS_BASE + 6)
-+
-+#define V4L2_CID_AUDIO_LIMITER_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 64)
-+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 65)
-+#define V4L2_CID_AUDIO_LIMITER_DEVIATION	(V4L2_CID_FM_TX_CLASS_BASE + 66)
-+
-+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED	(V4L2_CID_FM_TX_CLASS_BASE + 80)
-+#define V4L2_CID_AUDIO_COMPRESSION_GAIN		(V4L2_CID_FM_TX_CLASS_BASE + 81)
-+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD	(V4L2_CID_FM_TX_CLASS_BASE + 82)
-+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 83)
-+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 84)
-+
-+#define V4L2_CID_PILOT_TONE_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 96)
-+#define V4L2_CID_PILOT_TONE_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 97)
-+#define V4L2_CID_PILOT_TONE_FREQUENCY		(V4L2_CID_FM_TX_CLASS_BASE + 98)
-+
-+#define V4L2_CID_TUNE_PREEMPHASIS		(V4L2_CID_FM_TX_CLASS_BASE + 112)
-+enum v4l2_preemphasis {
-+	V4L2_PREEMPHASIS_DISABLED	= 0,
-+	V4L2_PREEMPHASIS_50_uS		= 1,
-+	V4L2_PREEMPHASIS_75_uS		= 2,
-+};
-+#define V4L2_CID_TUNE_POWER_LEVEL		(V4L2_CID_FM_TX_CLASS_BASE + 113)
-+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR		(V4L2_CID_FM_TX_CLASS_BASE + 114)
-+
-+/*
-+ *	T U N I N G
-+ */
-+struct v4l2_tuner {
-+	__u32                   index;
-+	__u8			name[32];
-+	enum v4l2_tuner_type    type;
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			rxsubchans;
-+	__u32			audmode;
-+	__s32			signal;
-+	__s32			afc;
-+	__u32			reserved[4];
-+};
-+
-+struct v4l2_modulator {
-+	__u32			index;
-+	__u8			name[32];
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			txsubchans;
-+	__u32			reserved[4];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_TUNER_CAP_LOW		0x0001
-+#define V4L2_TUNER_CAP_NORM		0x0002
-+#define V4L2_TUNER_CAP_STEREO		0x0010
-+#define V4L2_TUNER_CAP_LANG2		0x0020
-+#define V4L2_TUNER_CAP_SAP		0x0020
-+#define V4L2_TUNER_CAP_LANG1		0x0040
-+#define V4L2_TUNER_CAP_RDS		0x0080
-+#define V4L2_TUNER_CAP_RDS_BLOCK_IO	0x0100
-+#define V4L2_TUNER_CAP_RDS_CONTROLS	0x0200
-+
-+/*  Flags for the 'rxsubchans' field */
-+#define V4L2_TUNER_SUB_MONO		0x0001
-+#define V4L2_TUNER_SUB_STEREO		0x0002
-+#define V4L2_TUNER_SUB_LANG2		0x0004
-+#define V4L2_TUNER_SUB_SAP		0x0004
-+#define V4L2_TUNER_SUB_LANG1		0x0008
-+#define V4L2_TUNER_SUB_RDS		0x0010
-+
-+/*  Values for the 'audmode' field */
-+#define V4L2_TUNER_MODE_MONO		0x0000
-+#define V4L2_TUNER_MODE_STEREO		0x0001
-+#define V4L2_TUNER_MODE_LANG2		0x0002
-+#define V4L2_TUNER_MODE_SAP		0x0002
-+#define V4L2_TUNER_MODE_LANG1		0x0003
-+#define V4L2_TUNER_MODE_LANG1_LANG2	0x0004
-+
-+struct v4l2_frequency {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      frequency;
-+	__u32		      reserved[8];
-+};
-+
-+struct v4l2_hw_freq_seek {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      seek_upward;
-+	__u32		      wrap_around;
-+	__u32		      spacing;
-+	__u32		      reserved[7];
-+};
-+
-+/*
-+ *	R D S
-+ */
-+
-+struct v4l2_rds_data {
-+	__u8 	lsb;
-+	__u8 	msb;
-+	__u8 	block;
-+} __attribute__ ((packed));
-+
-+#define V4L2_RDS_BLOCK_MSK 	 0x7
-+#define V4L2_RDS_BLOCK_A 	 0
-+#define V4L2_RDS_BLOCK_B 	 1
-+#define V4L2_RDS_BLOCK_C 	 2
-+#define V4L2_RDS_BLOCK_D 	 3
-+#define V4L2_RDS_BLOCK_C_ALT 	 4
-+#define V4L2_RDS_BLOCK_INVALID 	 7
-+
-+#define V4L2_RDS_BLOCK_CORRECTED 0x40
-+#define V4L2_RDS_BLOCK_ERROR 	 0x80
-+
-+/*
-+ *	A U D I O
-+ */
-+struct v4l2_audio {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_AUDCAP_STEREO		0x00001
-+#define V4L2_AUDCAP_AVL			0x00002
-+
-+/*  Flags for the 'mode' field */
-+#define V4L2_AUDMODE_AVL		0x00001
-+
-+struct v4l2_audioout {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*
-+ *	M P E G   S E R V I C E S
-+ *
-+ *	NOTE: EXPERIMENTAL API
-+ */
-+#if 1
-+#define V4L2_ENC_IDX_FRAME_I    (0)
-+#define V4L2_ENC_IDX_FRAME_P    (1)
-+#define V4L2_ENC_IDX_FRAME_B    (2)
-+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
-+
-+struct v4l2_enc_idx_entry {
-+	__u64 offset;
-+	__u64 pts;
-+	__u32 length;
-+	__u32 flags;
-+	__u32 reserved[2];
-+};
-+
-+#define V4L2_ENC_IDX_ENTRIES (64)
-+struct v4l2_enc_idx {
-+	__u32 entries;
-+	__u32 entries_cap;
-+	__u32 reserved[4];
-+	struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
-+};
-+
-+
-+#define V4L2_ENC_CMD_START      (0)
-+#define V4L2_ENC_CMD_STOP       (1)
-+#define V4L2_ENC_CMD_PAUSE      (2)
-+#define V4L2_ENC_CMD_RESUME     (3)
-+
-+/* Flags for V4L2_ENC_CMD_STOP */
-+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
-+
-+struct v4l2_encoder_cmd {
-+	__u32 cmd;
-+	__u32 flags;
-+	union {
-+		struct {
-+			__u32 data[8];
-+		} raw;
-+	};
-+};
-+
-+#endif
-+
-+
-+/*
-+ *	D A T A   S E R V I C E S   ( V B I )
-+ *
-+ *	Data services API by Michael Schimek
-+ */
-+
-+/* Raw VBI */
-+struct v4l2_vbi_format {
-+	__u32	sampling_rate;		/* in 1 Hz */
-+	__u32	offset;
-+	__u32	samples_per_line;
-+	__u32	sample_format;		/* V4L2_PIX_FMT_* */
-+	__s32	start[2];
-+	__u32	count[2];
-+	__u32	flags;			/* V4L2_VBI_* */
-+	__u32	reserved[2];		/* must be zero */
-+};
-+
-+/*  VBI flags  */
-+#define V4L2_VBI_UNSYNC		(1 << 0)
-+#define V4L2_VBI_INTERLACED	(1 << 1)
-+
-+/* Sliced VBI
-+ *
-+ *    This implements is a proposal V4L2 API to allow SLICED VBI
-+ * required for some hardware encoders. It should change without
-+ * notice in the definitive implementation.
-+ */
-+
-+struct v4l2_sliced_vbi_format {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	__u32   io_size;
-+	__u32   reserved[2];            /* must be zero */
-+};
-+
-+/* Teletext World System Teletext
-+   (WST), defined on ITU-R BT.653-2 */
-+#define V4L2_SLICED_TELETEXT_B          (0x0001)
-+/* Video Program System, defined on ETS 300 231*/
-+#define V4L2_SLICED_VPS                 (0x0400)
-+/* Closed Caption, defined on EIA-608 */
-+#define V4L2_SLICED_CAPTION_525         (0x1000)
-+/* Wide Screen System, defined on ITU-R BT1119.1 */
-+#define V4L2_SLICED_WSS_625             (0x4000)
-+
-+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
-+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
-+
-+struct v4l2_sliced_vbi_cap {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	enum v4l2_buf_type type;
-+	__u32   reserved[3];    /* must be 0 */
-+};
-+
-+struct v4l2_sliced_vbi_data {
-+	__u32   id;
-+	__u32   field;          /* 0: first field, 1: second field */
-+	__u32   line;           /* 1-23 */
-+	__u32   reserved;       /* must be 0 */
-+	__u8    data[48];
-+};
-+
-+/*
-+ * Sliced VBI data inserted into MPEG Streams
-+ */
-+
-+/*
-+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
-+ *
-+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
-+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
-+ * data
-+ *
-+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
-+ * definitions are not included here.  See the MPEG-2 specifications for details
-+ * on these headers.
-+ */
-+
-+/* Line type IDs */
-+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
-+#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
-+#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
-+#define V4L2_MPEG_VBI_IVTV_VPS            (7)
-+
-+struct v4l2_mpeg_vbi_itv0_line {
-+	__u8 id;	/* One of V4L2_MPEG_VBI_IVTV_* above */
-+	__u8 data[42];	/* Sliced VBI data for the line */
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_itv0 {
-+	__le32 linemask[2]; /* Bitmasks of VBI service lines present */
-+	struct v4l2_mpeg_vbi_itv0_line line[35];
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_ITV0 {
-+	struct v4l2_mpeg_vbi_itv0_line line[36];
-+} __attribute__ ((packed));
-+
-+#define V4L2_MPEG_VBI_IVTV_MAGIC0	"itv0"
-+#define V4L2_MPEG_VBI_IVTV_MAGIC1	"ITV0"
-+
-+struct v4l2_mpeg_vbi_fmt_ivtv {
-+	__u8 magic[4];
-+	union {
-+		struct v4l2_mpeg_vbi_itv0 itv0;
-+		struct v4l2_mpeg_vbi_ITV0 ITV0;
-+	};
-+} __attribute__ ((packed));
-+
-+/*
-+ *	A G G R E G A T E   S T R U C T U R E S
-+ */
-+
-+/**
-+ * struct v4l2_plane_pix_format - additional, per-plane format definition
-+ * @sizeimage:		maximum size in bytes required for data, for which
-+ *			this plane will be used
-+ * @bytesperline:	distance in bytes between the leftmost pixels in two
-+ *			adjacent lines
-+ */
-+struct v4l2_plane_pix_format {
-+	__u32		sizeimage;
-+	__u16		bytesperline;
-+	__u16		reserved[7];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_pix_format_mplane - multiplanar format definition
-+ * @width:		image width in pixels
-+ * @height:		image height in pixels
-+ * @pixelformat:	little endian four character code (fourcc)
-+ * @field:		field order (for interlaced video)
-+ * @colorspace:		supplemental to pixelformat
-+ * @plane_fmt:		per-plane information
-+ * @num_planes:		number of planes for this format
-+ */
-+struct v4l2_pix_format_mplane {
-+	__u32				width;
-+	__u32				height;
-+	__u32				pixelformat;
-+	enum v4l2_field			field;
-+	enum v4l2_colorspace		colorspace;
-+
-+	struct v4l2_plane_pix_format	plane_fmt[VIDEO_MAX_PLANES];
-+	__u8				num_planes;
-+	__u8				reserved[11];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_format - stream data format
-+ * @type:	type of the data stream
-+ * @pix:	definition of an image format
-+ * @pix_mp:	definition of a multiplanar image format
-+ * @win:	definition of an overlaid image
-+ * @vbi:	raw VBI capture or output parameters
-+ * @sliced:	sliced VBI capture or output parameters
-+ * @raw_data:	placeholder for future extensions and custom formats
-+ */
-+struct v4l2_format {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_pix_format		pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
-+		struct v4l2_pix_format_mplane	pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
-+		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
-+		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
-+		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
-+		__u8	raw_data[200];                   /* user-defined */
-+	} fmt;
-+};
-+
-+/*	Stream type-dependent parameters
-+ */
-+struct v4l2_streamparm {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_captureparm	capture;
-+		struct v4l2_outputparm	output;
-+		__u8	raw_data[200];  /* user-defined */
-+	} parm;
-+};
-+
-+/*
-+ *	E V E N T S
-+ */
-+
-+#define V4L2_EVENT_ALL				0
-+#define V4L2_EVENT_VSYNC			1
-+#define V4L2_EVENT_EOS				2
-+#define V4L2_EVENT_PRIVATE_START		0x08000000
-+
-+/* Payload for V4L2_EVENT_VSYNC */
-+struct v4l2_event_vsync {
-+	/* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
-+	__u8 field;
-+} __attribute__ ((packed));
-+
-+struct v4l2_event {
-+	__u32				type;
-+	union {
-+		struct v4l2_event_vsync vsync;
-+		__u8			data[64];
-+	} u;
-+	__u32				pending;
-+	__u32				sequence;
-+	struct timespec			timestamp;
-+	__u32				reserved[9];
-+};
-+
-+struct v4l2_event_subscription {
-+	__u32				type;
-+	__u32				reserved[7];
-+};
-+
-+/*
-+ *	A D V A N C E D   D E B U G G I N G
-+ *
-+ *	NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
-+ *	FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
-+ */
-+
-+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
-+
-+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
-+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
-+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
-+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
-+
-+struct v4l2_dbg_match {
-+	__u32 type; /* Match type */
-+	union {     /* Match this chip, meaning determined by type */
-+		__u32 addr;
-+		char name[32];
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_dbg_register {
-+	struct v4l2_dbg_match match;
-+	__u32 size;	/* register size in bytes */
-+	__u64 reg;
-+	__u64 val;
-+} __attribute__ ((packed));
-+
-+/* VIDIOC_DBG_G_CHIP_IDENT */
-+struct v4l2_dbg_chip_ident {
-+	struct v4l2_dbg_match match;
-+	__u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
-+	__u32 revision;    /* chip revision, chip specific */
-+} __attribute__ ((packed));
-+
-+/*
-+ *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
-+ *
-+ */
-+#define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
-+#define VIDIOC_RESERVED		  _IO('V',  1)
-+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
-+#define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
-+#define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
-+#define VIDIOC_REQBUFS		_IOWR('V',  8, struct v4l2_requestbuffers)
-+#define VIDIOC_QUERYBUF		_IOWR('V',  9, struct v4l2_buffer)
-+#define VIDIOC_G_FBUF		 _IOR('V', 10, struct v4l2_framebuffer)
-+#define VIDIOC_S_FBUF		 _IOW('V', 11, struct v4l2_framebuffer)
-+#define VIDIOC_OVERLAY		 _IOW('V', 14, int)
-+#define VIDIOC_QBUF		_IOWR('V', 15, struct v4l2_buffer)
-+#define VIDIOC_DQBUF		_IOWR('V', 17, struct v4l2_buffer)
-+#define VIDIOC_STREAMON		 _IOW('V', 18, int)
-+#define VIDIOC_STREAMOFF	 _IOW('V', 19, int)
-+#define VIDIOC_G_PARM		_IOWR('V', 21, struct v4l2_streamparm)
-+#define VIDIOC_S_PARM		_IOWR('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_G_STD		 _IOR('V', 23, v4l2_std_id)
-+#define VIDIOC_S_STD		 _IOW('V', 24, v4l2_std_id)
-+#define VIDIOC_ENUMSTD		_IOWR('V', 25, struct v4l2_standard)
-+#define VIDIOC_ENUMINPUT	_IOWR('V', 26, struct v4l2_input)
-+#define VIDIOC_G_CTRL		_IOWR('V', 27, struct v4l2_control)
-+#define VIDIOC_S_CTRL		_IOWR('V', 28, struct v4l2_control)
-+#define VIDIOC_G_TUNER		_IOWR('V', 29, struct v4l2_tuner)
-+#define VIDIOC_S_TUNER		 _IOW('V', 30, struct v4l2_tuner)
-+#define VIDIOC_G_AUDIO		 _IOR('V', 33, struct v4l2_audio)
-+#define VIDIOC_S_AUDIO		 _IOW('V', 34, struct v4l2_audio)
-+#define VIDIOC_QUERYCTRL	_IOWR('V', 36, struct v4l2_queryctrl)
-+#define VIDIOC_QUERYMENU	_IOWR('V', 37, struct v4l2_querymenu)
-+#define VIDIOC_G_INPUT		 _IOR('V', 38, int)
-+#define VIDIOC_S_INPUT		_IOWR('V', 39, int)
-+#define VIDIOC_G_OUTPUT		 _IOR('V', 46, int)
-+#define VIDIOC_S_OUTPUT		_IOWR('V', 47, int)
-+#define VIDIOC_ENUMOUTPUT	_IOWR('V', 48, struct v4l2_output)
-+#define VIDIOC_G_AUDOUT		 _IOR('V', 49, struct v4l2_audioout)
-+#define VIDIOC_S_AUDOUT		 _IOW('V', 50, struct v4l2_audioout)
-+#define VIDIOC_G_MODULATOR	_IOWR('V', 54, struct v4l2_modulator)
-+#define VIDIOC_S_MODULATOR	 _IOW('V', 55, struct v4l2_modulator)
-+#define VIDIOC_G_FREQUENCY	_IOWR('V', 56, struct v4l2_frequency)
-+#define VIDIOC_S_FREQUENCY	 _IOW('V', 57, struct v4l2_frequency)
-+#define VIDIOC_CROPCAP		_IOWR('V', 58, struct v4l2_cropcap)
-+#define VIDIOC_G_CROP		_IOWR('V', 59, struct v4l2_crop)
-+#define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
-+#define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
-+#define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
-+#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
-+#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
-+#define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
-+#define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
-+#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum v4l2_priority)
-+#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum v4l2_priority)
-+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
-+#define VIDIOC_LOG_STATUS         _IO('V', 70)
-+#define VIDIOC_G_EXT_CTRLS	_IOWR('V', 71, struct v4l2_ext_controls)
-+#define VIDIOC_S_EXT_CTRLS	_IOWR('V', 72, struct v4l2_ext_controls)
-+#define VIDIOC_TRY_EXT_CTRLS	_IOWR('V', 73, struct v4l2_ext_controls)
-+#if 1
-+#define VIDIOC_ENUM_FRAMESIZES	_IOWR('V', 74, struct v4l2_frmsizeenum)
-+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
-+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
-+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
-+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
-+#endif
-+
-+#if 1
-+/* Experimental, meant for debugging, testing and internal use.
-+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-+   You must be root to use these ioctls. Never use these in applications! */
-+#define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)
-+#define	VIDIOC_DBG_G_REGISTER 	_IOWR('V', 80, struct v4l2_dbg_register)
-+
-+/* Experimental, meant for debugging, testing and internal use.
-+   Never use this ioctl in applications! */
-+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-+#endif
-+
-+#define VIDIOC_S_HW_FREQ_SEEK	 _IOW('V', 82, struct v4l2_hw_freq_seek)
-+#define	VIDIOC_ENUM_DV_PRESETS	_IOWR('V', 83, struct v4l2_dv_enum_preset)
-+#define	VIDIOC_S_DV_PRESET	_IOWR('V', 84, struct v4l2_dv_preset)
-+#define	VIDIOC_G_DV_PRESET	_IOWR('V', 85, struct v4l2_dv_preset)
-+#define	VIDIOC_QUERY_DV_PRESET	_IOR('V',  86, struct v4l2_dv_preset)
-+#define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)
-+#define	VIDIOC_G_DV_TIMINGS	_IOWR('V', 88, struct v4l2_dv_timings)
-+#define	VIDIOC_DQEVENT		 _IOR('V', 89, struct v4l2_event)
-+#define	VIDIOC_SUBSCRIBE_EVENT	 _IOW('V', 90, struct v4l2_event_subscription)
-+#define	VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
-+
-+#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
-+
-+#endif /* __LINUX_VIDEODEV2_H */
diff --git a/staging/xf86-video-vesa/PKGBUILD b/staging/xf86-video-vesa/PKGBUILD
deleted file mode 100644
index 08933fb5a..000000000
--- a/staging/xf86-video-vesa/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 149908 2012-02-11 15:13:43Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-vesa
-pkgver=2.3.0
-pkgrel=8
-_gitver=4ba7306fd0c9533750d389829e2cbf0522e149b3
-pkgdesc="X.org vesa video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        http://cgit.freedesktop.org/xorg/driver/xf86-video-vesa/snapshot/xf86-video-vesa-${_gitver}.tar.gz
-        #git-fixes.patch
-        revert-kernelcheck.patch)
-sha1sums=('52f5bf577038c6fe7819743ceac787bb619b6d47'
-          'c14454521ac91aaa08aad8a6025d7720a613d54b')
-
-build() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-vesa/git-fixes.patch b/staging/xf86-video-vesa/git-fixes.patch
deleted file mode 100644
index c4f442265..000000000
--- a/staging/xf86-video-vesa/git-fixes.patch
+++ /dev/null
@@ -1,444 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 22b4b13..f101fb8 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,4 +1,5 @@
- Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-+Copyright 2008 Red Hat, Inc.
- 
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
-diff --git a/configure.ac b/configure.ac
-index ff4713d..2e4f542 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,45 +20,44 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-vesa],
--        2.3.0,
-+        [2.3.0],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-vesa)
--
-+        [xf86-video-vesa])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
-                              [ moduledir="$withval" ],
-                              [ moduledir="$libdir/xorg/modules" ])
- AC_SUBST(moduledir)
- 
--
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-@@ -93,21 +92,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
--AC_SUBST([CFLAGS])
--AC_SUBST([INCLUDES])
--
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- DRIVER_NAME=vesa
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/vesa.man b/man/vesa.man
-index 19cb766..ce4b369 100644
---- a/man/vesa.man
-+++ b/man/vesa.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH VESA __drivermansuffix__ __vendorversion__
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 88da8a2..dc702f0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -24,6 +24,9 @@
- # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
- # _ladir passes a dummy rpath to libtool so the thing will actually link
- # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-+
-+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
-+
- vesa_drv_la_LTLIBRARIES = vesa_drv.la
- vesa_drv_la_LDFLAGS = -module -avoid-version
- vesa_drv_ladir = @moduledir@/drivers
-diff --git a/src/vesa.c b/src/vesa.c
-index 034a019..61d3550 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -281,7 +281,7 @@ static VESAPtr
- VESAGetRec(ScrnInfoPtr pScrn)
- {
-     if (!pScrn->driverPrivate)
--	pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1);
-+	pScrn->driverPrivate = calloc(sizeof(VESARec), 1);
- 
-     return ((VESAPtr)pScrn->driverPrivate);
- }
-@@ -296,7 +296,7 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
- 
-     data = (VbeModeInfoData *)vbemode->Private;
- 
--    data->block = xcalloc(sizeof(VbeCRTCInfoBlock), 1);
-+    data->block = calloc(sizeof(VbeCRTCInfoBlock), 1);
-     data->block->HorizontalTotal = ddcmode->HTotal;
-     data->block->HorizontalSyncStart = ddcmode->HSyncStart;
-     data->block->HorizontalSyncEnd = ddcmode->HSyncEnd;
-@@ -317,6 +317,30 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
- 				(double)(ddcmode->HTotal * ddcmode->VTotal));
- }
- 
-+/*
-+ * Despite that VBE gives you pixel granularity for mode sizes, some BIOSes
-+ * think they can only give sizes in multiples of character cells; and
-+ * indeed, the reference CVT and GTF formulae only give results where
-+ * (h % 8) == 0.  Whatever, let's just try to cope.  What we're looking for
-+ * here is cases where the display says 1366x768 and the BIOS says 1360x768.
-+ */
-+static Bool
-+vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr vbe)
-+{
-+    if (!(edid->type & M_T_DRIVER))
-+	return FALSE;
-+
-+    /* never seen a height granularity... */
-+    if (edid->VDisplay != vbe->VDisplay)
-+	return FALSE;
-+
-+    if (edid->HDisplay >= vbe->HDisplay &&
-+	(edid->HDisplay & ~7) == (vbe->HDisplay & ~7))
-+	return TRUE;
-+
-+    return FALSE;
-+}
-+
- static ModeStatus
- VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
- {
-@@ -358,9 +382,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
- 	 */
- 	if (pScrn->monitor->DDC) {
- 	    for (mode = pScrn->monitor->Modes; mode; mode = mode->next) {
--		if (mode->type & M_T_DRIVER && 
--			mode->HDisplay == p->HDisplay &&
--			mode->VDisplay == p->VDisplay) {
-+		if (vesaModesCloseEnough(mode, p)) {
- 		    if (xf86CheckModeForMonitor(mode, mon) == MODE_OK) {
- 			found = 1;
- 			break;
-@@ -391,7 +413,8 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
-     for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) {
- 	mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0);
- 	ret = xf86CheckModeForMonitor(mode, mon);
--	xfree(mode);
-+	free(mode->name);
-+	free(mode);
- 	if (ret == MODE_OK)
- 	    break;
-     }
-@@ -431,8 +454,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
-     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
- 				NULL, NULL, NULL, NULL, NULL);
-     if (pScrn != NULL) {
--	VESAPtr pVesa = VESAGetRec(pScrn);
-+	VESAPtr pVesa;
-+
-+	if (pci_device_has_kernel_driver(dev)) {
-+	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
-+	    return FALSE;
-+	}
- 
-+	pVesa = VESAGetRec(pScrn);
- 	VESAInitScrn(pScrn);
- 	pVesa->pciInfo = dev;
-     }
-@@ -480,7 +509,7 @@ VESAProbe(DriverPtr drv, int flags)
- 		    }
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- #endif
-@@ -503,11 +532,11 @@ VESAProbe(DriverPtr drv, int flags)
- 		foundScreen = TRUE;
- 	    }
- 	}
--	xfree(usedChips);
-+	free(usedChips);
-     }
- #endif
- 
--    xfree(devSections);
-+    free(devSections);
- 
-     return (foundScreen);
- }
-@@ -554,9 +583,9 @@ VESAFreeRec(ScrnInfoPtr pScrn)
- 		VbeModeInfoData *data = (VbeModeInfoData*)mode->Private;
- 
- 		if (data->block)
--		    xfree(data->block);
-+		    free(data->block);
- 
--		xfree(data);
-+		free(data);
- 
- 		mode->Private = NULL;
- 	    }
-@@ -564,12 +593,12 @@ VESAFreeRec(ScrnInfoPtr pScrn)
- 	} while (mode && mode != pScrn->modes);
-     }
- #endif
--    xfree(pVesa->monitor);
--    xfree(pVesa->vbeInfo);
--    xfree(pVesa->pal);
--    xfree(pVesa->savedPal);
--    xfree(pVesa->fonts);
--    xfree(pScrn->driverPrivate);
-+    free(pVesa->monitor);
-+    free(pVesa->vbeInfo);
-+    free(pVesa->pal);
-+    free(pVesa->savedPal);
-+    free(pVesa->fonts);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -712,7 +741,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
-     else {
- 	void *panelid = VBEReadPanelID(pVesa->pVbe);
- 	VBEInterpretPanelID(pScrn->scrnIndex, panelid);
--	xfree(panelid);
-+	free(panelid);
-     }
- #endif
- 
-@@ -805,7 +834,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     /* options */
-     xf86CollectOptions(pScrn, NULL);
--    if (!(pVesa->Options = xalloc(sizeof(VESAOptions)))) {
-+    if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) {
-         vbeFree(pVesa->pVbe);
- 	return FALSE;
-     }
-@@ -940,7 +969,7 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	pScrn->bitsPerPixel = 8;
- 
-     if (pVesa->shadowFB) {
--	pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY *
-+	pVesa->shadow = calloc(1, pScrn->displayWidth * pScrn->virtualY *
- 				   ((pScrn->bitsPerPixel + 7) / 8));
- 	if (!pVesa->shadow) {
- 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -1119,10 +1148,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
-     if (pVesa->shadowFB && pVesa->shadow) {
- 	shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
--	xfree(pVesa->shadow);
-+	free(pVesa->shadow);
-     }
-     if (pVesa->pDGAMode) {
--	xfree(pVesa->pDGAMode);
-+	free(pVesa->pDGAMode);
- 	pVesa->pDGAMode = NULL;
- 	pVesa->nDGAMode = 0;
-     }
-@@ -1180,7 +1209,7 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
- 	     * Free it as it will not be any longer useful
- 	     */
- 	    xf86ErrorF(", mode set without customized refresh.\n");
--	    xfree(data->block);
-+	    free(data->block);
- 	    data->block = NULL;
- 	    data->mode &= ~(1 << 11);
- 	}
-@@ -1315,7 +1344,7 @@ VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
-     int base;
- 
-     if (pVesa->pal == NULL)
--	pVesa->pal = xcalloc(1, sizeof(CARD32) * 256);
-+	pVesa->pal = calloc(1, sizeof(CARD32) * 256);
- 
-     for (i = 0, base = idx = indices[i]; i < numColors; i++, idx++) {
- 	int j = indices[i];
-@@ -1414,7 +1443,7 @@ SaveFonts(ScrnInfoPtr pScrn)
-     if (attr10 & 0x01)
- 	return;
- 
--    pVesa->fonts = xalloc(16384);
-+    pVesa->fonts = malloc(16384);
- 
-     /* save the registers that are needed here */
-     miscOut = ReadMiscOut();
-@@ -1622,7 +1651,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
- 		&& function == MODE_SAVE) {
- 	        /* don't rely on the memory not being touched */
- 	        if (pVesa->pstate == NULL)
--		    pVesa->pstate = xalloc(pVesa->stateSize);
-+		    pVesa->pstate = malloc(pVesa->stateSize);
- 		memcpy(pVesa->pstate, pVesa->state, pVesa->stateSize);
- 	    }
- 	}
-@@ -1737,7 +1766,7 @@ VESADGAAddModes(ScrnInfoPtr pScrn)
-     DGAModePtr pDGAMode;
- 
-     do {
--	pDGAMode = xrealloc(pVesa->pDGAMode,
-+	pDGAMode = realloc(pVesa->pDGAMode,
- 			    (pVesa->nDGAMode + 1) * sizeof(DGAModeRec));
- 	if (!pDGAMode)
- 	    break;
-diff --git a/src/vesa.h b/src/vesa.h
-index 4656e4c..89245b9 100644
---- a/src/vesa.h
-+++ b/src/vesa.h
-@@ -25,8 +25,6 @@
-  * Conectiva Linux.
-  *
-  * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
-- *
-- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.12 2002/08/06 13:46:27 dawes Exp $
-  */
- 
- #ifndef _VESA_H_
diff --git a/staging/xf86-video-vesa/revert-kernelcheck.patch b/staging/xf86-video-vesa/revert-kernelcheck.patch
deleted file mode 100644
index 37418cc3f..000000000
--- a/staging/xf86-video-vesa/revert-kernelcheck.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 08 Dec 2010 18:45:32 +0000
-Subject: Refuse to load if there's a kernel driver bound to the device
-
-Ported from the equivalent check in nv.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 168fde1..2523d76 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
-     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
- 				NULL, NULL, NULL, NULL, NULL);
-     if (pScrn != NULL) {
--	VESAPtr pVesa = VESAGetRec(pScrn);
-+	VESAPtr pVesa;
- 
-+	if (pci_device_has_kernel_driver(dev)) {
-+	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
-+	    return FALSE;
-+	}
-+
-+	pVesa = VESAGetRec(pScrn);
- 	VESAInitScrn(pScrn);
- 	pVesa->pciInfo = dev;
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-voodoo/PKGBUILD b/staging/xf86-video-voodoo/PKGBUILD
deleted file mode 100644
index 209f6a42e..000000000
--- a/staging/xf86-video-voodoo/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149900 2012-02-11 12:20:47Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-voodoo
-pkgver=1.2.4
-pkgrel=6
-pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.99.903')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/xf86-video-xgixp/PKGBUILD b/staging/xf86-video-xgixp/PKGBUILD
deleted file mode 100644
index 7027c85ba..000000000
--- a/staging/xf86-video-xgixp/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149902 2012-02-11 12:24:18Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-xgixp
-pkgver=1.8.0
-pkgrel=5
-pkgdesc="X.org XGIXP video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa') # 'glproto')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        api-compat-fix-for-DRAWABLE_BUFFER.patch)
-sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3'
-          'ea140a13963bbf33cdff1ad75789d765867ec53b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
deleted file mode 100644
index f8cb64673..000000000
--- a/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 25 Mar 2011 22:46:55 +0000
-Subject: API compat fix for DRAWABLE_BUFFER
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index e54d8c7..189b84a 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr,
- {
-     switch (pDraw->type) {
-     case DRAWABLE_WINDOW:
-+#ifdef DRAWABLE_BUFFER
-     case DRAWABLE_BUFFER:
-+#endif
- 	*read_ptr = xg47_read_memory_swap_func;
- 	*write_ptr = xg47_write_memory_swap_func;
- 	break;
---
-cgit v0.8.3-6-g21f6
diff --git a/staging/xfce4-verve-plugin/PKGBUILD b/staging/xfce4-verve-plugin/PKGBUILD
deleted file mode 100644
index 29814c68c..000000000
--- a/staging/xfce4-verve-plugin/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149169 2012-02-06 04:15:31Z allan $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-verve-plugin
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="command line plugin Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool')
-replaces=('verve-plugin')
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed7039c40d6e560ed8bcf9a324d2ae86')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xorg-server/10-quirks.conf b/staging/xorg-server/10-quirks.conf
deleted file mode 100644
index 7afad22dc..000000000
--- a/staging/xorg-server/10-quirks.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
-EndSection
diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD
deleted file mode 100644
index 961dcd7ef..000000000
--- a/staging/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,191 +0,0 @@
-# $Id: PKGBUILD 149823 2012-02-11 09:09:10Z 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.99.903
-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' 'udev' 'libgcrypt')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        #git-fixes.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf)
-sha1sums=('a8058c22c2dc0388e64fa58e0307813cb72a337f'
-          'f19658773d3fa4dc468bb28f9f01866acce71540'
-          '962fecc159c128728f14e8ba231c5b00391ff4ac'
-          '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"
-
-  # 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')
-  conflicts=('nvidia-utils<=290.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11"
-  mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/"
-  install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  rmdir "${pkgdir}/usr/share/X11"
-
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}
diff --git a/staging/xorg-server/autoconfig-nvidia.patch b/staging/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index 9ed9b7aee..000000000
--- a/staging/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1111,7 +1111,23 @@
- 	{
- 	    int idx = 0;
- #ifdef __linux__
--	    driverList[idx++] = "nouveau";
-+	    switch (dev->device_id)
-+		{
-+		/* NV1 */
-+		case 0x0008:
-+		case 0x0009:
-+		    driverList[idx++] = "vesa";
-+		    break;
-+		/* NV3 */
-+		case 0x0018:
-+		case 0x0019:
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		default:
-+		    driverList[idx++] = "nouveau";
-+		    driverList[idx++] = "nvidia";
-+		    break;
-+		}
- #endif
- 	    driverList[idx++] = "nv";
- 	    break;
diff --git a/staging/xorg-server/autoconfig-sis.patch b/staging/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index d936efaaa..000000000
--- a/staging/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/staging/xorg-server/git-fixes.patch b/staging/xorg-server/git-fixes.patch
deleted file mode 100644
index 27da61eca..000000000
--- a/staging/xorg-server/git-fixes.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Thu, 20 Oct 2011 13:43:01 +0000
-Subject: xf86Crtc: handle no outputs with no modes harder.
-
-If you started an X server with no connected outputs, we pick a default
-1024x768 mode, however if you then ran an xvidmode using app against that
-server it would segfault the server due to not finding any valid modes.
-
-This was due to the no output mode set code, only adding the modes to the
-scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would
-get called and remove all the modes and we'd end up with 0.
-
-This change fixes xf86SetScrnInfoModes to always report a scrn mode of at
-least 1024x768, and pushes the initial configuration to just call it instead
-of setting up the mode itself.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926
-
-I've seen other bugs like this on other distros so it might also actually fix them.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3)
----
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index d75cd77..8906806 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
- 		break;
-     }
- 
--    if (scrn->modes != NULL) {
--	/* For some reason, scrn->modes is circular, unlike the other mode
--	 * lists.  How great is that?
--	 */
--	for (last = scrn->modes; last && last->next; last = last->next)
--	    ;
--	last->next = scrn->modes;
--	scrn->modes->prev = last;
--	if (mode) {
--	    while (scrn->modes != mode)
--		scrn->modes = scrn->modes->next;
--	}
-+    if (!scrn->modes) {
-+	scrn->modes = xf86ModesAdd(scrn->modes,
-+				   xf86CVTMode(scrn->display->virtualX,
-+					       scrn->display->virtualY,
-+					       60, 0, 0));
-+    }
-+
-+    /* For some reason, scrn->modes is circular, unlike the other mode
-+     * lists.  How great is that?
-+     */
-+    for (last = scrn->modes; last && last->next; last = last->next)
-+	;
-+    last->next = scrn->modes;
-+    scrn->modes->prev = last;
-+    if (mode) {
-+	while (scrn->modes != mode)
-+	    scrn->modes = scrn->modes->next;
-     }
-+
-     scrn->currentMode = scrn->modes;
- #ifdef XFreeXDGA
-     if (scrn->pScreen)
-@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- 			      width, height);
-     }
- 
--    if (have_outputs) {
--	/* Mirror output modes to scrn mode list */
--	xf86SetScrnInfoModes (scrn);
--    } else {
--	/* Clear any existing modes from scrn->modes */
--	while (scrn->modes != NULL)
--	    xf86DeleteMode(&scrn->modes, scrn->modes);
--	scrn->modes = xf86ModesAdd(scrn->modes,
--				   xf86CVTMode(width, height, 60, 0, 0));
--    }
-+    xf86SetScrnInfoModes (scrn);
- 
-     success = TRUE;
-  bailout:
---
-cgit v0.9.0.2-2-gbebe
-From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001
-From: Christopher Yeleighton <giecrilj@stegny.2a.pl>
-Date: Tue, 25 Oct 2011 01:47:06 +0000
-Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2
-
-https://bugs.freedesktop.org/show_bug.cgi?id=38420
-
-Exit with fatal error message, not segfault.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995)
----
-diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
-index 31ed505..dce3f84 100644
---- a/hw/vfb/InitOutput.c
-+++ b/hw/vfb/InitOutput.c
-@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
- 				   (1 << DirectColor)),
- 				  10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff);
- 	break;
-+    default:
-+	return FALSE;
-     }
- 
-     miSetPixmapDepths ();
---
-cgit v0.9.0.2-2-gbebe
-From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 24 Oct 2011 02:00:32 +0000
-Subject: dix: block signals when closing all devices
-
-When closing down all devices, we manually unset master for all attached
-devices, but the device's sprite info still points to the master's sprite
-info. This leaves us a window where the master is freed already but the
-device isn't yet. A signal during that window causes dereference of the
-already freed spriteInfo in mieqEnqueue's EnqueueScreen macro.
-
-Simply block signals when removing all devices. It's not like we're really
-worrying about high-responsive input at this stage.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=737031
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a)
----
-diff --git a/dix/devices.c b/dix/devices.c
-index 0ccf252..cbdd4ea 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -982,6 +982,8 @@ CloseDownDevices(void)
- {
-     DeviceIntPtr dev;
- 
-+    OsBlockSignals();
-+
-     /* Float all SDs before closing them. Note that at this point resources
-      * (e.g. cursors) have been freed already, so we can't just call
-      * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master
-@@ -1004,6 +1006,8 @@ CloseDownDevices(void)
-     inputInfo.keyboard = NULL;
-     inputInfo.pointer = NULL;
-     XkbDeleteRulesDflts();
-+
-+    OsReleaseSignals();
- }
- 
- /**
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xorg-server/revert-trapezoids.patch b/staging/xorg-server/revert-trapezoids.patch
deleted file mode 100644
index b9046c5cb..000000000
--- a/staging/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/staging/xorg-server/xvfb-run b/staging/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/staging/xorg-server/xvfb-run
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
-  echo "Xvfb failed to start" >&2
-  exit 1
-fi
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/staging/xorg-server/xvfb-run.1 b/staging/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/staging/xorg-server/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/staging/xorg-xinput/PKGBUILD b/staging/xorg-xinput/PKGBUILD
deleted file mode 100644
index 853da2125..000000000
--- a/staging/xorg-xinput/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 149441 2012-02-07 18:10:46Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-xinput
-pkgver=1.5.99.1
-pkgrel=1
-pkgdesc="Small commandline tool to configure devices"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama')
-makedepends=('xorg-util-macros' 'inputproto')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2)
-sha1sums=('f979d9a4005d71db7e58064dff6ca6738bd9a345')
-
-build() {
-  cd "${srcdir}/xinput-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/xinput-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/zsh/PKGBUILD b/staging/zsh/PKGBUILD
deleted file mode 100644
index 67942c78d..000000000
--- a/staging/zsh/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 149207 2012-02-06 09:56:28Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=zsh
-pkgver=4.3.15
-pkgrel=3
-pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
-arch=('i686' 'x86_64')
-url='http://www.zsh.org/'
-license=('custom')
-depends=('pcre' 'libcap' 'gdbm')
-install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
-        'zprofile' 'svn-1.7.patch')
-backup=('etc/zsh/zprofile')
-md5sums=('11766b0dd674a513810903cd33ffcac4'
-         '24a9335edf77252a7b5f52e079f7aef7'
-         '4fcbc119fdb624a8c483a278f3a82efd')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i "${srcdir}/svn-1.7.patch"
-	# FS#16360
-	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
-				 Doc/zsh.texi \
-				 Completion/Unix/Type/_services \
-				 Completion/Unix/Command/_init_d
-	./configure --prefix=/usr \
-		--bindir=/bin \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-maildir-support \
-		--with-term-lib='ncursesw' \
-		--enable-multibyte \
-		--enable-function-subdirs \
-		--enable-fndir=/usr/share/zsh/functions \
-		--enable-scriptdir=/usr/share/zsh/scripts \
-		--with-tcsetpgrp \
-		--enable-pcre \
-		--enable-cap \
-		--enable-zsh-secure-free
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	# This test wont work with the noatime mount option
-	rm Test/C02cond.ztst
-	HOME="${srcdir}" make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
-	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
-	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/zsh/svn-1.7.patch b/staging/zsh/svn-1.7.patch
deleted file mode 100644
index 5ef314cc9..000000000
--- a/staging/zsh/svn-1.7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-index b1cb730..41cc3e7 100644
---- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-@@ -6,12 +6,28 @@
- 
- setopt localoptions noksharrays extendedglob NO_shwordsplit
- local svnbase svnbranch a b rrn
-+local -i rc
- local -A svninfo parentinfo
- local -xA hook_com
- 
- svnbase=".";
- svninfo=()
--${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
-+# Unfortunately, `$pipestatus' is broken currently. Until that problem is
-+# resolved, here is a workaround that will get things done, without using it.
-+# Clumsily, but that's life.
-+local -a dat
-+dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} )
-+rc=$?
-+(( rc != 0 )) && return 1
-+# The following line is the real code, the following is the workaround.
-+#${vcs_comm[cmd]} info --non-interactive \
-+print -l "${dat[@]}" \
-+|& while IFS=: read a b; do
-+    svninfo[${a// /_}]="${b## #}"
-+done
-+#rc=${pipestatus[1]}
-+#(( rc != 0 )) && return 1
-+
- while [[ -d "${svnbase}/../.svn" ]]; do
-     parentinfo=()
-     ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done
diff --git a/staging/zsh/zprofile b/staging/zsh/zprofile
deleted file mode 100644
index 6bfcdf7cb..000000000
--- a/staging/zsh/zprofile
+++ /dev/null
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'
diff --git a/staging/zsh/zsh.install b/staging/zsh/zsh.install
deleted file mode 100644
index e2a53bea8..000000000
--- a/staging/zsh/zsh.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	sed -i '/^\/bin\/zsh/d' etc/shells
-}
diff --git a/testing/abiword/PKGBUILD b/testing/abiword/PKGBUILD
deleted file mode 100644
index f624f75a3..000000000
--- a/testing/abiword/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 148049 2012-01-30 18:44:21Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Maël Lavault <moimael@neuf.fr>
-
-pkgbase=abiword
-pkgname=('abiword' 'abiword-plugins')
-pkgver=2.8.6
-pkgrel=7
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 
-             'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup')
-options=('!makeflags' '!libtool')
-source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz"
-        'compat_libwpg_0_9.patch'
-	'abiword-2.8.6-no-undefined.patch'
-        'abiword-2.8.6-libpng15.patch')
-md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
-         '09446a2ebba8288fc611e88f7cf17298'
-         '42e2614b6e0aad457d91f6ce20b6f225'
-         '40e370e7e88c5437140ef18037abfbd3')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
-  # fix a gcc 4.6.x build issue, patch from Fedora
-  patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
-
-  libtoolize --force
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --enable-clipart \
-              --enable-templates \
-              --enable-collab-backend-xmpp \
-              --enable-collab-backend-tcp \
-              --enable-collab-backend-service \
-              --disable-collab-backend-sugar \
-              --enable-plugins --without-gnomevfs \
-              --with-gio \
-              --with-goffice \
-              --disable-static \
-              --with-psiconv-config=/nothere
-  make
-}
-
-package_abiword() {
-  pkgdesc="A fully-featured word processor"
-  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
-  install=$pkgname.install
-  optdepends=('abiword-plugins')
-  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i plugins/Makefile \
-      -e 's/ collab / /' \
-      -e 's/ wpg / /' \
-      -e 's/ wmf / /' \
-      -e 's/ grammar / /' \
-      -e 's/ mathview / /' \
-      -e 's/ aiksaurus / /' \
-      -e 's/ latex / /' \
-      -e 's/ ots / /' \
-      -e 's/ wordperfect / /'
-  make DESTDIR="${pkgdir}" install
-}
-
-package_abiword-plugins() {
-  pkgdesc="Additional plugins for Abiword"
-  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
-           'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
-  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-}
diff --git a/testing/abiword/abiword-2.8.6-libpng15.patch b/testing/abiword/abiword-2.8.6-libpng15.patch
deleted file mode 100644
index 7eded4c83..000000000
--- a/testing/abiword/abiword-2.8.6-libpng15.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
-@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
- 
- 	/* Clean Up Memory Used */
- 		
--	FREEP(m_pPNGInfo->palette);
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
-+	FREEP(palette);
- 	DELETEP(pBB);
- 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-    
-@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- 	{
- 		/* Reset error handling for libpng */
--		if (setjmp(m_pPNG->jmpbuf))
-+		if (setjmp(png_jmpbuf(m_pPNG)))
- 		{
- 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 			return UT_ERROR;
-@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- 	/* Reset error handling for libpng */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 		return UT_ERROR;
-
-$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp
-@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
- 		png_set_strip_alpha( png_ptr );
- 		png_set_interlace_handling( png_ptr );
- 		png_set_bgr( png_ptr );
--		rowbytes = info_ptr->rowbytes;
-+		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
- 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- 	}
- 
-$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		DELETEP(m_pPngBB);
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
-+++ src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/testing/abiword/abiword-2.8.6-no-undefined.patch b/testing/abiword/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/testing/abiword/abiword-2.8.6-no-undefined.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
diff --git a/testing/abiword/abiword.install b/testing/abiword/abiword.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/testing/abiword/abiword.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/abiword/compat_libwpg_0_9.patch b/testing/abiword/compat_libwpg_0_9.patch
deleted file mode 100644
index cf36e188e..000000000
--- a/testing/abiword/compat_libwpg_0_9.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4
---- abiword-2.8.6.orig//plugin-configure.m4	2010-06-13 14:17:27.000000000 -0700
-+++ abiword-2.8.6/plugin-configure.m4	2010-12-06 13:59:43.083048588 -0800
-@@ -794,7 +794,7 @@
- AC_SUBST([OPENXML_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1497,8 +1497,8 @@
- AC_SUBST([EML_LIBS])
- 
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4
---- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-02-06 13:06:11.000000000 -0800
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-12-06 13:59:53.926381921 -0800
-@@ -60,7 +60,7 @@
- 
- // Stream class
- 
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
-@@ -70,12 +70,7 @@
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream :
--#ifdef HAVE_LIBWPS
--	public WPSInputStream
--#else
--    public WPXInputStream
--#endif
-+class AbiWordperfectInputStream : public WPXInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
-@@ -86,7 +81,7 @@
- 
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
- 
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -98,11 +93,7 @@
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--#ifdef HAVE_LIBWPS
--	WPSInputStream(),
--#else
--	WPXInputStream(true),
--#endif
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -117,9 +108,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -256,19 +247,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
-+	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPD_CONFIDENCE_NONE:
--		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
--		// however, we'll let the text importer handle such cases
--		case WPD_CONFIDENCE_POOR: 
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPD_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-@@ -328,7 +312,7 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
- 
- 	if (error != WPD_OK)
- 	{
-@@ -381,9 +365,9 @@
- 	float marginLeft = 1.0f, marginRight = 1.0f;
- 
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
- 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
-@@ -456,15 +440,15 @@
- 	float marginTop = 0.0f, marginBottom = 0.0f;
- 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
- 	if (propList["fo:margin-top"])
--	    marginTop = propList["fo:margin-top"]->getFloat();
-+	    marginTop = propList["fo:margin-top"]->getDouble();
- 	if (propList["fo:margin-bottom"])
--	    marginBottom = propList["fo:margin-bottom"]->getFloat();
-+	    marginBottom = propList["fo:margin-bottom"]->getDouble();
- 	if (propList["fo:margin-left"])
--	    marginLeft = propList["fo:margin-left"]->getFloat();
-+	    marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--	    marginRight = propList["fo:margin-right"]->getFloat();
-+	    marginRight = propList["fo:margin-right"]->getDouble();
- 	if (propList["fo:text-indent"])
--	    textIndent = propList["fo:text-indent"]->getFloat();
-+	    textIndent = propList["fo:text-indent"]->getDouble();
- 
- 	m_topMargin = marginTop;
- 	m_bottomMargin = marginBottom;
-@@ -487,7 +471,7 @@
- 
- 	float lineSpacing = 1.0f;
- 	if (propList["fo:line-height"])
--		lineSpacing = propList["fo:line-height"]->getFloat();
-+		lineSpacing = propList["fo:line-height"]->getDouble();
- 	
- 	UT_String tmpBuffer;
- 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
-@@ -504,7 +488,7 @@
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
--				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
-+				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
- 				propBuffer += tmpBuffer;
- 			}
- 
-@@ -640,9 +624,9 @@
- 
- 	// TODO: support spaceAfter
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
- 		m_bSectionChanged = true;
-@@ -709,9 +693,9 @@
- 	if (propList["style:num-format"])
- 		listType = propList["style:num-format"]->getStr().cstr()[0];
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || 
- 		m_pCurrentListDefinition->getOutlineHash() != listID ||
-@@ -749,9 +733,9 @@
- 	if (propList["libwpd:level"])
- 		level = propList["libwpd:level"]->getInt();
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
- 	{
-@@ -871,10 +855,10 @@
- 
- 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
- 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 
- 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
-@@ -1263,7 +1247,7 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
- 
- 		if (error != WPS_OK)
- 			{
-@@ -1302,18 +1286,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
-+	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_POOR: 
--			return UT_CONFIDENCE_POOR;
--		case WPS_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPS_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h	2009-06-19 01:55:49.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h	2010-12-06 13:59:53.929715254 -0800
-@@ -30,13 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#ifdef _WIN32
--#define POINT WPX_POINT
--#endif
- #include <libwpd/libwpd.h>
--#ifdef _WIN32
--#undef POINT
--#endif
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -98,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
-+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -154,6 +148,21 @@
-     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
-     virtual void closeTable();
- 
-+    virtual void definePageStyle(const WPXPropertyList&) {}
-+    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void defineCharacterStyle(const WPXPropertyList&) {}
-+    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void insertSpace() {}
-+    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
-+    virtual void openComment(const WPXPropertyList&) {}
-+    virtual void closeComment() {}
-+    virtual void openTextBox(const WPXPropertyList&) {}
-+    virtual void closeTextBox() {}
-+    virtual void openFrame(const WPXPropertyList&) {}
-+    virtual void closeFrame() {}
-+    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
-+    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+
-     
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
-diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4
---- abiword-2.8.6.orig//plugins/wpg/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp
---- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp	2008-08-15 14:52:32.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp	2010-12-06 13:59:53.923048588 -0800
-@@ -31,11 +31,10 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
--using libwpg::WPGString;
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
-@@ -48,7 +47,7 @@
- 	virtual bool isOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -60,7 +59,7 @@
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(true),
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -75,9 +74,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -245,10 +244,10 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPGString svgOutput;
-+	WPXString svgOutput;
- 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
-+		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
- 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
- 		g_object_unref(svgInput);
- 		return result;
diff --git a/testing/allegro/PKGBUILD b/testing/allegro/PKGBUILD
deleted file mode 100644
index 729921ae8..000000000
--- a/testing/allegro/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148051 2012-01-30 18:44:24Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: arjan <arjan@archlinux.org>
-
-pkgname=allegro
-pkgver=5.0.5
-pkgrel=2
-pkgdesc="Portable library mainly aimed at video game and multimedia programming"
-arch=('i686' 'x86_64')
-url="http://alleg.sourceforge.net/"
-license=('custom')
-depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
-makedepends=('cmake' 'mesa' 'freetype2')
-source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4d879afe7062f7dc9b8913cba2e44bdf')
-
-build() {
-  cd "${srcdir}"
-  mkdir build && cd build
-
-  cmake "../${pkgname}-${pkgver}" \
-  	-DCMAKE_BUILD_TYPE=Release \
-  	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DWANT_DOCS=OFF
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/alsaplayer/PKGBUILD b/testing/alsaplayer/PKGBUILD
deleted file mode 100644
index dac3e7262..000000000
--- a/testing/alsaplayer/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 148053 2012-01-30 18:44:26Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=alsaplayer
-pkgver=0.99.81
-pkgrel=3
-pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
-arch=('i686' 'x86_64')
-url="http://www.alsaplayer.org/"
-license=('GPL')
-depends=('gcc-libs' 'desktop-file-utils')
-makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen')
-optdepends=('gtk2: for the gtk2 GUI interface' \
-            'libgl: for the OpenGL visual plugins' \
-            'jack: for JACK audio server output support' \
-            'audiofile: for support of various audio formats like AIFF, WAVE, .snd/.au' \
-            'libid3tag: for flac support' \
-            'flac: for flac support' \
-            'libmad: for MPEG support' \
-            'libsndfile: for sndfile support' \
-            'libvorbis: for ogg vorbis support' \
-            'libmikmod: for mod, s3m, it and xm formats supports')
-options=('!libtool')
-install=alsaplayer.install
-source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-audiofile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/alsaplayer/alsaplayer.install b/testing/alsaplayer/alsaplayer.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/alsaplayer/alsaplayer.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/amule/PKGBUILD b/testing/amule/PKGBUILD
deleted file mode 100644
index 8cafe2c45..000000000
--- a/testing/amule/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 148055 2012-01-30 18:44:28Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Henrik Ronellenfitsch <searinox@web.de>
-# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
-# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
-
-pkgname=amule
-pkgver=10708
-pkgrel=2
-pkgdesc="An eMule-like client for ed2k p2p network"
-arch=('i686' 'x86_64')
-url="http://www.amule.org"
-license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3')
-
-build() {
-  cd "${srcdir}/aMule-SVN-r${pkgver}"
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --enable-cas \
-              --enable-wxcas \
-              --enable-amule-daemon \
-              --enable-amulecmd \
-              --enable-amule-gui \
-              --enable-alc \
-              --enable-alcc \
-              --enable-webserver \
-              --disable-debug \
-              --enable-optimize \
-              --enable-ccache \
-              --enable-geoip \
-              --enable-upnp
-
-  make
-}
-
-package() {
-  cd "${srcdir}/aMule-SVN-r${pkgver}"
-
-  make DESTDIR=${pkgdir}/ install
-}
diff --git a/testing/apache/PKGBUILD b/testing/apache/PKGBUILD
deleted file mode 100644
index 0aa266ca6..000000000
--- a/testing/apache/PKGBUILD
+++ /dev/null
@@ -1,150 +0,0 @@
-# $Id: PKGBUILD 149643 2012-02-08 23:59:06Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=apache
-pkgver=2.2.22
-pkgrel=3
-pkgdesc='A high performance Unix-based HTTP server'
-arch=('i686' 'x86_64')
-options=('!libtool')
-url='http://www.apache.org/dist/httpd'
-license=('APACHE')
-backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
-        etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
-        etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
-        etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
-        etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre')
-optdepends=('lynx: apachectl status')
-_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
-        http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
-        ${_itkurl}/02-rename-prefork-to-itk.patch
-        ${_itkurl}/03-add-mpm-to-build-system.patch
-        ${_itkurl}/04-correct-output-makefile-location.patch
-        ${_itkurl}/05-add-copyright.patch
-        ${_itkurl}/06-hook-just-after-merging-perdir-config.patch
-        ${_itkurl}/07-base-functionality.patch
-        ${_itkurl}/08-max-clients-per-vhost.patch
-        ${_itkurl}/09-capabilities.patch
-        ${_itkurl}/10-nice.patch
-        ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
-        apachectl-confd.patch
-        apache.conf.d
-        httpd.logrotate
-        httpd
-        arch.layout
-        pcre_info.patch)
-md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
-         '41b3a6e4948679cab70b9caf490877c4'
-         'f1d9d41360908ceb2374da55ae99197a'
-         'cdfa04985a0efa850976aef01c2a0c40'
-         '0930d2d0612eb0a53a0d00aea7e8687f'
-         '3a0c29bb91442c33ea73ebbe072af922'
-         '0ef4729a6f1ffc848ad0e9b440a66f66'
-         '940944caa948340b11ddae56adaef89b'
-         'ce09a987523884de8838f73dc8ec0d19'
-         'e75b7dd8d8afcd299ba4ab2ab81c11e4'
-         'ce1ccc21f3ad8625169c8f62913450ac'
-         '1e5b222edcfbf99a3edc56fcb2074fbe'
-         '4ac64df6e019edbe137017cba1ff2f51'
-         '08b3c875f6260644f2f52b4056d656b0'
-         '6382331e9700ed9e8cc78ea51887b537'
-         'c7e300a287ef7e2e066ac7639536f87e'
-         '3d659d41276ba3bfcb20c231eb254e0c'
-         'fde5121e32b5aeef5a7eedb5a97009ff')
-
-build() {
-	cd "${srcdir}/httpd-${pkgver}"
-
-	patch -p1 -i "${srcdir}/pcre_info.patch"
-	patch -Np0 -i "${srcdir}/apachectl-confd.patch"
-
-	# set default user
-	sed -e 's#User daemon#User http#' \
-	    -e 's#Group daemon#Group http#' \
-	    -i docs/conf/httpd.conf.in
-
-	cat "${srcdir}/arch.layout" >> config.layout
-
-	for mpm in prefork worker itk; do
-		if [ "${mpm}" = "itk" ]; then
-                        # Fix patch to apply with latest Apache version
-                        sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch"
-
-			mkdir -p server/mpm/experimental/itk
-			cp -r server/mpm/prefork/* server/mpm/experimental/itk/
-			mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c
-
-			patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch"
-			patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch"
-			patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch"
-			patch -Np1 -i "${srcdir}/05-add-copyright.patch"
-			patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch"
-			patch -Np1 -i "${srcdir}/07-base-functionality.patch"
-			patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch"
-			patch -Np1 -i "${srcdir}/09-capabilities.patch"
-			patch -Np1 -i "${srcdir}/10-nice.patch"
-                        patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch"
-
-			autoconf
-		fi
-		mkdir build-${mpm}
-		pushd build-${mpm}
-		../configure --enable-layout=Arch \
-			--enable-modules=all \
-			--enable-mods-shared=all \
-			--enable-so \
-			--enable-suexec \
-			--with-suexec-caller=http \
-			--with-suexec-docroot=/srv/http \
-			--with-suexec-logfile=/var/log/httpd/suexec.log \
-			--with-suexec-bin=/usr/sbin/suexec \
-			--with-suexec-uidmin=99 --with-suexec-gidmin=99 \
-			--enable-ldap --enable-authnz-ldap \
-			--enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
-			--enable-ssl --with-ssl \
-			--enable-deflate --enable-cgid \
-			--enable-proxy --enable-proxy-connect \
-			--enable-proxy-http --enable-proxy-ftp \
-			--enable-dbd \
-			--with-apr=/usr/bin/apr-1-config \
-			--with-apr-util=/usr/bin/apu-1-config \
-			--with-pcre=/usr \
-			--with-mpm=${mpm}
-		make
-		if [ "${mpm}" = "prefork" ]; then
-			make DESTDIR="${pkgdir}" install
-		else
-			install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}"
-		fi
-		popd
-	done
-
-	install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd"
-	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
-	install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache"
-
-	# symlinks for /etc/httpd
-	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
-	ln -fs /var/run/httpd "${pkgdir}/etc/httpd/run"
-	ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
-	ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
-
-	# set sane defaults
-	sed -e 's#/usr/lib/httpd/modules/#modules/#' \
-	    -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
-	    -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
-	    -i "${pkgdir}/etc/httpd/conf/httpd.conf"
-
-	# cleanup
-	rm -rf "${pkgdir}/usr/share/httpd/manual"
-	rm -rf "${pkgdir}/etc/httpd/conf/original"
-	rm -rf "${pkgdir}/srv/"
-	rm -rf "${pkgdir}/usr/bin"
-}
diff --git a/testing/apache/apache.conf.d b/testing/apache/apache.conf.d
deleted file mode 100644
index c6d0ebf52..000000000
--- a/testing/apache/apache.conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration file for the httpd service.
-
-#
-# The default processing model (MPM) is the process-based
-# 'prefork' model. A thread-based model, 'worker', is also
-# available, but does not work with some modules (such as PHP).
-# The service must be stopped before changing this variable.
-#
-#HTTPD=/usr/sbin/httpd.worker
-
-#
-# To pass additional options (for instance, -D definitions) to the
-# httpd binary at startup, set OPTIONS here.
-#
-#OPTIONS=
diff --git a/testing/apache/apachectl-confd.patch b/testing/apache/apachectl-confd.patch
deleted file mode 100644
index d0f4b699e..000000000
--- a/testing/apache/apachectl-confd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- support/apachectl.in.orig	2010-03-06 18:09:11.000000000 +0100
-+++ support/apachectl.in	2010-03-06 18:12:31.000000000 +0100
-@@ -56,6 +56,12 @@
- # the URL to your server's mod_status status page.  If you do not
- # have one, then status and fullstatus will not work.
- STATUSURL="http://localhost:@PORT@/server-status"
-+
-+# Source /etc/conf.d/apache for $HTTPD setting, etc.
-+if [ -r /etc/conf.d/apache ]; then
-+    . /etc/conf.d/apache
-+fi
-+
- #
- # Set this variable to a command that increases the maximum
- # number of file descriptors allowed per child process. This is
diff --git a/testing/apache/arch.layout b/testing/apache/arch.layout
deleted file mode 100644
index ab59db84b..000000000
--- a/testing/apache/arch.layout
+++ /dev/null
@@ -1,22 +0,0 @@
-<Layout Arch>
-	prefix:          /etc/httpd
-	exec_prefix:     /usr
-	bindir:          /usr/bin
-	sbindir:         /usr/sbin
-	libdir:          /usr/lib/httpd
-	libexecdir:      /usr/lib/httpd/modules
-	mandir:          /usr/share/man
-	sysconfdir:      /etc/httpd/conf
-	datadir:         /usr/share/httpd
-	installbuilddir: /usr/lib/httpd/build
-	errordir:        /usr/share/httpd/error
-	iconsdir:        /usr/share/httpd/icons
-	htdocsdir:       /srv/http
-	manualdir:       /usr/share/httpd/manual
-	cgidir:          /srv/http/cgi-bin
-	includedir:      /usr/include/httpd
-	localstatedir:   /var
-	runtimedir:      /var/run/httpd
-	logfiledir:      /var/log/httpd
-	proxycachedir:   /var/cache/httpd
-</Layout>
\ No newline at end of file
diff --git a/testing/apache/httpd b/testing/apache/httpd
deleted file mode 100755
index 6fa9c3cc7..000000000
--- a/testing/apache/httpd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=httpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-APACHECTL=/usr/sbin/apachectl
-
-case "$1" in
-  start)
-    stat_busy "Starting Apache Web Server"
-    [ ! -d /var/run/httpd ] && install -d /var/run/httpd
-    if $APACHECTL start >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Apache Web Server"
-    if $APACHECTL stop >/dev/null ; then
-      rm_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  reload)
-    stat_busy "Reloading Apache Web Server"
-    if $APACHECTL graceful >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    stat_busy "Restarting Apache Web Server"
-    if $APACHECTL restart >/dev/null ; then
-      add_daemon $daemon_name
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  status)
-    stat_busy "Checking Apache Web Server status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/testing/apache/httpd.logrotate b/testing/apache/httpd.logrotate
deleted file mode 100644
index a723d20d2..000000000
--- a/testing/apache/httpd.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/httpd/*log {
-   missingok
-   postrotate
-      /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
-   endscript
-}
diff --git a/testing/apache/pcre_info.patch b/testing/apache/pcre_info.patch
deleted file mode 100644
index 906a3159e..000000000
--- a/testing/apache/pcre_info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- httpd-2.2.22/server/util_pcre.c	2005-11-10 16:20:05.000000000 +0100
-+++ httpd-2.2.22/server/util_pcre.c	2012-02-08 11:23:56.273855663 +0100
-@@ -128,6 +128,7 @@
- const char *errorptr;
- int erroffset;
- int options = 0;
-+int nsub;
- 
- if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
- if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
-@@ -136,8 +137,9 @@
- preg->re_erroffset = erroffset;
- 
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
--
--preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
-+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
-+               PCRE_INFO_CAPTURECOUNT, &nsub);
-+preg->re_nsub = nsub;
- return 0;
- }
- 
diff --git a/testing/apr/PKGBUILD b/testing/apr/PKGBUILD
deleted file mode 100644
index 633e58696..000000000
--- a/testing/apr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 149645 2012-02-08 23:59:08Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=apr
-pkgver=1.4.5
-pkgrel=2
-pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
-url="http://apr.apache.org/"
-depends=('util-linux-ng>=2.16')
-options=('!libtool')
-license=('APACHE')
-source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('8b53f5a5669d0597f2da889a2f576eb6')
-
-build() {
-  cd "${srcdir}/apr-${pkgver}"
-  export apr_cv_accept4=no
-
-  ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
-    --with-installbuilddir=/usr/share/apr-1/build \
-    --enable-nonportable-atomics \
-    --with-devrandom=/dev/urandom
-  make
-}
-
-check() {
-  cd "${srcdir}/apr-${pkgver}"
-  make -j1 check
-}
-
-package() {
-  cd "${srcdir}/apr-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/at-spi/PKGBUILD b/testing/at-spi/PKGBUILD
deleted file mode 100644
index 3e0d18301..000000000
--- a/testing/at-spi/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 148057 2012-01-30 18:44:31Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=at-spi
-pkgver=1.32.0
-pkgrel=5
-pkgdesc="Assistive Technology Service Provider Interface"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libbonobo' 'libxtst' 'gtk2' 'gconf')
-makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=at-spi.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039')
-
-# !! make sure you 'pacman -Rsc python' from your chroot before building the package or it would use python3 instead of the wanted python2 !!
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/at-spi \
-      --enable-relocate
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain at-spi "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/at-spi/at-spi.install b/testing/at-spi/at-spi.install
deleted file mode 100644
index b4c75b51c..000000000
--- a/testing/at-spi/at-spi.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=at-spi
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/autopano-sift-c/PKGBUILD b/testing/autopano-sift-c/PKGBUILD
deleted file mode 100644
index 3b5d70f33..000000000
--- a/testing/autopano-sift-c/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148059 2012-01-30 18:44:37Z ibiru $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=autopano-sift-c
-pkgver=2.5.1
-pkgrel=3
-pkgdesc="Identify key feature points within arbitrary images"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('GPL2')
-depends=('libxml2' 'libpano13' 'gcc-libs')
-makedepends=('cmake')
-provides=('autopano-sift')
-conflicts=('autopano-sift')
-replaces=('autopano-sift')
-source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz)
-md5sums=('b9bade07e8c4f2ea383c22a082c260e0')
-
-build() {
-  cd "${srcdir}/autopano-sift-C-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt
-  make
-}
-
-package() {
-  cd "${srcdir}/autopano-sift-C-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/avahi/PKGBUILD b/testing/avahi/PKGBUILD
deleted file mode 100644
index aa8e043b7..000000000
--- a/testing/avahi/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 148061 2012-01-30 18:44:42Z ibiru $
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.30
-pkgrel=7
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
-url='http://www.avahi.org/'
-license=('LGPL')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings'
-            'qt3: qt3 bindings'
-            'qt: qt bindings'
-            'pygtk: avahi-bookmarks, avahi-discover'
-            'twisted: avahi-bookmarks'
-            'mono: mono bindings'
-            'dbus-python: avahi-discover'
-            'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'gnome-nettool.png'
-        'rc.d.patch')
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3'
-          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i "../rc.d.patch"
-
-	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
-	PYTHON=python2 \
-	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
-		./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-xmltoman \
-		--enable-compat-libdns_sd \
-		--enable-compat-howl \
-		--with-distro=archlinux \
-		--with-avahi-priv-access-group=network \
-		--with-autoipd-user=avahi \
-		--with-autoipd-group=avahi \
-		--with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
-
-	cd "${pkgdir}"
-	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
-	# howl and mdnsresponder compatability
-	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
-	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
-}
diff --git a/testing/avahi/gnome-nettool.png b/testing/avahi/gnome-nettool.png
deleted file mode 100644
index 227d0678a..000000000
--- a/testing/avahi/gnome-nettool.png
+++ /dev/null
diff --git a/testing/avahi/install b/testing/avahi/install
deleted file mode 100644
index 7c75c3dd4..000000000
--- a/testing/avahi/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-  getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-
-  cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==>               dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==>                 configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
-}
-
-post_remove() {
-  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-  getent group avahi &>/dev/null && groupdel avahi >/dev/null
-}
diff --git a/testing/avahi/rc.d.patch b/testing/avahi/rc.d.patch
deleted file mode 100644
index fd735734b..000000000
--- a/testing/avahi/rc.d.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in	2011-06-24 03:07:00.916170590 +0200
-+++ new/initscript/archlinux/avahi-daemon.in	2011-06-24 03:16:32.220596377 +0200
-@@ -33,6 +33,7 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then
diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD
deleted file mode 100644
index 8afc3cbe8..000000000
--- a/testing/avidemux/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 149121 2012-02-05 21:34:30Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.6
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
-    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
-    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faac: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux')
-  conflicts=('avidemux')
-  replaces=('avidemux')
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -d "${pkgdir}/usr/share/avidemux/i18n"
-  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/avidemux/avidemux.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/bmp/0.9.7.1-visualization.patch b/testing/bmp/0.9.7.1-visualization.patch
deleted file mode 100644
index ac03323f6..000000000
--- a/testing/bmp/0.9.7.1-visualization.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- beep/vis.c	2004-12-04 10:04:29.000000000 +0100
-+++ beep/vis.c	2005-02-17 12:02:25.391044008 +0100
-@@ -223,7 +223,8 @@ vis_draw(Widget * w)
-     /* FIXME: The check "shouldn't" be neccessary? */
-     /*	if (GTK_IS_WINDOW(vis->vs_window)) { */
-     GDK_THREADS_ENTER();
--    gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-+    if (GDK_IS_DRAWABLE(vis->vs_window))
-+        gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-                            vis->vs_widget.x, vis->vs_widget.y,
-                            vis->vs_widget.width, vis->vs_widget.height,
-                            GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
diff --git a/testing/bmp/PKGBUILD b/testing/bmp/PKGBUILD
deleted file mode 100644
index e45a88182..000000000
--- a/testing/bmp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148063 2012-01-30 18:44:44Z ibiru $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-pkgname=bmp
-pkgver=0.9.7.1
-pkgrel=9
-pkgdesc="gtk2 port of xmms"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/beepmp/"
-license=('GPL')
-depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils')
-makedepends=('libxt')
-options=('!libtool')
-install=bmp.install
-source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \
-        ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
-md5sums=('c25d5a8d49cc5851d13d525a20023c4c'
-         'fa1bdf5a8d03e8539a6bed5caa471176'
-         '42ad4109ddb66024d4c6d1f3e572ab86')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../${pkgver}-visualization.patch 
-  patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch 
-  LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man 
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/testing/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
deleted file mode 100644
index 4c1e46da9..000000000
--- a/testing/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Patch taken from xmms-crossfade 3.10 tarball.  Required for crossfade to
-work.  http://www.eisenlohr.org/xmms-crossfade/
-
-diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c
---- bmp-0.9.7.1/beep/mainwin.c	2005-05-09 10:45:39.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/mainwin.c	2005-11-25 00:03:59.000000000 +0100
-@@ -655,9 +655,11 @@
-     mainwin_set_shade(!cfg.player_shaded);
- }
- 
-+gboolean is_quitting = FALSE;
- void
- mainwin_quit_cb(void)
- {
-+    is_quitting = TRUE;
-     gtk_widget_hide(equalizerwin);
-     gtk_widget_hide(playlistwin);
-     gtk_widget_hide(mainwin);
-@@ -1318,7 +1320,7 @@
- change_song(guint pos)
- {
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     playlist_set_position(pos);
-     bmp_playback_initiate();
-diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c
---- bmp-0.9.7.1/beep/playback.c	2005-01-26 06:56:15.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.c	2005-11-25 00:03:59.000000000 +0100
-@@ -89,7 +89,7 @@
-         return;
- 
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     vis_clear_data(mainwin_vis);
-     vis_clear_data(playlistwin_vis);
-@@ -135,6 +135,15 @@
-     get_current_input_plugin()->pause(ip_data.paused);
- }
- 
-+gboolean input_stopped_for_restart = FALSE;
-+void
-+bmp_playback_stop_for_restart(void)
-+{
-+	input_stopped_for_restart = TRUE;
-+	bmp_playback_stop();
-+	input_stopped_for_restart = FALSE;
-+}
-+
- void
- bmp_playback_stop(void)
- {
-diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h
---- bmp-0.9.7.1/beep/playback.h	2004-12-04 10:04:26.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.h	2005-11-25 00:03:59.000000000 +0100
-@@ -26,6 +26,7 @@
- void bmp_playback_initiate(void);
- void bmp_playback_pause(void);
- void bmp_playback_stop(void);
-+void bmp_playback_stop_for_restart(void);
- gboolean bmp_playback_play_file(const gchar * filename);
- gboolean bmp_playback_get_playing(void);
- gboolean bmp_playback_get_paused(void);
-diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c
---- bmp-0.9.7.1/beep/playlist.c	2005-08-11 09:25:51.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/playlist.c	2005-11-25 00:03:59.000000000 +0100
-@@ -817,7 +817,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -868,7 +868,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1018,7 +1018,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1047,7 +1047,10 @@
- {
-     GList *plist_pos_list;
- 
--    bmp_playback_stop();
-+    if (cfg.repeat)
-+        bmp_playback_stop_for_restart();
-+    else
-+        bmp_playback_stop();
- 
-     PLAYLIST_LOCK();
-     plist_pos_list = find_playlist_position_list();
diff --git a/testing/bmp/bmp.install b/testing/bmp/bmp.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/testing/bmp/bmp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD
deleted file mode 100644
index 6287d8fba..000000000
--- a/testing/cairo/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 148065 2012-01-30 18:44:47Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=cairo
-pkgver=1.10.2
-pkgrel=3
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/"
-depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh')
-options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-tee
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/cairo/cairo-1.10.0-buggy_gradients.patch b/testing/cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/testing/cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

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

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

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

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

-      */

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

-     display->buggy_gradients = TRUE;

--#else

--    display->buggy_gradients = FALSE;

--#endif

-     display->buggy_pad_reflect = FALSE;

-     display->buggy_repeat = FALSE;

diff --git a/testing/cairomm/PKGBUILD b/testing/cairomm/PKGBUILD
deleted file mode 100644
index 75be50375..000000000
--- a/testing/cairomm/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148067 2012-01-30 18:44:49Z ibiru $
-# Maintainer: Kevin <kevin@archlinux.org>
-# Contributor: criminy <criminy@gmail.com>
-
-pkgname=cairomm
-pkgver=1.10.0
-pkgrel=2
-pkgdesc="C++ bindings to Cairo vector graphics library"
-arch=('i686' 'x86_64')
-url="http://www.cairographics.org"
-license=('LGPL' 'MPL')
-depends=('cairo' 'libsigc++')
-makedepends=('pkgconfig')
-source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool' '!emptydirs')
-sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/capi4hylafax/PKGBUILD b/testing/capi4hylafax/PKGBUILD
deleted file mode 100644
index e5c085d64..000000000
--- a/testing/capi4hylafax/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 148069 2012-01-30 18:44:52Z ibiru $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=capi4hylafax
-pkgver=010300
-pkgrel=5
-pkgdesc="capi plugin for hylafax to enable isdn faxing"
-arch=(i686 x86_64)
-url="ftp://ftp.avm.de/tools"
-license=('GPL')
-depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
-source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
-	config.faxCAPI capi4hylafax.rc)
-md5sums=('d37dc652ac80d1525ef8693be55ee67f'
-         '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07')
-install=capi4hylafax.install
-backup=(var/spool/hylafax/etc/config.faxCAPI)
-
-build() {
-  cd "$srcdir"/$pkgname-01.03.00
-# fix config file
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
-  autoreconf --force --install
-  ./configure
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-01.03.00
-  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
-  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
-  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
-  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
-  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
-# adding FIFO
-  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-# fix /var/spool/hylafax permission
-  chown 10 "$pkgdir"/var/spool/hylafax
-  chgrp 14 "$pkgdir"/var/spool/hylafax
-# adding udev rule
-  mkdir -p "$pkgdir"/lib/udev/rules.d
-cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
-# CAPI devices
-SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
-SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
-
-EOF
-# fix c2faxadd
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
-  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
-}
diff --git a/testing/capi4hylafax/capi4hylafax.install b/testing/capi4hylafax/capi4hylafax.install
deleted file mode 100644
index 20c2d8f63..000000000
--- a/testing/capi4hylafax/capi4hylafax.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-cat << EOF
-For more information about setting up the package, please have a look here:
-"http://wiki.archlinux.org/index.php/capi4hylafax"
-EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-cat << EOF
-Please remove your additions to /var/spool/hylafax/etc/config
-EOF
-}
diff --git a/testing/capi4hylafax/capi4hylafax.rc b/testing/capi4hylafax/capi4hylafax.rc
deleted file mode 100755
index 51025b020..000000000
--- a/testing/capi4hylafax/capi4hylafax.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/c2faxrecv`
-case "$1" in
-  start)
-    stat_busy "Starting capi4hylafax"
-    if [ -z "$PID" ]; then
-    /usr/bin/c2faxrecv > /dev/null &
-       faxmodem faxCAPI
-    fi
-    if [ ! -f /var/run/faxq.pid ]; then
-       stat_fail
-       echo "ERROR: hylafax is not running"
-       exit 1
-    fi
-    if [ ! -f /var/run/hfaxd.pid ]; then
-    stat_fail
-    echo "ERROR: hylafax is not running"
-    exit 1
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping capi4hylafax"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/capi4hylafax/config.faxCAPI b/testing/capi4hylafax/config.faxCAPI
deleted file mode 100644
index b2137757a..000000000
--- a/testing/capi4hylafax/config.faxCAPI
+++ /dev/null
@@ -1,397 +0,0 @@
-#
-# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP
-#
-
-# Grundsätzliches:
-# - Es gibt für jeden Wert einen Standardzustand (default), sodass jede Zeile
-#   der Datei oder auch das komplette Configfile ausgelassen werden kann.
-# - Es gibt ausschließlich ein Configfile, in dem alle nötigen Angaben für
-#   "c2faxsend/-receive" eingetragen werden können.
-# - Werden für HylaFAX mehrere virtuelle Geräte (devices) angelegt, muss es
-#   für jedes Device ein Configfile im Format config.[DeviceName] geben.
-#   Dessen Existenz wird von HylaFAX überprüft. Ohne dieses File kann die
-#   Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer
-#   solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile
-#   oder ein minimales "dummy"-ConfigFile nachgewiesen werden.
-#
-# Basics:
-# - There is a default condition for each value, such that each line of the
-#   file or the complete configfile can be left out.
-# - There is only one configfile in which all information required for
-#   "c2faxsend/-receive" can be entered.
-# - If multiple virtual devices are created for HylaFAX, there must be a
-#   Configfile in the format config.[DeviceName] for each device. HylaFAX
-#   checks that this file exists. Without this file, it is not possible to
-#   start working with the device. The easiest way to establish the existence
-#   of such a file is to create a link to this ConfigFile or a minimum
-#   "dummy" ConfigFile.
-
-
-# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die
-# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die
-# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb
-# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert.
-#
-# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX-
-# compatible operation or in which received faxes are to be saved in
-# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in
-# the directory $(SpoolDir)/recvq.
-#
-# default   /var/spool/hylafax
-#
-SpoolDir:               /var/spool/hylafax
-
-
-# "FaxRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein Fax
-# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter
-# übergeben als für HylaFAX (mehr dazu im sample_faxrcvd).
-#
-# "FaxRcvdCmd" indicates the script performed whenever a fax is
-# received. Parameters other than the ones for HylaFAX are returned in
-# stand-alone operation (see sample_faxrcvd for more information).
-#
-# default   /var/spool/hylafax/bin/faxrcvd
-#
-FaxRcvdCmd:             /var/spool/hylafax/bin/faxrcvd
-
-
-# "PollRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein
-# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden
-# andereParameter übergeben als für HylaFAX (mehr dazu im
-# sample_faxrcvd).
-#
-# "PollRcvdCmd" indicates the script performed whenever a fax was
-# received by fax polling. Parameters other than the ones for HylaFAX
-# are returned in stand-alone operation (see sample_faxrcvd for more
-# information).
-#
-# default   /var/spool/hylafax/bin/pollrcvd
-#
-PollRcvdCmd:             /var/spool/hylafax/bin/pollrcvd
-
-
-# "FaxReceiveUser" ist der User, als der c2faxrecv ausgeführt wird.
-# Die Änderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte
-# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag
-# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp"
-# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von
-# /dev/capi20 nicht geändert werden sollen oder Ihre Linux-Distribution einen
-# anderen User voraussetzt.
-#
-# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be
-# changed only by the Superuser or "root" user. If c2faxrecv is started by
-# another user, this entry will be ignored. Here it is a good idea to enter a
-# value other than the hylafax default value "uucp", for instance, if the
-# rights of /dev/capi20 are not to be changed or your Linux distribution
-# requires another user.
-#
-# default   ""
-#
-FaxReceiveUser:         uucp
-FaxReceiveGroup:	uucp
-
-
-# Im "LogFile" werden Informationen über den Faxablauf abgespeichert.
-#
-# Information about the order of events in faxing are saved in the "LogFile".
-#
-# default   ""
-#
-LogFile:                /var/spool/hylafax/log/capi4hylafax
-
-
-# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile
-# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles.
-#
-# The "LogTraceLevel" command indicates the amount of data written in a
-# LogFile. The range goes from 0 = nothing to 4 = many.
-#
-# default   0
-#
-LogTraceLevel:          0
-
-
-# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade
-# erwähnte LogFile als auch die LogFiles für HylaFAX angelegt werden.
-#
-# "LogFileMode" is the mode, on the basis of which both the LogFile just
-# mentioned and the LogFiles for HylaFAX are generated.
-#
-# default   0600
-#
-LogFileMode:            0600
-
-
-# Die geschweiften Klammern geben Anfang und Ende einer Section an.
-# Jede Section darf eine oder mehrere SubSections enthalten.
-# SubSubSections sind nicht erlaubt.
-# Dabei enthält die Section Angaben zu einem virtuellen Device;
-# die Subsection die Angaben für die Rufannahme jedes Controllers.
-# Es können beliebig viele Sections und, darin enthalten, jeweils beliebig
-# viele Subsections erzeugt werden.
-# Jede Section muss aber einen anderen HylafaxDeviceName erhalten;
-# zusätzlich muss in jeder Subsection innerhalb einer Section ein anderer
-# Controller aufgeführt werden. Beim Stand-Alone-Betrieb ist eine Section mit
-# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die
-# virtuellen DeviceNamen keine Rolle spielen.
-#
-# The curved brackets indicate the beginning and end of a section.
-# Each section may contain one or more subsections.
-# SubSubSections are not permitted.
-# The section contains information about a virtual device; the subsection the
-# call acceptance information for each controller.
-# Any number of sections containing any number of subsections may be
-# generated, but each section must receive a different HylafaxDeviceName; and
-# a different controller must be listed in every subsection within a section.
-# For stand-alone operation, it is sufficient to have just one section with
-# as many subsections as required, since virtual DeviceNames do not play
-# any role in this mode of operation.
-#
-{
-
-    # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als
-    # "virtuelles Modem" anmeldet. Sollen für HylaFAX mehrere dieser "Modems"
-    # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen
-    # HylafaxDeviceName an.
-    #
-    # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as
-    # a "virtual modem". If multiple "modems" are to be generated for HylaFAX,
-    # simply create a new section with another HylafaxDeviceName.
-    #
-    # default   faxCAPI
-    #
-    HylafaxDeviceName:          faxCAPI
-
-
-    # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert
-    # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.)
-    # festgelegt.
-    #
-    # "RecvFileMode" is the mode, in which received faxes are saved. User and
-    # Group of the file are determined by the FaxReceiveUser (see above).
-    #
-    # default   0600
-    #
-    RecvFileMode:               0600
-
-
-    # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite
-    # mitgeteilt (sichtbar z. B. im Fax-Journal).
-    #
-    # "FAXNumber" is the fax number of the computer itself and is transmitted
-    # to the remote site (visible in the Fax Journal).
-    #
-    # default   ""
-    #
-    FAXNumber:                  +49.00.00000
-
-
-    # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der
-    # Kopfzeile. Ein leerer Eintrag führt dazu, dass keine Fax-Kopfzeile
-    # eingefügt wird.
-    #
-    # "LocalIdentifier" is the part of the fax header which can be configured
-    # from CAPI. An empty entry specifies an empty header.
-    #
-    # default   ""
-    #
-    LocalIdentifier:            "AVM CAPI4HylaFAX"
-
-
-    # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann
-    # durch "MaxConcurrentRecvs" angepaßt werden. Diese Anzahl wird
-    # durch die Anzahl der durch die Hardware zur Verfügung
-    # gestellten B-Kanäle begrenzt.
-    #
-    # The maximum number of faxes that can be received at the same
-    # time can be adjusted using "MaxConcurrentRecvs". This number
-    # is limited by the number of B channels provided by the hardware.
-    #
-    # default   2
-    #
-    MaxConcurrentRecvs:         2
-
-
-    # ----------- outgoing params -----------
-
-    # "OutgoingController" gibt den Controller an, über den eine externe
-    # Verbindung aufgebaut werden soll.
-    #
-    # "OutgoingController" indicates the controller which is to be used to
-    # establish an external connection.
-    #
-    # default   1
-    #
-    OutgoingController:         1
-
-
-    # Die "OutgoingMSN" ist die MSN, die für ausgehenden Faxe benutzt wird.
-    #
-    # The "OutgoingMSN" is the MSN used for outgoing faxes.
-    #
-    # default   ""
-    #
-    OutgoingMSN:
-
-
-    # CLIR (Rufnummernunterdrückung) kann über "SuppressMSN" und den Wert (0)
-    # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden.
-    #
-    # CLIR (Calling Line Identification Restriction) can be switched off using
-    # the value (0) or switched back on by entering the value (1).
-    #
-    # default   0
-    #
-    SuppressMSN:                0
-
-
-    # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei
-    # Nebenstellenanlagen wichtig, bei denen für den Aufbau einer externen
-    # Verbindung eine Ziffer vorgewählt werden muss.
-    #
-    # "NumberPrefix" is set to precede each telephone number. This is
-    # important for PBX systems which require that a number be dialed to
-    # obtain an outside line.
-    #
-    # default   ""
-    #
-    NumberPrefix:
-
-
-    # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf
-    # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz
-    # Audio-Verbindung hergestellt.
-    #
-    # When in "UseISDNFaxService" the value is = 1, an outoing call will be
-    # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz
-    # audio connection is established.
-    #
-    # default   0
-    #
-    UseISDNFaxService:          0
-
-
-    # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die
-    # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die
-    # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des
-    # Wertes 0 nutzt die gesamte Wartezeit.
-    #
-    # The duration in seconds you wait for the remote site to accept your
-    # outgoing call In this way you do not have to use the entire ringing
-    # duration preset by the telephone company. The default value 0 uses the
-    # entire ringing duration.
-    #
-    # default   0
-    #
-    RingingDuration:            0
-
-
-    # ----------- incoming params -----------
-    {
-
-        # Controller, für den diese Subsection gilt.
-        #
-        # Controller for which this subsection is valid.
-        #
-        # default   1
-        #
-        Controller:             1
-
-
-        # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung
-        # "Sprache" angenommen.
-        #
-        # If "AcceptSpeech" is set to 1, the service indicator "Voice" also
-        # will be accepted.
-        #
-        # default   0
-        #
-        AcceptSpeech:           1
-
-
-        # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen.
-        #
-        # If DDI is to be used, "UseDDI" should be set to a value of 1.
-        #
-        # default   0
-        #
-        UseDDI:                 0
-
-
-        # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen.
-        # Der Standardwert führt zu keinem korrekten Ergebnis und
-        # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer
-        # verändert werden.
-        #
-        # "DDIOffset" indicates the DDI offset number which precedes
-        # extension number. Because the default value can't guarantee
-        # a correct result, this value should be modified whenever
-        # "UseDDI" is set to 1.
-        #
-        # default   ""
-        #
-        DDIOffset:              "12345"
-
-
-        # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern
-        # werden lediglich als Teil der Empfängernummer mitgeteilt.) Der
-        # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst
-        # werden.
-        #
-        # "DDILength" indicates the number of digits in the extension. (These
-        # numbers are only used as a component of the recipient's number.) The
-        # default value should be adapted whenever DDI is used.
-        #
-        # default   0
-        #
-        DDILength:              3
-
-
-        # Bei "IncomingDDIs" können in einer durch Komma getrennten Liste alle
-        # Durchwahlziffern (DDIs) angegeben werden, für die Rufe angenommen
-        # werden sollen. Eine Bereichsangabe ist auch möglich (z.B. 100-300),
-        # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind.
-        # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert.
-        #
-        # In "IncomingDDIs", all extension numbers (DDIs) for which calls are
-        # to be accepted may be listed, separated by commas. It is also
-        # possible to specify a range (e.g. 100-300); here no open ranges are
-        # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the
-        # parameters for DDILength will be ignored.
-        #
-        # default   ""
-        #
-        IncomingDDIs:
-
-
-        # Bei "IncomingMSNs" können in einer durch Komma getrennten Liste alle
-        # MSNs angegeben werden, für die Rufe angenommen werden sollen. Ist
-        # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und
-        # eventuell "Sprache" angenommen.
-        # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert.
-        #
-        # In "IncomingMSNs", all MSNs for which calls are to be accepted may
-        # be listed, separated by commas. When the list is empty, all calls
-        # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice".
-        # When "UseDDI" is set to 1, "IncomingMSNs" is ignored.
-        #
-        # default   ""
-        #
-        IncomingMSNs:
-
-
-        # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne
-        # Zielrufnummer (ohne MSN) angenommen.
-        # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer
-        # senden.
-        #
-        # If "AcceptGlobalCall" is set to 1, calls without Called Party
-        # Number also will be accepted.
-        # Needed on internal ports of some PBX.
-        #
-        # default   1
-        #
-        AcceptGlobalCall:   1
-    }
-}
-
diff --git a/testing/celestia/PKGBUILD b/testing/celestia/PKGBUILD
deleted file mode 100644
index c56a9de4b..000000000
--- a/testing/celestia/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 148071 2012-01-30 18:44:55Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=celestia
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="Real-time space simulation"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
-        'celestia-1.6.1-gcc46.patch' 
-        'celestia-1.6.1-libpng15.patch'
-        'celestia-1.6.1-linking.patch')
-sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
-          '7c08ca391603806d788cb8f3342acedafc924eef'
-          '46ecc4e10b24191384bc848c206652498843adf0'
-          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    # build patch
-    patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
-    patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
-    patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
-
-    # This version of Celestia has a bug in the font rendering and requires -fsigned-char 
-    export CFLAGS="$CFLAGS -fsigned-char"
-    export CXXFLAGS="$CXXFLAGS -fsigned-char"
-
-    autoreconf
-    ./configure --prefix=/usr \
-                --with-lua=/usr \
-		--datadir=/usr/share \
-                --with-gtk \
-                --disable-rpath \
-                --with-lua
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir} install
-}
-
diff --git a/testing/celestia/celestia-1.5.1-gcc44.patch b/testing/celestia/celestia-1.5.1-gcc44.patch
deleted file mode 100644
index b1ee896f0..000000000
--- a/testing/celestia/celestia-1.5.1-gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/celengine/overlay.h.orig	2009-07-08 02:27:08.000000000 -0400
-+++ src/celengine/overlay.h	2009-07-08 02:27:28.000000000 -0400
-@@ -10,6 +10,7 @@
- #ifndef _OVERLAY_H_
- #define _OVERLAY_H_
- 
-+#include <cstdio>
- #include <string>
- #include <iostream>
- #include <celtxf/texturefont.h>
---- src/celengine/star.cpp.orig	2009-07-08 02:40:52.000000000 -0400
-+++ src/celengine/star.cpp	2009-07-08 02:41:08.000000000 -0400
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
- 
- #include <celmath/mathlib.h>
-+#include <cstdio>
- #include <cstring>
- #include <cassert>
- #include "celestia.h"
diff --git a/testing/celestia/celestia-1.6.1-gcc46.patch b/testing/celestia/celestia-1.6.1-gcc46.patch
deleted file mode 100644
index ddf4036f2..000000000
--- a/testing/celestia/celestia-1.6.1-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=366073
-
-Patch written by Nils Larsson <ni1s@nerdshack.com>
---- src/celengine/frametree.h
-+++ src/celengine/frametree.h
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/testing/celestia/celestia-1.6.1-gentoo.patch b/testing/celestia/celestia-1.6.1-gentoo.patch
deleted file mode 100644
index 57fffe159..000000000
--- a/testing/celestia/celestia-1.6.1-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/celestia/Makefile.am	2011-06-07 19:15:51.502000147 +0200
-+++ src/celestia/Makefile.am.new	2011-06-07 19:15:47.208000302 +0200
-@@ -15,6 +15,7 @@
- if ENABLE_GTK
- SUBDIRS += gtk
- celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-
-Index: src/celengine/frametree.h
-===================================================================
---- src/celengine/frametree.h	(revision 5163)
-+++ src/celengine/frametree.h	(arbetskopia)
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/testing/celestia/celestia-1.6.1-libpng15.patch b/testing/celestia/celestia-1.6.1-libpng15.patch
deleted file mode 100644
index 5dffbab24..000000000
--- a/testing/celestia/celestia-1.6.1-libpng15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-
---- src/celestia/imagecapture.cpp
-+++ src/celestia/imagecapture.cpp
-@@ -31,6 +31,9 @@
- #include "png.h"
- #endif
- 
-+// Z_BEST_COMPRESSION
-+#include <zlib.h>
-+
- // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
- #ifndef png_jmpbuf
- #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/testing/celestia/celestia-1.6.1-linking.patch b/testing/celestia/celestia-1.6.1-linking.patch
deleted file mode 100644
index d610d5243..000000000
--- a/testing/celestia/celestia-1.6.1-linking.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking issues:
- * underlinking GLUT (bug #372123, #387609)
- * as-needed (bug #281258)
-
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -7,14 +7,15 @@
- 
- if ENABLE_KDE
- SUBDIRS += kde
--celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
--                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
-+celestiaKDELIBS = kde/libkdegui.a
- celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
- endif
- 
- if ENABLE_GTK
- SUBDIRS += gtk
--celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+celestiaGTKLIBS = gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-@@ -62,6 +63,7 @@
- 
- if ENABLE_GLUT
- GLUTSOURCES = glutmain.cpp
-+GLUTLIBS = -lGL
- endif
- 
- if ENABLE_THEORA
-@@ -80,15 +82,16 @@
- celestia_LDADD = \
- 	$(celestiaKDELIBS) \
- 	$(celestiaGTKLIBS) \
--	$(DL_LIBS) \
--	$(LUA_LIBS) \
--	$(THEORA_LIBS) \
- 	../celengine/libcelengine.a \
- 	../celtxf/libceltxf.a \
- 	../cel3ds/libcel3ds.a \
- 	../celmath/libcelmath.a \
- 	../celutil/libcelutil.a \
--	$(SPICE_LIBS)
-+	$(LUA_LIBS) \
-+	$(THEORA_LIBS) \
-+	$(GLUTLIBS) \
-+	$(SPICE_LIBS) \
-+	$(DL_LIBS)
- 
- noinst_HEADERS = $(wildcard *.h)
- noinst_DATA = ../../celestia
diff --git a/testing/cinepaint/LICENSE b/testing/cinepaint/LICENSE
deleted file mode 100644
index 746207229..000000000
--- a/testing/cinepaint/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.ntributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission. 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/testing/cinepaint/PKGBUILD b/testing/cinepaint/PKGBUILD
deleted file mode 100644
index a4dbe6100..000000000
--- a/testing/cinepaint/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 148075 2012-01-30 18:45:01Z ibiru $
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-
-pkgname=cinepaint
-pkgver=1.0
-pkgrel=2
-pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL' 'MIT')
-url="http://www.cinepaint.org"
-depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint')
-optdepends=('python2: for python plug-ins' 
-            'gutenprint: for print plug-ins'
-            'ghostscript: for pdf plug-ins')
-options=('!libtool')
-install=cinepaint.install
-source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz
-        LICENSE cinepaint-libpng15.patch)
-md5sums=('7dfdb005d246578392ac9bd500534804'
-         '169085743f667c250ea2e4022efecf5f'
-         '682de65ad358512d00a8b76730453664')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p1 -i ../cinepaint-libpng15.patch
-  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
-
-  aclocal -I aclocal
-  autoconf
-  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
-  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
-    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
-    -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
-  sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/cinepaint/cinepaint-libpng15.patch b/testing/cinepaint/cinepaint-libpng15.patch
deleted file mode 100644
index e22edafae..000000000
--- a/testing/cinepaint/cinepaint-libpng15.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
---- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
-+++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
-@@ -390,6 +390,16 @@
-   gchar		*progress;	/* Title for progress display... */
-   guchar	alpha[256],	/* Index -> Alpha */
-   		*alpha_ptr;	/* Temporary pointer */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  int compression_type;
-+  png_bytepp iccp_profile;
-+  png_uint_32 iccp_proflen;
-+  png_uint_32 width, height;
-+  png_byte channels;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -405,7 +415,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. File corrupted?", filename);
-     return image;
-@@ -442,21 +452,26 @@
-   */
- 
-   png_read_info(pp, info);
-+  color_type = png_get_color_type(pp, info);
-+  width=png_get_image_width(pp, info);
-+  height=png_get_image_height(pp, info);
- 
-  /*
-   * Latest attempt, this should be my best yet :)
-   */
- 
-+  bit_depth = png_get_bit_depth(pp, info);
-+
- #ifndef WORDS_BIGENDIAN
--  if(info->bit_depth == 16)
-+  if(bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-     png_set_expand(pp);
-   }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
-     png_set_packing(pp);
-   }
- 
-@@ -464,8 +479,8 @@
-   * Expand G+tRNS to GA, RGB+tRNS to RGBA
-   */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--                       (info->valid & PNG_INFO_tRNS)) {
-+  if (color_type != PNG_COLOR_TYPE_PALETTE &&
-+      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
-     png_set_expand(pp);
-   }
- 
-@@ -482,7 +497,7 @@
- 
- #if PNG_LIBPNG_VER > 99
-   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
-     /* Copy the existing alpha values from the tRNS chunk */
-@@ -505,9 +520,9 @@
- 
-   png_read_update_info(pp, info);
-   
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 6;
-@@ -545,7 +560,7 @@
-   }
-   else
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 3;
-@@ -582,7 +597,7 @@
- 	  };
-   }
- 
--  image = gimp_image_new(info->width, info->height, image_type);
-+  image = gimp_image_new(width, height, image_type);
-   if (image == -1)
-   {
-     g_message("Can't allocate new image\n%s", filename);
-@@ -595,7 +610,7 @@
-   * Create the "background" layer to hold the image...
-   */
- 
--  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new(image, _("Background"), width, height,
-                          layer_type, 100, NORMAL_MODE);
-   gimp_image_add_layer(image, layer, 0);
- 
-@@ -627,20 +642,21 @@
- 
-   empty= 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
-+  if (color_type & PNG_COLOR_MASK_PALETTE) {
- 
- #if PNG_LIBPNG_VER > 99
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
-         /* Calculates number of fully transparent "empty" entries */
- 
--      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
--                          info->num_palette - empty);
-+      gimp_image_set_cmap(image, (guchar *) (palette + empty),
-+                          num_palette - empty);
-     } else {
--      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
-     }
- #else
--    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- #endif /* PNG_LIBPNG_VER > 99 */
- 
-   }
-@@ -659,18 +675,19 @@
-   */
- 
-   tile_height = gimp_tile_height ();
--  pixel       = g_new(guchar, tile_height * info->width * bpp);
-+  pixel       = g_new(guchar, tile_height * width * bpp);
-   pixels      = g_new(guchar *, tile_height);
-+  channels=png_get_channels(pp, info);
- 
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i * 2;
-+		  pixels[i] = pixel + width * channels * i * 2;
-   }
-   else
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i;
-+		  pixels[i] = pixel + width * channels * i;
-   }
- 
-   for (pass = 0; pass < num_passes; pass ++)
-@@ -680,11 +697,11 @@
- 	   */
- 
- 	  for (begin = 0, end = tile_height;
--			  begin < info->height;
-+			  begin < height;
- 			  begin += tile_height, end += tile_height)
- 	  {
--		  if (end > info->height)
--			  end = info->height;
-+		  if (end > height)
-+			  end = height;
- 
- 		  num = end - begin;
- 
-@@ -697,20 +714,21 @@
- 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
- 				  drawable->width, num);
- 
--		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
-+		  gimp_progress_update(((double)pass + (double)end / (double)height) /
- 				  (double)num_passes);
- 	  };
-   };
- 
- #if defined(PNG_iCCP_SUPPORTED)
-   /* set icc profile */
--  if (info->iccp_proflen > 0) {
--    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
--                                              info->iccp_profile,
--                                              ICC_IMAGE_PROFILE);
-+  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
-+  if (iccp_proflen > 0) {
-+    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
-+				       (gchar *)iccp_profile,
-+				       ICC_IMAGE_PROFILE);
-     printf ("%s:%d %s() set embedded profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -808,6 +826,14 @@
-                 blue;           /* Used for palette background */
-   time_t	cutime;         /* Time since epoch */
-   struct tm	*gmt;		/* GMT broken down */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  int filter_method=0;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  png_uint_32 height;
-+  int compression_type;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -824,7 +849,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. Couldn't save image", filename);
-     return 0;
-@@ -857,15 +882,6 @@
-   drawable = gimp_drawable_get (drawable_ID);
-   type     = gimp_drawable_type (drawable_ID);
- 
-- /*
--  * Set the image dimensions, bit depth, interlacing and compression
--  */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->interlace_type = pngvals.interlaced;
- 
-  /*
-   * Set color type and remember bytes per pixel count 
-@@ -874,71 +890,69 @@
-   switch (type)
-   {
-     case RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 8;
-         bpp              = 3;
-         break;
-     case RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 4;
-         break;
-     case GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 8;
-         bpp              = 1;
-         break;
-     case GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 2;
-         break;
-     case INDEXED_IMAGE :
- 	bpp		 = 1;
--	info->bit_depth      = 8;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case INDEXEDA_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 8;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 8;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     case U16_RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 16;
-         bpp              = 6;
-         break;
-     case U16_RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 8;
-         break;
-     case U16_GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 16;
-         bpp              = 2;
-         break;
-     case U16_GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 4;
-         break;
-     case U16_INDEXED_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 16;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case U16_INDEXEDA_IMAGE :
- 	bpp		 = 4;
--	info->bit_depth      = 16;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 16;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     default:
-@@ -950,30 +964,36 @@
-   * Fix bit depths for (possibly) smaller colormap images
-   */
-   
--  if (info->valid & PNG_INFO_PLTE) {
--    if (info->num_palette <= 2)
--      info->bit_depth= 1;
--    else if (info->num_palette <= 4)
--      info->bit_depth= 2;
--    else if (info->num_palette <= 16)
--      info->bit_depth= 4;
-+  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-+    if (num_palette <= 2)
-+      bit_depth= 1;
-+    else if (num_palette <= 4)
-+      bit_depth= 2;
-+    else if (num_palette <= 16)
-+      bit_depth= 4;
-     /* otherwise the default is fine */
-   }
- 
-+ png_set_compression_level (pp, pngvals.compression_level);
-+ png_set_IHDR(pp, info, drawable->width, drawable->height,
-+	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
-+
-+
-   // write icc profile
- #if defined(PNG_iCCP_SUPPORTED)
-   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
--    int size;
-+    int  size;
-     char *buffer;
-     
-     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
-                                                 ICC_IMAGE_PROFILE);
-     png_set_iCCP (pp, info,
-            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
--                  0, buffer, size);
-+                  0, (png_const_bytep)buffer, size);
-     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -1039,13 +1059,13 @@
-   * Convert unpacked pixels to packed if necessary
-   */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
-     png_set_packing(pp);
- 
-   /* Set swapping for 16 bit per sample images */
-   
- #ifndef WORDS_BIGENDIAN
--  if (info->bit_depth == 16)
-+  if (bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
-   
-@@ -1063,6 +1083,7 @@
- 
-   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
-                       drawable->height, FALSE, FALSE);
-+  height=png_get_image_height(pp, info);
- 
-   for (pass = 0; pass < num_passes; pass ++)
-   {
-@@ -1077,7 +1098,7 @@
- 	num = end - begin;
- 	
- 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
--        if (info->valid & PNG_INFO_tRNS) {
-+        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1085,7 +1106,7 @@
-             }
-           }
-        /* Forgot this case before, what if there are too many colors? */
--        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
-+        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1095,9 +1116,8 @@
-         }
- 	
- 	png_write_rows (pp, pixels, num);
--	
- 	gimp_progress_update (((double)pass + (double)end /
--                    (double)info->height) / (double)num_passes);
-+                    (double)height) / (double)num_passes);
-       };
-   };
- 
diff --git a/testing/cinepaint/cinepaint.install b/testing/cinepaint/cinepaint.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/testing/cinepaint/cinepaint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/cloog/PKGBUILD b/testing/cloog/PKGBUILD
deleted file mode 100644
index 52080ec65..000000000
--- a/testing/cloog/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148584 2012-02-04 00:03:40Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=cloog
-pkgver=0.17.0
-pkgrel=1
-pkgdesc="Library that generates loops for scanning polyhedra"
-arch=('i686' 'x86_64')
-url="http://www.bastoul.net/cloog/"
-license=('GPL')
-depends=('isl' 'gmp')
-conflicts=('cloog-ppl<0.15.10-2')
-options=('!libtool')
-source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
-md5sums=('0aa3302c81f65ca62c114e5264f8a802')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-isl=system --with-gmp=system
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/testing/dansguardian/PKGBUILD b/testing/dansguardian/PKGBUILD
deleted file mode 100644
index 3d50dd9d0..000000000
--- a/testing/dansguardian/PKGBUILD
+++ /dev/null
@@ -1,154 +0,0 @@
-# $Id: PKGBUILD 149647 2012-02-08 23:59:11Z allan $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=dansguardian
-pkgver=2.10.1.1
-pkgrel=3
-pkgdesc="Squid plugin for web content filtering."
-url="http://dansguardian.org"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('squid' 'pcre' 'zlib')
-install=${pkgname}.install
-source=(http://dansguardian.org/downloads/2/Stable/${pkgname}-${pkgver}.tar.gz
-        dansguardian
-        dg2.10.1.1-missing.stdio.patch)
-md5sums=('0987a1c9bfbdf398118386f10279611a'
-         'a65a2cb6309670ad8978f1544907d290'
-         '3444718c00cc17337cba711ceaa1c0e5')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/dg2.10.1.1-missing.stdio.patch
-  ./configure --prefix="/usr" --with-proxyuser=proxy --with-proxygroup=proxy \
-              --sysconfdir=/etc --localstatedir=/var --enable-email
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -D data/scripts/dansguardian ${pkgdir}/etc/logrotate.d/dansguardian
-  install -D -m755 ${srcdir}/dansguardian ${pkgdir}/etc/rc.d/dansguardian
-}
-
-backup=(etc/dansguardian/dansguardian.conf 
-etc/dansguardian/dansguardianf1.conf
-etc/dansguardian/downloadmanagers/default.conf
-etc/dansguardian/downloadmanagers/fancy.conf
-etc/dansguardian/authplugins/proxy-digest.conf
-etc/dansguardian/authplugins/proxy-basic.conf
-etc/dansguardian/authplugins/ident.conf
-etc/dansguardian/authplugins/ip.conf
-etc/dansguardian/lists/weightedphraselist 
-etc/dansguardian/lists/contentregexplist
-etc/dansguardian/lists/exceptionfileurllist
-etc/dansguardian/lists/exceptionextensionlist
-etc/dansguardian/lists/bannedextensionlist
-etc/dansguardian/lists/exceptionmimetypelist
-etc/dansguardian/lists/blacklists/ads/urls
-etc/dansguardian/lists/blacklists/ads/domains
-etc/dansguardian/lists/exceptionregexpurllist
-etc/dansguardian/lists/authplugins/ipgroups
-etc/dansguardian/lists/bannedregexpheaderlist
-etc/dansguardian/lists/phraselists/rta/banned
-etc/dansguardian/lists/phraselists/sport/weighted
-etc/dansguardian/lists/phraselists/proxies/weighted
-etc/dansguardian/lists/phraselists/safelabel/banned
-etc/dansguardian/lists/phraselists/peer2peer/weighted
-etc/dansguardian/lists/phraselists/drugadvocacy/weighted
-etc/dansguardian/lists/phraselists/googlesearches/banned
-etc/dansguardian/lists/phraselists/conspiracy/weighted
-etc/dansguardian/lists/phraselists/secretsocieties/weighted
-etc/dansguardian/lists/phraselists/idtheft/weighted
-etc/dansguardian/lists/phraselists/illegaldrugs/banned
-etc/dansguardian/lists/phraselists/illegaldrugs/weighted_portuguese
-etc/dansguardian/lists/phraselists/illegaldrugs/weighted
-etc/dansguardian/lists/phraselists/violence/weighted_portuguese
-etc/dansguardian/lists/phraselists/violence/weighted
-etc/dansguardian/lists/phraselists/domainsforsale/weighted
-etc/dansguardian/lists/phraselists/music/weighted
-etc/dansguardian/lists/phraselists/upstreamfilter/weighted
-etc/dansguardian/lists/phraselists/games/weighted
-etc/dansguardian/lists/phraselists/weapons/weighted_portuguese
-etc/dansguardian/lists/phraselists/weapons/weighted
-etc/dansguardian/lists/phraselists/legaldrugs/weighted
-etc/dansguardian/lists/phraselists/gore/weighted_portuguese
-etc/dansguardian/lists/phraselists/gore/weighted
-etc/dansguardian/lists/phraselists/warezhacking/weighted
-etc/dansguardian/lists/phraselists/pornography/weighted_chinese
-etc/dansguardian/lists/phraselists/pornography/weighted_malay
-etc/dansguardian/lists/phraselists/pornography/weighted_german
-etc/dansguardian/lists/phraselists/pornography/weighted_dutch
-etc/dansguardian/lists/phraselists/pornography/banned_portuguese
-etc/dansguardian/lists/phraselists/pornography/weighted_french
-etc/dansguardian/lists/phraselists/pornography/weighted_polish
-etc/dansguardian/lists/phraselists/pornography/banned
-etc/dansguardian/lists/phraselists/pornography/weighted_danish
-etc/dansguardian/lists/phraselists/pornography/weighted_japanese
-etc/dansguardian/lists/phraselists/pornography/weighted_portuguese
-etc/dansguardian/lists/phraselists/pornography/weighted_russian
-etc/dansguardian/lists/phraselists/pornography/weighted_italian
-etc/dansguardian/lists/phraselists/pornography/weighted_swedish
-etc/dansguardian/lists/phraselists/pornography/weighted
-etc/dansguardian/lists/phraselists/pornography/weighted_norwegian
-etc/dansguardian/lists/phraselists/pornography/weighted_spanish
-etc/dansguardian/lists/phraselists/personals/weighted_portuguese
-etc/dansguardian/lists/phraselists/personals/weighted
-etc/dansguardian/lists/phraselists/nudism/weighted
-etc/dansguardian/lists/phraselists/malware/weighted
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_polish
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_swedish
-etc/dansguardian/lists/phraselists/goodphrases/exception_email
-etc/dansguardian/lists/phraselists/goodphrases/exception
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_danish
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_malay
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_dutch
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese
-etc/dansguardian/lists/phraselists/goodphrases/weighted_news
-etc/dansguardian/lists/phraselists/translation/weighted
-etc/dansguardian/lists/phraselists/chat/weighted_italian
-etc/dansguardian/lists/phraselists/chat/weighted
-etc/dansguardian/lists/phraselists/news/weighted
-etc/dansguardian/lists/phraselists/badwords/weighted_german
-etc/dansguardian/lists/phraselists/badwords/weighted_dutch
-etc/dansguardian/lists/phraselists/badwords/weighted_french
-etc/dansguardian/lists/phraselists/badwords/weighted_portuguese
-etc/dansguardian/lists/phraselists/badwords/weighted_spanish
-etc/dansguardian/lists/phraselists/webmail/weighted
-etc/dansguardian/lists/phraselists/travel/weighted
-etc/dansguardian/lists/phraselists/gambling/banned_portuguese
-etc/dansguardian/lists/phraselists/gambling/banned
-etc/dansguardian/lists/phraselists/gambling/weighted_portuguese
-etc/dansguardian/lists/phraselists/gambling/weighted
-etc/dansguardian/lists/phraselists/forums/weighted
-etc/dansguardian/lists/phraselists/intolerance/banned_portuguese
-etc/dansguardian/lists/phraselists/intolerance/weighted_portuguese
-etc/dansguardian/lists/phraselists/intolerance/weighted
-etc/dansguardian/lists/logsitelist
-etc/dansguardian/lists/logregexpurllist
-etc/dansguardian/lists/greysitelist
-etc/dansguardian/lists/filtergroupslist
-etc/dansguardian/lists/downloadmanagers/managedmimetypelist
-etc/dansguardian/lists/downloadmanagers/managedextensionlist
-etc/dansguardian/lists/exceptionfilesitelist
-etc/dansguardian/lists/bannedmimetypelist
-etc/dansguardian/lists/pics
-etc/dansguardian/lists/exceptionurllist
-etc/dansguardian/lists/logurllist
-etc/dansguardian/lists/exceptionphraselist
-etc/dansguardian/lists/bannedurllist
-etc/dansguardian/lists/headerregexplist
-etc/dansguardian/lists/bannediplist
-etc/dansguardian/lists/exceptionsitelist
-etc/dansguardian/lists/bannedphraselist
-etc/dansguardian/lists/exceptioniplist
-etc/dansguardian/lists/bannedregexpurllist
-etc/dansguardian/lists/bannedsitelist
-etc/dansguardian/lists/urlregexplist
-etc/dansguardian/lists/greyurllist)
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/dansguardian/dansguardian b/testing/dansguardian/dansguardian
deleted file mode 100644
index c537da8bd..000000000
--- a/testing/dansguardian/dansguardian
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/dansguardian`
-case "$1" in
-  start)
-    stat_busy "Starting DansGuardian"
-    [ -z "$PID" ] && /usr/sbin/dansguardian
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dansguardian
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DansGuardian"
-    [ ! -z "$PID" ]  && /usr/sbin/dansguardian -q &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dansguardian
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/dansguardian/dansguardian.install b/testing/dansguardian/dansguardian.install
deleted file mode 100644
index 05a72ad80..000000000
--- a/testing/dansguardian/dansguardian.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  echo "--------------------------------------------------"
-  echo "NOTE: DansGuardian is NOT free for commercial use."
-  echo "      See http://dansguardian.org for details on"
-  echo "      setup, configuration, and licensing."
-  echo "--------------------------------------------------"
-  chown -R proxy.proxy var/log/dansguardian 
-}
diff --git a/testing/dansguardian/dg2.10.1.1-missing.stdio.patch b/testing/dansguardian/dg2.10.1.1-missing.stdio.patch
deleted file mode 100644
index b92aef008..000000000
--- a/testing/dansguardian/dg2.10.1.1-missing.stdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/downloadmanagers/fancy.cpp.orig	2009-09-13 18:37:56.000000000 -0400
-+++ src/downloadmanagers/fancy.cpp	2009-09-13 18:38:14.000000000 -0400
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <iostream>
- #include <math.h>
-+#include <cstdio>
- 
- 
- // GLOBALS
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 ed1dbaf12..000000000
--- a/testing/dhcpcd/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 149635 2012-02-08 21:43:02Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.5.4
-pkgrel=1
-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=('8aa42abd28d49cce5b179998490c36f6c490e338'
-          '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 \
-	--rundir=/run
-
-  # Build
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # Create Binary Symlink
-  install -d ${pkgdir}/usr/sbin
-  ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
-  # Install Configuration File used in /etc/rc.d/network
-  install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
-  # Install License
-  install -d $pkgdir/usr/share/licenses/$pkgname
-  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
-        >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # Set Options in /etc/dhcpcd.conf
-  echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
-}
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/digikam/PKGBUILD b/testing/digikam/PKGBUILD
deleted file mode 100644
index 8f9780a19..000000000
--- a/testing/digikam/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=2.5.0
-pkgrel=5
-pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.digikam.org/"
-makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
-             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	"boost148.patch" "libkipi140.patch")
-sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383'
-          '93853084905b21309c46ce7d585021e76283d429'
-          '8a8f624fd0ca768a9dcd706405eb6e4944892d87')
-build() {
-  cd "${srcdir}"
-
-  pushd ${pkgname}-${pkgver}/core
-  patch -Np0 -i ${srcdir}/boost148.patch
-  patch -Np1 -i ${srcdir}/libkipi140.patch
-  popd
-
-  mkdir build
-  cd build
-  # Use internal lensfun (FS#21816)
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DLENSFUN_LIBRARY="" \
-    -DLENSFUN_INCLUDE_DIR=""
-  make
-}
-
-package_digikam() {
-  pkgdesc="Digital photo management application for KDE"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr'
-           'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap')
-  optdepends=('kipi-plugins: for more extras and plugins')
-  install=digikam.install
-
-  cd "${srcdir}"/build/core
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/po
-  make DESTDIR="${pkgdir}" install
-
-  # these are in oxygen-icons
-  rm -rf ${pkgdir}/usr/share/icons
-}
-
-package_libkface() {
-  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
-  depends=('kdelibs' 'opencv')
-
-  cd "${srcdir}"/build/extra/libkface
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkgeomap() {
-  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
-
-  cd "${srcdir}"/build/extra/libkgeomap
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkvkontakte() {
-  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs' 'qjson')
-
-  cd "${srcdir}"/build/extra/libkvkontakte
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libmediawiki() {
-  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
-  depends=('kdelibs')
-
-  cd "${srcdir}"/build/extra/libmediawiki
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kipi-plugins() {
-  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'qjson' 'libkvkontakte' 'libkexiv2')
-  optdepends=('libkgeomap'
-              'libmediawiki'
-              'libgpod'
-              'hugin')
-  install=kipi-plugins.install
-
-  cd "${srcdir}"/build/extra/kipi-plugins
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/digikam/boost148.patch b/testing/digikam/boost148.patch
deleted file mode 100644
index 6d3ff585b..000000000
--- a/testing/digikam/boost148.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
---- libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 08:32:19.837388059 -0500
-+++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 09:17:27.798341897 -0500
-@@ -1198,7 +1198,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Store distance and predecessors in QMaps, wrapped to serve as property maps
-                                           distance_map(VertexIntMapAdaptor(distances)).
-                                           predecessor_map(VertexVertexMapAdaptor(predecessors))
-@@ -1218,7 +1218,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Invert the default compare method: With greater, we get the longest path
-                                           distance_compare(std::greater<int>()).
-                                           // will be returned if a node is unreachable
-@@ -1384,14 +1384,15 @@
-         template <class GraphType, typename VertexLessThan>
-         class lessThanMapEdgeToTarget
-         {
-+            typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
-         public:
-             lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
-                 : g(g), vertexLessThan(vertexLessThan) {}
-             const GraphType& g;
-             VertexLessThan vertexLessThan;
--            bool operator()(const Edge& a, const Edge& b)
-+            bool operator()(const edge_descriptor& a, const edge_descriptor& b)
-             {
--                return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
-+                return vertexLessThan(boost::target(a, g), boost::target(b, g));
-             }
-         };
- 
-@@ -1402,20 +1403,21 @@
-         {
-             typedef std::pair<Vertex, QList<Edge> > VertexInfo;
- 
--            QList<Edge>             outEdges;
-+            typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
-+            QList<edge_descriptor> outEdges;
-             std::vector<VertexInfo> stack;
- 
-             boost::put(color, u, boost::gray_color);
-             vis.discover_vertex(u, g);
- 
--            outEdges = toEdgeList(boost::out_edges(u, g));
-+            outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
-             // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
-             // maps the given edges to their targets, and calls our vertex lessThan.
-             qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
- 
--            foreach(const Edge& e, outEdges)
-+            foreach(const edge_descriptor& e, outEdges)
-             {
--                Vertex v = boost::target(e.toEdge(), g);
-+                Vertex v = boost::target(e, g);
-                 vis.examine_edge(e, g);
-                 boost::default_color_type v_color = boost::get(color, v);
-                 if (v_color == boost::white_color)
diff --git a/testing/digikam/digikam.install b/testing/digikam/digikam.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/digikam/digikam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/digikam/kipi-plugins.install b/testing/digikam/kipi-plugins.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/digikam/kipi-plugins.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/digikam/libkipi140.patch b/testing/digikam/libkipi140.patch
deleted file mode 100644
index a221b5847..000000000
--- a/testing/digikam/libkipi140.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/utilities/setup/setupplugins.cpp
-+++ b/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
- 
-     panel->setLayout(mainLayout);
- 
-+#if KIPI_VERSION < 0x010400
-+    d->checkAllBtn->setVisible(false);
-+    d->clearBtn->setVisible(false);
-+#endif
-+
-     initPlugins();
- 
-     // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotCheckAll();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
- void SetupPlugins::slotClear()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotClear();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
-diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/utilities/setup/setupplugins.h
-+++ b/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-
-  
diff --git a/testing/djvulibre/PKGBUILD b/testing/djvulibre/PKGBUILD
deleted file mode 100644
index 6faf641c4..000000000
--- a/testing/djvulibre/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 148081 2012-01-30 18:45:15Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: mgushee
-
-pkgname=djvulibre
-pkgver=3.5.24
-pkgrel=3
-pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://djvu.sourceforge.net/"
-depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme')
-makedepends=('pkg-config')
-provides=("libdjvu=${pkgver}")
-replaces=('libdjvu')
-conflicts=('libdjvu')
-optdepends=('djview4: Viewer application')
-options=('!libtool')
-install=djvulibre.install
-source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz
-        git-fixes.patch)
-md5sums=('af83d27af5083198432a178d22b259c5'
-         'ff3798e383e9c3fae407455d8a51deec')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr --disable-desktopfiles
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  #Install icons for mime-types.
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48,64x64}/mimetypes
-  for sz in 22 32 48 64; do
-    install -m644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png"
-  done
-}
diff --git a/testing/djvulibre/djvulibre.install b/testing/djvulibre/djvulibre.install
deleted file mode 100644
index 3e9bb5c49..000000000
--- a/testing/djvulibre/djvulibre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -x usr/bin/gtk-update-icon-cache ]; then  
-    gtk-update-icon-cache -q -f usr/share/icons/hicolor
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/djvulibre/git-fixes.patch b/testing/djvulibre/git-fixes.patch
deleted file mode 100644
index 3077cf0b4..000000000
--- a/testing/djvulibre/git-fixes.patch
+++ /dev/null
@@ -1,1607 +0,0 @@
-From 3341545edba359b292a8ef6db1b7d342caf3dcf1 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Wed, 4 May 2011 21:25:35 -0700
-Subject: [PATCH] Added include <stddef.h> for gcc-4.6
-
----
- libdjvu/BSByteStream.cpp       |    1 +
- libdjvu/BSEncodeByteStream.cpp |    1 +
- libdjvu/ByteStream.cpp         |    1 +
- libdjvu/DjVuFileCache.cpp      |    1 +
- libdjvu/DjVuGlobal.cpp         |    2 ++
- libdjvu/DjVuGlobalMemory.cpp   |    2 ++
- libdjvu/DjVuMessage.cpp        |    1 +
- libdjvu/DjVuMessageLite.cpp    |    2 +-
- libdjvu/DjVuPalette.cpp        |    2 ++
- libdjvu/DjVuPort.h             |    1 +
- libdjvu/DjVuToPS.cpp           |    1 +
- libdjvu/GBitmap.cpp            |    2 ++
- libdjvu/GException.cpp         |    1 +
- libdjvu/GOS.cpp                |    1 +
- libdjvu/GPixmap.cpp            |    2 ++
- libdjvu/GSmartPointer.cpp      |    1 +
- libdjvu/GSmartPointer.h        |    2 ++
- libdjvu/GString.cpp            |    1 +
- libdjvu/GString.h              |    1 +
- libdjvu/GThreads.cpp           |    2 ++
- libdjvu/GURL.cpp               |    1 +
- libdjvu/GUnicode.cpp           |    2 ++
- libdjvu/IFFByteStream.h        |    1 +
- libdjvu/IW44EncodeCodec.cpp    |    1 +
- libdjvu/IW44Image.cpp          |    1 +
- libdjvu/JPEGDecoder.h          |    1 +
- libdjvu/MMX.cpp                |    1 +
- libdjvu/UnicodeByteStream.h    |    1 +
- libdjvu/XMLParser.cpp          |    1 +
- libdjvu/ZPCodec.cpp            |    2 ++
- libdjvu/atomic.cpp             |    1 +
- libdjvu/ddjvuapi.cpp           |    1 +
- libdjvu/ddjvuapi.h             |    1 +
- libdjvu/miniexp.cpp            |    1 +
- libdjvu/miniexp.h              |    3 ++-
- tools/bzz.cpp                  |    1 +
- tools/c44.cpp                  |    1 +
- tools/cjb2.cpp                 |    1 +
- tools/cpaldjvu.cpp             |    1 +
- tools/csepdjvu.cpp             |    1 +
- tools/ddjvu.cpp                |    1 +
- tools/djvm.cpp                 |    2 +-
- tools/djvmcvt.cpp              |    1 +
- tools/djvudump.cpp             |    1 +
- tools/djvuextract.cpp          |    1 +
- tools/djvumake.cpp             |    1 +
- tools/djvups.cpp               |    1 +
- tools/djvused.cpp              |    1 +
- tools/djvuserve.cpp            |    1 +
- tools/djvutxt.cpp              |    1 +
- tools/tiff2pdf.h               |    1 +
- xmltools/djvutoxml.cpp         |    1 +
- xmltools/djvuxmlparser.cpp     |    1 +
- 53 files changed, 63 insertions(+), 3 deletions(-)
-
-diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp
-index b762ccf..d662ab0 100644
---- a/libdjvu/BSByteStream.cpp
-+++ b/libdjvu/BSByteStream.cpp
-@@ -62,6 +62,7 @@
- 
- // - Author: Leon Bottou, 07/1998
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp
-index 5d80e51..68bc3e3 100644
---- a/libdjvu/BSEncodeByteStream.cpp
-+++ b/libdjvu/BSEncodeByteStream.cpp
-@@ -71,6 +71,7 @@
- #include "GOS.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp
-index 158c33c..be01847 100644
---- a/libdjvu/ByteStream.cpp
-+++ b/libdjvu/ByteStream.cpp
-@@ -73,6 +73,7 @@
- #include "GOS.h"
- #include "GURL.h"
- #include "DjVuMessage.h"
-+#include <stddef.h>
- #include <fcntl.h>
- #if defined(WIN32) || defined(__CYGWIN32__)
- # include <io.h>
-diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp
-index 6b1e85d..7d7a192 100644
---- a/libdjvu/DjVuFileCache.cpp
-+++ b/libdjvu/DjVuFileCache.cpp
-@@ -63,6 +63,7 @@
- #include "DjVuFileCache.h"
- #include "debug.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp
-index e6d3cec..df9278e 100644
---- a/libdjvu/DjVuGlobal.cpp
-+++ b/libdjvu/DjVuGlobal.cpp
-@@ -76,6 +76,8 @@
- #include "GThreads.h"
- #include "GException.h"
- #include "GContainer.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp
-index 3c6012c..c8ba309 100644
---- a/libdjvu/DjVuGlobalMemory.cpp
-+++ b/libdjvu/DjVuGlobalMemory.cpp
-@@ -67,6 +67,8 @@
- 
- #include "DjVuGlobal.h"
- #include "GException.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- #include "debug.h"
-diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp
-index 6f5a735..1726025 100644
---- a/libdjvu/DjVuMessage.cpp
-+++ b/libdjvu/DjVuMessage.cpp
-@@ -71,6 +71,7 @@
- #include "debug.h"
- #include <ctype.h>
- #include <string.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #ifdef WIN32
- # include <tchar.h>
-diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp
-index b8c1010..5daa9d9 100644
---- a/libdjvu/DjVuMessageLite.cpp
-+++ b/libdjvu/DjVuMessageLite.cpp
-@@ -73,8 +73,8 @@
- #include "debug.h"
- #include <ctype.h>
- #include <string.h>
-+#include <stddef.h>
- #include <stdlib.h>
--// #include <stdio.h>
- #ifdef WIN32
- #include <tchar.h>
- #include <windows.h>
-diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp
-index c489f7b..76b0bf4 100644
---- a/libdjvu/DjVuPalette.cpp
-+++ b/libdjvu/DjVuPalette.cpp
-@@ -64,6 +64,8 @@
- #include "ByteStream.h"
- #include "BSByteStream.h"
- #include "DjVuPalette.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <math.h>
- 
-diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h
-index f6a92f6..e2b3125 100644
---- a/libdjvu/DjVuPort.h
-+++ b/libdjvu/DjVuPort.h
-@@ -65,6 +65,7 @@
- 
- #include "GThreads.h"
- #include "GURL.h"
-+#include "stddef.h"
- 
- #ifdef HAVE_NAMESPACES
- namespace DJVU {
-diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp
-index 5517bf3..6914ff9 100644
---- a/libdjvu/DjVuToPS.cpp
-+++ b/libdjvu/DjVuToPS.cpp
-@@ -72,6 +72,7 @@
- #include "GPixmap.h"
- #include "debug.h"
- #include <stdarg.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <time.h>
-diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
-index ab5c0de..797edcc 100644
---- a/libdjvu/GBitmap.cpp
-+++ b/libdjvu/GBitmap.cpp
-@@ -66,6 +66,8 @@
- #include "GString.h"
- #include "GThreads.h"
- #include "GException.h"
-+#include <stddef.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- // - Author: Leon Bottou, 05/1997
-diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp
-index 2ea179a..89da70f 100644
---- a/libdjvu/GException.cpp
-+++ b/libdjvu/GException.cpp
-@@ -60,6 +60,7 @@
- # pragma implementation
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp
-index e784932..d2088e2 100644
---- a/libdjvu/GOS.cpp
-+++ b/libdjvu/GOS.cpp
-@@ -65,6 +65,7 @@
- #include "GOS.h"
- #include "GURL.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
-diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp
-index 392df54..4bf6f57 100644
---- a/libdjvu/GPixmap.cpp
-+++ b/libdjvu/GPixmap.cpp
-@@ -75,6 +75,8 @@
- #include "GThreads.h"
- #include "Arrays.h"
- #include "JPEGDecoder.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <math.h>
- #include <assert.h>
-diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp
-index 6e523e7..58aef5b 100644
---- a/libdjvu/GSmartPointer.cpp
-+++ b/libdjvu/GSmartPointer.cpp
-@@ -67,6 +67,7 @@
- // Our original implementation consisted of multiple classes.
- // <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
- 
-+#include <stddef.h>
- #include <string.h>
- #if PARANOID_DEBUG
- # include <assert.h>
-diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h
-index 82781bd..8a8bb8a 100644
---- a/libdjvu/GSmartPointer.h
-+++ b/libdjvu/GSmartPointer.h
-@@ -97,6 +97,8 @@
- #include "DjVuGlobal.h"
- #include "atomic.h"
- 
-+#include <stddef.h>
-+
- #ifdef HAVE_NAMESPACES
- namespace DJVU {
- # ifdef NOT_DEFINED // Just to fool emacs c++ mode
-diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
-index 03f6226..350b11b 100644
---- a/libdjvu/GString.cpp
-+++ b/libdjvu/GString.cpp
-@@ -73,6 +73,7 @@
- #include "GThreads.h"
- #include "debug.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/GString.h b/libdjvu/GString.h
-index b63b753..3aa1f76 100644
---- a/libdjvu/GString.h
-+++ b/libdjvu/GString.h
-@@ -108,6 +108,7 @@
- #include "DjVuGlobal.h"
- #include "GContainer.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #ifdef WIN32
-diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp
-index d81f3c3..253fed8 100644
---- a/libdjvu/GThreads.cpp
-+++ b/libdjvu/GThreads.cpp
-@@ -71,6 +71,8 @@
- #include "GThreads.h"
- #include "GException.h"
- #include "DjVuMessageLite.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- 
-diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp
-index c37bf52..a80078c 100644
---- a/libdjvu/GURL.cpp
-+++ b/libdjvu/GURL.cpp
-@@ -72,6 +72,7 @@
- #include "GURL.h"
- #include "debug.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
-diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp
-index 415c081..a8b25b8 100644
---- a/libdjvu/GUnicode.cpp
-+++ b/libdjvu/GUnicode.cpp
-@@ -62,6 +62,8 @@
- 
- #include "GString.h"
- 
-+#include <stddef.h>
-+
- #if HAS_ICONV
- #include <iconv.h>
- #endif
-diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h
-index a653f8c..e31b216 100644
---- a/libdjvu/IFFByteStream.h
-+++ b/libdjvu/IFFByteStream.h
-@@ -124,6 +124,7 @@
- 
- 
- #include "DjVuGlobal.h"
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
-index 8d7b12c..49081b7 100644
---- a/libdjvu/IW44EncodeCodec.cpp
-+++ b/libdjvu/IW44EncodeCodec.cpp
-@@ -76,6 +76,7 @@
- #include "IFFByteStream.h"
- #include "GRect.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
-index 9476726..4a19fb5 100644
---- a/libdjvu/IW44Image.cpp
-+++ b/libdjvu/IW44Image.cpp
-@@ -76,6 +76,7 @@
- #include "IFFByteStream.h"
- #include "GRect.h"
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h
-index bd430a0..fad1d4c 100644
---- a/libdjvu/JPEGDecoder.h
-+++ b/libdjvu/JPEGDecoder.h
-@@ -64,6 +64,7 @@
- 
- #ifdef NEED_JPEG_DECODER
- 
-+#include <stddef.h>
- #include <string.h>
- #include <setjmp.h>
- 
-diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
-index 5ab60bb..528dab6 100644
---- a/libdjvu/MMX.cpp
-+++ b/libdjvu/MMX.cpp
-@@ -62,6 +62,7 @@
- 
- #include "MMX.h"
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h
-index 0ae112b..9b49a17 100644
---- a/libdjvu/UnicodeByteStream.h
-+++ b/libdjvu/UnicodeByteStream.h
-@@ -88,6 +88,7 @@
- #include "GString.h"
- #include "ByteStream.h"
- 
-+#include <stddef.h>
- 
- #ifdef HAVE_NAMESPACES
- namespace DJVU {
-diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
-index 84386c5..7da923a 100644
---- a/libdjvu/XMLParser.cpp
-+++ b/libdjvu/XMLParser.cpp
-@@ -75,6 +75,7 @@
- #include "debug.h"
- #include <stdio.h>
- #include <ctype.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp
-index f6e971d..ff5b9bf 100644
---- a/libdjvu/ZPCodec.cpp
-+++ b/libdjvu/ZPCodec.cpp
-@@ -66,6 +66,8 @@
- #include "ZPCodec.h"
- #include "ByteStream.h"
- #include "GException.h"
-+
-+#include <stddef.h>
- #include <stdlib.h>
- #include <assert.h>
- #include <math.h>
-diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp
-index bdc193e..63fd483 100644
---- a/libdjvu/atomic.cpp
-+++ b/libdjvu/atomic.cpp
-@@ -28,6 +28,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <assert.h>
- #include "atomic.h"
-diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp
-index b18b84b..f40f5aa 100644
---- a/libdjvu/ddjvuapi.cpp
-+++ b/libdjvu/ddjvuapi.cpp
-@@ -60,6 +60,7 @@
- # pragma implementation "ddjvuapi.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
-index d0ed48f..841f223 100644
---- a/libdjvu/ddjvuapi.h
-+++ b/libdjvu/ddjvuapi.h
-@@ -64,6 +64,7 @@ extern "C" {
- }
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- 
-diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
-index e0fb087..fc51297 100644
---- a/libdjvu/miniexp.cpp
-+++ b/libdjvu/miniexp.cpp
-@@ -23,6 +23,7 @@
- # pragma implementation "miniexp.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
-diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h
-index 91e345d..993005b 100644
---- a/libdjvu/miniexp.h
-+++ b/libdjvu/miniexp.h
-@@ -38,7 +38,8 @@ extern "C" {
- #ifndef MINILISPAPI
- # define MINILISPAPI /**/
- #endif
--  
-+
-+#include <stddef.h>  
- 
- /* -------------------------------------------------- */
- /* LISP EXPRESSIONS                                   */
-diff --git a/tools/bzz.cpp b/tools/bzz.cpp
-index ca092e1..2ebc7b9 100644
---- a/tools/bzz.cpp
-+++ b/tools/bzz.cpp
-@@ -94,6 +94,7 @@
- #include "GURL.h"
- #include "DjVuMessage.h"
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- static const char *program = "(unknown)";
-diff --git a/tools/c44.cpp b/tools/c44.cpp
-index 6f23b53..855504b 100644
---- a/tools/c44.cpp
-+++ b/tools/c44.cpp
-@@ -226,6 +226,7 @@
- #include <locale.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- // command line data
-diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp
-index 8cf89b9..11eb662 100644
---- a/tools/cjb2.cpp
-+++ b/tools/cjb2.cpp
-@@ -120,6 +120,7 @@
- #include "jb2tune.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #if HAVE_TIFF
- #include <tiffio.h>
-diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp
-index 111cbd3..b640a7a 100644
---- a/tools/cpaldjvu.cpp
-+++ b/tools/cpaldjvu.cpp
-@@ -118,6 +118,7 @@
- #include "jb2tune.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <math.h>
- 
-diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
-index cd721f8..d5203d5 100644
---- a/tools/csepdjvu.cpp
-+++ b/tools/csepdjvu.cpp
-@@ -162,6 +162,7 @@
- #include "jb2tune.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- #undef MIN
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 817e045..981a270 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -62,6 +62,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
-diff --git a/tools/djvm.cpp b/tools/djvm.cpp
-index 951bd66..6ea88c2 100644
---- a/tools/djvm.cpp
-+++ b/tools/djvm.cpp
-@@ -135,9 +135,9 @@
- #include "DjVuMessage.h"
- 
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
--#include <stdlib.h>
- 
- static const char * progname;
- 
-diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp
-index 9ca1c54..20b468a 100644
---- a/tools/djvmcvt.cpp
-+++ b/tools/djvmcvt.cpp
-@@ -144,6 +144,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- static const char * progname;
-diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
-index 6a0215a..2dddbdf 100644
---- a/tools/djvudump.cpp
-+++ b/tools/djvudump.cpp
-@@ -119,6 +119,7 @@ xxx
- #include <locale.h>
- #include <stdio.h>
- #include <ctype.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- void
-diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp
-index 4a9f381..907b99c 100644
---- a/tools/djvuextract.cpp
-+++ b/tools/djvuextract.cpp
-@@ -105,6 +105,7 @@
- #include "GOS.h"
- #include "DjVuMessage.h"
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- 
-diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp
-index 7020484..4c5fc0f 100644
---- a/tools/djvumake.cpp
-+++ b/tools/djvumake.cpp
-@@ -153,6 +153,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <ctype.h>
- 
-diff --git a/tools/djvups.cpp b/tools/djvups.cpp
-index 51aa999..632b832 100644
---- a/tools/djvups.cpp
-+++ b/tools/djvups.cpp
-@@ -57,6 +57,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
-diff --git a/tools/djvused.cpp b/tools/djvused.cpp
-index de84dcd..687fdca 100644
---- a/tools/djvused.cpp
-+++ b/tools/djvused.cpp
-@@ -61,6 +61,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <errno.h>
-diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp
-index 19a17da..818fe78 100644
---- a/tools/djvuserve.cpp
-+++ b/tools/djvuserve.cpp
-@@ -73,6 +73,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <time.h>
-diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp
-index ba2c745..9e9124c 100644
---- a/tools/djvutxt.cpp
-+++ b/tools/djvutxt.cpp
-@@ -61,6 +61,7 @@
- # include "config.h"
- #endif
- 
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
-diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h
-index 082f5fb..656dc43 100644
---- a/tools/tiff2pdf.h
-+++ b/tools/tiff2pdf.h
-@@ -22,6 +22,7 @@
- # endif
- # if HAVE_TIFF
- #  include <stdio.h>
-+#  include <stddef.h>
- #  include <stdlib.h>
- #  include <tiff.h>
- #  include <tiffio.h>
-diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp
-index 17c769b..b40535e 100644
---- a/xmltools/djvutoxml.cpp
-+++ b/xmltools/djvutoxml.cpp
-@@ -71,6 +71,7 @@
- 
- #include <locale.h>
- #include <stdio.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <assert.h>
-diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp
-index bdc5768..6679a9d 100644
---- a/xmltools/djvuxmlparser.cpp
-+++ b/xmltools/djvuxmlparser.cpp
-@@ -70,6 +70,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <locale.h>
-+#include <stddef.h>
- #include <stdlib.h>
- 
- static void 
--- 
-1.7.4.1
-
-From 3cc41e2a72bbd6d34e81a9a214abbebf41cc00c7 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sat, 21 May 2011 09:27:17 -0700
-Subject: [PATCH] Added ddjvu option to skip corrupted pages.
-
----
- tools/ddjvu.1   |    7 +++++++
- tools/ddjvu.cpp |   49 +++++++++++++++++++++++++++++++++----------------
- 2 files changed, 40 insertions(+), 16 deletions(-)
-
-diff --git a/tools/ddjvu.1 b/tools/ddjvu.1
-index 29285c3..7d3d105 100644
---- a/tools/ddjvu.1
-+++ b/tools/ddjvu.1
-@@ -178,6 +178,13 @@ select specific layers of a DjVu image.
- These modes can fail if the DjVu image does 
- not contain the selected layer.
- .RE
-+.TP
-+.BI "-skip"
-+Instead of aborting when encountering a corrupted page,
-+this option causes
-+.BR ddjvu
-+to simply skip the corrupted page and continue with the next.
-+This is useful for processing certain damaged files.
- 
- .SH RESOLUTION OPTIONS
- The following options control the resolution of the output image.  
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 981a270..b9cb038 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -132,6 +132,7 @@ ddjvu_rect_t info_size;
- ddjvu_rect_t info_segment;
- const char  *inputfilename = 0;
- const char  *outputfilename = 0;
-+int          flag_skip_corrupted = 0;
- 
- #if HAVE_TIFF2PDF
- char *tempfilename = 0;
-@@ -164,7 +165,6 @@ handle(int wait)
-           if (msg->m_error.filename)
-             fprintf(stderr,"ddjvu: '%s:%d'\n", 
-                     msg->m_error.filename, msg->m_error.lineno);
--          exit(10);
-         default:
-           break;
-         }
-@@ -554,8 +554,16 @@ dopage(int pageno)
-   while (! ddjvu_page_decoding_done(page))
-     handle(TRUE);
-   if (ddjvu_page_decoding_error(page))
--    die(i18n("Cannot decode page %d."), pageno);
--  
-+    {
-+      handle(FALSE);
-+      fprintf(stderr,"ddjvu: ");
-+      fprintf(stderr,i18n("Cannot decode page %d."), pageno);
-+      fprintf(stderr,"\n");
-+      if (flag_skip_corrupted)
-+        return;
-+      else
-+        exit(10);
-+    }
-   timingdata[1] = ticks();
-   /* Open files */
-   if (flag_format == 't')
-@@ -753,19 +761,20 @@ usage()
-     i18n("DjVu decompression utility\n\n"
-          "Usage: ddjvu [options] [<djvufile> [<outputfile>]]\n\n"
-          "Options:\n"
--         "  -verbose          Prints various informational messages.\n"
--         "  -format=FMT       Selects output format: pbm,pgm,ppm,pnm,rle,tiff.\n"
--         "  -scale=N          Selects display scale.\n"
--         "  -size=WxH         Selects size of rendered image.\n"
--         "  -subsample=N      Selects direct subsampling factor.\n"
--         "  -aspect=no        Authorizes aspect ratio changes\n"
--         "  -segment=WxH+X+Y  Selects which segment of the rendered image\n"
--         "  -mode=black       Renders a meaningful bitonal image.\n"
--         "  -mode=mask        Only renders the mask layer.\n"
--         "  -mode=foreground  Only renders the foreground layer.\n"
--         "  -mode=background  Only renders the background layer.\n"
--         "  -page=PAGESPEC    Selects page(s) to be decoded.\n"
--         "  -quality=QUALITY  Specifies jpeg quality for lossy tiff output.\n"
-+         "  -verbose          Print various informational messages.\n"
-+         "  -format=FMT       Select output format: pbm,pgm,ppm,pnm,rle,tiff.\n"
-+         "  -scale=N          Select display scale.\n"
-+         "  -size=WxH         Select size of rendered image.\n"
-+         "  -subsample=N      Select direct subsampling factor.\n"
-+         "  -aspect=no        Authorize aspect ratio changes\n"
-+         "  -segment=WxH+X+Y  Select which segment of the rendered image\n"
-+         "  -mode=black       Render a meaningful bitonal image.\n"
-+         "  -mode=mask        Only render the mask layer.\n"
-+         "  -mode=foreground  Only render the foreground layer.\n"
-+         "  -mode=background  Only render the background layer.\n"
-+         "  -page=PAGESPEC    Select page(s) to be decoded.\n"
-+         "  -skip             Skip corrupted pages instead of aborting.\n"
-+         "  -quality=QUALITY  Specify jpeg quality for lossy tiff output.\n"
-          "\n"
-          "If <outputfile> is a single dash or omitted, the decompressed image\n"
-          "is sent to the standard output.  If <djvufile> is a single dash or\n"
-@@ -846,6 +855,12 @@ parse_option(int argc, char **argv, int i)
-         die(i18n(errarg), opt);
-       flag_verbose = 1;
-     }
-+  if (!strcmp(opt,"skip"))
-+    {
-+      if (arg) 
-+        die(i18n(errarg), opt);
-+      flag_skip_corrupted = 1;
-+    }
-   else if (!strcmp(opt,"scale"))
-     {
-       if (!arg) 
-@@ -1012,6 +1027,8 @@ main(int argc, char **argv)
-     die(i18n("Cannot open djvu document '%s'."), inputfilename);
-   while (! ddjvu_document_decoding_done(doc))
-     handle(TRUE);
-+  if (ddjvu_document_decoding_error(doc))
-+    die(i18n("Cannot decode document."));
-   
-   /* Process all pages */
-   i = ddjvu_document_get_pagenum(doc);
--- 
-1.7.4.1
-
-From 6a6e6a047b41a431cfc091bd71fcad554fd79437 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Mon, 30 May 2011 18:52:33 -0700
-Subject: [PATCH] Added option -o outputfile to djvudump.
-
----
- tools/djvudump.1   |    2 +-
- tools/djvudump.cpp |   34 +++++++++++++++++++++++++---------
- 2 files changed, 26 insertions(+), 10 deletions(-)
-
-diff --git a/tools/djvudump.1 b/tools/djvudump.1
-index c86b7d5..e39a318 100644
---- a/tools/djvudump.1
-+++ b/tools/djvudump.1
-@@ -27,7 +27,7 @@
- djvudump \- Display internal structure of DjVu files.
- 
- .SH SYNOPSIS
--.BI "djvudump " "djvufiles" "..."
-+.BI "djvudump [-o " "outputfile" "] " "djvufiles" "..."
- 
- .SH DESCRIPTION
- Program 
-diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
-index 2dddbdf..6daaf2c 100644
---- a/tools/djvudump.cpp
-+++ b/tools/djvudump.cpp
-@@ -122,6 +122,9 @@ xxx
- #include <stddef.h>
- #include <stdlib.h>
- 
-+const char *outputfile = 0;
-+FILE *outputf = stdout;
-+
- void
- display(const GURL &url)
- {
-@@ -134,7 +137,7 @@ display(const GURL &url)
-    obs->seek(0);
-    obs->readall(buf, size);
-    GNativeString ns = str;
--   fputs((const char*)ns, stdout);
-+   fputs((const char*)ns, outputf);
- }
- 
- 
-@@ -146,7 +149,7 @@ usage()
-           "DJVUDUMP --- DjVuLibre-" DJVULIBRE_VERSION "\n"
- #endif
-           "Describes DjVu and IFF85 files\n\n"
--          "Usage: djvudump <iff_filenames>\n" );
-+          "Usage: djvudump [-o outputfile] <iff_filenames>\n" );
-   exit(1);
- }
- 
-@@ -156,24 +159,37 @@ main(int argc, char **argv)
-   setlocale(LC_ALL,"");
-   setlocale(LC_NUMERIC,"C");
-   djvu_programname(argv[0]);
--  GArray<GUTF8String> dargv(0,argc-1);
-+  // get output file name
-+  if (argc>2 && !strcmp(argv[1],"-o"))
-+    {
-+      outputfile = argv[2];
-+      argv += 2;
-+      argc -= 2;
-+    }
-+  // convert iff file name
-+  GArray<GUTF8String> dargv(0, argc-1);
-   for(int i=0;i<argc;++i)
-     dargv[i]=GNativeString(argv[i]);
-+  if (argc <= 1)
-+    usage();
-+  if (outputfile && !(outputf = fopen(outputfile,"w")))
-+    {
-+      DjVuPrintErrorUTF8("djvudump: Cannot open output file.\n");
-+      exit(1);
-+    }
-   G_TRY
-     {
--      if (argc<=1)
--        usage();
-       for (int i=1; i<argc; i++)
--      {
-+        {
-         const GURL::Filename::UTF8 url(dargv[i]);
-         display(url);
--      }
-+        }
-     }
-   G_CATCH(ex)
--    {
-+  {
-       ex.perror();
-       exit(1);
--    }
-+  }
-   G_ENDCATCH;
-   return 0;
- }
--- 
-1.7.4.1
-
-From 6db359d1ad5e7e863fac53301e7ff884cfe44423 Mon Sep 17 00:00:00 2001
-From: Bill C Riemers <briemers@redhat.com>
-Date: Thu, 2 Jun 2011 13:17:27 -0400
-Subject: [PATCH] Correct error copying an error in the annotation class of assigning a tempory
- GUTF8String directly to a const char *.
-
----
- libdjvu/DjVuAnno.cpp |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp
-index 6ca5b4e..e2a9108 100644
---- a/libdjvu/DjVuAnno.cpp
-+++ b/libdjvu/DjVuAnno.cpp
-@@ -261,7 +261,8 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const
-     to_print=buffer.format("%d",number);
-     break;
-   case STRING:
--    to_print=make_c_string(string);
-+    buffer=make_c_string(string);
-+    to_print=(const char *)buffer;
-     break;
-   case SYMBOL:
-     to_print=buffer.format("%s",(const char *)symbol);
--- 
-1.7.4.1
-
-From 2b26415c3c46ffb7532ca250990668564be62d39 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Thu, 2 Jun 2011 09:48:49 -0700
-Subject: [PATCH] Corrected polarity of xmp annotation saving
-
----
- libdjvu/DjVuAnno.cpp |   19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp
-index e2a9108..8e16dd8 100644
---- a/libdjvu/DjVuAnno.cpp
-+++ b/libdjvu/DjVuAnno.cpp
-@@ -254,25 +254,24 @@ GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const
-   if (!cur_pos) { cur_pos = &local_cur_pos; }
-   
-   GUTF8String buffer;
--  const char * to_print=0;
-   switch(type)
-   {
-   case NUMBER:
--    to_print=buffer.format("%d",number);
-+    buffer.format("%d",number);
-     break;
-   case STRING:
--    buffer=make_c_string(string);
--    to_print=(const char *)buffer;
-+    buffer = make_c_string(string);
-     break;
-   case SYMBOL:
--    to_print=buffer.format("%s",(const char *)symbol);
-+    buffer.format("%s",(const char *)symbol);
-     break;
-   case LIST:
--    to_print=buffer.format("(%s",(const char *)name);
-+    buffer.format("(%s",(const char *)name);
-     break;
-   case INVALID:
-     break;
-   }
-+  const char * to_print = (const char*)buffer;
-   if (!compact && *cur_pos+strlen(to_print)>70)
-   {
-     char ch='\n';
-@@ -1375,7 +1374,7 @@ DjVuANT::encode_raw(void) const
-      }
-       //*** XMP Metadata
-    del_all_items(XMP_TAG, parser);
--   if (!xmpmetadata)
-+   if (!!xmpmetadata)
-      {
-        GUTF8String mdatabuffer("(");
-        mdatabuffer +=  XMP_TAG;
-@@ -1385,8 +1384,10 @@ DjVuANT::encode_raw(void) const
-      //*** Mapareas
-    del_all_items(GMapArea::MAPAREA_TAG, parser);
-    for(GPosition pos=map_areas;pos;++pos)
--      parser.parse(map_areas[pos]->print());
--
-+     {
-+       GUTF8String mapareabuffer = map_areas[pos]->print();
-+       parser.parse(mapareabuffer);
-+     }
-    GP<ByteStream> gstr=ByteStream::create();
-    ByteStream &str=*gstr;
-    parser.print(str, 1);
--- 
-1.7.4.1
-
-From 65600b5801d11ff8ca8db3a25bf004fc06f4515b Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sat, 4 Jun 2011 15:29:18 -0700
-Subject: [PATCH] Eliminate warnings with gcc-4.6.0
-
----
- libdjvu/Arrays.cpp        |    2 -
- libdjvu/DjVuDocEditor.cpp |   37 +++++++++----------
- libdjvu/GString.cpp       |   44 ++++++++--------------
- libdjvu/JPEGDecoder.cpp   |    2 -
- libdjvu/XMLParser.cpp     |    7 +---
- tools/ddjvu.cpp           |    2 +-
- tools/jb2cmp/patterns.cpp |   87 +-------------------------------------------
- tools/tiff2pdf.c          |    9 ++---
- 8 files changed, 40 insertions(+), 150 deletions(-)
-
-diff --git a/libdjvu/Arrays.cpp b/libdjvu/Arrays.cpp
-index c4f74ca..6c7f23a 100644
---- a/libdjvu/Arrays.cpp
-+++ b/libdjvu/Arrays.cpp
-@@ -239,9 +239,7 @@ ArrayRep::ins(int n, const void * what, unsigned int howmany)
-       copy(ndata, lobound-minlo, hibound-minlo,
- 	   data, lobound-minlo, hibound-minlo);
-       destroy(data, lobound-minlo, hibound-minlo);
--      void *tmp=data;
-       data=ndata;
--      tmp=data;
-       maxhi = nmaxhi;
-    }
- 
-diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp
-index 2247e40..f1d8b0d 100644
---- a/libdjvu/DjVuDocEditor.cpp
-+++ b/libdjvu/DjVuDocEditor.cpp
-@@ -555,27 +555,24 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
-                                          can_compress_flag);
-   }
- 
--         // Oh. It does exist... Check that it has IFF structure
-+  // Oh. It does exist... Check that it has IFF structure
-   {
--       const GP<IFFByteStream> giff(
--         IFFByteStream::create(file_pool->get_stream()));
--       IFFByteStream &iff=*giff;
--       GUTF8String chkid;
--
--       int length;
--       length=iff.get_chunk(chkid);
--       if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
--         chkid!="FORM:BM44" && chkid!="FORM:PM44")
--       G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"+file_url.get_string());
--
--       // Wonderful. It's even a DjVu file. Scan for NDIR chunks.
--       // If NDIR chunk is found, ignore the file
--       while(iff.get_chunk(chkid))
--       {
--         if (chkid=="NDIR")
--           return false;
--         iff.close_chunk();
--       }
-+    const GP<IFFByteStream> giff(
-+       IFFByteStream::create(file_pool->get_stream()));
-+    IFFByteStream &iff=*giff;
-+    GUTF8String chkid;
-+    if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
-+        chkid!="FORM:BM44" && chkid!="FORM:PM44")
-+      G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"
-+               + file_url.get_string());
-+    // Wonderful. It's even a DjVu file. Scan for NDIR chunks.
-+    // If NDIR chunk is found, ignore the file
-+    while(iff.get_chunk(chkid))
-+      {
-+        if (chkid=="NDIR")
-+          return false;
-+        iff.close_chunk();
-+      }
-   }
-   return insert_file(file_pool,file_url,is_page,file_pos,name2id,source);
- }
-diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
-index 350b11b..ed92a7f 100644
---- a/libdjvu/GString.cpp
-+++ b/libdjvu/GString.cpp
-@@ -643,26 +643,22 @@ GBaseString::UTF8ToNative(
-   const char *source=(*this);
-   GP<GStringRep> retval;
-   if(source && source[0]) 
--  {
--#if DO_CHANGELOCALE
--    GUTF8String lc_ctype(setlocale(LC_CTYPE,0));
--#endif
--    bool repeat;
--    for(repeat=!currentlocale;;repeat=false)
-     {
--      retval=(*this)->toNative((GStringRep::EscapeMode)escape);
- #if DO_CHANGELOCALE
--      if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
-+      GUTF8String lc_ctype(setlocale(LC_CTYPE,0));
-+      bool repeat;
-+      for(repeat=!currentlocale;;repeat=false)
-+        {
- #endif
--        break;
--    }
-+          retval=(*this)->toNative((GStringRep::EscapeMode)escape);
- #if DO_CHANGELOCALE
--    if(!repeat)
--      {
-+          if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
-+            break;
-+        }
-+      if(!repeat)
-         setlocale(LC_CTYPE,(const char *)lc_ctype);
--      }
- #endif
--  }
-+    }
-   return GNativeString(retval);
- }
- 
-@@ -697,27 +693,19 @@ GBaseString::NativeToUTF8(void) const
-     const char *source=(*this);
- #if DO_CHANGELOCALE
-     GUTF8String lc_ctype=setlocale(LC_CTYPE,0);
--#endif
-     bool repeat;
-     for(repeat=true;;repeat=false)
--    {
--      if( (retval=GStringRep::NativeToUTF8(source)) )
-       {
--        if(GStringRep::cmp(retval->toNative(),source))
--        {
--          retval=GStringRep::UTF8::create((unsigned int)0);
--        }
--      }
--#if DO_CHANGELOCALE
--      if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
- #endif
--        break;
--    }
-+        if( (retval=GStringRep::NativeToUTF8(source)) )
-+          if(GStringRep::cmp(retval->toNative(),source))
-+            retval=GStringRep::UTF8::create((unsigned int)0);
- #if DO_CHANGELOCALE
-+        if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
-+          break;
-+      }
-     if(!repeat)
--    {
-       setlocale(LC_CTYPE,(const char *)lc_ctype);
--    }
- #endif
-   }
-   return GUTF8String(retval);
-diff --git a/libdjvu/JPEGDecoder.cpp b/libdjvu/JPEGDecoder.cpp
-index cb7aa97..f22f77a 100644
---- a/libdjvu/JPEGDecoder.cpp
-+++ b/libdjvu/JPEGDecoder.cpp
-@@ -153,7 +153,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix)
- 
-   JSAMPARRAY buffer;    /* Output row buffer */
-   int row_stride;   /* physical row width in output buffer */
--  int full_buf_size;
-   int isGrey,i;
- 
-   cinfo.err = jpeg_std_error(&jerr.pub);
-@@ -184,7 +183,6 @@ JPEGDecoder::decode(ByteStream & bs,GPixmap &pix)
- 
-   /* JSAMPLEs per row in output buffer */
-   row_stride = cinfo.output_width * cinfo.output_components;
--  full_buf_size = row_stride * cinfo.output_height;
- 
-   /* Make a one-row-high sample array that will go away when done with image */
-   buffer = (*cinfo.mem->alloc_sarray)
-diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
-index 7da923a..026b27d 100644
---- a/libdjvu/XMLParser.cpp
-+++ b/libdjvu/XMLParser.cpp
-@@ -646,17 +646,12 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags, GURL *pdjvufile)
-     GPosition datapos=args.contains("data");
-     if(datapos)
-     {
--      bool isDjVuType=false;
-       GPosition typePos(args.contains("type"));
-       if(typePos)
--      {
--        if(args[typePos] != mimetype)
-         {
--          // DjVuPrintErrorUTF8("Ignoring %s Object tag\n",mimetype);
-+          if(args[typePos] != mimetype)
-           continue;
-         }
--        isDjVuType=true;
--      }
-       const GURL url = (pdjvufile) ? *pdjvufile 
-         : GURL::UTF8(args[datapos], 
-                      (args[datapos][0] == '/') ? codebase.base() : codebase);
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index b9cb038..3b4ce16 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -855,7 +855,7 @@ parse_option(int argc, char **argv, int i)
-         die(i18n(errarg), opt);
-       flag_verbose = 1;
-     }
--  if (!strcmp(opt,"skip"))
-+  else if (!strcmp(opt,"skip"))
-     {
-       if (arg) 
-         die(i18n(errarg), opt);
-diff --git a/tools/jb2cmp/patterns.cpp b/tools/jb2cmp/patterns.cpp
-index e456902..b31cf4e 100644
---- a/tools/jb2cmp/patterns.cpp
-+++ b/tools/jb2cmp/patterns.cpp
-@@ -303,11 +303,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
-     int32 (*compare_row)(byte *, byte *, int32),
-     int32 (*compare_with_white)(byte *, int32), int32 ceiling)
- {
--    byte **p1, **p2;
-     int32 w1, w2, h1, h2;
-     int32 shift_x, shift_y; /* of i1's coordinate system with respect to i2 */
--    /*int32 s = 0, i, i_start, i_cap;
--    int32 right_margin_start, right_margin_width;*/
- 
-     /* make i1 to be narrower than i2 */
-     if (i1->width > i2->width)
-@@ -317,8 +314,8 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
-         i2 = img;
-     }
- 
--    w1 = i1->width; h1 = i1->height; p1 = i1->pixels;
--    w2 = i2->width; h2 = i2->height; p2 = i2->pixels;
-+    w1 = i1->width; h1 = i1->height;
-+    w2 = i2->width; h2 = i2->height; 
- 
-     /* (shift_x, shift_y) */
-     /*     is what should be added to i1's coordinates to get i2's coordinates. */
-@@ -339,86 +336,6 @@ static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
- 
-     return distance_by_pixeldiff_functions_by_shift(
-         i1, i2, compare_row, compare_with_white, ceiling, shift_x, shift_y);
--
--/* FIXME */
--#if 0
--    /* Compute difference in the non-overlapping top margin */
--
--    if (shift_y < 0)
--    {
--        /* i1 has top rows not covered by i2 */
--        i_cap = -shift_y;
--        for (i = 0; i < i_cap; i++)
--        {
--            assert(i >= 0 && i < h1);
--            s += compare_with_white(p1[i], w1);
--            if (s > ceiling) return maxint;
--        }
--        i_start = i_cap; /* topmost overlapping row in i1's coords */
--    }
--    else
--    {
--        /* i2 has top rows not covered by i1 */
--        for (i = 0; i < shift_y; i++)
--        {
--            assert(i >= 0 && i < h2);
--            s += compare_with_white(p2[i], w2);
--            if (s > ceiling) return maxint;
--        }
--        i_start = 0;
--    }
--
--    /* Compute difference in the overlapping area */
--
--    i_cap = h2 - shift_y;
--    if (h1 < i_cap) i_cap = h1;
--
--    right_margin_start = shift_x + w1;
--    right_margin_width = w2 - right_margin_start;
--
--    for (i = i_start; i < i_cap; i++) /* i is a coordinate in i1 system */
--    {
--        int32 y = i + shift_y; /* same row coordinate in i2 system */
--        assert(y >= 0 && y < h2);
--        s += compare_with_white(p2[y], shift_x);
--        if (s > ceiling) return maxint;
--        assert(i >= 0 && i < h1);
--        assert(shift_x + w1 <= w2);
--        assert(i < h1);
--        s += compare_row(p2[y] + shift_x, p1[i], w1);
--        if (s > ceiling) return maxint;
--        s += compare_with_white(p2[y] + right_margin_start, right_margin_width);
--        if (s > ceiling) return maxint;
--    }
--
--
--    /* Compute difference in the non-overlapping bottom margin */
--
--    if (i_cap == h1)
--    {
--        /* i2 has bottom rows not covered by i1 */
--        i_start = i_cap + shift_y;
--        for (i = i_start; i < h2; i++)
--        {
--            assert(i >= 0 && i < h2);
--            s += compare_with_white(p2[i], w2);
--            if (s > ceiling) return maxint;
--        }
--    }
--    else
--    {
--        /* i1 has bottom rows not covered by i2 */
--        i_start = i_cap;
--        for (i = i_cap; i < h1; i++)
--        {
--            assert(i >= 0 && i < h1);
--            s += compare_with_white(p1[i], w1);
--            if (s > ceiling) return maxint;
--        }
--    }
--
--    return s;
--#endif
- }
- 
- #endif
-diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
-index 36949f1..2db8703 100644
---- a/tools/tiff2pdf.c
-+++ b/tools/tiff2pdf.c
-@@ -721,7 +721,6 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
-   const char *outfilename = "<null>";
-   T2P *t2p = NULL;
-   TIFF *output = NULL;
--  tsize_t written=0;
-   int c;
- 
-   /* T2P */
-@@ -874,7 +873,7 @@ tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
-   TIFFSeekFile(output, (toff_t) 0, SEEK_SET);
- 
-   /* Write */
--  written = t2p_write_pdf(t2p, input, output);
-+  t2p_write_pdf(t2p, input, output);
-   if(t2p->t2p_error != 0){
-     TIFFError(TIFF2PDF_MODULE, "An error occurred creating output PDF file");
-     goto fail;
-@@ -2633,7 +2632,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output,
- 	tsize_t read=0;
- 	uint16 i=0;
- 	ttile_t tilecount=0;
--	tsize_t tilesize=0;
- 	ttile_t septilecount=0;
- 	tsize_t septilesize=0;
- #ifdef JPEG_SUPPORT
-@@ -2819,7 +2817,6 @@ static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output,
- 		if(t2p->pdf_sample == T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG){
- 			septilesize=TIFFTileSize(input);
- 			septilecount=TIFFNumberOfTiles(input);
--			tilesize=septilesize*t2p->tiff_samplesperpixel;
- 			tilecount=septilecount/t2p->tiff_samplesperpixel;
- 			buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
- 			if(buffer==NULL){
-@@ -3802,7 +3799,6 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
- 	tsize_t written=0;
- 	char* info;
- 	char buffer[512];
--	int buflen=0;
- 	
- 	if(t2p->pdf_datetime==NULL){
- 		t2p_pdf_tifftime(t2p, input);
-@@ -3815,7 +3811,8 @@ static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
- 	}
- 	written += TIFFWriteFile(output, (tdata_t) "\r/Producer ", 11);
- 	_TIFFmemset((tdata_t)buffer, 0x00, 512);
--	buflen=sprintf(buffer, "libtiff / tiff2pdf - %d / %s", TIFFLIB_VERSION, T2P_VERSION);
-+	sprintf(buffer, "libtiff / tiff2pdf - %d / %s", 
-+                TIFFLIB_VERSION, T2P_VERSION);
- 	written += t2p_write_pdf_string(buffer, output);
- 	written += TIFFWriteFile(output, (tdata_t) "\r", 1);
- 	if(t2p->pdf_creator != NULL){ 
--- 
-1.7.4.1
-
-From 5b3d074c2b315e7339ce279c559c3a99f26bef6a Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sat, 4 Jun 2011 17:37:00 -0700
-Subject: [PATCH] Fix MMX code when using gcc-4.6
-
-Fix MMX macros
-Enable MMX on x86_64
----
- libdjvu/MMX.cpp |   17 ++++++++++++++++-
- libdjvu/MMX.h   |   11 ++++++-----
- tools/ddjvu.cpp |    1 -
- 3 files changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
-index 528dab6..e70fdd8 100644
---- a/libdjvu/MMX.cpp
-+++ b/libdjvu/MMX.cpp
-@@ -167,8 +167,23 @@ MMXControl::enable_mmx()
-                     : "=m" (cpuflags) :
-                     : "eax","ecx","edx");
- #endif
-+#if defined(MMX) && defined(__GNUC__) && defined(__x86_64__)
-+  // Detection of MMX for GCC
-+  __asm__ volatile (// Check that CR0:EM is clear
-+                    "xorl %%edx,%%edx\n\t"
-+                    "smsw %%ax\n\t"
-+                    "andl $4,%%eax\n\t"
-+                    "jnz 1f\n\t"
-+                    // Execute CPUID
-+                    "movl $1,%%eax\n\t"
-+                    "cpuid\n"
-+                    // Finish
-+		    "1:\tmovl %%edx, %0"
-+                    : "=m" (cpuflags) :
-+                    : "eax","ebx","ecx","edx");
-+#endif
- #if defined(MMX) && defined(_MSC_VER) && defined(_M_IX86)
--  // Detection of MMX for MSVC
-+  // Detection of MMX for MSVC 32 bits
-   __asm {  pushfd
-            pop     ecx
-            xor     edx,edx
-diff --git a/libdjvu/MMX.h b/libdjvu/MMX.h
-index b0af5e5..f8780af 100644
---- a/libdjvu/MMX.h
-+++ b/libdjvu/MMX.h
-@@ -143,17 +143,18 @@ class MMXControl
- 
- #ifndef NO_MMX
- 
--#if defined(__GNUC__) && defined(__i386__)
-+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-+typedef struct{ char c[8]; } MMX_t;
- #define MMXemms \
-   __asm__ volatile("emms" : : : "memory" ) 
- #define MMXrr(op,src,dst) \
--  __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory") 
-+  __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory" ) 
- #define MMXir(op,imm,dst) \
--  __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory") 
-+  __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory" )
- #define MMXar(op,addr,dst) \
--  __asm__ volatile( #op " %0,%%" #dst : : "m" (*(addr)) : "memory") 
-+  __asm__ volatile( #op " %0,%%" #dst : : "m" (*(MMX_t*)(addr)) : "memory" ) 
- #define MMXra(op,src,addr) \
--  __asm__ volatile( #op " %%" #src ",%0" : : "m" (*(addr)) : "memory") 
-+  __asm__ volatile( #op " %%" #src ",%0" : "=m" (*(MMX_t*)(addr)) : : "memory") 
- #define MMX 1
- #endif
- 
-diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
-index 3b4ce16..216c6cb 100644
---- a/tools/ddjvu.cpp
-+++ b/tools/ddjvu.cpp
-@@ -846,7 +846,6 @@ parse_option(int argc, char **argv, int i)
-       arg = opt;
-       opt = "subsample";
-     }
--  
-   /* Parse options */
-   if (!strcmp(opt,"v") ||
-       !strcmp(opt,"verbose"))
--- 
-1.7.4.1
-
-From fbed8e51e5970b12ce36afb0dec8c4e02992c0f8 Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Thu, 9 Jun 2011 14:37:52 -0700
-Subject: [PATCH] Fixed regression in djvm.
-
----
- libdjvu/DjVuDocEditor.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp
-index f1d8b0d..baeb7dd 100644
---- a/libdjvu/DjVuDocEditor.cpp
-+++ b/libdjvu/DjVuDocEditor.cpp
-@@ -561,6 +561,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
-        IFFByteStream::create(file_pool->get_stream()));
-     IFFByteStream &iff=*giff;
-     GUTF8String chkid;
-+    iff.get_chunk(chkid);
-     if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
-         chkid!="FORM:BM44" && chkid!="FORM:PM44")
-       G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"
--- 
-1.7.4.1
-
-From f63327438954b8831a1a9f43afc8b6d16e1d3baf Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Wed, 15 Jun 2011 00:05:50 -0700
-Subject: [PATCH] Encode oblique text as separate lines.
-
----
- tools/csepdjvu.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
-index d5203d5..08f7a27 100644
---- a/tools/csepdjvu.cpp
-+++ b/tools/csepdjvu.cpp
-@@ -1288,7 +1288,7 @@ Comments::textmark(GP<TxtMark> mark)
-       int shx = (mark->x - lastx) * 100 / fontsize;
-       int shy = (mark->y - lasty) * 100 / fontsize;
-       int inter = dirx * shx + diry * shy;
--      if ( (dirx == lastdirx) && (diry == lastdiry) &&
-+      if ( (dirx || diry) && (dirx == lastdirx) && (diry == lastdiry) &&
-            (inter > -150) && (inter < 300) && 
-            abs(diry * shx + dirx * shy) < 80 )
-         mark->inter = inter;
--- 
-1.7.4.1
-
-From ea9fd2acab2e298ba721eb79f5026d34e6ef141f Mon Sep 17 00:00:00 2001
-From: Barak A. Pearlmutter <barak+git@cs.nuim.ie>
-Date: Wed, 22 Jun 2011 11:21:41 +0100
-Subject: [PATCH] consistent prototype for ddjvu_anno_get_xmp
-
----
- libdjvu/ddjvuapi.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
-index 841f223..14b63eb 100644
---- a/libdjvu/ddjvuapi.h
-+++ b/libdjvu/ddjvuapi.h
-@@ -1619,7 +1619,7 @@ ddjvu_anno_get_metadata(miniexp_t annotations, miniexp_t key);
-    Returns zero if no such key is present. */
- 
- DDJVUAPI const char *
--ddjvu_anno_get_xmp(miniexp_t annotations, miniexp_t xmp);
-+ddjvu_anno_get_xmp(miniexp_t annotations);
- 
- 
- /* -------------------------------------------------- */
--- 
-1.7.4.1
-
-From 701d1261493e175955aac97921949f4e4241750d Mon Sep 17 00:00:00 2001
-From: Leon Bottou <leon@bottou.org>
-Date: Sun, 11 Sep 2011 09:59:26 -0700
-Subject: [PATCH] Fixed typo in man page.
-
----
- tools/ddjvu.1 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/ddjvu.1 b/tools/ddjvu.1
-index 7d3d105..cbb8307 100644
---- a/tools/ddjvu.1
-+++ b/tools/ddjvu.1
-@@ -66,7 +66,7 @@ and
- .BR "ppm"
- respectively produce a Portable Bitmap (PBM),
- Portable Graymap (PGM),
--or Portable Pixmap (PGM) file.
-+or Portable Pixmap (PPM) file.
- Format 
- .B "pnm"
- produces a PBM, PGM, or PPM 
--- 
-1.7.4.1
-
diff --git a/testing/dvdauthor/PKGBUILD b/testing/dvdauthor/PKGBUILD
deleted file mode 100644
index cafc5ca9d..000000000
--- a/testing/dvdauthor/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148083 2012-01-30 18:45:17Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de>
-
-pkgname=dvdauthor
-pkgver=0.7.0
-pkgrel=4
-pkgdesc="DVD authoring tools"
-arch=('i686' 'x86_64')
-url="http://dvdauthor.sourceforge.net/"
-license=('GPL')
-depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'dvdauthor-0.7.0-libpng15.patch')
-md5sums=('33a447fb98ab3293ac40f869eedc17ff'
-         '9ea90bbea6adb0469c8c1b2f7d033f11')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  patch -Np0 -i "${srcdir}/dvdauthor-0.7.0-libpng15.patch"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch
deleted file mode 100644
index 2bb636380..000000000
--- a/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -610,7 +611,7 @@
-         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-         return -1;
-       } /*if*/
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-       {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         fclose(fp);
diff --git a/testing/emacs/PKGBUILD b/testing/emacs/PKGBUILD
deleted file mode 100644
index 7fa3741a5..000000000
--- a/testing/emacs/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 148457 2012-02-01 08:56:36Z juergen $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
-
-pkgname=emacs
-pkgver=23.4
-pkgrel=1
-pkgdesc="The extensible, customizable, self-documenting real-time display editor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/emacs/emacs.html"
-license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
-install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch)
-md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0'
-         '55eb16eb48b44987693c0e3ea5ab8075'
-         '12e2e7a66df5cc5ded54e1d30083a1fb')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  patch -p1 -i ../emacs-subversion17.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk --with-xft
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # remove conflict with ctags package
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
-  # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
-  # fix perms on /var/games
-  chmod 775 "$pkgdir"/var/games
-  chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
-  chown -R root:games "$pkgdir"/var/games
-}
diff --git a/testing/emacs/emacs-subversion17.patch b/testing/emacs/emacs-subversion17.patch
deleted file mode 100644
index e7969de81..000000000
--- a/testing/emacs/emacs-subversion17.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001
-From: Karl Pflästerer <k@rl.pflaesterer.de>
-Date: Sat, 12 Feb 2011 01:12:53 +0000
-Subject: Adapt to Subversion change, with no .svn directory in each sub directory.
-
-http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html
-
-* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root.
-(vc-svn-root): New function.  Make vc-svn-responsible-p an alias.
-(vc-svn-repository-hostname): Use "svn info".
----
-(limited to 'lisp/vc/vc-svn.el')
-
-diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
-index aefef50..20c7689 100644
---- a/lisp/vc-svn.el
-+++ b/lisp/vc-svn.el
-@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t."
- ;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
- ;;;###autoload                           "_svn")
- ;;;###autoload                          (t ".svn"))))
--;;;###autoload     (when (file-readable-p (expand-file-name
--;;;###autoload                             (concat admin-dir "/entries")
--;;;###autoload                             (file-name-directory f)))
-+;;;###autoload     (when (vc-find-root f admin-dir)
- ;;;###autoload       (load "vc-svn")
- ;;;###autoload       (vc-svn-registered f))))
- 
- (defun vc-svn-registered (file)
-   "Check if FILE is SVN registered."
--  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
--						   "/entries")
--					   (file-name-directory file)))
-+  (when (vc-svn-root file)
-     (with-temp-buffer
-       (cd (file-name-directory file))
-       (let* (process-file-side-effects
-@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches'
- to the SVN command."
-   (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
- 
--(defun vc-svn-responsible-p (file)
--  "Return non-nil if SVN thinks it is responsible for FILE."
--  (file-directory-p (expand-file-name vc-svn-admin-directory
--				      (if (file-directory-p file)
--					  file
--					(file-name-directory file)))))
-+(defun vc-svn-root (file)
-+  (vc-find-root file vc-svn-admin-directory))
- 
--(defalias 'vc-svn-could-register 'vc-svn-responsible-p
-+(defalias 'vc-svn-responsible-p 'vc-svn-root)
-+
-+(defalias 'vc-svn-could-register 'vc-svn-root
-   "Return non-nil if FILE could be registered in SVN.
- This is only possible if SVN is responsible for FILE's directory.")
- 
-@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
- 
- (defun vc-svn-repository-hostname (dirname)
-   (with-temp-buffer
--    (let ((coding-system-for-read
--	   (or file-name-coding-system
--	       default-file-name-coding-system)))
--      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
--						"/entries")
--					dirname)))
-+    (let (process-file-side-effects)
-+      (vc-svn-command t t dirname "info" "--xml"))
-     (goto-char (point-min))
--    (when (re-search-forward
--	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
--	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
--		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
--		   "url=\"\\(?1:[^\"]+\\)\""
--                   ;; Yet newer ones don't use XML any more.
--                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
-+    (when (re-search-forward "<url>\\(.*\\)</url>" nil t)
-       ;; This is not a hostname but a URL.  This may actually be considered
-       ;; as a feature since it allows vc-svn-stay-local to specify different
-       ;; behavior for different modules on the same server.
---
-cgit v0.9.0.2
diff --git a/testing/emacs/emacs.install b/testing/emacs/emacs.install
deleted file mode 100644
index d84f1de14..000000000
--- a/testing/emacs/emacs.install
+++ /dev/null
@@ -1,32 +0,0 @@
-ICON_PATH=usr/share/icons/hicolor
-INFO_DIR=usr/share/info
-
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
-org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
diff --git a/testing/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD
deleted file mode 100644
index 03e2b1e2c..000000000
--- a/testing/enblend-enfuse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 148087 2012-01-30 18:45:24Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=5
-pkgdesc="Intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng')
-makedepends=('boost')
-replaces=('enblend')
-conflicts=('enblend')
-provides=('enblend')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \
-        libpng-1.4.patch enblend-4.0-libpng15.patch)
-sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
-          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
-          'eae6cf48ea082865130302d0b4d1ca0b884a563b'
-          '71e961d90be842eafe9d473d8d70b04b29077036')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
-  patch -p1 -i ../libpng-1.4.patch
-  patch -p0 -i ../enblend-4.0-libpng15.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
-  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
-}
diff --git a/testing/enblend-enfuse/enblend-4.0-libpng15.patch b/testing/enblend-enfuse/enblend-4.0-libpng15.patch
deleted file mode 100644
index d4465ccad..000000000
--- a/testing/enblend-enfuse/enblend-4.0-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
-     png_error_message = std::string(error_msg);
--    longjmp( png_ptr->jmpbuf, 1 );
-+    longjmp( png_jmpbuf( png_ptr ), 1 );
- }
- 
- // called on non-fatal errors
-@@ -213,7 +213,7 @@
-         vigra_postcondition( png != 0, "could not create the read struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
-         }
-@@ -221,14 +221,14 @@
-         vigra_postcondition( info != 0, "could not create the info struct." );
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-         png_init_io( png, file.get() );
- 
-         // specify that the signature was already read
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
-         }
-@@ -244,13 +244,13 @@
-     void PngDecoderImpl::init()
-     {
-         // read all chunks up to the image data
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
-         png_read_info( png, info );
- 
-         // pull over the header fields
-         int interlace_method, compression_method, filter_method;
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
-         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
-                       &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +264,7 @@
- 
-         // transform palette to rgb
-         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
-             png_set_palette_to_rgb(png);
-             color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,7 +273,7 @@
- 
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-             png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-@@ -283,7 +283,7 @@
- #if 0
-         // strip alpha channel
-         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
-             png_set_strip_alpha(png);
-             color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -323,12 +323,12 @@
- 
-         // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
--        char * dummyName;
-+        png_charpp dummyName;
-         int dummyCompType;
--        char * profilePtr;
-+        png_bytepp profilePtr;
-         png_uint_32 profileLen;
--        if (info->valid & PNG_INFO_iCCP) {
--            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-+        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
-+            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
-             iccProfilePtr = (unsigned char *) profilePtr;
-             iccProfileLength = profileLen;
-         }
-@@ -340,7 +340,7 @@
-         // image gamma
-         double image_gamma = 0.45455;
-         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
-             png_get_gAMA( png, info, &image_gamma );
-         }
-@@ -349,26 +349,26 @@
-         double screen_gamma = 2.2;
- 
-         // set gamma correction
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
-         png_set_gamma( png, screen_gamma, image_gamma );
- #endif
- 
-         // interlace handling, get number of read passes needed
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
-         n_interlace_passes = png_set_interlace_handling(png);
- 
-         // update png library state to reflect any changes that were made
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
-         png_read_update_info( png, info );
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
-         n_channels = png_get_channels(png, info);
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
-         rowsize = png_get_rowbytes(png, info);
- 
-@@ -379,7 +379,7 @@
-     void PngDecoderImpl::nextScanline()
-     {
-         for (int i=0; i < n_interlace_passes; i++) {
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-             png_read_row(png, row_data.begin(), NULL);
-         }
-@@ -545,7 +545,7 @@
-         vigra_postcondition( png != 0, "could not create the write struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
-         }
-@@ -556,7 +556,7 @@
-         }
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-@@ -571,7 +571,7 @@
-     void PngEncoderImpl::finalize()
-     {
-         // write the IHDR
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
-         png_set_IHDR( png, info, width, height, bit_depth, color_type,
-                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +579,7 @@
- 
-         // set resolution
-         if (x_resolution > 0 && y_resolution > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +588,7 @@
- 
-         // set offset
-         if (position.x > 0 && position.y > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
-             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
-         }
-@@ -597,12 +597,12 @@
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, "icc", 0,
--                         (char *)iccProfile.begin(), iccProfile.size());
-+                         iccProfile.begin(), iccProfile.size());
-         }
- #endif
- 
-         // write the info struct
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
-         png_write_info( png, info );
- 
-@@ -634,10 +634,10 @@
-         }
- 
-         // write the whole image
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
-         png_write_image( png, row_pointers.begin() );
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
-         png_write_end(png, info);
-     }
diff --git a/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install
deleted file mode 100644
index 24ea28a4e..000000000
--- a/testing/enblend-enfuse/enblend-enfuse.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist=(enblend.info enfuse.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/enblend-enfuse/libpng-1.4.patch b/testing/enblend-enfuse/libpng-1.4.patch
deleted file mode 100644
index 3bf852b58..000000000
--- a/testing/enblend-enfuse/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx	2010-01-19 22:09:36.000000000 -0500
-+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx	2010-01-19 22:13:43.000000000 -0500
-@@ -275,8 +275,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/testing/ettercap/PKGBUILD b/testing/ettercap/PKGBUILD
deleted file mode 100644
index 35e5fc8a9..000000000
--- a/testing/ettercap/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 149649 2012-02-08 23:59:14Z allan $
-# Maintainer:
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=ettercap
-pkgname=('ettercap' 'ettercap-gtk')
-pkgver=NG_0.7.4.2
-_origver=${pkgver/_/-}
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://ettercap.sourceforge.net/"
-license=('GPL')
-makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz")
-md5sums=('ab2354bf9c91195f06ad0b5d058565a4')
-
-build() {
-  cd "${srcdir}"
-  sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop
-
-  cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
-
-  cd ${pkgbase}-${_origver}
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --disable-gtk
-  make
-
-  cd ../${pkgbase}-${_origver}-gtk
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --enable-gtk
-  make
-}
-
-package_ettercap() {
-  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
-  backup=('etc/etter.conf')
-
-  cd "${srcdir}"/${pkgbase}-${_origver}
-  make DESTDIR="${pkgdir}" install
-}
-
-package_ettercap-gtk() {
-  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
-  depends=('ettercap' 'gtk2' 'hicolor-icon-theme')
-  optdepends=('gksu: to run ettercap from the menu')
-  install=ettercap-gtk.install
-
-  cd "${srcdir}"/${pkgbase}-${_origver}-gtk
-  install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
-  install -Dm644 desktop/ettercap.desktop \
-    "${pkgdir}"/usr/share/applications/ettercap.desktop
-  install -Dm644 share/ettercap.png \
-    "${pkgdir}"/usr/share/ettercap/ettercap.png
-  install -Dm644 desktop/ettercap.xpm \
-    "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm
-  install -Dm644 desktop/ettercap.svg \
-    "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg
-}
diff --git a/testing/ettercap/ettercap-gtk.install b/testing/ettercap/ettercap-gtk.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/ettercap/ettercap-gtk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
deleted file mode 100644
index 22d1dc83f..000000000
--- a/testing/evince/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148089 2012-01-30 18:45:27Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.2.1
-pkgrel=3
-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/testing/evince/evince.install b/testing/evince/evince.install
deleted file mode 100644
index 9643a9ba0..000000000
--- a/testing/evince/evince.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall evince
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/fbida/PKGBUILD b/testing/fbida/PKGBUILD
deleted file mode 100644
index d3365e7cb..000000000
--- a/testing/fbida/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148091 2012-01-30 18:45:29Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fbida
-pkgver=2.08
-pkgrel=2
-pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
-arch=('i686' 'x86_64')
-url="http://www.kraxel.org/blog/linux/fbida/"
-license=('GPL2')
-depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl')
-makedepends=('libxpm')
-optdepends=('ghostscript: to use fbgs')
-source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9b3693ab26a58194e36b479bffb61ed0')
-sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/ungif/gif/' GNUmakefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" prefix=/usr install
-}
diff --git a/testing/feh/PKGBUILD b/testing/feh/PKGBUILD
deleted file mode 100644
index 7602f6744..000000000
--- a/testing/feh/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 148520 2012-02-03 01:14:17Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=feh
-pkgver=2.3
-pkgrel=2
-pkgdesc='Fast and light imlib2-based image viewer'
-url='http://feh.finalrewind.org/'
-license=('MIT')
-arch=('i686' 'x86_64')
-depends=('giblib' 'curl' 'libxinerama')
-optdepends=('perl: feh-cam, webcam wrapper for feh')
-makedepends=('libxt')
-source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9f42ba920baeb405777f834546223a9ff9eb43e7')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PREFIX=/usr
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
deleted file mode 100644
index 140c7b4db..000000000
--- a/testing/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 149123 2012-02-05 21:34:34Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=20120127
-pkgrel=2
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz)
-md5sums=('dc706cdb31801b4746f37459b0c38b7e')
-
-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-libpulse \
-    --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 7cc1baea4..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=3
-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/fltk/PKGBUILD b/testing/fltk/PKGBUILD
deleted file mode 100644
index 5a9ddabe0..000000000
--- a/testing/fltk/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 148099 2012-01-30 18:45:45Z ibiru $
-# Maintainer:
-
-pkgbase=fltk
-pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.0
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('custom:LGPL')
-url="http://www.fltk.org/"
-makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
-             'alsa-lib' 'desktop-file-utils')
-source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
-         -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
-  ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-  make
-  cd documentation
-  make html
-}
-
-package_fltk() {
-  pkgdesc="Graphical user interface toolkit for X"
-  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
-           'desktop-file-utils' 'xdg-utils')
-  options=('!docs')
-  install=fltk.install
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  (cd fluid; make DESTDIR="$pkgdir" install install-linux)
-  chmod 644 "$pkgdir"/usr/lib/*.a
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_fltk-docs() {
-  pkgdesc="Graphical user interface toolkit for X (documentation)"
-
-  cd "$srcdir/$pkgbase-$pkgver/documentation"
-  install -d "$pkgdir"/usr/share/doc/fltk/
-  for _file in html/* ; do
-    install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
-  done
-  cd ../test
-  make DESTDIR="$pkgdir" install
-  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_fltk-games() {
-  pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku"
-  depends=('alsa-lib' 'fltk')
-  install=fltk-games.install
-
-  cd "$srcdir/$pkgbase-$pkgver/test"
-  make DESTDIR="$pkgdir" install-linux
-  (cd ../documentation;  make DESTDIR="$pkgdir" install-linux)
-  install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/fltk/fltk-games.install b/testing/fltk/fltk-games.install
deleted file mode 100644
index f3fe2b08b..000000000
--- a/testing/fltk/fltk-games.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/fltk/fltk.install b/testing/fltk/fltk.install
deleted file mode 100644
index f89ec8213..000000000
--- a/testing/fltk/fltk.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/fontforge/PKGBUILD b/testing/fontforge/PKGBUILD
deleted file mode 100644
index 4a1596e53..000000000
--- a/testing/fontforge/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 148101 2012-01-30 18:45:51Z ibiru $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=fontforge
-pkgver=20120119
-pkgrel=1
-pkgdesc='Outline and bitmap font editor'
-arch=('i686' 'x86_64')
-url='http://fontforge.sourceforge.net/'
-license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
-options=('!libtool' '!makeflags')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c')
-
-# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed -i 's/python /python2 /g' Makefile.dynamic.in
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-type3 \
-		--enable-devicetables \
-		--enable-double \
-		--with-regular-link \
-		--with-python=python2 \
-		--enable-pyextension \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/foobillard++/PKGBUILD b/testing/foobillard++/PKGBUILD
deleted file mode 100644
index 1debfca9a..000000000
--- a/testing/foobillard++/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 148501 2012-02-02 20:08:26Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=foobillard++
-pkgver=3.42beta
-pkgrel=3
-pkgdesc="An OpenGL billiard game"
-arch=('i686' 'x86_64')
-url="http://foobillardplus.sourceforge.net/"
-license=('GPL2')
-depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
-replaces=('foobillard')
-source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
-sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')
-
-build() {
-  cd "${srcdir}/foobillardplus-${pkgver}"
-  sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
-  sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
-  aclocal --force
-  autoconf -f
-  autoheader -f
-  automake -a -c -f 
-  ./configure --prefix=/usr/share
-  make
-}
-
-package() {
-  cd "${srcdir}/foobillardplus-${pkgver}"
-  make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \
-    prefix="${pkgdir}/usr/share" install
-
-  install -d "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
-  mv "${pkgdir}"/usr/share/{AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO} "${pkgdir}/usr/share/foobillardplus" 
-  mv "${pkgdir}"/usr/share/foobillardplus.desktop "${pkgdir}"/usr/share/applications
-  mv "${pkgdir}"/usr/share/foobillardplus.{png,xbm} "${pkgdir}"/usr/share/pixmaps
-  ln -s /usr/share/foobillardplus/bin/foobillardplus "${pkgdir}"/usr/bin/foobillardplus
-}
diff --git a/testing/fvwm/PKGBUILD b/testing/fvwm/PKGBUILD
deleted file mode 100644
index a7c4300ba..000000000
--- a/testing/fvwm/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 148103 2012-01-30 18:45:55Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fvwm
-pkgver=2.6.3
-pkgrel=2
-pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
-arch=('i686' 'x86_64')
-url="http://www.fvwm.org"
-license=('GPL' 'custom')
-depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor')
-makedepends=('libxslt')
-provides=('fvwm-devel')
-conflicts=('fvwm-devel')
-replaces=('fvwm-devel')
-options=('!emptydirs' '!makeflags')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop)
-sha1sums=('7a04dae0e4a17f4d908589e704b48246b7c05e39'
-          '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm"
-  install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/testing/fvwm/fvwm.desktop b/testing/fvwm/fvwm.desktop
deleted file mode 100644
index e297a6109..000000000
--- a/testing/fvwm/fvwm.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM
-Comment=The fvwm window manager
-Type=XSession
-Exec=/usr/bin/fvwm
-TryExec=/usr/bin/fvwm
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
deleted file mode 100644
index 2583af054..000000000
--- a/testing/gcc/PKGBUILD
+++ /dev/null
@@ -1,265 +0,0 @@
-# $Id: PKGBUILD 148580 2012-02-04 00:03:35Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.6.2
-pkgrel=7
-_snapshot=4.6-20120120
-_libstdcppmanver=20111215		# Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-	gcc_pure64.patch
-	gcc-hash-style-both.patch
-	gcc-4.6.2-cloog-0.17.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
-         '450772ce32daed97d7383199f8797f33'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         '6d9939a2e667376031679ac9f9c49263')
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -Np1 -i ${srcdir}/gcc_pure64.patch
-  fi
-  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  # compatibility with latest cloog
-  patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libssp \
-      --enable-checking=release
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC"
-  groups=('base')
-  depends=('glibc>=2.14')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
-  groups=('base-devel')
-  install=gcc.install
-
-  cd gcc-build
-  
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages require these symlinks
-  install -dm755 ${pkgdir}/lib
-  ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
-  ln -sf gcc ${pkgdir}/usr/bin/cc
-  ln -sf g++ ${pkgdir}/usr/bin/c++
-
-  # install gengtype for plugin support
-  install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-  install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
-  # plugin headers are all over the place at the moment...
-  for i in common objc pragma pretty-print; do
-    ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
-  done
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
-  pkgdesc="Fortran front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
-  pkgdesc="Objective-C front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
-  pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
-  pkgdesc="Go front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/testing/gcc/gcc-4.6.2-cloog-0.17.patch b/testing/gcc/gcc-4.6.2-cloog-0.17.patch
deleted file mode 100644
index 0503a05ed..000000000
--- a/testing/gcc/gcc-4.6.2-cloog-0.17.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
-diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
-+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
-@@ -1367,7 +1367,7 @@
-   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
-      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
-      we pass an incomplete program to cloog.  */
--  options->language = LANGUAGE_C;
-+  options->language = CLOOG_LANGUAGE_C;
- 
-   /* Enable complex equality spreading: removes dummy statements
-      (assignments) in the generated code which repeats the
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/testing/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/testing/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/testing/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/testing/gcc/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/testing/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/testing/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/testing/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/testing/gd/PKGBUILD b/testing/gd/PKGBUILD
deleted file mode 100644
index c86beabc0..000000000
--- a/testing/gd/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148105 2012-01-30 18:46:00Z ibiru $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=gd
-pkgver=2.0.36RC1
-pkgrel=5
-pkgdesc="Library for the dynamic creation of images by programmers"
-arch=('i686' 'x86_64')
-url="http://www.libgd.org/"
-license=('custom')
-depends=('libpng' 'fontconfig' 'libjpeg')
-optdepends=('perl: bdftogd script')
-options=('!libtool')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'libpng14.patch')
-md5sums=('e876979ca3130623a4e7866d9579171a'
-         '7921556f4960e8d66cf4fb67ea7101b5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ${srcdir}/libpng14.patch
-  ./configure --prefix=/usr --without-xpm
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/gd/libpng14.patch b/testing/gd/libpng14.patch
deleted file mode 100644
index 19a3fda91..000000000
--- a/testing/gd/libpng14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c
---- gd-2.0.36RC1.orig/gd_png.c	2007-11-27 10:30:34.000000000 +0200
-+++ gd-2.0.36RC1/gd_png.c	2010-01-17 17:14:11.000000000 +0200
-@@ -151,7 +151,7 @@
- 	return NULL;
-   }
- 
--	if (!png_check_sig (sig, 8)) { /* bad signature */
-+	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
-     	return NULL;		/* bad signature */
- 	}
- 
diff --git a/testing/gdk-pixbuf2/PKGBUILD b/testing/gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index 24ce8daf3..000000000
--- a/testing/gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 148380 2012-01-30 21:47:59Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gdk-pixbuf2
-pkgver=2.24.1
-pkgrel=3
-pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libpng>=1.5.7' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
-
-build() {
-  cd "$srcdir/gdk-pixbuf-$pkgver"
-
-  ./configure --prefix=/usr \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "$srcdir/gdk-pixbuf-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gdk-pixbuf2/gdk-pixbuf2.install b/testing/gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 1b35942cb..000000000
--- a/testing/gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/testing/gegl/PKGBUILD b/testing/gegl/PKGBUILD
deleted file mode 100644
index 9b8f1ba8c..000000000
--- a/testing/gegl/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148109 2012-01-30 18:46:09Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gegl
-pkgver=0.1.8
-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)
-sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-#check() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gif2png/PKGBUILD b/testing/gif2png/PKGBUILD
deleted file mode 100644
index 2cde21e6a..000000000
--- a/testing/gif2png/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148113 2012-01-30 18:46:19Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Andrew Rose <ody@netrux.com>
-
-pkgname=gif2png
-pkgver=2.5.4
-pkgrel=3
-pkgdesc="A GIF to PNG image format converter"
-arch=('i686' 'x86_64')
-url="http://www.catb.org/~esr/gif2png/"
-license=('ZLIB')
-depends=('libpng')
-optdepends=('python2: for using web2png')
-source=("http://www.catb.org/~esr/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gif2png-2.5.4-libpng15.patch')
-md5sums=('d63ea3fc6b6119589e8d4d6fead30df9'
-         'd4d6d31e04e7448315eae56bb12d4df6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's#env python#env python2#' web2png
-  patch -Np0 -i ${srcdir}/gif2png-2.5.4-libpng15.patch
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/gif2png/gif2png-2.5.4-libpng15.patch b/testing/gif2png/gif2png-2.5.4-libpng15.patch
deleted file mode 100644
index 9e5c333bb..000000000
--- a/testing/gif2png/gif2png-2.5.4-libpng15.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/graphics/gif2png/patches/patch-aa
-
---- gif2png.c
-+++ gif2png.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>	/* for isatty() */
-+#include <zlib.h>
- 
- #if !defined(TRUE)
- #define FALSE	0
-@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc
-     int colors_used = 0;
-     byte remap[MAXCMSIZE];
-     int low_prec;
--    png_struct *png_ptr = xalloc(sizeof (png_struct));
--    png_info *info_ptr = xalloc(sizeof (png_info));
-+    png_struct *png_ptr;
-+    png_info *info_ptr;
-     int p;
-     int gray_bitdepth;
-     png_color pal_rgb[MAXCMSIZE], *pltep;
-@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc
-     png_text software;
-     png_text comment;
- 
-+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+    if (png_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+    info_ptr = png_create_info_struct(png_ptr);
-+    if (info_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+
-     /* these volatile declarations prevent gcc warnings ("variable might be
-      *  clobbered by `longjmp' or `vfork'") */
-     volatile int gray = TRUE;
diff --git a/testing/gimp-dbp/PKGBUILD b/testing/gimp-dbp/PKGBUILD
deleted file mode 100644
index 18bdd2403..000000000
--- a/testing/gimp-dbp/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 148117 2012-01-30 18:46:24Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gimp-dbp
-pkgver=1.1.9
-pkgrel=3
-pkgdesc="David's batch processor for the GIMP"
-arch=('i686' 'x86_64')
-url="http://members.ozemail.com.au/~hodsond/dbp.html"
-license=('GPL')
-depends=('gimp')
-source=(http://www.ozemail.com.au/~hodsond/dbpSrc-${pkgver//./-}.tgz)
-md5sums=('1106625707798ab8ea1317ac6bece1c5')
-
-build() {
-  cd "${srcdir}/dbp-${pkgver}"
-  sed -i "s|<string>|<cstring>|" op.h
-  make
-}
-
-package() {
-  cd "${srcdir}/dbp-${pkgver}"
-  install -D -m755 dbp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/dbp"
-}
diff --git a/testing/gimp-devel/PKGBUILD b/testing/gimp-devel/PKGBUILD
deleted file mode 100644
index b1eba7d03..000000000
--- a/testing/gimp-devel/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 148119 2012-01-30 18:46:27Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gimp-devel
-pkgver=2.7.4
-pkgrel=2
-pkgdesc="GNU Image Manipulation Program (Development Version)"
-arch=('i686' 'x86_64')
-url="http://www.gimp.org/"
-license=('GPL3' 'LGPL3')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
-         'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser or web-page plug-ins'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support')
-options=('!libtool' '!makeflags')
-conflicts=('gimp')
-provides=("gimp=${pkgver}")
-install=gimp-devel.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('bda95a29c3483b8ff458b06b1543f867'
-         'bb27bc214261d36484093e857f015f38')
-
-build() {
-  cd "${srcdir}/gimp-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-python --with-libcurl \
-    --with-gif-compression=lzw --without-aa --without-gvfs
-  make
-}
-
-#check() {
-#  cd "${srcdir}/gimp-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/gimp-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
-
-  ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
-  ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-}
diff --git a/testing/gimp-devel/gimp-devel.install b/testing/gimp-devel/gimp-devel.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/gimp-devel/gimp-devel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gimp-devel/linux.gpl b/testing/gimp-devel/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/testing/gimp-devel/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/testing/gimp-ufraw/PKGBUILD b/testing/gimp-ufraw/PKGBUILD
deleted file mode 100644
index 4dd7f4c88..000000000
--- a/testing/gimp-ufraw/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148121 2012-01-30 18:46:29Z ibiru $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=gimp-ufraw
-pkgver=0.18
-pkgrel=4
-pkgdesc="Standalone or gimp plugin converter for raw files"
-url="http://ufraw.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils')
-makedepends=('gimp' 'cinepaint')
-optdepends=('gimp: to use the gimp import plugin for raw images'
-            'cinepaint: to use the cinepaint import plugin for raw images')
-install=gimp-ufraw.install
-source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz)
-sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2')
-
-build() {
-  cd "${srcdir}/ufraw-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --enable-extras \
-              --enable-mime \
-              --enable-openmp
-  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/ufraw-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/bin/dcraw"
-}
diff --git a/testing/gimp-ufraw/gimp-ufraw.install b/testing/gimp-ufraw/gimp-ufraw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/gimp-ufraw/gimp-ufraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/gimp/PKGBUILD b/testing/gimp/PKGBUILD
deleted file mode 100644
index 8f14a02ad..000000000
--- a/testing/gimp/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 148478 2012-02-02 08:21:50Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-
-pkgname=gimp
-pkgver=2.6.12
-pkgrel=1
-pkgdesc="GNU Image Manipulation Program"
-arch=('i686' 'x86_64')
-url="http://www.gimp.org/"
-license=('GPL' 'LGPL')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support')
-options=('!libtool' '!makeflags')
-conflicts=('gimp-devel')
-install=gimp.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
-        uri-backend-libcurl.patch)
-sha1sums=('82964e3d4eb003239f3443a1bccac53f5d780e15'
-          '110ce9798173b19a662d086ed7b882b4729f06cf'
-          'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../uri-backend-libcurl.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-gimp-remote \
-    --enable-python --with-gif-compression=lzw --with-libcurl \
-    --without-aa --without-hal --without-gvfs --without-gnomevfs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  rm "${pkgdir}/usr/share/man/man1/gimp-console.1"
-  ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-}
diff --git a/testing/gimp/gimp.install b/testing/gimp/gimp.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/gimp/gimp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gimp/linux.gpl b/testing/gimp/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/testing/gimp/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/testing/gimp/uri-backend-libcurl.patch b/testing/gimp/uri-backend-libcurl.patch
deleted file mode 100644
index 85da2fc7f..000000000
--- a/testing/gimp/uri-backend-libcurl.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c
---- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c	2010-07-03 00:51:59.000000000 +0200
-+++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c	2011-06-23 19:15:30.000000000 +0200
-@@ -4,9 +4,9 @@
-  * libcurl backend for the URI plug-in
-  * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org>
-  *
-- * This program is free software; you can redistribute it and/or modify
-+ * 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
-+ * the Free Software Foundation; either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-@@ -15,8 +15,7 @@
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
- #include "config.h"
-@@ -24,7 +23,6 @@
- #include <errno.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <glib/gstdio.h>
-@@ -63,7 +61,7 @@
- 
-   vinfo = curl_version_info (CURLVERSION_NOW);
- 
--  protocols = g_string_new ("http:,ftp:");
-+  protocols = g_string_new ("http:,ftp:,gopher:");
- 
-   if (vinfo->features & CURL_VERSION_SSL)
-     {
-@@ -153,7 +151,7 @@
-   FILE      *out_file;
-   CURL      *curl_handle;
-   CURLcode   result;
--  gint       response_code;
-+  glong      response_code;
- 
-   gimp_progress_init (_("Connecting to server"));
- 
-@@ -195,12 +193,12 @@
- 
-   curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
- 
--  if (response_code != 200)
-+  if (response_code != 200 && response_code != 226 && response_code != 0)
-     {
-       fclose (out_file);
-       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                    _("Opening '%s' for reading resulted in HTTP "
--                     "response code: %d"),
-+                     "response code: %ld"),
-                    uri, response_code);
-       curl_easy_cleanup (curl_handle);
-       return FALSE;
-@@ -224,3 +222,10 @@
- 
-   return FALSE;
- }
-+
-+gchar *
-+uri_backend_map_image (const gchar  *uri,
-+                       GimpRunMode   run_mode)
-+{
-+  return NULL;
-+}
diff --git a/testing/git/ChangeLog b/testing/git/ChangeLog
deleted file mode 100644
index f0c15233e..000000000
--- a/testing/git/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-Simple version bumps are omitted from the following ChangeLog.
-
-2011-08-16 Dan McGee <dan@archlinux.org>
-	Version 1.7.6.1-1
-	* Enable USE_LIBPCRE for `git grep -P` usage
-
-2011-05-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.5.1-1
-	* Byte compile emacs files (FS#20874)
-	* Respect CFLAGS/LDFLAGS (FS#23963)
-
-2011-04-27 Dan McGee <dan@archlinux.org>
-	Version 1.7.5-1
-	* Add missing optdepends for git send-email (FS#20923)
-
-2011-01-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.3.5-1
-	* More flexible git-daemon RC scripts (FS#20575)
-
-2010-10-01 Allan McRae <allan@archlinux.org>
-	Version 1.7.3.1-2
-	* Python 2/3 rebuild
-
-2010-06-29 Dan McGee <dan@archlinux.org>
-	Version 1.7.1.1-1
-	* Add emacs completion files (FS#17968)
-	* Add git-daemon RC scripts (FS#19291)
-
-2009-06-05 Dan McGee <dan@archlinux.org>
-	Version 1.6.3.2-1
-	* Remove gitweb from /usr/share; it needs customization to be helpful
-	* Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683)
-
-2008-09-14 Dan McGee <dan@archlinux.org>
-	Version 1.6.0.2-1
-	* Moved optional depends from install file to optdepends array
-
-2008-06-15 Dan McGee <dan@archlinux.org>
-	Version 1.5.6-1
-	* Removed 'cpio' dependency, clone is now a builtin and no longer needs it
-
-2008-02-02 Dan McGee <dan@archlinux.org>
-	Version 1.5.4-1
-	* Upstream version 1.5.4
-	* Enable pthreads support in pack-objects. To use, set the pack.threads
-	  git config option. Read manpages of pack-objects and config for more
-	  details.
-	* Changelog added (with entries going back a bit).
-
-2008-01-28 Kevin Piche <kevin@archlinux.org>
-	Version 1.5.3.7-2
-	* Updated for new perl policy (vendor dirs)
-	* Change license to GPL2
-
-2007-11-01 Eric Belanger <eric@archlinux.org>
-	Version 1.5.3.5-2
-	* Fix Perl module location
diff --git a/testing/git/PKGBUILD b/testing/git/PKGBUILD
deleted file mode 100644
index 7e0dc6d60..000000000
--- a/testing/git/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 149651 2012-02-08 23:59:17Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=git
-pkgver=1.7.9
-pkgrel=2
-pkgdesc="the fast distributed version control system"
-arch=(i686 x86_64)
-url="http://git-scm.com/"
-license=('GPL2')
-depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
-optdepends=('tk: gitk and git gui'
-            'perl-libwww: git svn'
-            'perl-term-readkey: git svn'
-            'perl-mime-tools: git send-email'
-            'perl-net-smtp-ssl: git send-email TLS support'
-            'perl-authen-sasl: git send-email TLS support'
-            'python2: various helper scripts'
-            'subversion: git svn'
-            'cvsps: git cvsimport')
-replaces=('git-core')
-provides=('git-core')
-backup=('etc/conf.d/git-daemon.conf')
-#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2"
-#        "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2"
-source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
-        "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
-        git-daemon
-        git-daemon.conf)
-changelog=ChangeLog
-
-build() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1
-
-  cd contrib/emacs
-  make prefix=/usr
-}
-
-package() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
-
-  # bash completion
-  mkdir -p "$pkgdir"/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
-  # more contrib stuff
-  cp -a ./contrib $pkgdir/usr/share/git/ 
-  # scripts are for python 2.x
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
-    $(find "$pkgdir" -name '*.py') \
-    "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview}
-
-  # emacs interface
-  cd contrib/emacs
-  make prefix=/usr DESTDIR="$pkgdir" install
-
-  # how 'bout some manpages?
-  for mansect in man1 man5 man7; do
-    for manpage in "$srcdir"/$mansect/*; do
-      install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage)
-    done
-  done
-
-  # remove perllocal.pod, .packlist, and empty directories.
-  rm -rf "$pkgdir"/usr/lib/perl5
-
-  # git daemon script
-  install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon
-  install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
-}
-
-sha1sums=('ed51ef5ef250daaa6e98515cf2641820cd268d4c'
-          '1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a'
-          'f2b41828bd912b72e2cb3e14677739c4f370de66'
-          '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/testing/git/git-daemon b/testing/git/git-daemon
deleted file mode 100644
index 21ba73ed5..000000000
--- a/testing/git/git-daemon
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/lib/git-core/git-daemon"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/git/git-daemon.conf b/testing/git/git-daemon.conf
deleted file mode 100644
index 3f9a12060..000000000
--- a/testing/git/git-daemon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# path to git repositories served
-GIT_REPO="/srv/git/"
-# see `man git-daemon` for all available options
-# $GIT_REPO will be present twice in most configs
-GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
diff --git a/testing/glade-perl/PKGBUILD b/testing/glade-perl/PKGBUILD
deleted file mode 100644
index 9e92a55f5..000000000
--- a/testing/glade-perl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148123 2012-01-30 18:46:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glade-perl
-_realname=Gtk2-GladeXML
-pkgver=1.007
-pkgrel=5
-pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('libglade' 'gtk2-perl' 'perl')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('e6ca234e2a9f0221263acd2a593c583b')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/glhack/PKGBUILD b/testing/glhack/PKGBUILD
deleted file mode 100644
index d4c39bee2..000000000
--- a/testing/glhack/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 148125 2012-01-30 18:46:34Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=glhack
-pkgver=1.2
-pkgrel=6
-pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
-arch=('i686' 'x86_64')
-url="http://glhack.sourceforge.net/"
-license=('custom')
-depends=('sdl' 'libpng' 'libgl')
-makedepends=('mesa')
-options=('!makeflags')
-install=glhack.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz glhack-libpng15.patch)
-sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae'
-          '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d')
-
-build(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../glhack-libpng15.patch
-  sed -i 's|/usr/lib/games|/usr/share|' include/config.h
-  sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
-  sed -i -e 's|PREFIX	 = /usr|PREFIX	 = $(DESTDIR)/usr|' Makefile
-  sed -i -e 's|VARDIR   = /var/lib/games/glhack|VARDIR   = $(DESTDIR)/var/games/glhack|' Makefile
-  sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile
-  sed -i -e 's|GAMEDIR  = $(PREFIX)/lib/games/$(GAME)|GAMEDIR  = $(PREFIX)/share/$(GAME)|' Makefile
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}"/usr/share/man/man{5,6}
-  make DESTDIR="$pkgdir" install
-  install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license"
-
-# Renaming man pages which conflicts with nethack
-  cd "${pkgdir}/usr/share/man/man6"
-  for manpage in dgn_comp dlb lev_comp nethack recover; do
-    mv $manpage.6 $manpage-glhack.6
-  done
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  mv "${pkgdir}/usr/share/glhack/glhack" "${pkgdir}/usr/bin/glhack"
-  mv "${pkgdir}/usr/share/glhack/recover_glhack" "${pkgdir}/usr/bin/recover_glhack"
-
-  chown -R root:root "${pkgdir}/usr/share/glhack"
-
-  rm -r "${pkgdir}"/var/games/glhack
-  install -d "${pkgdir}/var/games/glhack/save"
-  chmod -R 775 "${pkgdir}/var/games"
-  chown -R root:games "${pkgdir}/var/games"
-}
diff --git a/testing/glhack/glhack-libpng15.patch b/testing/glhack/glhack-libpng15.patch
deleted file mode 100644
index d8e644d1c..000000000
--- a/testing/glhack/glhack-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- win/gl/gl_image.c.old	2012-01-19 04:01:26.000000000 -0500
-+++ win/gl/gl_image.c	2012-01-19 04:03:04.000000000 -0500
-@@ -486,7 +486,7 @@
-   /* set error handling since we are using the setjmp/longjmp method
-    * (this is the normal method of doing things with libpng).
-    */
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-   {
-     sdlgl_warning("Problem within LibPNG (unknown)\n");
-     goto failed;
diff --git a/testing/glhack/glhack.install b/testing/glhack/glhack.install
deleted file mode 100644
index 78e1655bc..000000000
--- a/testing/glhack/glhack.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  touch var/games/glhack/{record,perm,logfile}
-  chown root:games var/games/glhack/{record,perm,logfile}
-  chmod 664 var/games/glhack/{record,perm,logfile}
-}
-
-pre_upgrade() {
-  install -d -m775 var/games/glhack
-  chown root:games var/games/glhack
-  [ -e usr/share/glhack/record ] && cp usr/share/glhack/record var/games/glhack
-  [ -e usr/share/glhack/perm ] && cp usr/share/glhack/perm var/games/glhack
-  [ -e usr/share/glhack/logfile ] && cp usr/share/glhack/logfile var/games/glhack
-  if [ -d usr/share/glhack/save ]; then
-    chmod g-s usr/share/glhack/save
-    mv usr/share/glhack/save var/games/glhack
-  else
-    install -d -m775 var/games/glhack/save
-  fi
-  chown root:games var/games/glhack/save
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index deed25d62..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 149653 2012-02-08 23:59:19Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.30.2
-pkgrel=2
-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/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD
deleted file mode 100644
index 0371b3d55..000000000
--- a/testing/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148129 2012-01-30 18:46:38Z ibiru $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.2.2
-pkgrel=2
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash' 'shared-color-profiles' 'shared-color-targets')
-makedepends=('intltool' 'gtk-doc')
-install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a')
-
-build(){
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-color-manager \
-      --disable-static --disable-man-pages
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/testing/gnome-color-manager/gnome-color-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-color-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-desktop2/PKGBUILD b/testing/gnome-desktop2/PKGBUILD
deleted file mode 100644
index eb9162bd9..000000000
--- a/testing/gnome-desktop2/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148131 2012-01-30 18:46:41Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor:  Jan de Groot <jan@archlinux.org>
-
-_pkgname=gnome-desktop
-pkgname=${_pkgname}2
-pkgver=2.32.1
-pkgrel=2
-pkgdesc="Library with common API for various GNOME modules (legacy version)"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(gconf gtk2 startup-notification)
-makedepends=(gnome-doc-utils intltool)
-url="http://www.gnome.org"
-options=(!libtool !emptydirs)
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
-sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-gnome-distributor="Archlinux" \
-      --disable-scrollkeeper \
-      --disable-gnome-about --disable-desktop-docs
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-perl/PKGBUILD b/testing/gnome-perl/PKGBUILD
deleted file mode 100644
index dcff4c575..000000000
--- a/testing/gnome-perl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148133 2012-01-30 18:46:43Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-perl
-_realname=Gnome2
-pkgver=1.042
-pkgrel=7
-pkgdesc="Perl bindings for libgnome"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('gnomecanvas-perl' 'gnome-vfs-perl' 'libgnomeui' 'perl')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('eb7b624114e45e54e022a633ffc1cce6')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-python/PKGBUILD b/testing/gnome-python/PKGBUILD
deleted file mode 100644
index 1452ef84c..000000000
--- a/testing/gnome-python/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 148135 2012-01-30 18:46:45Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgbase=gnome-python
-pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs')
-pkgver=2.28.1
-pkgrel=8
-arch=(i686 x86_64)
-license=('LGPL')
-makedepends=('pygtk' 'pyorbit' 'libgnomeui')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2)
-sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8')
-
-build() {
-    cd "${srcdir}/gnome-python-${pkgver}"
-    PYTHON=python2 ./configure --prefix=/usr
-    make
-}
-
-package_gnome-python() {
-    pkgdesc="PyGNOME Python extension module"
-    depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-bonobo(){
-    pkgdesc="Python bindings for interacting with Bonobo"
-    depends=('pygtk' 'libbonoboui' 'pyorbit' 'python2-gnomecanvas')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C bonobo install DESTDIR="${pkgdir}"
-}
-
-package_python2-gconf(){
-    pkgdesc="Python bindings for interacting with GConf"
-    depends=('pygtk' 'gconf')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gconf install DESTDIR="${pkgdir}"
-}
-
-package_python2-libgnome() {
-    pkgdesc="Python bindings for libgnome"
-    depends=('pygtk' 'libgnomeui' 'python2-gnomevfs' 'python2-gnomecanvas' 'python2-bonobo')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gnome install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomecanvas() {
-    pkgdesc="Python bindings for the GNOME Canvas"
-    depends=('pygtk' 'libgnomecanvas')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gnomecanvas install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomevfs() {
-    pkgdesc="Python bindings for interacting with gnome-vfs"
-    depends=('python2' 'libbonobo' 'gnome-vfs')
-
-    cd "${srcdir}/gnome-python-${pkgver}"
-    make -C gnomevfs install DESTDIR="${pkgdir}"
-}
diff --git a/testing/gnome-sharp/PKGBUILD b/testing/gnome-sharp/PKGBUILD
deleted file mode 100644
index 10596a11b..000000000
--- a/testing/gnome-sharp/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 148137 2012-01-30 18:46:48Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
-
-pkgbase=gnome-sharp
-pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
-pkgver=2.24.2
-pkgrel=2
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://gtk-sharp.sourceforge.net"
-makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3b38f53960c736d4afb8f04204efe98b')
-
-build() {
-  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package_gnome-sharp() {
-  pkgdesc="GNOME bindings for C#"
-  depends=('art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
-}
-
-package_art-sharp() {
-  pkgdesc="Mono bindings for libart"
-  depends=('gtk-sharp-2' 'libart-lgpl')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C art install DESTDIR="${pkgdir}"
-}
-
-package_gconf-sharp() {
-  pkgdesc="Mono bindings for GConf"
-  depends=('gtk-sharp-2' 'gconf')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gconf/GConf install DESTDIR="${pkgdir}"
-  make -C gconf/tools install DESTDIR="${pkgdir}"
-}
-
-package_gconf-sharp-peditors() {
-  pkgdesc="Mono bindings for GConf - Property Editing classes"
-  depends=('gconf-sharp' 'libgnome-sharp')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gconf/GConf.PropertyEditors install DESTDIR="${pkgdir}"
-}
-
-package_libgnome-sharp() {
-  pkgdesc="Mono bindings for libgnome"
-  depends=('art-sharp' 'gnome-vfs-sharp' 'libgnomeui')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnome install DESTDIR="${pkgdir}"
-}
-
-package_gnome-vfs-sharp() {
-  pkgdesc="Mono bindings for GNOME-VFS"
-  depends=('gtk-sharp-2' 'gnome-vfs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomevfs install DESTDIR="${pkgdir}"
-}
diff --git a/testing/gnomecanvas-perl/PKGBUILD b/testing/gnomecanvas-perl/PKGBUILD
deleted file mode 100644
index 889047140..000000000
--- a/testing/gnomecanvas-perl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148127 2012-01-30 18:46:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnomecanvas-perl
-_realname=Gnome2-Canvas
-pkgver=1.002
-pkgrel=9
-pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('gtk2-perl' 'libgnomecanvas' 'perl')
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('93405a987ba4bbd03c2f91592b88f5cb')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/testing/gnupg/PKGBUILD b/testing/gnupg/PKGBUILD
deleted file mode 100644
index b795dc482..000000000
--- a/testing/gnupg/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148532 2012-02-03 14:51:21Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-pkgname=gnupg
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="GNU Privacy Guard - a PGP replacement tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00')
-source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
-install=gnupg.install
-url="http://www.gnupg.org/"
-md5sums=('ce3742e5c7912559cab7894ad8ba7f6b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--libexecdir=/usr/lib \
-	--enable-noexecstack
-  make
-  #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check #All 27 tests passed
-}
-
-package () {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # fix fileconflict with gnupg2 pkg
-  rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
-}
diff --git a/testing/gnupg/gnupg.install b/testing/gnupg/gnupg.install
deleted file mode 100644
index 5a6704716..000000000
--- a/testing/gnupg/gnupg.install
+++ /dev/null
@@ -1,21 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg1.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
-}
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD
deleted file mode 100644
index b7a55e671..000000000
--- a/testing/gpsd/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 149489 2012-02-08 10:18:41Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Giacomo Rizzo <alt@free-os.it>
-
-pkgname=gpsd
-pkgver=3.4
-pkgrel=1
-pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
-url="http://catb.org/gpsd/"
-license=('BSD')
-depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
-optdepends=('php: generate a PHP status page for your GPS'
-            'php-gd: image support for the PHP status page'
-            'pygtk: GUI frontends')
-makedepends=('scons' 'docbook-xsl' 'chrpath')
-backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
-options=('!libtool')
-install="${pkgname}.install"
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd' 'gpsd.conf.d')
-md5sums=('c01353459faa68834309109d4e868460'
-         '8aea27e1b0c23f254f94861f7d898106'
-         '1f3402f8e33a7032b9ae6dfd077234f7'
-         '3e963df3f9f7ef3572ecc648ae829315')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix python 2.7 path
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \
-    gpscat gpsfake gpsprof xgps xgpsspeed
-
-  scons prefix=/usr \
-    systemd=yes \
-    libQgpsmm=no \
-    PYTHONPATH=/usr/bin/python2
-  scons build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix man pages path (FS#21715)
-  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
-
-  export DESTDIR="${pkgdir}"
-  scons install
-
-  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
-
-  install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules"
-
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
-  install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug"
-
-  # GPSD needs RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
-
-  install -D -m644 packaging/X11/xgps.desktop \
-    "${pkgdir}/usr/share/applications/xgps.desktop"
-  install -D -m644 packaging/X11/xgpsspeed.desktop \
-    "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
-  install -D -m644 packaging/X11/gpsd-logo.png \
-    "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
-
-  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/gpsd/gpsd b/testing/gpsd/gpsd
deleted file mode 100755
index b510a7542..000000000
--- a/testing/gpsd/gpsd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
-
-NAME=gpsd
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME/$NAME.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-   start)
-	stat_busy "Starting $NAME"
-	[ ! -d /var/run/$NAME ] && install -d /var/run/$NAME
-	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES}
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon $NAME
-		stat_done
-	fi
-   ;;
-   stop)
-	stat_busy "Stopping $NAME"
-	[ ! -z "$PID" ]  && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-	    rm -f $PIDFILE &>/dev/null
-	    rm_daemon $NAME
-	    stat_done
-	fi
-   ;;
-
-   restart)
-	$0 stop
-	sleep 2
-	$0 start
-   ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/gpsd/gpsd.conf.d b/testing/gpsd/gpsd.conf.d
deleted file mode 100644
index 9fef72cb9..000000000
--- a/testing/gpsd/gpsd.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for gpsd.
-START_DAEMON="true"
-GPSD_OPTIONS=""
-DEVICES=""
-USBAUTO="true"
diff --git a/testing/gpsd/gpsd.install b/testing/gpsd/gpsd.install
deleted file mode 100644
index ee661fcb1..000000000
--- a/testing/gpsd/gpsd.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    echo ">>> Note: the supplied gpsd udev rules are device-specific, so"
-    echo ">>> if your device isn't detected correctly, please use lsusb or"
-    echo ">>> another suitable tool to determine the proper device IDs and"
-    echo ">>> use the commented rules to fill in the blanks for your device."
-
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    update-desktop-database -q
-}
-
-post_remove() {
-    update-desktop-database -q
-}
diff --git a/testing/graphicsmagick/PKGBUILD b/testing/graphicsmagick/PKGBUILD
deleted file mode 100644
index f147fe464..000000000
--- a/testing/graphicsmagick/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 148139 2012-01-30 18:46:50Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Anton Leontiev <bunder@t-25.ru>
-
-pkgname=graphicsmagick
-pkgver=1.3.13
-pkgrel=2
-pkgdesc='Image processing system'
-url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
-license=('MIT')
-makedepends=('perl')
-depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
-         'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6')
-
-build() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--with-perl \
-		--enable-shared \
-		--disable-static \
-		--with-gs-font-dir=/usr/share/fonts/Type1 \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	# Install MIT license
-	install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
-
-	# Install perl bindings
-	# The patching was introduced in order to build perl module without installing package itself and
-	# not to introduce unnecessary path into LD_RUN_PATH
-	cd PerlMagick
-	sed -i -e "s:'LDDLFLAGS'  => \"\(.*\)\":'LDDLFLAGS'  => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
-	perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
-	sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
-	make
-	make install
-
-	# Remove perllocal.pod and .packlist
-	rm -rf "${pkgdir}/usr/lib/perl5/core_perl"
-	rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist"
-}
diff --git a/testing/graphviz/LICENSE b/testing/graphviz/LICENSE
deleted file mode 100644
index 16cc69a52..000000000
--- a/testing/graphviz/LICENSE
+++ /dev/null
@@ -1,87 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/testing/graphviz/PKGBUILD b/testing/graphviz/PKGBUILD
deleted file mode 100644
index d875e696a..000000000
--- a/testing/graphviz/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 148141 2012-01-30 18:46:52Z ibiru $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=graphviz
-pkgver=2.28.0
-pkgrel=7
-pkgdesc='Graph visualization software'
-url='http://www.graphviz.org/'
-license=('custom:EPL')
-arch=('i686' 'x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
-            'lua: lua bindings'
-            'ocaml: ocaml bindings'
-            'perl: perl bindings'
-            'php: php bindings'
-            'python2: python bindings'
-            'r: r bindings'
-            'ruby: ruby bindings'
-            'tcl: tcl bindings'
-            'qt: gvedit')
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
-        'LICENSE')
-sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
-          'e78277e502c29abb74b9587a5dc951ec392554ea')
-
-options=('!libtool')
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i "/RUBY_INCLUDES=\"/s|\"$| `eval echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,}`\"|" configure
-	sed -i '/LIBPOSTFIX="64"/d' configure
-	export PYTHON=python2
-
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# cf. http://www.graphviz.org/License.php
-	install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE
-}
diff --git a/testing/graphviz/install b/testing/graphviz/install
deleted file mode 100644
index 65fba522b..000000000
--- a/testing/graphviz/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	rm -f usr/lib/graphviz/config{,6}
-	usr/bin/dot -c
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	rm -f usr/lib/graphviz/config{,6}
-}
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD
deleted file mode 100644
index c8fb32f54..000000000
--- a/testing/grep/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149655 2012-02-08 23:59:22Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.10
-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=('709915434d09f5db655e5ebd7fd6bb7f'
-         '9ad5c390a6ad7f566c58db28ddb06aed')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --without-included-regex
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/grep/grep.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/gstreamer0.10-good/PKGBUILD b/testing/gstreamer0.10-good/PKGBUILD
deleted file mode 100644
index aebf9005e..000000000
--- a/testing/gstreamer0.10-good/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 148145 2012-01-30 18:46:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-good
-pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
-pkgver=0.10.30
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2)
-sha256sums=('b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6')
-
-build() {
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --disable-schemas-install \
-    --disable-hal \
-    --disable-esd \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-
-  make
-  sed -e 's/gst sys ext/gst/' -i Makefile
-}
-
-package_gstreamer0.10-good() {
-  depends=('gstreamer0.10-base>=0.10.34' 'bzip2')
-  pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
-
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/etc/gconf"
-}
-
-package_gstreamer0.10-good-plugins() {
-  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev')
-  pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
-  conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
-  install=gstreamer0.10-good-plugins.install
-
-  cd "${srcdir}/gst-plugins-good-${pkgver}"
-  make -C sys DESTDIR="${pkgdir}" install
-  make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas"
-}
diff --git a/testing/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/testing/gstreamer0.10-good/gstreamer0.10-good-plugins.install
deleted file mode 100644
index e343beea5..000000000
--- a/testing/gstreamer0.10-good/gstreamer0.10-good-plugins.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gstreamer0.10-good-plugins
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    pre_remove
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index 0de558ff8..000000000
--- a/testing/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 149135 2012-02-05 21:34:55Z 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=5
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('04a7009a4efea2844075949c111f5e4d')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gthumb/PKGBUILD b/testing/gthumb/PKGBUILD
deleted file mode 100644
index aeb46be4b..000000000
--- a/testing/gthumb/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148536 2012-02-03 15:54:44Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=2.14.2
-pkgrel=1
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://gthumb.sourceforge.net/"
-depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base')
-optdepends=('gstreamer0.10-base: video support')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gthumb "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gthumb/gthumb.install b/testing/gthumb/gthumb.install
deleted file mode 100644
index 6046ebb6f..000000000
--- a/testing/gthumb/gthumb.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gthumb
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gtk-engines/PKGBUILD b/testing/gtk-engines/PKGBUILD
deleted file mode 100644
index bdbaed8d6..000000000
--- a/testing/gtk-engines/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148149 2012-01-30 18:47:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gtk-engines
-pkgver=2.20.2
-pkgrel=2
-pkgdesc="Theme engines for GTK+ 2"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk2>=2.22.0')
-makedepends=('pkg-config' 'intltool')
-options=('!libtool')
-url="http://live.gnome.org/GnomeArt"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-conflicts=('lighthouse-gtk2' 'clearlooks-gtk2')
-replaces=('lighthouse-gtk2')
-sha256sums=('15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-animation
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD
deleted file mode 100644
index 113ba9c8d..000000000
--- a/testing/gtk2/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 148382 2012-01-30 22:03:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.9
-pkgrel=3
-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 cups-custom-print.patch)
-sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '9535c9df19338cbea98ec4b2b5c8e4cef718455938f05c9cf8a08a3805d6b85d')
-
-build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-
-    # https://bugzilla.gnome.org/show_bug.cgi?id=543520
-    patch -Rp1 -i "$srcdir/cups-custom-print.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>=2.24.1-3')
-
-    cd "$srcdir/gtk+-$pkgver/gtk"
-
-    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
-}
diff --git a/testing/gtk2/cups-custom-print.patch b/testing/gtk2/cups-custom-print.patch
deleted file mode 100644
index ffc89aa32..000000000
--- a/testing/gtk2/cups-custom-print.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8170436e61ea68c713d75ad374d22c3261be9203 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <benjamin@sipsolutions.net>
-Date: Sat, 24 Dec 2011 16:26:32 +0000
-Subject: Set cups Custom print options correctly (bug #543520, patch by Marek Kašík)
-
-This patch fixes the cups print backend to pass Custom options with
-the "Custom." prefix to cups if neccessary.
----
-diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
-index 14a1b5d..2751ee4 100644
---- a/modules/printbackends/cups/gtkprintbackendcups.c
-+++ b/modules/printbackends/cups/gtkprintbackendcups.c
-@@ -483,22 +483,44 @@ cups_print_cb (GtkPrintBackendCups *print_backend,
-   GDK_THREADS_LEAVE ();  
- }
- 
-+typedef struct {
-+  GtkCupsRequest *request;
-+  GtkPrinterOptionSet *options;
-+} CupsOptionsData;
-+
- static void
- add_cups_options (const gchar *key,
- 		  const gchar *value,
- 		  gpointer     user_data)
- {
--  GtkCupsRequest *request = user_data;
-+  CupsOptionsData *data = (CupsOptionsData *) user_data;
-+  GtkCupsRequest *request = data->request;
-+  GtkPrinterOptionSet *options = data->options;
-+  GtkPrinterOption *option = NULL;
-+  gchar *new_value = NULL;
- 
-   if (!g_str_has_prefix (key, "cups-"))
-     return;
- 
-   if (strcmp (value, "gtk-ignore-value") == 0)
-     return;
-+
-+  option = gtk_printer_option_set_lookup (options, key);
-   
-   key = key + strlen ("cups-");
- 
--  gtk_cups_request_encode_option (request, key, value);
-+  /* Add "Custom." prefix to custom values */
-+  if (value && option &&
-+      !gtk_printer_option_has_choice (option, value))
-+    new_value = g_strdup_printf ("Custom.%s", value);
-+
-+  if (new_value)
-+    {
-+      gtk_cups_request_encode_option (request, key, new_value);
-+      g_free (new_value);
-+    }
-+  else
-+    gtk_cups_request_encode_option (request, key, value);
- }
- 
- static void
-@@ -511,8 +533,12 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
- {
-   GtkPrinterCups *cups_printer;
-   CupsPrintStreamData *ps;
-+  CupsOptionsData *options_data;
-   GtkCupsRequest *request;
-   GtkPrintSettings *settings;
-+  GtkPrinterOptionSet *options;
-+  GtkPrintCapabilities capabilities;
-+  GtkPageSetup *page_setup;
-   const gchar *title;
-   char  printer_absolute_uri[HTTP_MAX_URI];
- 
-@@ -521,6 +547,8 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
- 
-   cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
-   settings = gtk_print_job_get_settings (job);
-+  capabilities = cups_printer_get_capabilities (GTK_PRINTER (cups_printer));
-+  page_setup = gtk_printer_get_default_page_size (GTK_PRINTER (cups_printer));
- 
-   request = gtk_cups_request_new_with_username (NULL,
-                                                 GTK_CUPS_POST,
-@@ -558,8 +586,18 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend         *print_backend,
-                                      IPP_TAG_NAME, "job-name", 
-                                      NULL, title);
- 
--  gtk_print_settings_foreach (settings, add_cups_options, request);
--  
-+  options = cups_printer_get_options (GTK_PRINTER (cups_printer), settings, page_setup, capabilities);
-+
-+  options_data = g_new0 (CupsOptionsData, 1);
-+  options_data->request = request;
-+  options_data->options = options;
-+
-+  gtk_print_settings_foreach (settings, add_cups_options, options_data);
-+
-+  g_object_unref (page_setup);
-+  g_object_unref (options);
-+  g_free (options_data);
-+
-   ps = g_new0 (CupsPrintStreamData, 1);
-   ps->callback = callback;
-   ps->user_data = user_data;
---
-cgit v0.9.0.2
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/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD
deleted file mode 100644
index c64d0834c..000000000
--- a/testing/gtkglext/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148151 2012-01-30 18:47:04Z ibiru $
-# Maintainer:
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=gtkglext
-pkgver=1.2.0
-pkgrel=7
-pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-license=('LGPL')
-depends=('gtk2' 'mesa' 'libxmu')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-	'gtk2.20.patch')
-md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
-         'e5a87ec3f2d0e616c6f32f90c3f7237f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/gtk2.20.patch"
-  sed '/AC_PATH_XTRA/d' -i configure.in
-
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkglext/gtk2.20.patch b/testing/gtkglext/gtk2.20.patch
deleted file mode 100644
index 54b34c11e..000000000
--- a/testing/gtkglext/gtk2.20.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
---- gtkglext-1.2.0.orig/gtk/gtkglwidget.c	2004-02-20 11:38:36.000000000 +0200
-+++ gtkglext-1.2.0/gtk/gtkglwidget.c	2010-04-20 19:29:42.941917275 +0300
-@@ -127,7 +127,7 @@
-    * Synchronize OpenGL and window resizing request streams.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
-+  if (gtk_widget_get_realized (widget) && private->is_realized)
-     {
-       gldrawable = gdk_window_get_gl_drawable (widget->window);
-       gdk_gl_drawable_wait_gdk (gldrawable);
-@@ -154,7 +154,7 @@
-    * Remove OpenGL-capability from widget->window.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     gdk_window_unset_gl_capability (widget->window);
- 
-   private->is_realized = FALSE;
-@@ -174,7 +174,7 @@
-    */
- 
-   toplevel = gtk_widget_get_toplevel (widget);
--  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
-+  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - Install colormap to the top-level window."));
-@@ -194,7 +194,7 @@
-    * Set a background of "None" on window to avoid AIX X server crash.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - window->bg_pixmap = %p",
-@@ -250,8 +250,8 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
-+  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
-+  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
-   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
- 
-   /* 
-@@ -432,7 +432,7 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   gldrawable = gdk_window_get_gl_drawable (widget->window);
-   if (gldrawable == NULL)
-@@ -474,7 +474,7 @@
-   GLWidgetPrivate *private;
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
-   if (private == NULL)
-@@ -501,7 +501,7 @@
- gtk_widget_get_gl_window (GtkWidget *widget)
- {
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   return gdk_window_get_gl_window (widget->window);
- }
diff --git a/testing/gtkhtml/PKGBUILD b/testing/gtkhtml/PKGBUILD
deleted file mode 100644
index 6ca49739e..000000000
--- a/testing/gtkhtml/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148153 2012-01-30 18:47:06Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gtkhtml
-pkgver=3.32.2
-pkgrel=3
-pkgdesc="A lightweight HTML renderer/editor widget for GTK2"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gtkhtml \
-      --localstatedir=/var --disable-static \
-      --disable-deprecated-warning-flags
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/bin/gtkhtml-editor-test"
-}
diff --git a/testing/gtkmm/PKGBUILD b/testing/gtkmm/PKGBUILD
deleted file mode 100644
index 4a712e92a..000000000
--- a/testing/gtkmm/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 148155 2012-01-30 18:47:09Z ibiru $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtkmm
-pkgname=('gtkmm' 'gtkmm-docs')
-pkgver=2.24.2
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm() {
-  pkgdesc="C++ bindings for gtk2"
-  depends=('gtk2' 'pangomm' 'atkmm')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gtkmm-docs() {
-  pkgdesc="Developer documentation for gtkmm v2"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C docs DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtksourceview2/PKGBUILD b/testing/gtksourceview2/PKGBUILD
deleted file mode 100644
index 19bd77b43..000000000
--- a/testing/gtksourceview2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148157 2012-01-30 18:47:11Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gtksourceview2
-pkgver=2.10.5
-pkgrel=2
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2>=2.22.0' 'libxml2>=2.7.7')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2)
-sha256sums=('c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e')
-
-build() {
-  cd "${srcdir}/gtksourceview-${pkgver}"
-  sed -i 's#python#python2#' gtksourceview/language-specs/convert.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/gtksourceview-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gv/PKGBUILD b/testing/gv/PKGBUILD
deleted file mode 100644
index dd32c2270..000000000
--- a/testing/gv/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148622 2012-02-04 13:38:01Z andyrtr $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gv
-pkgver=3.7.3
-pkgrel=1
-pkgdesc="A program to view PostScript and PDF documents"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gv/"
-license=('GPL')
-depends=('xaw3d>=1.6' 'ghostscript' 'desktop-file-utils')
-install=gv.install
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png
-        buildfix.diff)
-md5sums=('98ae3e9ce338b64ba5ab622389c5960e'
-         'cf04652952f2d0903bc7578b4826f50c'
-         'ab0e3879dbe39e59ad1c923020c28a86'
-         '943baf7a6bb61389a09a4ec71083a900')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # https://trac.macports.org/browser/trunk/dports/print/gv/files/patch-src-Scrollbar.c.diff?rev=89338
-  patch -Np0 -i ${srcdir}/buildfix.diff
-  sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../gv.desktop "${pkgdir}/usr/share/applications/gv.desktop"
-  install -D -m644 ../gv.png "${pkgdir}/usr/share/pixmaps/gv.png"
-}
diff --git a/testing/gv/buildfix.diff b/testing/gv/buildfix.diff
deleted file mode 100644
index 76c88b158..000000000
--- a/testing/gv/buildfix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
-
-http://bugs.gentoo.org/399753
-
---- src/Scrollbar.c
-+++ src/Scrollbar.c
-@@ -1006,7 +1006,7 @@
-    TOPLOC = newtop;
-    SHOWNLENGTH = newbot-newtop+1;
- 
--   (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
-+   (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
- 
-    ENDMESSAGE(Redisplay)
- }
diff --git a/testing/gv/gv.desktop b/testing/gv/gv.desktop
deleted file mode 100644
index 6332ee859..000000000
--- a/testing/gv/gv.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=GV
-MimeType=application/pdf;application/postscript;image/x-eps;application/illustrator
-GenericName=Postscript Viewer
-Exec=gv
-Icon=gv
-Categories=Application;Graphics;Viewer;Office;
-Type=Application
-Terminal=false
-StartupNotify=true
diff --git a/testing/gv/gv.install b/testing/gv/gv.install
deleted file mode 100644
index 0c048cd5b..000000000
--- a/testing/gv/gv.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=usr/share/info
-file=gv.info.gz
-
-post_install() {
-  update-desktop-database -q
-  [ -x usr/bin/install-info ] || return 0
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  update-desktop-database -q
-  [ -x usr/bin/install-info ] || return 0
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}
diff --git a/testing/gv/gv.png b/testing/gv/gv.png
deleted file mode 100644
index 59e832a48..000000000
--- a/testing/gv/gv.png
+++ /dev/null
diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD
deleted file mode 100644
index 79824ffdd..000000000
--- a/testing/hugin/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148159 2012-01-30 18:47:14Z ibiru $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=hugin
-pkgver=2011.4.0
-pkgrel=1
-pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('GPL')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
-         'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
-makedepends=('zip' 'cmake' 'boost' 'tclap')
-install=hugin.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build && cd build
-  cmake "${srcdir}/${pkgname}-${pkgver}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
-    -DENABLE_LAPACK=yes
-  make
-}
-
-package(){
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install
deleted file mode 100644
index 362749233..000000000
--- a/testing/hugin/hugin.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
diff --git a/testing/hylafax/PKGBUILD b/testing/hylafax/PKGBUILD
deleted file mode 100644
index 74ece5343..000000000
--- a/testing/hylafax/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 148161 2012-01-30 18:47:17Z ibiru $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-pkgname=hylafax
-pkgver=6.0.5
-pkgrel=3
-pkgdesc="Fax Server"
-arch=('i686' 'x86_64')
-install='hylafax.install'
-license=('custom')
-depends=('libtiff' 'pam' 'ghostscript')
-makedepends=('smtp-server')
-url="http://www.hylafax.org/"
-backup=(var/spool/hylafax/bin/{faxrcvd,notify}
-	usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules}
-	var/spool/hylafax/etc/hosts.hfaxd) 
-source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz 
-        hylafax 
-        hylafax.cron.daily 
-        config.local
-        configure-6.0.5.patch 
-        hylafax-libtiff4.patch)
-md5sums=('eb9ac942354ad708e20e4583cec6615f'
-         '6602288a405324d8c8e3c5eac2bf19fd'
-         '52beffe7dc296b4f9ce9fd0387f7804e'
-         '0d2ce24d918226a852539aebf57d3f4a'
-         '51d9f639bb76e5e39cdc8e2ac07e208d'
-         '3d239c186f24720e945508d349b069b1')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  cp ../config.local .
-  # fix compiling
-  patch -Np0 -i ../configure-6.0.5.patch
-  patch -Np1 -i ../hylafax-libtiff4.patch
-  ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
-  make
-}
-
-package () {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts}
-  mkdir -p "$pkgdir"/var/{spool/hylafax,lock}
-  make ROOT="$pkgdir" install
-  install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax
-  install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax
-  # add missing awk file for notify-4.1 script
-  install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \
-  	"$pkgdir"/var/spool/hylafax/bin/notify.awk
-  # fix permission on /var/lock
-  chmod 1777 "$pkgdir"/var/lock
-
-  install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
-}
diff --git a/testing/hylafax/config.local b/testing/hylafax/config.local
deleted file mode 100644
index 0d8e2bcd8..000000000
--- a/testing/hylafax/config.local
+++ /dev/null
@@ -1,273 +0,0 @@
-# $Id: config.local,v 1.1 2003/06/28 00:24:49 jproctor Exp $
-#
-# HylaFAX Facsimile Software
-#
-# Copyright (c) 1990-1996 Sam Leffler
-# Copyright (c) 1991-1996 Silicon Graphics, Inc.
-# HylaFAX is a trademark of Silicon Graphics, Inc.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-#
-
-#
-# This file holds site-specific configuration parameters.
-#
-# Nothing is defined in here by default, the definitions
-# commented out below serve as documentation for what you
-# can set in this file or a config.local file.
-#
-# Note that you do not need to set anything here unless you
-# want to override the auto-configuration behaviour and/or
-# interactive prompting done by the configure script.
-#
-
-#
-# Package controls.
-#
-#DSO="auto"			# configure DSO support (auto|IRIX|no)
-#GETTY="auto"			# type of getty support (auto|BSD|SysV)
-#HTML="no"			# install HTML documentation (yes|no)
-#PS="auto"			# PostScript support to use (auto|gs|dps|imp)
-#SGI2FAX="auto"			# configure SGI image support (auto|yes|no)
-#DPS="no"			# install SGI DPS-based RIP (yes|no)
-#GS="no"			# install Ghostscript RIP (yes|no)
-#IMP="no"			# install SGI Impressario 2.1 support (yes|no)
-#REGEX="yes"			# use distributed regular expression package
-#UTMP="utmpx"			# type of utmp+wtmp handling (auto|utmp|utmpx)
-#DBLIB="no"			# use distributed libdb distribution
-
-#
-# Directory parameters.
-#
-DIR_BIN="/usr/bin"		# directory for client apps
-DIR_LIB="/usr/lib"
-DIR_LIBDATA="/usr/lib/fax"		# directory for client data
-DIR_LIBEXEC="/usr/lib/fax"		# directory for libraries&hidden apps
-DIR_MAN="/usr/share/man"		# directory for manual pages
-DIR_SPOOL="/var/spool/hylafax"		# directory for spooling area
-DIR_SBIN="/usr/sbin"		# directory for system apps
-DIR_LOCKS="/var/lock"		# directory for UUCP lock files
-FONTMAP="/usr/share/ghostscript/fonts"	# directorys containing Fontmap files
-DIR_LOCALE="/usr/share/locale"
-#PATH_AFM="/usr/lib/DPS/AFM"		# directorys for AFM files
-
-#
-# HTML-specific parameters; only used when the
-# HTML package is configured for installation.
-#
-# Note that ``PATH''s are the virtual pathnames used
-# in forming URLs; they are not directory pathnames
-# in the filesystem.
-#
-DIR_HTML="/usr/share/hylafax/httpd"	# directory for HTML documentation
-#DIR_CGI="/var/httpd/cgi-bin"		# directory for CGI scripts
-#HTMLPATH="/hylafax"			# virtual path to HTML materials
-#CGIPATH="/cgi-bin"			# virtual path to CGI scripts
-
-#
-# Miscellaneous parameters.
-#
-#DEFVRES="196"				# default vertical res for outbound fax
-#FILLORDER="MS2LSB"			# bit order of cpu (MSB2LSB/LSB2MSB)
-#AXGID="uucp"				# group ID for fax user
-#FAXUID="uucp"				# user ID for fax user
-#PAGESIZE="North American Letter"	# default page size
-SYSGID="root"				# group ID for system installs
-SYSUID="root"				# user ID for system installs
-#LOCKS="ascii"				# default UUCP lockfile scheme
-#
-#PATH_GETTY="/etc/getty"		# pathname of suitable getty program
-#PATH_VGETTY="/bin/vgetty"		# pathname of voice getty program
-#PATH_EGETTY="/bin/egetty"		# pathname of external getty program
-#PATH_SENDMAIL="/usr/lib/sendmail"	# pathname of suitable sendmail program
-#PATH_GSRIP="/usr/local/bin/gs"		# pathname of Ghostscript-based RIP
-#PATH_DPSRIP="/var/spool/hylafax/bin/ps2fax.exe" # pathname of DPS-based RIP
-#PATH_IMPRIP="/usr/lib/print/psrip"	# pathname of Impressario 2.1 RIP
-#MANSCHEME="sysv-source-cat-strip"	# manual page installation scheme
-#SYSVINIT="auto"		# install SysV-style init support (auto|yes|no)
-#DIR_SYSVINIT="/etc/init.d"	# location of SysV-style init script
-#DIR_SYSVINITSTART="../rc2.d"	# location of SysV-style start script
-#DIR_SYSVINITSTOP="../rc0.d"	# location of SysV-style stop script
-#NAME_SYSVINITSTART="S80fax"	# name of SysV-style start script
-#NAME_SYSVINITSTOP="K80fax"	# name of SysV-style stop script
-#FAXQ_SERVER=yes		# init script starts faxq
-#HFAXD_SERVER=yes		# init script starts hfaxd
-#HFAXD_OLD_PROTOCOL=no		# don't start old protocol
-#HFAXD_SNPP_SERVER=no		# don't start paging protocol
-
-# SVR4 packaging stuff
-#PKG_ARCH=				# ARCH variable in pkginfo file
-#PKG_EMAIL=someone@somehost.somedomain	# EMAIL variable in pkginfo file
-#PKG_VENDOR="Your Name Here"		# VENDOR variable in pkginfo file
-#
-
-#
-# Parameters used when building the software.
-#
-# Note that configure has several ENVOPTS built into it that are
-# set according to the target.  This is done to help naive folks.
-#
-# Beware of changing the INSTALL definition; you *must* have an
-# install script that emulates the Silicon Graphics install program!
-#
-#AR="/bin/ar"				# pathname of suitable ar program
-#AROPTS="rc"				# options to ar for creating archive
-#CC="gcc"				# name/pathname of C compiler
-#CXX="gcc"				# name/pathname of C++ compiler
-#CXXFILE="-x c++"			# options for proper C++ processing
-#ENVOPTS="-Aa"				# options for getting ANSI C
-#GCOPTS="-g"				# options to pass C compiler
-#GCXXOPTS="-g"				# options to pass C++ compiler
-#GENDIST="/sbin/gendist"		# pathname of SGI inst generator program
-#INSTALL='${SHELL} ${PORT}/install.sh'	# SGI install program/emulator
-#LIBMALLOC="auto"			# yes|no|auto configure -lmalloc use
-#LIBPORT='${PORT}/libport.a'		# library with emulation code
-#LIBSUN="auto"				# yes|no|auto configure -lsun use
-#LLDOPTS=""				# extra link line options
-#MACHDEPLIBS=""				# extra libraries for linking
-#PORTFUNCS=""				# non-standard functions to emulate
-#PROTOTYPES="-prototypes"		# C compiler options for checking function prototypes
-#RANLIB=":"				# pathname of suitable ranlib program
-#SHDLIBC="-lc_s"			# shared C library, if not standard
-#SIGHANDLERTYPES='(void(*)(int,...))'	# types to check for signal handler
-#STRIP="/bin/strip"			# strip program used by install.sh
-
-#
-# The source for the TIFF library is not required
-# to build this software, but the library is required
-# to link against.  If libtiff is installed in a
-# non-standard location then setup LIBTIFF accordingly.
-#
-#LIBTIFF="-L/usr/local/lib -ltiff"	# linkage convention for libtiff
-#TIFFINC="/usr/local/include"		# place to find tiffio.h
-#TIFFBIN="/usr/local/bin"		# where TIFF tools live
-
-#
-# The source for the ZLIB library is not required
-# to build this software, but the library is required
-# to link against.  If ZLIB is installed in a 
-# non-standard location then setup LIBZ accordingly.
-#
-#LIBZ="-L/usr/local/lib -lz"		# linkage convention for libz
-#ZLIBINC="-I/usr/local/include"		# place to find zlib.h
-
-#
-# The source for the POSIX regular expression package
-# is not required to build this software, but the package
-# is required to link against.  If the copy of the software
-# that is included in this distribution is not to be used
-# then set REGEX=no and supply the following definitions.
-#
-#LIBREGEX=" "				# linkage convention for regex package
-#REGEXINC="/usr/include"		# place to find regex.h
-
-#
-# The LIBDB hashed database package is (currently) used
-# only by the MLA tools that are not publicly available
-# but which are built from within this source tree.  In
-# the future the fax software may use the libdb software
-# for the remote client capabilities database (so these
-# hooks are included now).
-#
-# The source for the LIBDB hashed database package
-# is not required to build this software, but the package
-# is required to link against.  If the copy of the software
-# that is included in this distribution is not to be used
-# then set DBLIB=no and supply the following definitions.
-#
-#LIBDB=" "				# linkage convention for libdb package
-#DBLIBINC="/usr/include"		# place to find db.h
-
-#
-# Parameters to control various workarounds for system bugs.
-#
-# These parameters are normally set in configure based on
-# the target system.  If they are set here, then they will
-# override anything done by configure.
-#
-#CONFIG_OPENFIFO="O_RDONLY"		# mode to open FIFOs in server proc's
-#CONFIG_FIFOBUG="yes"			# enable workaround for FIFO select bug
-#CONFIG_TIOCMBISBYREF="yes"		# pass arg by reference to ioctl
-#CONFIG_WINSZHACK="no"			# include extra files for TIOCWINSZ use
-#CONFIG_ABORTBUG="no"			# enable workaround for abort problems
-#CONFIG_NOREOPEN="yes"			# reopen tty device after toggling DTR
-#CONFIG_NOSTDINDUP="yes"		# do not redirect stdout to stdin in ondelay
-#CONFIG_BADEXECVPROTO="no"		# system has incorrect execv func decl
-#CONFIG_BADEXECVEPROTO="no"		# system has incorrect execve func decl
-#CONFIG_BADGETOPTPROTO="no"		# system has incorrect getopt func decl
-#CONFIG_SOCKARGLENTYPE="unsigned long"	# call-by-ref arg type for socket funcs
-#CONFIG_BADSELECTPROTO="no"		# system has way old select func decl
-#CONFIG_MAXGID="5999"			# maximum permissable GID
-#CONFIG_OSFCNH="auto"			# control inclusion of <osfcn.h>
-
-#
-# Dynamic Shared Object (DSO) support.
-#
-# Beware that adding new support for DSOs may require some
-# modifications to the */Makefile.dso files.
-#
-#DSOSUF="so"				# DSO filename suffix
-#DSODELAY="-delay_load"			# DSO option for delayed loading
-#DSOOPTS="-shared -rdata_shared"	# options for building DSOs
-
-#
-# Makefile construction parameters.
-#
-# These should not normally be set; configure will
-# deduce the appropriate syntax to use for includes.
-#
-#MAKECXXOVERRIDE="=.C"			# make override stuff for SunPRO C++
-#MAKEDEPINCLUDE="include"		# make include for dependency files
-#MAKEDSOINCLUDE="#"			# make include for DSO support
-#MAKEINCLUDE=".include"			# make include syntax
-#MAKELQUOTE="<"				# make include syntax
-#MAKERQUOTE=">"				# make include syntax
-#SETMAKE='MAKE	= ${MAKE}'		# define if make does not setup $MAKE
-#MKDEPCOPTS=""				# C compiler opts to supply w/ -M
-#MKDEPCXXOPTS=""			# C++ compiler opts to supply w/ -M
-
-#
-# General system stuff used by the distribution.
-#
-# Beware of setting these as configure selects several programs
-# based on whether or not they are capable of processing scripts
-# included in the distribution (e.g AWK and SCRIPT_SH, SED).
-#
-#AWK="/bin/awk"				# pathname of suitable awk program
-#CAT="/bin/cat"				# pathname of suitable cat program
-#CHGRP="/etc/chgrp"			# pathname of suitable chgrp program
-#CHMOD="/etc/chmod"			# pathname of suitable chmod program
-#CHOWN="/etc/chown"			# pathname of suitable chown program
-#CMP="/bin/cmp"				# pathname of suitable cmp program
-#COL="/bin/col"				# pathname of suitable col program
-#CP="/bin/cp"				# pathname of suitable cp program
-#ECHO="/bin/echo"			# pathname of suitable echo program
-#GREP="/bin/grep"			# pathname of suitable grep program
-#LN="/bin/ln"				# pathname of suitable ln program
-#LN_S="-s"				# option to ${LN} to create symlink
-#MAN="/usr/bin/man"			# pathname of suitable man program
-#MKDIR="/bin/mkdir"			# pathname of suitable mkdir program
-#MKFIFO="/bin/mkfifo"			# pathname of suitable mkfifo program
-#MV="/bin/mv"				# pathname of suitable mv program
-#MV_F="-f"				# option to ${MV} to force operation
-#RMCMD="/bin/rm"			# pathname of suitable rm program
-#SED="/bin/sed"				# pathname of suitable sed program
-#SCRIPT_SH="/bin/sh"			# pathname of suitable shell
-#SORT="/bin/sort"			# pathname of suitable sort program
diff --git a/testing/hylafax/configure-6.0.5.patch b/testing/hylafax/configure-6.0.5.patch
deleted file mode 100644
index e1f1126a5..000000000
--- a/testing/hylafax/configure-6.0.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2011-08-08 10:19:37.619657223 +0200
-+++ configure	2011-08-08 10:20:26.422189170 +0200
-@@ -2882,7 +2882,7 @@
- 	echo '#define HAS_FCHMOD 1'
- 	Note "... configure use of fchmod"
- 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
--	    unistd.h libc.h $OSFCNH sys/stat.h
-+	    unistd.h $OSFCNH sys/stat.h libc.h
-     }
-     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
- 	unistd.h sys/stat.h
diff --git a/testing/hylafax/hylafax b/testing/hylafax/hylafax
deleted file mode 100755
index 9f949c2ac..000000000
--- a/testing/hylafax/hylafax
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="hylafax"
-FAXQ_BIN=/usr/sbin/faxq
-FAXQ_PID=`pidof -o %PPID $FAXQ_BIN`
-HFAXD_BIN=/usr/lib/fax/hfaxd
-HFAXD_PID=`pidof -o %PPID $HFAXD_BIN`
-HFAXD_OPTS="-i hylafax"
-FAXQUIT_BIN=/usr/sbin/faxquit
-
-. /var/spool/hylafax/etc/setup.cache
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ -z "$FAXQ_PID" ] && $FAXQ_BIN
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      echo `pidof -o %PPID $FAXQ_BIN` > /var/run/faxq.pid
-    fi
-    [ -z "$HFAXD_PID" ] && $HFAXD_BIN $HFAXD_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      echo `pidof -o %PPID $HFAXD_BIN` > /var/run/hfaxd.pid
-    fi
-    add_daemon $DAEMON_NAME
-    stat_done
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-	 $FAXQUIT_BIN >/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      [ ! -z "$FAXQ_PID" ]  && kill $FAXQ_PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        rm /var/run/faxq.pid &> /dev/null
-      fi
-    else
-      rm /var/run/faxq.pid &> /dev/null
-    fi
-    [ ! -z "$HFAXD_PID" ]  && kill $HFAXD_PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm /var/run/hfaxd.pid &> /dev/null
-    fi
-    rm_daemon $DAEMON_NAME
-    stat_done
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/hylafax/hylafax-libtiff4.patch b/testing/hylafax/hylafax-libtiff4.patch
deleted file mode 100644
index 4a49511f8..000000000
--- a/testing/hylafax/hylafax-libtiff4.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- hylafax-6.0.5/configure	2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/configure	2012-01-02 17:44:20.000000000 -0500
-@@ -2531,6 +2566,7 @@
-     Note "... checking TIFF library version"
-     tiff_runlen_t=""
-     cat>t.c<<EOF
-+#include <stdlib.h>
- #include <stdio.h>
- #include "tiffio.h"
- main()
-@@ -2550,8 +2586,18 @@
- 	Note "  Found libtiff version ${lib_ver}"
- 	if [ ${header_ver} -ge 19960307 ]; then
- 	    case ${lib_ver} in
--		3.4)		tiff_runlen_t="uint16" ;;
--		3.[56789])	tiff_runlen_t="uint32" ;;
-+		3.4)		tiff_runlen_t="uint16"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+				echo '#define TIFFVERSION TIFF_VERSION'
-+				echo '#define TIFFHEADER TIFFHeader';;
-+		3.[56789])	tiff_runlen_t="uint32"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+				echo '#define TIFFVERSION TIFF_VERSION'
-+				echo '#define TIFFHEADER TIFFHeader';;
-+		4.0)		tiff_runlen_t="uint32"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint64'
-+				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
-+				echo '#define TIFFHEADER TIFFHeaderClassic';;
- 	    esac
- 	fi
-     else
-@@ -2588,7 +2634,7 @@
- Incompatible TIFF Library.
- 
- HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through
--3.9.  If you do not have up to date TIFF software on your system
-+4.0.  If you do not have up to date TIFF software on your system
- then you can retrieve it from the location where you obtained this software.
- The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/
- EOF
---- hylafax-6.0.5/hfaxd/FileTransfer.c++	2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-02 17:44:19.000000000 -0500
-@@ -164,26 +142,26 @@
-  * a single IFD/image from a TIFF file.
-  */
- typedef struct {
--    TIFFDirEntry	SubFileType;
--    TIFFDirEntry	ImageWidth;
--    TIFFDirEntry	ImageLength;
--    TIFFDirEntry	BitsPerSample;
--    TIFFDirEntry	Compression;
--    TIFFDirEntry	Photometric;
--    TIFFDirEntry	FillOrder;
--    TIFFDirEntry	StripOffsets;
--    TIFFDirEntry	Orientation;
--    TIFFDirEntry	SamplesPerPixel;
--    TIFFDirEntry	RowsPerStrip;
--    TIFFDirEntry	StripByteCounts;
--    TIFFDirEntry	XResolution;
--    TIFFDirEntry	YResolution;
--    TIFFDirEntry	Options;		// T4 or T6
--    TIFFDirEntry	ResolutionUnit;
--    TIFFDirEntry	PageNumber;
--    TIFFDirEntry	BadFaxLines;
--    TIFFDirEntry	CleanFaxData;
--    TIFFDirEntry	ConsecutiveBadFaxLines;
-+    HFClassicTIFFDirEntry	SubFileType;
-+    HFClassicTIFFDirEntry	ImageWidth;
-+    HFClassicTIFFDirEntry	ImageLength;
-+    HFClassicTIFFDirEntry	BitsPerSample;
-+    HFClassicTIFFDirEntry	Compression;
-+    HFClassicTIFFDirEntry	Photometric;
-+    HFClassicTIFFDirEntry	FillOrder;
-+    HFClassicTIFFDirEntry	StripOffsets;
-+    HFClassicTIFFDirEntry	Orientation;
-+    HFClassicTIFFDirEntry	SamplesPerPixel;
-+    HFClassicTIFFDirEntry	RowsPerStrip;
-+    HFClassicTIFFDirEntry	StripByteCounts;
-+    HFClassicTIFFDirEntry	XResolution;
-+    HFClassicTIFFDirEntry	YResolution;
-+    HFClassicTIFFDirEntry	Options;		// T4 or T6
-+    HFClassicTIFFDirEntry	ResolutionUnit;
-+    HFClassicTIFFDirEntry	PageNumber;
-+    HFClassicTIFFDirEntry	BadFaxLines;
-+    HFClassicTIFFDirEntry	CleanFaxData;
-+    HFClassicTIFFDirEntry	ConsecutiveBadFaxLines;
-     uint32		link;			// offset to next directory
-     uint32		xres[2];		// X resolution indirect value
-     uint32		yres[2];		// Y resolution indirect value
-@@ -226,10 +204,10 @@
- 		 * amount of image data and then adding in
- 		 * the expected data for the TIFF headers.
- 		 */
--		uint32* sb;
-+		TIFFSTRIPBYTECOUNTS* sb;
- 		TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
- 		file_size = sizeof (DirTemplate) +
--		    sizeof (TIFFHeader) + sizeof (uint16);
-+		    sizeof (TIFFHEADER) + sizeof (uint16);
- 		for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
- 		    file_size += sb[s];
- 		reply(code, "%s for %s (%lu bytes).",
-@@ -261,10 +239,10 @@
- 	if (fd >= 0) {
- 	    union {
- 		char buf[512];
--		TIFFHeader h;
-+		TIFFHEADER h;
- 	    } b;
- 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
--	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
-+	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION &&
- 	      (b.h.tiff_magic == TIFF_BIGENDIAN ||
- 	       b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
- 		(void) lseek(fd, 0L, SEEK_SET);		// rewind
-@@ -318,12 +296,12 @@
- }
- 
- static void
--getLong(TIFF* tif, TIFFDirEntry& de)
-+getLong(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
-     TIFFGetField(tif, de.tdir_tag, &de.tdir_offset);
- }
- static void
--getShort(TIFF* tif, TIFFDirEntry& de)
-+getShort(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
-     uint16 v;
-     TIFFGetField(tif, de.tdir_tag, &v);
-@@ -343,7 +321,7 @@
- {
-     static DirTemplate templ = {
- #define	TIFFdiroff(v) \
--    (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
-+    (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \
-       (intptr_t) &(((DirTemplate*) 0)->v))
- 	{ TIFFTAG_SUBFILETYPE,		TIFF_LONG,	1 },
- 	{ TIFFTAG_IMAGEWIDTH,		TIFF_LONG,	1 },
-@@ -368,7 +346,7 @@
- 	0,					// next directory
- 	{ 0, 1 }, { 0, 1 },			// x+y resolutions
-     };
--#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry))
-+#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry))
-     /*
-      * Construct the TIFF header for this IFD using
-      * the preconstructed template above.  We extract
-@@ -377,14 +355,14 @@
-      * of things about the contents of the TIFF file.
-      */
-     struct {
--	TIFFHeader h;
-+	TIFFHEADER h;
- 	uint16	dircount;
- 	u_char	dirstuff[sizeof (templ)];
-     } buf;
-     union { int32 i; char c[4]; } u; u.i = 1;
-     buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
--    buf.h.tiff_version = TIFF_VERSION;
--    buf.h.tiff_diroff = sizeof (TIFFHeader);
-+    buf.h.tiff_version = TIFFVERSION;
-+    buf.h.tiff_diroff = sizeof (TIFFHEADER);
-     buf.dircount = (uint16) NTAGS;
-     getLong(tif, templ.SubFileType);
-     getLong(tif, templ.ImageWidth);
-@@ -412,7 +390,7 @@
-     getShort(tif, templ.CleanFaxData);
-     getLong(tif, templ.ConsecutiveBadFaxLines);
-     if (buf.h.tiff_magic == TIFF_BIGENDIAN) {
--	TIFFDirEntry* dp = &templ.SubFileType;
-+	HFClassicTIFFDirEntry* dp = &templ.SubFileType;
- 	for (u_int i = 0; i < NTAGS; i++) {
- 	    if (dp->tdir_type == TIFF_SHORT)
- 		dp->tdir_offset <<= 16;
-@@ -441,7 +419,7 @@
- bool
- HylaFAXServer::sendITIFFData(TIFF* tif, int fdout)
- {
--    uint32* sb;
-+    TIFFSTRIPBYTECOUNTS* sb;
-     (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
-     tdata_t buf = _TIFFmalloc(sb[0]);
-     tsize_t bsize = sb[0];
---- hylafax-6.0.5/hfaxd/FileTransfer.c++	2012-01-28 15:27:47.000000000 -0500
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-28 15:30:12.000000000 -0500
-@@ -69,7 +69,7 @@
- 
- 
- static bool
--isTIFF(const TIFFHeader& h)
-+isTIFF(const TIFFHEADER& h)
- {
-     if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
- 	return (false);
-@@ -82,11 +82,23 @@
-     // byte swap version stamp if opposite byte order
-     if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
- 	TIFFSwabShort(&version);
--    return (version == TIFF_VERSION);
-+    return (version == TIFFVERSION);
- }
- 
- 
- /*
-+ * This is copied right from tiff.h in version 3.8.2.  This was necessary
-+ * to localize here because it was removed from tiff.h in version 4.0.
-+ * In tiff.h 3.8.2 it was known as "TIFFDirEntry".
-+ */
-+typedef struct {
-+	uint16		tdir_tag;
-+	uint16		tdir_type;	/* data type */
-+	uint32		tdir_count;	/* number of items; length in spec */
-+	uint32		tdir_offset;	/* byte offset to field data */
-+} HFClassicTIFFDirEntry;
-+ 
-+/*
-  * Record a file transfer in the log file.
-  */
- void
-@@ -957,7 +957,7 @@
- 	if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
- 	    union {
- 		char buf[512];
--		TIFFHeader h;
-+		TIFFHEADER h;
- 	    } b;
- 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
- 	    if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
diff --git a/testing/hylafax/hylafax.cron.daily b/testing/hylafax/hylafax.cron.daily
deleted file mode 100644
index 2d1a77e5c..000000000
--- a/testing/hylafax/hylafax.cron.daily
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/sbin/faxqclean
-/usr/sbin/faxcron -rcv 30
diff --git a/testing/hylafax/hylafax.install b/testing/hylafax/hylafax.install
deleted file mode 100644
index 5dacf4045..000000000
--- a/testing/hylafax/hylafax.install
+++ /dev/null
@@ -1,46 +0,0 @@
-
-print_install() {
-  printf "\n"
-  echo "Add the following to /etc/inittab and run telinit q"
-  echo "  f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0"
-  echo "faxgetty should now be running"
-  printf "\n"
-  echo "Run faxsetup to configure and be sure to set..."
-  echo "  The device to configure is usually ttyS0"
-  echo "  The number of pages to accept to more than 25"
-  echo "  The country code and area code"
-  echo "  The faxclass to 2.0"
-  echo "  Most other defaults are OK"
-  printf "\n"
-}
-
-print_remove() {
-  printf "\n\n"
-  echo "You may manually remove /var/spool/hylafax and /usr/lib/fax if you do not need anything."
-  echo "You may also remove any aliases added to /etc/mail/aliases."
-  printf "\n"
-}
-
-post_install() {
-  post_upgrade
-  print_install
-}
-
-post_upgrade() {
-  groupadd -g 14 uucp &>/dev/null
-  useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null
-  useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null
-  chown uucp /var/spool/hylafax/{,archive,bin,client,config,dev,docq,doneq,etc}
-  chown uucp /var/spool/hylafax/{FIFO,info,log,pollq,recvq,sendq,status,tmp}
-  chown uucp /var/spool/hylafax/etc/{hosts.hfaxd,lutRS18.pcf,xferfaxlog}
-  chown -R uucp /var/spool/hylafax/etc/templates
-  usermod -d '/' uucp &>/dev/null
-  usermod -d '/' fax &>/dev/null
-}
-
-pre_remove() {
-  userdel uucp &>/dev/null
-  groupdel uucp &>/dev/null
-  userdel fax &>/dev/null
-  print_remove
-}
diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD
deleted file mode 100644
index 6a68531b7..000000000
--- a/testing/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 148163 2012-01-30 18:47:19Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.4.7
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-        perlmagick.rpath.patch)
-sha1sums=('87cde464a569d8b34ef8edae817fbe4f51f8c2d0'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf
-  patch -p0 -i ../perlmagick.rpath.patch
-
-  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
-    ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
-    --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" \
-    --without-gvc --without-djvu --without-autotrace --without-webp \
-    --without-jbig --without-fpx --without-dps --without-fftw --without-lqr
-  make
-}
-
-check() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  optdepends=('ghostscript: for Ghostscript support' 
-              'openexr: for OpenEXR support' 
-              'libwmf: for WMF support' 
-              'librsvg: for SVG support' 
-              'libxml2: for XML support' 
-              'jasper: for JPEG-2000 support' 
-              'libpng: for PNG support')
-  backup=('etc/ImageMagick/coder.xml'
-          'etc/ImageMagick/colors.xml'
-          'etc/ImageMagick/delegates.xml'
-          'etc/ImageMagick/log.xml'
-          'etc/ImageMagick/magic.xml'
-          'etc/ImageMagick/mime.xml'
-          'etc/ImageMagick/policy.xml'
-          'etc/ImageMagick/sRGB.icc'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
-  options=('!makeflags' '!docs' 'libtool')
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
-  find "${pkgdir}" -name '*.bs' -delete
-  rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
-  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-  depends=()
-  options=('!makeflags')
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install-data-html
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}
diff --git a/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch
deleted file mode 100644
index 958c0f2ee..000000000
--- a/testing/imagemagick/perlmagick.rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/testing/imlib/CAN-2004-1026.patch b/testing/imlib/CAN-2004-1026.patch
deleted file mode 100644
index c820270d4..000000000
--- a/testing/imlib/CAN-2004-1026.patch
+++ /dev/null
@@ -1,510 +0,0 @@
-diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c
---- imlib-1.9.13.orig/Imlib/load.c	Wed Mar 13 19:06:29 2002
-+++ imlib-1.9.13/Imlib/load.c	Thu Sep 16 17:21:01 2004
-@@ -4,6 +4,8 @@
- #include "Imlib_private.h"
- #include <setjmp.h>
- 
-+#define G_MAXINT ((int) 0x7fffffff)
-+
- /*      Split the ID - damages input    */
- 
- static char        *
-@@ -41,13 +43,17 @@
- 
- /*
-  *     Make sure we don't wrap on our memory allocations
-+ *     we check G_MAXINT/4 because rend.c malloc's w * h * bpp
-+ *     + 3 is safety margin
-  */
- 
- void * _imlib_malloc_image(unsigned int w, unsigned int h)
- {
--       if( w > 32767 || h > 32767)
--               return NULL;
--       return malloc(w * h * 3);
-+       if (w <= 0 || w > 32767 ||
-+           h <= 0 || h > 32767 ||
-+           h >= (G_MAXINT/4 - 1) / w)
-+                return NULL;
-+       return malloc(w * h * 3 + 3);
- }
- 
- #ifdef HAVE_LIBJPEG
-@@ -360,7 +366,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-        TIFFClose(tif);
-        return NULL;
-@@ -463,7 +471,7 @@
- 	    }
- 	  *w = gif->Image.Width;
- 	  *h = gif->Image.Height;
--	  if (*h > 32767 || *w > 32767)
-+	  if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
- 	    {
- 	       return NULL;
- 	    }
-@@ -965,7 +973,12 @@
-   comment = 0;
-   quote = 0;
-   context = 0;
-+  memset(lookup, 0, sizeof(lookup));
-+
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -994,25 +1007,25 @@
- 		{
- 		  /* Header */
- 		  sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--                  if (ncolors > 32766)
-+                  if (ncolors <= 0 || ncolors > 32766)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (cpp > 5)
-+		  if (cpp <= 0 || cpp > 5)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*w > 32767)
-+		  if (*w <= 0 || *w > 32767)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*h > 32767)
-+		  if (*h <= 0 || *h > 32767)
- 		    {
- 		      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
- 		      free(line);
-@@ -1045,11 +1058,13 @@
- 		    {
- 		      int                 slen;
- 		      int                 hascolor, iscolor;
-+		      int                 space;
- 
- 		      iscolor = 0;
- 		      hascolor = 0;
- 		      tok[0] = 0;
- 		      col[0] = 0;
-+		      space = sizeof(col) - 1;
- 		      s[0] = 0;
- 		      len = strlen(line);
- 		      strncpy(cmap[j].str, line, cpp);
-@@ -1072,10 +1087,10 @@
- 				{
- 				  if (k >= len)
- 				    {
--				      if (col[0])
--					strcat(col, " ");
--                                      if (strlen(col) + strlen(s) < sizeof(col))
--					strcat(col, s);
-+				      if (col[0] && space > 0)
-+					strcat(col, " "), space -= 1;
-+                                      if (slen <= space)
-+					strcat(col, s), space -= slen;
- 				    }
- 				  if (col[0])
- 				    {
-@@ -1105,14 +1120,17 @@
- 					    }
- 					}
- 				    }
--				  strcpy(tok, s);
-+				  if (slen < sizeof(tok));
-+				    strcpy(tok, s);
- 				  col[0] = 0;
-+				  space = sizeof(col) - 1;
- 				}
- 			      else
- 				{
--				  if (col[0])
--				    strcat(col, " ");
--				  strcat(col, s);
-+				  if (col[0] && space > 0)
-+				    strcat(col, " "), space -=1;
-+				  if (slen <= space)
-+				    strcat(col, s), space -= slen;
- 				}
- 			    }
- 			}
-@@ -1341,12 +1359,12 @@
- 	  sscanf(s, "%i %i", w, h);
- 	  a = *w;
- 	  b = *h;
--	  if (a > 32767)
-+	  if (a <= 0 || a > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
- 	      return NULL;
- 	    }
--	  if (b > 32767)
-+	  if (b <= 0 || b > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
- 	      return NULL;
-diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c
---- imlib-1.9.13.orig/Imlib/utils.c	Mon Mar  4 17:45:28 2002
-+++ imlib-1.9.13/Imlib/utils.c	Thu Sep 16 17:21:15 2004
-@@ -1496,36 +1496,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+	break;
-+      line = strdup(line);
-+      if (!line)
-+	break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+	{
-+	  c = line[i];
-+	  if (c < 32)
-+	    line[i] = 32;
-+	  else if (c > 127)
-+	    line[i] = 127;
-+	}
-+
-       if (context == 0)
- 	{
- 	  /* Header */
- 	  sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--	  if (ncolors > 32766)
-+	  if (ncolors <= 0 || ncolors > 32766)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (cpp > 5)
-+	  if (cpp <= 0 || cpp > 5)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (w > 32767)
-+	  if (w <= 0 || w > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (h > 32767)
-+	  if (h <= 0 || h > 32767)
- 	    {
- 	      fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1533,6 +1553,7 @@
- 	  if (!cmap)
- 	    {
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->rgb_width = w;
-@@ -1542,6 +1563,7 @@
- 	    {
- 	      free(cmap);
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->alpha_data = NULL;
-@@ -1817,6 +1839,7 @@
- 	}
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
- 	done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c
---- imlib-1.9.13.orig/gdk_imlib/io-gif.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-gif.c	Thu Sep 16 16:11:31 2004
-@@ -55,7 +55,7 @@
- 	    }
- 	  *w = gif->Image.Width;
- 	  *h = gif->Image.Height;
--	  if(*h > 32767 || *w > 32767)
-+	  if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
- 	    {
- 	      return NULL;
- 	    }
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c
---- imlib-1.9.13.orig/gdk_imlib/io-ppm.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-ppm.c	Thu Sep 16 16:13:13 2004
-@@ -53,12 +53,12 @@
- 	  sscanf(s, "%i %i", w, h);
- 	  a = *w;
- 	  b = *h;
--	  if (a > 32767)
-+	  if (a <= 0 || a > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
- 	      return NULL;
- 	    }
--	  if (b > 32767)
-+	  if (b <= 0 || b > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
- 	      return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c
---- imlib-1.9.13.orig/gdk_imlib/io-tiff.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-tiff.c	Thu Sep 16 16:13:57 2004
-@@ -36,7 +36,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-       TIFFClose(tif);
-       return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c
---- imlib-1.9.13.orig/gdk_imlib/io-xpm.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-xpm.c	Thu Sep 16 17:08:24 2004
-@@ -40,8 +40,12 @@
-   context = 0;
-   i = j = 0;
-   cmap = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -70,25 +74,25 @@
- 		{
- 		  /* Header */
- 		  sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--		  if (ncolors > 32766)
-+		  if (ncolors <= 0 || ncolors > 32766)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (cpp > 5)
-+		  if (cpp <= 0 || cpp > 5)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*w > 32767)
-+		  if (*w <= 0 || *w > 32767)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
- 		      free(line);
- 		      return NULL;
- 		    }
--		  if (*h > 32767)
-+		  if (*h <= 0 || *h > 32767)
- 		    {
- 		      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
- 		      free(line);
-@@ -120,11 +124,13 @@
- 		    {
- 		      int                 slen;
- 		      int                 hascolor, iscolor;
-+		      int                 space;
- 
- 		      hascolor = 0;
- 		      iscolor = 0;
- 		      tok[0] = 0;
- 		      col[0] = 0;
-+		      space = sizeof(col) - 1;
- 		      s[0] = 0;
- 		      len = strlen(line);
- 		      strncpy(cmap[j].str, line, cpp);
-@@ -147,10 +153,10 @@
- 				{
- 				  if (k >= len)
- 				    {
--				      if (col[0])
--					strcat(col, " ");
--				      if (strlen(col) + strlen(s) < sizeof(col))
--					strcat(col, s);
-+				      if (col[0] && space > 0)
-+					strncat(col, " ", space), space -= 1;
-+				      if (slen <= space)
-+					strcat(col, s), space -= slen;
- 				    }
- 				  if (col[0])
- 				    {
-@@ -180,14 +186,17 @@
- 					    }
- 					}
- 				    }
--				  strcpy(tok, s);
-+				  if (slen < sizeof(tok))
-+				    strcpy(tok, s);
- 				  col[0] = 0;
-+				  space = sizeof(col) - 1;
- 				}
- 			      else
- 				{
--				  if (col[0])
--				    strcat(col, " ");
--				  strcat(col, s);
-+				  if (col[0] && space > 0)
-+				    strcat(col, " "), space -= 1;
-+				  if (slen <= space)
-+				    strcat(col, s), space -= slen;
- 				}
- 			    }
- 			}
-diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c
---- imlib-1.9.13.orig/gdk_imlib/misc.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/misc.c	Thu Sep 16 16:35:32 2004
-@@ -1355,11 +1355,16 @@
- 
- /*
-  *	Make sure we don't wrap on our memory allocations
-+ *	we check G_MAX_INT/4 because rend.c malloc's w * h * bpp
-+ *	+ 3 is safety margin
-  */
- 
- void *_gdk_malloc_image(unsigned int w, unsigned int h)
- {
--	if( w > 32767 || h > 32767)
-+	if (w <= 0 || w > 32767 ||
-+	    h <= 0 || h > 32767 ||
-+	    h >= (G_MAXINT/4 - 1) / w)
- 		return NULL;
--	return malloc(w * h * 3);
-+	return malloc(w * h * 3 + 3);
- }
-+
-diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c
---- imlib-1.9.13.orig/gdk_imlib/utils.c	Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/utils.c	Thu Sep 16 17:28:35 2004
-@@ -1236,36 +1236,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+	break;
-+      line = strdup(line);
-+      if (!line)
-+	break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+        {
-+	  c = line[i];
-+	  if (c < 32)
-+	    line[i] = 32;
-+	  else if (c > 127)
-+	    line[i] = 127;
-+	}
-+
-       if (context == 0)
- 	{
- 	  /* Header */
- 	  sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--	  if (ncolors > 32766)
-+	  if (ncolors <= 0 || ncolors > 32766)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (cpp > 5)
-+	  if (cpp <= 0 || cpp > 5)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (w > 32767)
-+	  if (w <= 0 || w > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
--	  if (h > 32767)
-+	  if (h <= 0 || h > 32767)
- 	    {
- 	      fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n");
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1273,6 +1293,7 @@
- 	  if (!cmap)
- 	    {
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->rgb_width = w;
-@@ -1282,6 +1303,7 @@
- 	    {
- 	      free(cmap);
- 	      free(im);
-+	      free(line);
- 	      return NULL;
- 	    }
- 	  im->alpha_data = NULL;
-@@ -1355,7 +1377,7 @@
- 				  strcpy(col + colptr, " ");
- 				  colptr++;
- 				}
--			      if (colptr + ls <= sizeof(col))
-+			      if (colptr + ls < sizeof(col))
- 				{
- 				  strcpy(col + colptr, s);
- 				  colptr += ls;
-@@ -1558,6 +1580,7 @@
- 	}
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
- 	done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {
diff --git a/testing/imlib/PKGBUILD b/testing/imlib/PKGBUILD
deleted file mode 100644
index c705dbb45..000000000
--- a/testing/imlib/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 148165 2012-01-30 18:47:22Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=imlib
-pkgver=1.9.15
-pkgrel=11
-pkgdesc="General image handling library for X11 and Gtk"
-arch=('i686' 'x86_64')
-url="http://freshmeat.net/projects/imlib/"
-license=('GPL')
-depends=('gtk' 'giflib' 'libpng' 'libtiff')
-makedepends=('libxt')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
-        debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch)
-sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
-          'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
-          'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
-          'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
-          '33c3aaa43eb624f2a6ab0406285a8515903333e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/debian-bug448360.patch"
-  patch -p1 -i "${srcdir}/CAN-2004-1026.patch"
-  patch -p0 -i "${srcdir}/aclocal-fixes.patch"
-  patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch"
-  sed '/AC_PATH_XTRA/d' -i configure.in
-  libtoolize --force
-  cp /usr/bin/libtool .
-  autoreconf --force --install
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/imlib/aclocal-fixes.patch b/testing/imlib/aclocal-fixes.patch
deleted file mode 100644
index 04ef737e7..000000000
--- a/testing/imlib/aclocal-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- imlib.m4.orig	2006-03-05 12:41:14.000000000 +0000
-+++ imlib.m4	2006-03-05 12:44:15.000000000 +0000
-@@ -6,7 +6,7 @@
- dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
- dnl
--AC_DEFUN(AM_PATH_IMLIB,
-+AC_DEFUN([AM_PATH_IMLIB],
- [dnl 
- dnl Get the cflags and libraries from the imlib-config script
- dnl
-@@ -164,7 +164,7 @@
- ])
- 
- # Check for gdk-imlib
--AC_DEFUN(AM_PATH_GDK_IMLIB,
-+AC_DEFUN([AM_PATH_GDK_IMLIB],
- [dnl 
- dnl Get the cflags and libraries from the imlib-config script
- dnl
diff --git a/testing/imlib/debian-bug448360.patch b/testing/imlib/debian-bug448360.patch
deleted file mode 100644
index f1c0ef111..000000000
--- a/testing/imlib/debian-bug448360.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c
---- imlib-1.9.15.orig/gdk_imlib/misc.c	2002-03-04 18:06:32.000000000 +0100
-+++ imlib-1.9.15/gdk_imlib/misc.c	2007-10-28 14:00:04.000000000 +0100
-@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams
-   visual = gdk_rgb_get_visual();
-   id->x.visual = GDK_VISUAL_XVISUAL(visual);	/* the visual type */
-   id->x.depth = visual->depth;	/* the depth of the screen in bpp */
-+
-+  id->x.shm = 0;
-+  id->x.shmp = 0;
-+  id->max_shm = 0;
- #ifdef HAVE_SHM
-   if (XShmQueryExtension(id->x.disp))
-     {
-@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams
- 	      id->x.last_xim = NULL;
- 	      id->x.last_sxim = NULL;
- 	      id->max_shm = 0x7fffffff;
--	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
-+	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap) &&
-+		  (pm == True))
- 		id->x.shmp = 1;
- 	    }
- 	}
-     }
--  else
- #endif
--    {
--      id->x.shm = 0;
--      id->x.shmp = 0;
--    }
-+
-   id->cache.on_image = 0;
-   id->cache.size_image = 0;
-   id->cache.num_image = 0;
-@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams
- 	}
-       if (p->flags & PARAMS_SHAREDPIXMAPS)
- 	{
--	  if (id->x.shm)
--	    id->x.shmp = p->sharedpixmaps;
-+	  if (!p->sharedpixmaps)
-+	    id->x.shmp = 0;
- 	}
-       if (p->flags & PARAMS_PALETTEOVERRIDE)
- 	override = p->paletteoverride;
-diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c
---- imlib-1.9.15.orig/Imlib/misc.c	2004-09-21 02:22:59.000000000 +0200
-+++ imlib-1.9.15/Imlib/misc.c	2007-10-28 14:00:23.000000000 +0100
-@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I
-   id->x.root = DefaultRootWindow(disp);		/* the root window id */
-   id->x.visual = DefaultVisual(disp, id->x.screen);	/* the visual type */
-   id->x.depth = DefaultDepth(disp, id->x.screen);	/* the depth of the screen in bpp */
-+
-+  id->x.shm = 0;
-+  id->x.shmp = 0;
-+  id->max_shm = 0;
- #ifdef HAVE_SHM
-   if (XShmQueryExtension(id->x.disp))
-     {
-@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I
- 	      id->x.last_xim = NULL;
- 	      id->x.last_sxim = NULL;
- 	      id->max_shm = 0x7fffffff;
--	      if (XShmPixmapFormat(id->x.disp) == ZPixmap)
-+	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap &&
-+		   (pm == True)))
- 		id->x.shmp = 1;
- 	    }
- 	}
-     }
--  else
- #endif
--    {
--      id->x.shm = 0;
--      id->x.shmp = 0;
--    }
-+
-   id->cache.on_image = 0;
-   id->cache.size_image = 0;
-   id->cache.num_image = 0;
-@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I
- 	}
-       if (p->flags & PARAMS_SHAREDPIXMAPS)
- 	{
--	  if (id->x.shm)
--	    id->x.shmp = p->sharedpixmaps;
-+	  if (!p->sharedpixmaps)
-+	    id->x.shmp = 0;
- 	}
-       if (p->flags & PARAMS_PALETTEOVERRIDE)
- 	override = p->paletteoverride;
diff --git a/testing/imlib/imlib-1.9.15-libpng15.patch b/testing/imlib/imlib-1.9.15-libpng15.patch
deleted file mode 100644
index 7837cd488..000000000
--- a/testing/imlib/imlib-1.9.15-libpng15.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- gdk_imlib/io-png.c
-+++ gdk_imlib/io-png.c
-@@ -40,13 +40,13 @@
-       return NULL;
-     }
- 
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
- 
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -275,13 +275,13 @@
-       return NULL;
-     }
-   
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
-   
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -301,6 +301,9 @@
-   /* Setup Translators */
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-     png_set_expand(png_ptr);
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-+    png_set_expand(png_ptr);
-+
-   png_set_strip_16(png_ptr);
-   png_set_packing(png_ptr);
-   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
-@@ -440,13 +443,13 @@
- 		return NULL;
- 	}
- 	
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		return NULL;
- 	}
- 	
--	if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		return NULL;
-@@ -635,7 +638,7 @@
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	      return 0;
- 	    }
--	  if (setjmp(png_ptr->jmpbuf))
-+	  if (setjmp(png_jmpbuf(png_ptr)))
- 	    {
- 	      fclose(f);
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
---- Imlib/load.c
-+++ Imlib/load.c
-@@ -197,12 +197,12 @@
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-@@ -260,7 +260,8 @@
-   png_read_image(png_ptr, lines);
-   png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-   ptr = data;
--  if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+  if (color_type == PNG_COLOR_TYPE_GRAY
-+      || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-       for (y = 0; y < *h; y++)
- 	{
-@@ -285,6 +286,7 @@
- 	    }
- 	}
-     }
-+#if 0
-   else if (color_type == PNG_COLOR_TYPE_GRAY)
-     {
-       for (y = 0; y < *h; y++)
-@@ -300,6 +302,7 @@
- 	    }
- 	}
-     }
-+#endif
-   else
-     {
-       for (y = 0; y < *h; y++)
---- Imlib/save.c
-+++ Imlib/save.c
-@@ -342,7 +342,7 @@
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	      return 0;
- 	    }
--	  if (setjmp(png_ptr->jmpbuf))
-+	  if (setjmp(png_jmpbuf(png_ptr)))
- 	    {
- 	      fclose(f);
- 	      png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
---- Imlib/utils.c
-+++ Imlib/utils.c
-@@ -1981,14 +1981,13 @@
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  
--  if (setjmp(png_ptr->jmpbuf))
-+  if (setjmp(png_jmpbuf(png_ptr)))  
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
-     }
-   
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/testing/imlib2/PKGBUILD b/testing/imlib2/PKGBUILD
deleted file mode 100644
index b9f697c09..000000000
--- a/testing/imlib2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 148167 2012-01-30 18:47:24Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Arjan Timmerman <arjan.archlinux.org>
-# Contributor: Tom Newsom <Jeepster.gmx.co.uk>
-
-pkgname=imlib2
-pkgver=1.4.5
-pkgrel=2
-pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
-url="http://sourceforge.net/projects/enlightenment/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2")
-sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # disable optimizations, they cause problems (e.g. FS#12268)
-  [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx"
-  [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64"
-
-  # Configure and Build
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/imlib2 \
-              --x-libraries=/usr/lib $EXTRAOPTS
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # Install License
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD
deleted file mode 100644
index 68a352f95..000000000
--- a/testing/inkscape/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 148169 2012-01-30 18:47:27Z ibiru $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.2
-pkgrel=6
-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' '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'
-            'pyxml: some extensions'
-            'uniconvertor: reading/writing to some proprietary formats')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'libpng15.patch')
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3'
-          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
-	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
-	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
-	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
-	sed -i 's|"python"|"python2"|g' src/main.cpp
-
-	patch -p1 -i ../libpng15.patch
-
-	./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/testing/inkscape/install b/testing/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/testing/inkscape/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/testing/inkscape/libpng15.patch b/testing/inkscape/libpng15.patch
deleted file mode 100644
index e24913ed6..000000000
--- a/testing/inkscape/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
-+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1443,7 +1443,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
---- inkscape-0.48.1/src/helper/png-write.cpp
-+++ inkscape-0.48.1-mod//src/helper/png-write.cpp
-@@ -165,7 +165,7 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
---- inkscape-0.48.1/src/sp-image.cpp
-+++ inkscape-0.48.1-mod//src/sp-image.cpp
-@@ -386,9 +386,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD
deleted file mode 100644
index 12f9c6c80..000000000
--- a/testing/isl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 148582 2012-02-04 00:03:38Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=isl
-pkgver=0.09
-pkgrel=1
-pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
-arch=('i686' 'x86_64')
-url="http://www.kotnet.org/~skimo/isl/"
-license=('LGPL2.1')
-options=('!libtool')
-source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('6873f0b3c9f4d1fb8efae4aea53f2ab2')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 DESTDIR="$pkgdir/" install
-  
-  # this seems a better place for this file...
-  install -dm755 $pkgdir/usr/share/gdb/auto-load/
-  mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.9.0.0-gdb.py
-}
diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
deleted file mode 100644
index c28a67688..000000000
--- a/testing/iw/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 149342 2012-02-06 21:31:23Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=iw
-pkgver=3.3
-pkgrel=1
-pkgdesc="nl80211 based CLI configuration utility for wireless devices"
-arch=("i686" "x86_64")
-url="http://wireless.kernel.org/en/users/Documentation/iw"
-license=("GPL")
-depends=("libnl")
-makedepends=("kernel-headers")
-source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD
deleted file mode 100644
index e2e70cd57..000000000
--- a/testing/java7-openjdk/PKGBUILD
+++ /dev/null
@@ -1,346 +0,0 @@
-# $Id: PKGBUILD 148171 2012-01-30 18:47:32Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
-
-pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') 
- # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
-pkgbase=java7-openjdk
-_java_ver=7
-_openjdk_build=b147
-_openjdk_date=27_jun_2011
-_icedtea_ver=2.0
-_date=20110922
-
-# check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=4d9e4fb8af09
-_HOTSPOT_CHANGESET=b28ae681bae0
-_JAXP_CHANGESET=948e734135ea
-_JAXWS_CHANGESET=a2ebfdc9db7e
-_JDK_CHANGESET=2054526dd141
-_LANGTOOLS_CHANGESET=9b85f1265346
-_OPENJDK_CHANGESET=0a76e5390e68
-
-_bootstrap=0 # 0/1 for quick build or full bootstrap
-
-pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=6
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org"
-license=('custom')
-options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
-             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`?
-[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
-
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-        ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
-        ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
-        ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
-        ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz					# jaxws.tar.gz
-        ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz						# jdk.tar.gz
-        ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
-        ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
-        fontconfig-paths.diff
-        fix_corba_cmds_path.diff
-        openjdk7_fix_jdk_cmds_path.diff
-        openjdk7_nonreparenting-wm.diff
-        jdk7-openjdk.profile
-        jdk7-openjdk.profile.csh
-        jre7-openjdk.profile
-        jre7-openjdk.profile.csh
-        glibc2_15.diff)
-md5sums=('752721a037a625001fad7a5fc2013f60'
-         '4c34ddf70124ea90c79201c1afede3e3'
-         '8f8d222d0a6d363d06b40576da5f1ea2'
-         '4abf34372e34cccd74ad337e487ed790'
-         'f2f40590a83889b8aa1d4631b705092d'
-         'd3beed0118bbd93d4651af762eb748c7'
-         'c8617700b4bd6cd5de1257bc36509bed'
-         'f10b711b0c784df8707808d9d0f52abd'
-         'ee1afda124d5927345014ab382ef581e'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'c195c4865b84d9e2e0fd71ac6d88eadb'
-         '203640d6e79e41b0065e016818c17ccd'
-         'b7b8996448c7b4fa7dd2d744488ed3bd'
-         'cdabafad0ec413d9a983888bf445a443'
-         '612b0fec7e0943c37a6de77c43622007'
-         '62443459da0cb28181feb260dc0e5ce7'
-         'a4293acadff03bdccbc9b412ad288549')
-
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
-           "${_CORBA_CHANGESET}.tar.gz"
-           "${_JAXP_CHANGESET}.tar.gz"
-           "${_JAXWS_CHANGESET}.tar.gz"
-           "${_JDK_CHANGESET}.tar.gz"
-           "${_LANGTOOLS_CHANGESET}.tar.gz"
-           "${_HOTSPOT_CHANGESET}.tar.gz")
-
-  _jvmdir=/usr/lib/jvm/java-7-openjdk
-  
-  [ "$CARCH" = "x86_64" ] && _JARCH=amd64
-  [ "$CARCH" = "i686" ] && _JARCH=i386
-  
-build() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-
-  unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-  
-  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
-  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
-  
-  unset MAKEFLAGS # parallel build is currently broken 
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-
-  . /etc/profile.d/apache-ant.sh
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/glibc2_15.diff"
-
-  if [ "$_bootstrap" = "1" ]; then
-     BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
-   else 
-     BOOTSTRAPOPT="--disable-bootstrap"
-  fi
-
-  ./configure \
-	$BOOTSTRAPOPT \
-        --with-parallel-jobs="${MAKEFLAGS/-j}" \
-        --disable-tests \
-        --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
-        --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
-        --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
-        --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
-        --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \
-        --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
-        --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
-        --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
-        --enable-pulse-java \
-        --enable-nss \
-        --with-rhino
-	#--help
-
-#     --enable-systemtap      Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed
-  
-  make
-}
-
-check() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-  make -k check
-}
-
-package_jre7-openjdk-headless() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs"
-  depends=('libjpeg-turbo' 'lcms2' 'nss'
-           'ca-certificates-java' 'rhino')
-  optdepends=('libcups: needed for Java Mauve support - libmawt.so'
-              'fontconfig: needed for Java Mauve support - libmawt.so')
-  provides=('java-runtime=7')
-  conflicts=('java-runtime' 'openjdk6')
-  #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
-  backup=(etc/profile.d/jre.sh
-          etc/profile.d/jre.csh
-          etc/java-7-openjdk/calendars.properties
-          etc/java-7-openjdk/content-types.properties
-          etc/java-7-openjdk/cursors/cursors.properties
-          etc/java-7-openjdk/flavormap.properties
-          etc/java-7-openjdk/fontconfig.bfc
-          etc/java-7-openjdk/fontconfig.properties
-          etc/java-7-openjdk/jvm.cfg
-          etc/java-7-openjdk/logging.properties
-          etc/java-7-openjdk/management/jmxremote.access
-          etc/java-7-openjdk/management/jmxremote.password
-          etc/java-7-openjdk/management/management.properties
-          etc/java-7-openjdk/management/snmp.acl
-          etc/java-7-openjdk/net.properties
-          etc/java-7-openjdk/psfont.properties.ja
-          etc/java-7-openjdk/psfontj2d.properties
-          etc/java-7-openjdk/security/java.policy
-          etc/java-7-openjdk/security/java.security
-          etc/java-7-openjdk/security/nss.cfg
-          etc/java-7-openjdk/sound.properties
-          etc/java-7-openjdk/tz.properties)
-  install=jre7-openjdk-headless.install
-
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
-  mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties
-  mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc
-  rm -f lib/fontconfig.*.bfc
-  rm -f lib/fontconfig.*.properties.src 
-  rm -f lib/fontconfig.properties.src
-
-  install -d -m755 ${pkgdir}/${_jvmdir}/jre/
-  cp -a bin lib ${pkgdir}/${_jvmdir}/jre
-
-  # Install man pages
-  pushd ../../j2re-image/man
-  install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/
-  install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1
-  install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1
-  popd
-
-  # more files that belong to the desktop package
-  mkdir ${srcdir}/tmp-desktop-jre
-  for file in \
-	"/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \
-	"/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \
-	"/usr/share/man/ja/man1/policytool.1" \
-	"/usr/share/man/man1/policytool.1"; do
-     dirname=`dirname $file`
-     install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true
-     # mv file from fakeinstall to pkgdir
-     mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file
-  done
-  rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt
-
-  # Link binaries into /usr/bin
-  pushd ${pkgdir}/${_jvmdir}/jre/bin
-  install -m755 -d ${pkgdir}/usr/bin/
-  for file in *; do
-    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
-  done
-  popd
-
-  # Link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
-
-  # Set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d/
-  install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh
-  install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh
-
-  # Install license
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
-  install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
-                 ${pkgdir}/usr/share/licenses/${pkgbase}
-		 
-  # Put some more files under backup control
-  install -m755 -d ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/
-  # install dummy links to make them found by JAVA
-  cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/
-  for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do
-    ln -vsf /etc/java-7-openjdk/`basename $file` .
-  done
-  # some more
-  install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security}
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/
-    ln -vsf /etc/java-7-openjdk/cursors/cursors.properties .
-  popd
-  mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password
-  mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management
-    ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} .
-  popd
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security
-    ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} .
-  popd
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/
-  pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/
-     ln -vsf /etc/java-7-openjdk/jvm.cfg .
-  popd
-}
-	 
-package_jre7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs"
-  depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
-  optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
-             'alsa-lib: for basic sound support'
-             'giflib: for gif format support'
-             'libpulse: for advanced sound support'
-             'gtk2: for the Gtk+ look and feel - desktop usage')
-  install=jre7-openjdk.install
-  conflicts=('openjdk6')
-  
-  mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
-  # Link binaries into /usr/bin
-  pushd ${pkgdir}/${_jvmdir}/jre/bin
-  install -m755 -d ${pkgdir}/usr/bin/
-  for file in *; do
-    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
-  done
-  popd
-  
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
-  # Install icons and menu entries
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
-    install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-                  ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
-  done
-  
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-}
-
-package_jdk7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
-  depends=('jre7-openjdk')
-  provides=('java-environment=7')
-  conflicts=('java-environment')
-  #  replaces=('openjdk6')
-  backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
-
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
-
-  # Main files
-  install -m755 -d ${pkgdir}/${_jvmdir}/
-
-  cp -a demo include lib sample ${pkgdir}/${_jvmdir}
-
-  # 'bin' files
-  pushd bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \
-                   ${pkgdir}/usr/bin/ \
-                   ${pkgdir}/usr/share/man/{,ja/}man1/
-
-  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
-  for b in $(ls | grep -v java-rmi.cgi); do
-    if [ -e ../jre/bin/${b} ]; then
-      # Provide a link of the jre binary in the jdk/bin/ directory
-      ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b}
-    else
-      # Copy binary to jdk/bin/
-      install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b}
-      # Copy man page
-      install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
-      install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
-      # Link from /bin/
-      ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
-    fi
-  done
-  popd
-
-  # Handling 'java-rmi.cgi' separately
-  install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
-
-  # Set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d/
-  install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
-  install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
-}
-
-package_openjdk7-src() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
-  install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
-             ${pkgdir}/${_jvmdir}/src.zip
-}
diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff
deleted file mode 100644
index 842657880..000000000
--- a/testing/java7-openjdk/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/testing/java7-openjdk/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/testing/java7-openjdk/glibc2_15.diff b/testing/java7-openjdk/glibc2_15.diff
deleted file mode 100644
index c2fd6124b..000000000
--- a/testing/java7-openjdk/glibc2_15.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid@redhat.com>
-
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -33,8 +33,6 @@
- #include "opto/subnode.hpp"
- 
- // Portions of code courtesy of Clifford Click
--
--#define MAXFLOAT        ((float)3.40282346638528860e+38)
- 
- // Classic Add functionality.  This covers all the usual 'add' behaviors for
- // an algebraic ring.  Add-integer, add-float, add-double, and binary-or are
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@ extern "C" {                            
-     if (env != xenv) {                                                   \
-       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
-     }                                                                    \
--    __ENTRY(result_type, header, thr)
-+    VM_ENTRY_BASE(result_type, header, thr)
- 
- 
- #define UNCHECKED() (unchecked_jni_NativeInterface)
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl	Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text
-     <xsl:value-of select="$space"/>
-     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
-     <xsl:value-of select="$space"/>
--    <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+    <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
-     <xsl:apply-templates select="." mode="functionid"/>
-     <xsl:text> , current_thread)</xsl:text>
-     <xsl:value-of select="$space"/>
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread 
-     // from native so as to resolve the jthread.
- 
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+    VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     oop thread_oop = JNIHandles::resolve_external_guard(thread);
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM 
-     JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
-     // transition code: native to VM
-     ThreadInVMfromNative __tiv(current_thread);
--    __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+    VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-     debug_only(VMNativeEntryWrapper __vew;)
- 
-     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp	Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj
-   }
- };
- 
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
- 
- 
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H
- 
- // LEAF routines do not lock, GC or throw exceptions
- 
--#define __LEAF(result_type, header)                                  \
-+#define VM_LEAF_BASE(result_type, header)                            \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   /* begin of body */
-@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H
- 
- // ENTRY routines may lock, GC and throw exceptions
- 
--#define __ENTRY(result_type, header, thread)                         \
-+#define VM_ENTRY_BASE(result_type, header, thread)                   \
-   TRACE_CALL(result_type, header)                                    \
-   HandleMarkCleaner __hm(thread);                                    \
-   Thread* THREAD = thread;                                           \
-@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H
- 
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
- 
--#define __QUICK_ENTRY(result_type, header, thread)                   \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread)             \
-   TRACE_CALL(result_type, header)                                    \
-   debug_only(NoHandleMark __hm;)                                     \
-   Thread* THREAD = thread;                                           \
-@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H
- #define IRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define IRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--    __LEAF(result_type, header)                                      \
-+    VM_LEAF_BASE(result_type, header)                                \
-     debug_only(No_Safepoint_Verifier __nspv(true);)
- 
- 
- #define IRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H
-   result_type header {                                               \
-     nmethodLocker _nmlock(nm);                                       \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- #define IRT_END }
- 
-@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H
- #define JRT_ENTRY(result_type, header)                               \
-   result_type header {                                               \
-     ThreadInVMfromJava __tiv(thread);                                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- 
- #define JRT_LEAF(result_type, header)                                \
-   result_type header {                                               \
--  __LEAF(result_type, header)                                        \
-+  VM_LEAF_BASE(result_type, header)                                  \
-   debug_only(JRT_Leaf_Verifier __jlv;)
- 
- 
- #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
-   result_type header {                                               \
-     ThreadInVMfromJavaNoAsyncException __tiv(thread);                \
--    __ENTRY(result_type, header, thread)                             \
-+    VM_ENTRY_BASE(result_type, header, thread)                       \
-     debug_only(VMEntryWrapper __vew;)
- 
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header)                         \
- extern "C" {                                                         \
-   result_type JNICALL header {                                \
-@@ -555,7 +555,7 @@ extern "C" {                            
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JNI_LEAF(result_type, header)                                \
-@@ -563,7 +563,7 @@ extern "C" {                            
-   result_type JNICALL header {                                \
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_ENTRY_NO_ENV(result_type, header)                        \
-@@ -588,7 +588,7 @@ extern "C" {                            
-     JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();  \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __ENTRY(result_type, header, thread)
-+    VM_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_QUICK_ENTRY(result_type, header)                         \
-@@ -597,14 +597,14 @@ extern "C" {                            
-     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-     ThreadInVMfromNative __tiv(thread);                              \
-     debug_only(VMNativeEntryWrapper __vew;)                          \
--    __QUICK_ENTRY(result_type, header, thread)
-+    VM_QUICK_ENTRY_BASE(result_type, header, thread)
- 
- 
- #define JVM_LEAF(result_type, header)                                \
- extern "C" {                                                         \
-   result_type JNICALL header {                                       \
-     VM_Exit::block_if_vm_exited();                                   \
--    __LEAF(result_type, header)
-+    VM_LEAF_BASE(result_type, header)
- 
- 
- #define JVM_END } }
-
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile
deleted file mode 100644
index 91265cc86..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7.sh
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh
deleted file mode 100644
index cc7dc8ab1..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
diff --git a/testing/java7-openjdk/jre7-openjdk-headless.install b/testing/java7-openjdk/jre7-openjdk-headless.install
deleted file mode 100644
index 45f52fe32..000000000
--- a/testing/java7-openjdk/jre7-openjdk-headless.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-}
-
-post_upgrade() {
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-}
-
-#post_remove() {
-#
-#}
diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install
deleted file mode 100644
index d98e79ec5..000000000
--- a/testing/java7-openjdk/jre7-openjdk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/jre.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile
deleted file mode 100644
index c86ce857a..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
-export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh
deleted file mode 100644
index a9aed27d1..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
deleted file mode 100644
index c68bd4441..000000000
--- a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2011-08-06 15:46:01.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2011-08-06 15:59:26.000000000 +0200
-@@ -91,10 +91,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -141,7 +141,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
deleted file mode 100644
index ba1a588e1..000000000
--- a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2011-08-07 18:45:05.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2011-08-07 18:45:54.000000000 +0200
-@@ -102,7 +102,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -576,7 +577,7 @@
-     // TODO: according to wikipedia, compiz is now reparenting. This should
-     // probably be updated.
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -762,9 +763,17 @@
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             }
-             /*
-              * Check for legacy WMs.
-@@ -775,6 +784,8 @@
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1289,6 +1300,7 @@
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD
deleted file mode 100644
index bbd13b4fd..000000000
--- a/testing/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 148173 2012-01-30 18:47:35Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.8.0
-pkgrel=2
-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' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-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' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          'e4198a443703f749b58a4fec88362fced1b45789'
-          '264e395c2c44cdda5a242c6dee649afab44cd6e5'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
-
-build() {
-	cd "${srcdir}"/${_pkgname}-${pkgver}
-	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=ON \
-        -DKWIN_BUILD_WITH_OPENGLES=ON \
-        -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/testing/kdebase-workspace/fixpath.patch b/testing/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/testing/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/testing/kdebase-workspace/kde-np.pam b/testing/kdebase-workspace/kde-np.pam
deleted file mode 100644
index dfedb8edf..000000000
--- a/testing/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,8 +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
--session    optional    pam_systemd.so
diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam
deleted file mode 100644
index 9ec074d06..000000000
--- a/testing/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +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
--session    optional    pam_systemd.so
diff --git a/testing/kdebase-workspace/kdebase-workspace.install b/testing/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/testing/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/testing/kdebase-workspace/kdm b/testing/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/testing/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/kdebase-workspace/kdm-xinitrd.patch b/testing/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/testing/kdebase-workspace/kdm-xinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
-+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
-@@ -742,6 +742,15 @@
- "[ -f /etc/xprofile ] && . /etc/xprofile\n"
- "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
- "\n"
-+"# run all system xinitrc shell scripts.\n"
-+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
-+"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
-+"  if [ -x \"$i\" ]; then\n"
-+"    . \"$i\"\n"
-+"  fi\n"
-+"  done\n"
-+"fi\n"
-+"\n"
- "if [ -d /etc/X11/Xresources ]; then\n"
- "  for i in /etc/X11/Xresources/*; do\n"
- "    [ -f $i ] && xrdb -merge $i\n"
diff --git a/testing/kdebase-workspace/kscreensaver.pam b/testing/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/testing/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/testing/kdebase-workspace/terminate-server.patch b/testing/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/testing/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/testing/kdegraphics-okular/PKGBUILD b/testing/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 8c266dff8..000000000
--- a/testing/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148175 2012-01-30 18:47:38Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.8.0
-pkgrel=2
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c')
-
-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/testing/kdegraphics-okular/kdegraphics-okular.install b/testing/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdegraphics-strigi-analyzer/PKGBUILD b/testing/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index f0b286c1a..000000000
--- a/testing/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148177 2012-01-30 18:47:40Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.8.0
-pkgrel=2
-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=('9c607105f30c13e83fac3430649696a19e1c4d7b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdelibs3/PKGBUILD b/testing/kdelibs3/PKGBUILD
deleted file mode 100644
index e370510ca..000000000
--- a/testing/kdelibs3/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 149659 2012-02-08 23:59:30Z allan $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kdelibs3
-pkgver=3.5.10
-pkgrel=13
-pkgdesc='KDE3 Core Libraries'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
-         'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
-optdepends=('hspell: for Hebrew spell-checking support')
-options=('libtool')
-install=kdelibs3.install
-source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2"
-        'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
-        'acinclude.patch'
-        'kde3.profile'
-        'kde4-compatibility.patch'
-        'kconf_updaterc'
-        'openssl.patch'
-        'kdelibs3-missing-include.patch')
-sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
-          'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
-          '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
-          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
-          '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
-          '35e56fe4c5f71685e64b13f448dcacc620166e06'
-          '50e92950498463defb9149ffcf8cbc2e8cd1063b'
-          'e5f5b8c060a2db9cedb82bf18caadfa869921779')
-
-build() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	. /etc/profile.d/qt3.sh
-	. "$srcdir"/kde3.profile
-
-	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
-	patch -p1 -i "$srcdir"/acinclude.patch
-	patch -p1 -i "$srcdir"/kde4-compatibility.patch
-	patch -p1 -i "${srcdir}"/openssl.patch
-	patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
-
-	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-	make -f admin/Makefile.common cvs
-
-	./configure --prefix=/opt/kde \
-		--with-distribution='Arch Linux' \
-		--with-alsa \
-		--disable-debug \
-		--disable-dnssd \
-		--disable-dnotify \
-		--enable-inotify \
-		--enable-sendfile \
-		--without-lua \
-		--with-hspell \
-		--enable-gcc-hidden-visibility \
-		--enable-final \
-		--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \
-		--without-arts \
-		--disable-libfam
-	make
-}
-
-package() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	make DESTDIR="$pkgdir" install
-
-	# disable broken kconf_update by default
-	install -D -m644 "$srcdir"/kconf_updaterc \
-      "$pkgdir"/opt/kde/share/config/kconf_updaterc
-
-	# install KDE3 profile
-	install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
-	# make KDE3 styles available to Qt3
-	install -d -m755 "$pkgdir"/opt/qt/plugins
-	ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles
-
-	# cert bundle seems to be hardcoded
-	# link it to the one from ca-certificates
-	rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-	ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-
-	# we don't have khelpcenter anyway
-	rm -rf "$pkgdir"/opt/kde/share/doc
-
-	install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-	echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
-}
diff --git a/testing/kdelibs3/acinclude.patch b/testing/kdelibs3/acinclude.patch
deleted file mode 100644
index 0610d6df5..000000000
--- a/testing/kdelibs3/acinclude.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-2009-12-10  Stepan Kasal  <skasal@redhat.com>
-
-The change of implementation of AC_REQUIRE in 2.64 caused a regression
-in the arts project.
-This can be fixed by shuffling some macro calls.
-
-I suppose that most of this patch will not be needed with a future
-release of Autoconf.
-But the last chunk of this patch is a real bug in this source and
-should go upstream.
-
---- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
-+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
-@@ -3081,8 +3081,18 @@
- fi
- ])
- 
-+AC_DEFUN([AC_CHECK_COMPILERS_CC],
-+[ 
-+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+  CFLAGS=" $CFLAGS"
-+  AC_PROG_CC
-+  CXXFLAGS=" $CXXFLAGS"
-+  AC_PROG_CXX
-+])
-+
- AC_DEFUN([AC_CHECK_COMPILERS],
- [
-+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
-   AC_ARG_ENABLE(debug,
- 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-   [
-@@ -3141,11 +3151,6 @@
-     [kde_use_profiling="no"]
-   )
- 
--  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
--  CFLAGS=" $CFLAGS"
--
--  AC_PROG_CC 
--
-   AC_PROG_CPP
- 
-   if test "$GCC" = "yes"; then
-@@ -3174,10 +3179,6 @@
-      LDFLAGS=""
-   fi
- 
--  CXXFLAGS=" $CXXFLAGS"
--
--  AC_PROG_CXX
--
-   KDE_CHECK_FOR_BAD_COMPILER
- 
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-@@ -3503,8 +3504,8 @@
- AC_REQUIRE([AC_LIBTOOL_DLOPEN])
- AC_REQUIRE([KDE_CHECK_LIB64])
- 
--AC_OBJEXT
--AC_EXEEXT
-+AC_REQUIRE([AC_OBJEXT])
-+AC_REQUIRE([AC_EXEEXT])
- 
- AM_PROG_LIBTOOL
- AC_LIBTOOL_CXX
diff --git a/testing/kdelibs3/kconf_updaterc b/testing/kdelibs3/kconf_updaterc
deleted file mode 100644
index 24c2623fb..000000000
--- a/testing/kdelibs3/kconf_updaterc
+++ /dev/null
@@ -1,2 +0,0 @@
-updateInfoAdded=false
-autoUpdateDisabled=true
diff --git a/testing/kdelibs3/kde3.profile b/testing/kdelibs3/kde3.profile
deleted file mode 100755
index ef09631ff..000000000
--- a/testing/kdelibs3/kde3.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export PATH=$PATH:/opt/kde/bin
-if [ ! -z $XDG_DATA_DIRS ]; then
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share
-else
-  export XDG_DATA_DIRS=/opt/kde/share
-fi
diff --git a/testing/kdelibs3/kde4-compatibility.patch b/testing/kdelibs3/kde4-compatibility.patch
deleted file mode 100644
index 129c314ae..000000000
--- a/testing/kdelibs3/kde4-compatibility.patch
+++ /dev/null
@@ -1,1012 +0,0 @@
-diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp
---- kdelibs-3.5.10/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
-+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp	2009-08-06 06:18:06.000000000 +0200
-@@ -158,7 +158,7 @@
-           int i = 0;
- 
-           // argument 0 has to be drkonqi
--          argv[i++] = "drkonqi";
-+          argv[i++] = "/usr/lib/kde4/libexec/drkonqi";
- 
- #if defined Q_WS_X11
-           // start up on the correct display
-@@ -325,7 +325,7 @@
-       _exit(253);
-     if(!geteuid() && setuid(getuid()) < 0)
-       _exit(253);
--    execvp("drkonqi", const_cast< char** >( argv ));
-+    execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv ));
-     _exit(errno);
-   }
-   else
-diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am
---- kdelibs-3.5.10/kded/Makefile.am	2005-10-10 17:06:29.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.am	2009-08-06 06:21:37.000000000 +0200
-@@ -58,7 +58,7 @@
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
- 
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- 
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
-diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in
---- kdelibs-3.5.10/kded/Makefile.in	2008-08-20 18:05:57.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.in	2009-08-06 06:22:19.000000000 +0200
-@@ -535,7 +535,7 @@
- 
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
- #>- all: all-am
-@@ -1173,7 +1173,7 @@
- 	-rm -f  kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc
- 
- #>+ 2
--KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
-+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
- 
- #>+ 2
- docs-am:
-diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu
---- kdelibs-3.5.10/kded/applications.menu	2005-09-10 10:27:40.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/applications.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,469 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>Applications</Name>
--	<Directory>kde-main.directory</Directory>
--	<!-- Search the default locations -->
--	<KDELegacyDirs/>
--	<DefaultAppDirs/>
--	<DefaultDirectoryDirs/>
--	<DefaultLayout>
--		<Merge type="menus"/>
--		<Merge type="files"/>
--		<Separator/>
--		<Menuname>More</Menuname>
--	</DefaultLayout>
--	<Layout>
--		<Merge type="menus"/>
--		<Menuname>Applications</Menuname>
--		<Merge type="files"/>
--	</Layout>
--
--	<Menu>
--		<Name>Applications</Name>
--		<Directory>kde-unknown.directory</Directory>
--		<OnlyUnallocated/>
--		<Include>
--			<Not>
--				<!-- Don't list non-KDE core applications -->
--				<And>
--					<Category>Core</Category>
--					<Not><Category>KDE</Category></Not>
--				</And>
--				<!-- Don't list SUSE's YaST in here -->
--				<Category>X-SuSE-YaST</Category>
--			</Not>
--		</Include>
--	</Menu>
--       <Menu>
--                <Name>Development</Name>
--                <Directory>kde-development.directory</Directory>
--                <Menu>
--                        <Name>X-KDE-KDevelopIDE</Name>
--                        <Directory>kde-development-kdevelop.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Development</Category>
--                                <Category>X-KDE-KDevelopIDE</Category>
--                                </And>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>Translation</Name>
--			<Directory>kde-development-translation.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>Translation</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Web Development</Name>
--			<Directory>kde-development-webdevelopment.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>WebDevelopment</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Include>
--                        <And>
--                        <Category>Development</Category>
--                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
--                        <Not><Category>Translation</Category></Not>
--                        <Not><Category>WebDevelopment</Category></Not>
--                        </And>
--                </Include>
--        </Menu>
--	<Menu>
--		<Name>Science</Name>
--		<Directory>kde-science.directory</Directory>
--		<Include>
--			<And><!-- Include /any/ Science app which is not an Education app -->
--				<Or>
--					<Category>Astronomy</Category>
--					<Category>Biology</Category>
--					<Category>Chemistry</Category>
--					<Category>Geology</Category>
--					<Category>MedicalSoftware</Category>
--					<Category>Physics</Category>
--					<Category>Math</Category>
--					<Category>Science</Category>
--				</Or>
--				<Not><Category>Education</Category></Not>
--			</And>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Edutainment</Name>
--		<Directory>kde-edutainment.directory</Directory>
--		<Menu>
--			<Name>Languages</Name>
--			<Directory>kde-edu-languages.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Mathematics</Name>
--			<Directory>kde-edu-mathematics.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Math</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Miscellaneous</Name>
--			<Directory>kde-edu-miscellaneous.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Not>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				<Category>Math</Category>
--				<Category>Science</Category>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Not>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Science</Name>
--			<Directory>kde-edu-science.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Science</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Tools</Name>
--			<Directory>kde-edu-tools.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Games</Name>
--		<Directory>kde-games.directory</Directory>
--		<Menu>
--			<Name>Arcade</Name>
--			<Directory>kde-games-arcade.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>ArcadeGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Board</Name>
--			<Directory>kde-games-board.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>BoardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Card</Name>
--			<Directory>kde-games-card.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>CardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Kidsgames</Name>
--			<Directory>kde-games-kids.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Or>
--				<Category>X-KDE-KidsGame</Category>
--				<Category>KidsGame</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>TacticStrategy</Name>
--			<Directory>kde-games-strategy.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>StrategyGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Include>
--			<And>
--			<Category>Game</Category>
--			<Not>
--			<Category>ArcadeGame</Category>
--			<Category>BoardGame</Category>
--			<Category>CardGame</Category>
--			<Category>X-KDE-KidsGame</Category>
--			<Category>KidsGame</Category>
--			<Category>StrategyGame</Category>
--			</Not>
--			</And>
--		</Include>
--               <Menu>
--                        <Name>Toys</Name>
--                        <Directory>kde-toys.directory</Directory>
--                        <Include>
--                                 <Category>Amusement</Category>
--                        </Include>
--               </Menu>
--	</Menu>
--	<Menu>
--		<Name>Graphics</Name>
--		<Directory>kde-graphics.directory</Directory>
--		<Include>
--			<And>
--			<Category>Graphics</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Graphics</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Internet</Name>
--		<Directory>kde-internet.directory</Directory>
--		<Include>
--			<And>
--			<Category>Network</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--		  <Name>Terminal</Name>
--		  <Directory>kde-internet-terminal.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Network</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Multimedia</Name>
--		<Directory>kde-multimedia.directory</Directory>
--		<Include>
--			<And>
--			<Category>AudioVideo</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>AudioVideo</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Office</Name>
--		<Directory>kde-office.directory</Directory>
--		<Layout>
--			<Merge type="menus"/>
--			<Filename>kde-koshell.desktop</Filename>
--			<Filename>kde-Kontact.desktop</Filename>
--			<Separator/>
--			<Filename>kde-kword.desktop</Filename>
--			<Filename>kde-kspread.desktop</Filename>
--			<Filename>kde-kpresenter.desktop</Filename>
--			<Merge type="files"/>
--			<Separator/>
--			<Menuname>More</Menuname>
--		</Layout>
--		<Include>
--                        <And>
--			<Category>Office</Category>
--                        <Not><Category>X-KDE-More</Category></Not>
--                        </And>
--                </Include>
--                <Menu>
--                        <Name>More</Name>
--                        <Directory>kde-more.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Office</Category>
--                                <Category>X-KDE-More</Category>
--                                </And>
--                        </Include>
--                </Menu>
--	</Menu>
--	<Menu>
--		<Name>Settingsmenu</Name>
--		<Directory>kde-settingsmenu.directory</Directory>
--		<Include>
--			<Category>Settings</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>System</Name>
--		<Directory>kde-system.directory</Directory>
--		<Include>
--			<And>
--			<Category>System</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>System</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>ScreenSavers</Name>
--			<Directory>kde-system-screensavers.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>Terminal</Name>
--			<Directory>kde-system-terminal.directory</Directory>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Utilities</Name>
--		<Directory>kde-utilities.directory</Directory>
--		<Include>
--			<And>
--			<Category>Utility</Category>
--			<Not><Category>Accessibility</Category></Not>
--			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
--			<Not><Category>X-KDE-Utilities-File</Category></Not>
--			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
--			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>Accessibility</Name>
--			<Directory>kde-utilities-accessibility.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>Accessibility</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Desktop</Name>
--			<Directory>kde-utilities-desktop.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Desktop</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Menu>
--                        <Name>Editors</Name>
--                        <Directory>kde-editors.directory</Directory>
--                        <Include>
--                                <Category>TextEditor</Category>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>File</Name>
--			<Directory>kde-utilities-file.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-File</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Peripherals</Name>
--			<Directory>kde-utilities-peripherals.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Peripherals</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>PIM</Name>
--			<Directory>kde-utilities-pim.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-PIM</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>XUtilities</Name>
--			<Directory>kde-utilities-xutils.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Include>
--		<And>
--		<Category>KDE</Category>
--		<Category>Core</Category>
--		</And>
--	</Include>
--	<DefaultMergeDirs/>
--	<MergeFile>applications-kmenuedit.menu</MergeFile>
--</Menu>
-diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp
---- kdelibs-3.5.10/kded/kbuildsycoca.cpp	2007-05-14 09:52:43.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp	2009-08-06 06:23:48.000000000 +0200
-@@ -379,7 +379,7 @@
-      connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
-              this, SLOT(slotCreateEntry(const QString &, KService **)));
-              
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu
---- kdelibs-3.5.10/kded/kde-applications.menu	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-3.5.10.new/kded/kde-applications.menu	2005-09-10 10:27:40.000000000 +0200
-@@ -0,0 +1,469 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>Applications</Name>
-+	<Directory>kde-main.directory</Directory>
-+	<!-- Search the default locations -->
-+	<KDELegacyDirs/>
-+	<DefaultAppDirs/>
-+	<DefaultDirectoryDirs/>
-+	<DefaultLayout>
-+		<Merge type="menus"/>
-+		<Merge type="files"/>
-+		<Separator/>
-+		<Menuname>More</Menuname>
-+	</DefaultLayout>
-+	<Layout>
-+		<Merge type="menus"/>
-+		<Menuname>Applications</Menuname>
-+		<Merge type="files"/>
-+	</Layout>
-+
-+	<Menu>
-+		<Name>Applications</Name>
-+		<Directory>kde-unknown.directory</Directory>
-+		<OnlyUnallocated/>
-+		<Include>
-+			<Not>
-+				<!-- Don't list non-KDE core applications -->
-+				<And>
-+					<Category>Core</Category>
-+					<Not><Category>KDE</Category></Not>
-+				</And>
-+				<!-- Don't list SUSE's YaST in here -->
-+				<Category>X-SuSE-YaST</Category>
-+			</Not>
-+		</Include>
-+	</Menu>
-+       <Menu>
-+                <Name>Development</Name>
-+                <Directory>kde-development.directory</Directory>
-+                <Menu>
-+                        <Name>X-KDE-KDevelopIDE</Name>
-+                        <Directory>kde-development-kdevelop.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Development</Category>
-+                                <Category>X-KDE-KDevelopIDE</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>Translation</Name>
-+			<Directory>kde-development-translation.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>Translation</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Web Development</Name>
-+			<Directory>kde-development-webdevelopment.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>WebDevelopment</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Include>
-+                        <And>
-+                        <Category>Development</Category>
-+                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
-+                        <Not><Category>Translation</Category></Not>
-+                        <Not><Category>WebDevelopment</Category></Not>
-+                        </And>
-+                </Include>
-+        </Menu>
-+	<Menu>
-+		<Name>Science</Name>
-+		<Directory>kde-science.directory</Directory>
-+		<Include>
-+			<And><!-- Include /any/ Science app which is not an Education app -->
-+				<Or>
-+					<Category>Astronomy</Category>
-+					<Category>Biology</Category>
-+					<Category>Chemistry</Category>
-+					<Category>Geology</Category>
-+					<Category>MedicalSoftware</Category>
-+					<Category>Physics</Category>
-+					<Category>Math</Category>
-+					<Category>Science</Category>
-+				</Or>
-+				<Not><Category>Education</Category></Not>
-+			</And>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Edutainment</Name>
-+		<Directory>kde-edutainment.directory</Directory>
-+		<Menu>
-+			<Name>Languages</Name>
-+			<Directory>kde-edu-languages.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Mathematics</Name>
-+			<Directory>kde-edu-mathematics.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Math</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Miscellaneous</Name>
-+			<Directory>kde-edu-miscellaneous.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Not>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				<Category>Math</Category>
-+				<Category>Science</Category>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Not>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Science</Name>
-+			<Directory>kde-edu-science.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Science</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Tools</Name>
-+			<Directory>kde-edu-tools.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Games</Name>
-+		<Directory>kde-games.directory</Directory>
-+		<Menu>
-+			<Name>Arcade</Name>
-+			<Directory>kde-games-arcade.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>ArcadeGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Board</Name>
-+			<Directory>kde-games-board.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>BoardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Card</Name>
-+			<Directory>kde-games-card.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>CardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Kidsgames</Name>
-+			<Directory>kde-games-kids.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Or>
-+				<Category>X-KDE-KidsGame</Category>
-+				<Category>KidsGame</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>TacticStrategy</Name>
-+			<Directory>kde-games-strategy.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>StrategyGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Include>
-+			<And>
-+			<Category>Game</Category>
-+			<Not>
-+			<Category>ArcadeGame</Category>
-+			<Category>BoardGame</Category>
-+			<Category>CardGame</Category>
-+			<Category>X-KDE-KidsGame</Category>
-+			<Category>KidsGame</Category>
-+			<Category>StrategyGame</Category>
-+			</Not>
-+			</And>
-+		</Include>
-+               <Menu>
-+                        <Name>Toys</Name>
-+                        <Directory>kde-toys.directory</Directory>
-+                        <Include>
-+                                 <Category>Amusement</Category>
-+                        </Include>
-+               </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Graphics</Name>
-+		<Directory>kde-graphics.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Graphics</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Graphics</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Internet</Name>
-+		<Directory>kde-internet.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Network</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+		  <Name>Terminal</Name>
-+		  <Directory>kde-internet-terminal.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Network</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Multimedia</Name>
-+		<Directory>kde-multimedia.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>AudioVideo</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>AudioVideo</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Office</Name>
-+		<Directory>kde-office.directory</Directory>
-+		<Layout>
-+			<Merge type="menus"/>
-+			<Filename>kde-koshell.desktop</Filename>
-+			<Filename>kde-Kontact.desktop</Filename>
-+			<Separator/>
-+			<Filename>kde-kword.desktop</Filename>
-+			<Filename>kde-kspread.desktop</Filename>
-+			<Filename>kde-kpresenter.desktop</Filename>
-+			<Merge type="files"/>
-+			<Separator/>
-+			<Menuname>More</Menuname>
-+		</Layout>
-+		<Include>
-+                        <And>
-+			<Category>Office</Category>
-+                        <Not><Category>X-KDE-More</Category></Not>
-+                        </And>
-+                </Include>
-+                <Menu>
-+                        <Name>More</Name>
-+                        <Directory>kde-more.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Office</Category>
-+                                <Category>X-KDE-More</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Settingsmenu</Name>
-+		<Directory>kde-settingsmenu.directory</Directory>
-+		<Include>
-+			<Category>Settings</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>System</Name>
-+		<Directory>kde-system.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>System</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>System</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>ScreenSavers</Name>
-+			<Directory>kde-system-screensavers.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>Terminal</Name>
-+			<Directory>kde-system-terminal.directory</Directory>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Utilities</Name>
-+		<Directory>kde-utilities.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Utility</Category>
-+			<Not><Category>Accessibility</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-+			<Not><Category>X-KDE-Utilities-File</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-+			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>Accessibility</Name>
-+			<Directory>kde-utilities-accessibility.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>Accessibility</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Desktop</Name>
-+			<Directory>kde-utilities-desktop.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Desktop</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Menu>
-+                        <Name>Editors</Name>
-+                        <Directory>kde-editors.directory</Directory>
-+                        <Include>
-+                                <Category>TextEditor</Category>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>File</Name>
-+			<Directory>kde-utilities-file.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-File</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Peripherals</Name>
-+			<Directory>kde-utilities-peripherals.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Peripherals</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>PIM</Name>
-+			<Directory>kde-utilities-pim.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-PIM</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>XUtilities</Name>
-+			<Directory>kde-utilities-xutils.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Include>
-+		<And>
-+		<Category>KDE</Category>
-+		<Category>Core</Category>
-+		</And>
-+	</Include>
-+	<DefaultMergeDirs/>
-+	<MergeFile>applications-kmenuedit.menu</MergeFile>
-+</Menu>
diff --git a/testing/kdelibs3/kdelibs3-missing-include.patch b/testing/kdelibs3/kdelibs3-missing-include.patch
deleted file mode 100644
index 5b84ef746..000000000
--- a/testing/kdelibs3/kdelibs3-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdeprint/cups/cupsdconf2/cups-util.c.old	2012-01-19 01:30:26.000000000 -0500
-+++ kdeprint/cups/cupsdconf2/cups-util.c	2012-01-19 01:31:33.000000000 -0500
-@@ -2,6 +2,7 @@
- #include <cups/http.h>
- #include <cups/cups.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/testing/kdelibs3/kdelibs3.install b/testing/kdelibs3/kdelibs3.install
deleted file mode 100644
index 7291ac0a2..000000000
--- a/testing/kdelibs3/kdelibs3.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-}
diff --git a/testing/kdelibs3/openssl.patch b/testing/kdelibs3/openssl.patch
deleted file mode 100644
index a948b884a..000000000
--- a/testing/kdelibs3/openssl.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
-                                    const EVP_CIPHER *,unsigned char *,int ,
-                                             pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
-@@ -430,9 +435,14 @@ KConfig *cfg;
-       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
-       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
-       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
-       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
-       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
-       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
-       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
-       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
-       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -594,7 +604,7 @@ KConfig *cfg;
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
- 
- 
-@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
-    else return -1;
- }
- 
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+   else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
-    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
-    else return 0L;
-@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
-         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-    else return -1;
- }
--
-+#endif
- 
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
-    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
-@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
- 
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@ public:
-     */
-    int PEM_write_bio_X509(BIO *bp, X509 *x);
- 
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-    /*
-     *   X509_asn1_meth - used for netscape output
-     */
-    ASN1_METHOD *X509_asn1_meth();
--
-+#endif
- 
-    /*
-     *   ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@ public:
-     */
-    void sk_free(STACK *s);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /* 
-     *  Number of elements in the stack
-@@ -543,6 +549,9 @@ public:
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /* 
-     *  Create a new stack
-@@ -555,6 +564,9 @@ public:
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
- 
-    /* 
-     *  Duplicate the stack
-diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
- 
- 
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
--    STACK_OF(X509) *x509 = sk_new(NULL);
-+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
-     KSSLCertificate *cert = certs.first();
-     while(cert) {
- 	sk_X509_push(x509, cert->getCert());
-diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -1003,17 +1003,31 @@ return qba;
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	NETSCAPE_X509 nx;
-+	ASN1_OCTET_STRING hdr;
-+#else
-+   ASN1_HEADER ah;
-+   ASN1_OCTET_STRING os;
-+#endif
-+	KTempFile ktf;
- 
--	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
--	os.length = strlen(NETSCAPE_CERT_HDR);
--	ah.header = &os;
--	ah.data = (char *)getCert();
--	ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+	hdr.length = strlen(NETSCAPE_CERT_HDR);
-+	nx.header = &hdr;
-+	nx.cert = getCert();
-+
-+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+   os.length = strlen(NETSCAPE_CERT_HDR);
-+   ah.header = &os;
-+   ah.data = (char *)getCert();
-+   ah.meth = d->kossl->X509_asn1_meth();
- 
--	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
- 
- 	ktf.close();
- 
diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD
deleted file mode 100644
index 48641899c..000000000
--- a/testing/kismet/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 149661 2012-02-08 23:59:33Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Jason Chu <jason@archlinux.org>
-# Contributor: Juergen Hoetzel <jason@archlinux.org>
-
-pkgname=kismet
-pkgver=2011_03_R2
-_realver="${pkgver//_/-}"
-pkgrel=3
-pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-arch=('i686' 'x86_64')
-url="http://www.kismetwireless.net/"
-license=('GPL')
-depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat')
-makedepends=() # already in core: ('grep' 'gcc-libs')
-optdepends=('gpsd: log coordinates of detected networks'
-            'wireshark-cli: provide OUI files used to determine device manufacturer'
-            'wireshark-cli: mergecap, to merge multiple capture files'
-            'sox: provide the default kismet sound playback binary'
-            'festival: text-to-speech support'
-            'flite:  alternative/lightweight text-to-speech support'
-            'mac80211-driver: full rfmon support'
-            'ruby: ruby interface')
-backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
-install=kismet.install
-changelog=kismet.changelog
-source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz")
-md5sums=('8bf077e8111e6dc8c12cadefdf40aadd')
-
-build() {
-    cd "${srcdir}/${pkgname}-${_realver}"
-
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --localstatedir=/var
-    make dep
-    make
-
-    # Include plugins bundled with kismet
-    make plugins
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${_realver}"
-
-    # Install kismet
-    make DESTDIR="$pkgdir" install
-
-    # Install plugins
-    make plugins-install DESTDIR="$pkgdir"
-
-    # the README is very comprehensive, a good idea to include it
-    install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README"
-
-    # Our own suid-install, first half (see kismet.install)
-    install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/"
-}
diff --git a/testing/kismet/kismet.changelog b/testing/kismet/kismet.changelog
deleted file mode 100644
index e66dcfda0..000000000
--- a/testing/kismet/kismet.changelog
+++ /dev/null
@@ -1,26 +0,0 @@
-2010-05-07 Angel Velasquez <angvp@archlinux.org>
-    * ChangeLog added
-
-    * Removed old patches from SVN
-
-    * Applied changes from FS#15746 thanks to people who worked on it. 
-
-    * Files that are no longer shipped and so should not be backed up:
-      backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf')
-
-    *  No longer needed; gpsmap is deprecated and being replaced with a tile-based
-      mapper, as of yet incomplete
-      optdepends=('perl-libwww: fetch maps for gpsmap')
-
-    * Configuration has completely changed, no longer containing
-      references to either prism2 or wlanng 
-      sed -i 's/prism2/wlanng/g' conf/kismet.conf
-
-    * Ownership of man pages now defaults to "root" if the group "man" does not exist
-      chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
-
-    * Dependencies no longer needed
-      depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7')
-
-    * Options no longer needed
-      options=('!makeflags')
diff --git a/testing/kismet/kismet.install b/testing/kismet/kismet.install
deleted file mode 100644
index 0bc806034..000000000
--- a/testing/kismet/kismet.install
+++ /dev/null
@@ -1,34 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  post_upgrade
-
-  cat << EOP
-  If you have not done so already, read the README file and the FAQ file.
-	You MUST edit /etc/kismet.conf and configure Kismet for your system, or
-  it will NOT run properly!"
-
-  Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by 
-  users in the group ' kismet '.  This WILL ALLOW USERS IN THIS GROUP 
-  TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running 
-  all of Kismet as root.  ONLY users in this group will be able to 
-  run Kismet and capture from physical network devices.
-EOP
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  # Add the group needed to use the limited-functionality binary "kismet_capture"
-  # Change group ownership of "kismet_capture" to this new group
-  # Preserve the file mode bits of "kismet_capture"
-  getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null
-  chown root:kismet "/usr/bin/kismet_capture"
-  chmod 4550 "/usr/bin/kismet_capture"
-}
-
-## arg 1:  the old package version
-post_remove() {
-  getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch b/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
deleted file mode 100644
index 73ed7801b..000000000
--- a/testing/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7b67a2c080e77acef0344d5a7518c07dbac830f1 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:12:32 -0500
-Subject: [PATCH 1/8] partially fix parsing of alias with dots
-
----
- libkmod/libkmod-util.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
-index 7c2611b..6a9f697 100644
---- a/libkmod/libkmod-util.c
-+++ b/libkmod/libkmod-util.c
-@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- 		case ']':
- 			return -EINVAL;
- 		case '[':
--			while (alias[s] != ']' &&
--					alias[s] != '.' && alias[s] != '\0')
-+			while (alias[s] != ']' && alias[s] != '\0')
- 				s++;
- 
- 			if (alias[s] != ']')
-@@ -144,7 +143,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- 			s++;
- 			break;
- 		case '\0':
--		case '.':
- 			goto finish;
- 		default:
- 			buf[s] = c;
--- 
-1.7.9
-
diff --git a/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch b/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
deleted file mode 100644
index 7019e5132..000000000
--- a/testing/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 133132b6129f86c1f0aabdf3e807f56ea0190f8a Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:13:43 -0500
-Subject: [PATCH 2/8] libkmod-module: used shared code in module creation
-
----
- libkmod/libkmod-module.c |  135 ++++++++++++++++++++++++++-------------------
- 1 files changed, 78 insertions(+), 57 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 47b1709..48e4aa1 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -162,6 +162,76 @@ fail:
- 	return err;
- }
- 
-+/*
-+ * Memory layout with alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey -----.
-+ *        alias -----. |
-+ *        name ----. | |
-+ * }               | | |
-+ * name <----------' | |
-+ * alias <-----------' |
-+ * name\alias <--------'
-+ *
-+ * Memory layout without alias:
-+ *
-+ * struct kmod_module {
-+ *        hashkey ---.
-+ *        alias -----|----> NULL
-+ *        name ----. |
-+ * }               | |
-+ * name <----------'-'
-+ *
-+ * @key is "name\alias" or "name" (in which case alias == NULL)
-+ */
-+static int kmod_module_new(struct kmod_ctx *ctx, const char *key,
-+				const char *name, size_t namelen,
-+				const char *alias, size_t aliaslen,
-+				struct kmod_module **mod)
-+{
-+	struct kmod_module *m;
-+	size_t keylen;
-+
-+	m = kmod_pool_get_module(ctx, key);
-+	if (m != NULL) {
-+		*mod = kmod_module_ref(m);
-+		return 0;
-+	}
-+
-+	if (alias == NULL)
-+		keylen = namelen;
-+	else
-+		keylen = namelen + aliaslen + 1;
-+
-+	m = malloc(sizeof(*m) + (alias == NULL ? 1 : 2) * (keylen + 1));
-+	if (m == NULL) {
-+		free(m);
-+		return -ENOMEM;
-+	}
-+
-+	memset(m, 0, sizeof(*m));
-+
-+	m->ctx = kmod_ref(ctx);
-+	m->name = (char *)m + sizeof(*m);
-+	memcpy(m->name, key, keylen + 1);
-+	if (alias == NULL) {
-+		m->hashkey = m->name;
-+		m->alias = NULL;
-+	} else {
-+		m->name[namelen] = '\0';
-+		m->alias = m->name + namelen + 1;
-+		m->hashkey = m->name + keylen + 1;
-+		memcpy(m->hashkey, key, keylen + 1);
-+	}
-+
-+	m->refcount = 1;
-+	kmod_pool_add_module(ctx, m, m->hashkey);
-+	*mod = m;
-+
-+	return 0;
-+}
-+
- /**
-  * kmod_module_new_from_name:
-  * @ctx: kmod library context
-@@ -188,54 +258,15 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
- 						const char *name,
- 						struct kmod_module **mod)
- {
--	struct kmod_module *m;
- 	size_t namelen;
- 	char name_norm[PATH_MAX];
--	char *namesep;
- 
- 	if (ctx == NULL || name == NULL || mod == NULL)
- 		return -ENOENT;
- 
--	if (alias_normalize(name, name_norm, &namelen) < 0) {
--		DBG(ctx, "invalid alias: %s\n", name);
--		return -EINVAL;
--	}
-+	modname_normalize(name, name_norm, &namelen);
- 
--	m = kmod_pool_get_module(ctx, name_norm);
--	if (m != NULL) {
--		*mod = kmod_module_ref(m);
--		return 0;
--	}
--
--	namesep = strchr(name_norm, '/');
--	m = malloc(sizeof(*m) + (namesep == NULL ? 1 : 2) * namelen + 2);
--	if (m == NULL) {
--		free(m);
--		return -ENOMEM;
--	}
--
--	memset(m, 0, sizeof(*m));
--
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name_norm, namelen + 1);
--
--	if (namesep) {
--		size_t len = namesep - name_norm;
--
--		m->name[len] = '\0';
--		m->alias = m->name + len + 1;
--		m->hashkey = m->name + namelen + 1;
--		memcpy(m->hashkey, name_norm, namelen + 1);
--	} else {
--		m->hashkey = m->name;
--	}
--
--	m->refcount = 1;
--	kmod_pool_add_module(ctx, m, m->hashkey);
--	*mod = m;
--
--	return 0;
-+	return kmod_module_new(ctx, name_norm, name_norm, namelen, NULL, 0, mod);
- }
- 
- int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
-@@ -251,9 +282,9 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
- 
- 	memcpy(key, name, namelen);
- 	memcpy(key + namelen + 1, alias, aliaslen + 1);
--	key[namelen] = '/';
-+	key[namelen] = '\\';
- 
--	err = kmod_module_new_from_name(ctx, key, mod);
-+	err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod);
- 	if (err < 0)
- 		return err;
- 
-@@ -323,7 +354,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 			free(abspath);
- 		else {
- 			ERR(ctx, "kmod_module '%s' already exists with different path: new-path='%s' old-path='%s'\n",
--									name, abspath, m->path);
-+							name, abspath, m->path);
- 			free(abspath);
- 			return -EEXIST;
- 		}
-@@ -332,21 +363,11 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 		return 0;
- 	}
- 
--	m = malloc(sizeof(*m) + namelen + 1);
--	if (m == NULL)
--		return -errno;
--
--	memset(m, 0, sizeof(*m));
-+	err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
-+	if (err < 0)
-+		return err;
- 
--	m->ctx = kmod_ref(ctx);
--	m->name = (char *)m + sizeof(*m);
--	memcpy(m->name, name, namelen + 1);
- 	m->path = abspath;
--	m->hashkey = m->name;
--	m->refcount = 1;
--
--	kmod_pool_add_module(ctx, m, m->hashkey);
--
- 	*mod = m;
- 
- 	return 0;
--- 
-1.7.9
-
diff --git a/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch b/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
deleted file mode 100644
index f4754c5a7..000000000
--- a/testing/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2e42e3b3af219575dc855971f08d8bed226ebfa8 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:05:26 -0500
-Subject: [PATCH 3/8] modprobe: handle all error returns from init_module
-
----
- tools/kmod-modprobe.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 3e51506..c882856 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -551,6 +551,8 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
- 
- 	err = kmod_module_insert_module(mod, flags, opts);
- 	switch (err) {
-+	case 0:
-+		break;
- 	case -EEXIST:
- 		/*
- 		 * We checked for EEXIST with an earlier call to
-@@ -564,7 +566,7 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
- 			ERR("Module %s already in kernel.\n",
- 					kmod_module_get_name(mod));
- 		break;
--	case -EPERM:
-+	default:
- 		ERR("could not insert '%s': %s\n", kmod_module_get_name(mod),
- 				strerror(-err));
- 		break;
--- 
-1.7.9
-
diff --git a/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch b/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch
deleted file mode 100644
index a76b609b8..000000000
--- a/testing/kmod/0004-modprobe-remove-0-refcnt-deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f169a0c3737b8ac69499240fca8314a2bd67a0a1 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:39:30 -0500
-Subject: [PATCH 4/8] modprobe: remove 0 refcnt deps
-
----
- tools/kmod-modprobe.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index c882856..bd991a5 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -381,7 +381,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
- static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- {
- 	const char *modname = kmod_module_get_name(mod);
--	struct kmod_list *pre = NULL, *post = NULL;
-+	struct kmod_list *pre = NULL, *post = NULL, *deps, *itr;
- 	const char *cmd = NULL;
- 	int err;
- 
-@@ -422,7 +422,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- 	rmmod_do_deps_list(post, false);
- 
- 	if (do_dependencies && remove_dependencies) {
--		struct kmod_list *deps = kmod_module_get_dependencies(mod);
-+		deps = kmod_module_get_dependencies(mod);
- 
- 		err = rmmod_do_deps_list(deps, true);
- 		if (err < 0)
-@@ -451,6 +451,17 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- 
- 	rmmod_do_deps_list(pre, false);
- 
-+	deps = kmod_module_get_dependencies(mod);
-+	if (deps != NULL) {
-+		kmod_list_foreach_reverse(itr, deps) {
-+			struct kmod_module *dep = kmod_module_get_module(itr);
-+			if (kmod_module_get_refcnt(dep) == 0)
-+				rmmod_do_remove_module(dep);
-+			kmod_module_unref(dep);
-+		}
-+		kmod_module_unref_list(deps);
-+	}
-+
- error:
- 	kmod_module_unref_list(pre);
- 	kmod_module_unref_list(post);
--- 
-1.7.9
-
diff --git a/testing/kmod/0005-continue-after-module-insert-fail.patch b/testing/kmod/0005-continue-after-module-insert-fail.patch
deleted file mode 100644
index cdc0c87c5..000000000
--- a/testing/kmod/0005-continue-after-module-insert-fail.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f386a0e357a8916713fe26acd96206be2159157 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Wed, 1 Feb 2012 20:09:27 -0500
-Subject: [PATCH 5/8] continue after module insert fail
-
----
- tools/kmod-modprobe.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index bd991a5..e70bf3d 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -825,8 +825,6 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias,
- 			array_free_array(&recursion);
- 		}
- 		kmod_module_unref(mod);
--		if (err < 0)
--			break;
- 	}
- 
- 	kmod_module_unref_list(list);
--- 
-1.7.9
-
diff --git a/testing/kmod/0006-modprobe-remove-support-for-path-based-loading.patch b/testing/kmod/0006-modprobe-remove-support-for-path-based-loading.patch
deleted file mode 100644
index b694413fb..000000000
--- a/testing/kmod/0006-modprobe-remove-support-for-path-based-loading.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 658e2cafc2b88d1ab88f20b6183daabc113d3714 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Sat, 4 Feb 2012 16:08:34 -0500
-Subject: [PATCH 6/8] modprobe: remove support for path based loading
-
-m-i-t doesn't support this, and it causes serious problems with local
-files clashing with alias names.
----
- tools/kmod-modprobe.c |   35 ++---------------------------------
- 1 files changed, 2 insertions(+), 33 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index e70bf3d..b9943da 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -737,27 +737,6 @@ error:
- 	return err;
- }
- 
--static int insmod_path(struct kmod_ctx *ctx, const char *path,
--						const char *extra_options)
--{
--	struct kmod_module *mod;
--	struct array recursion;
--	int err;
--
--	err = kmod_module_new_from_path(ctx, path, &mod);
--	if (err < 0) {
--		LOG("Module %s not found.\n", path);
--		return err;
--	}
--
--	array_init(&recursion, INSMOD_RECURSION_STEP);
--	err = insmod_do_module(mod, extra_options, true, &recursion);
--	kmod_module_unref(mod);
--	array_free_array(&recursion);
--
--	return err;
--}
--
- static int handle_failed_lookup(struct kmod_ctx *ctx, const char *alias)
- {
- 	struct kmod_module *mod;
-@@ -831,22 +810,12 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias,
- 	return err;
- }
- 
--static int insmod(struct kmod_ctx *ctx, const char *name,
--						const char *extra_options)
--{
--	struct stat st;
--	if (stat(name, &st) == 0)
--		return insmod_path(ctx, name, extra_options);
--	else
--		return insmod_alias(ctx, name, extra_options);
--}
--
- static int insmod_all(struct kmod_ctx *ctx, char **args, int nargs)
- {
- 	int i, err = 0;
- 
- 	for (i = 0; i < nargs; i++) {
--		int r = insmod(ctx, args[i], NULL);
-+		int r = insmod_alias(ctx, args[i], NULL);
- 		if (r < 0)
- 			err = r;
- 	}
-@@ -1232,7 +1201,7 @@ static int do_modprobe(int argc, char **orig_argv)
- 		char *opts;
- 		err = options_from_array(args, nargs, &opts);
- 		if (err == 0) {
--			err = insmod(ctx, args[0], opts);
-+			err = insmod_alias(ctx, args[0], opts);
- 			free(opts);
- 		}
- 	}
--- 
-1.7.9
-
diff --git a/testing/kmod/0007-modinfo-handle-arguments-more-carefully.patch b/testing/kmod/0007-modinfo-handle-arguments-more-carefully.patch
deleted file mode 100644
index 389008414..000000000
--- a/testing/kmod/0007-modinfo-handle-arguments-more-carefully.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 2b77a48833818feb8cf35ffac3adcba8de503aec Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan@archlinux.org>
-Date: Fri, 3 Feb 2012 20:20:21 -0600
-Subject: [PATCH 7/8] modinfo: handle arguments more carefully
-
-A simple case of breakage before this commit:
-
-    $ touch aes
-    $ modinfo aes
-    filename:       /tmp/aes
-    ERROR: could not get modinfo from 'aes': Invalid argument
-
-Add a new is_module_filename() function that attempts to do more than
-just check if the passed argument is a regular file. We look at the name
-for a '.ko' string, and if that is found, ensure it is either at the end
-of the string or followed by another '.' (for .gz and .xz modules, for
-instance). We don't make this second option conditional on the way the
-tools are built with compression support; the file is a module file
-regardless and should always be treated that way.
-
-When doing this, and noticed in the test suite output, we open the
-system modules index unconditionally, even if it is never going to be
-used during the modinfo call, which is the case when passing module
-filenames directly. Delay the opening of the index file until we get an
-argument that is not a module filename.
-
-With-help-from: Dave Reisner <dreisner@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- tools/kmod-modinfo.c |   20 +++++++++++++++++---
- 1 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index 87483a5..ace5d3f 100644
---- a/tools/kmod-modinfo.c
-+++ b/tools/kmod-modinfo.c
-@@ -19,6 +19,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdbool.h>
- #include <getopt.h>
- #include <errno.h>
- #include <string.h>
-@@ -332,6 +333,21 @@ static void help(const char *progname)
- 		progname);
- }
- 
-+static bool is_module_filename(const char *name)
-+{
-+	struct stat st;
-+	const char *ptr;
-+	if (stat(name, &st) == 0 && S_ISREG(st.st_mode) &&
-+			(ptr = strstr(name, ".ko")) != NULL) {
-+		/* we screened for .ko; make sure this is either at the end of the name
-+		 * or followed by another '.' (e.g. gz or xz modules) */
-+		if(ptr[3] != '\0' && ptr[3] != '.')
-+			return false;
-+		return true;
-+	}
-+	return false;
-+}
-+
- static int do_modinfo(int argc, char *argv[])
- {
- 	struct kmod_ctx *ctx;
-@@ -418,15 +434,13 @@ static int do_modinfo(int argc, char *argv[])
- 		fputs("Error: kmod_new() failed!\n", stderr);
- 		return EXIT_FAILURE;
- 	}
--	kmod_load_resources(ctx);
- 
- 	err = 0;
- 	for (i = optind; i < argc; i++) {
- 		const char *name = argv[i];
--		struct stat st;
- 		int r;
- 
--		if (stat(name, &st) == 0 && S_ISREG(st.st_mode))
-+		if (is_module_filename(name))
- 			r = modinfo_path_do(ctx, name);
- 		else
- 			r = modinfo_alias_do(ctx, name);
--- 
-1.7.9
-
diff --git a/testing/kmod/0008-Use-realpath-to-canonicalize-provided-paths.patch b/testing/kmod/0008-Use-realpath-to-canonicalize-provided-paths.patch
deleted file mode 100644
index 652d2e854..000000000
--- a/testing/kmod/0008-Use-realpath-to-canonicalize-provided-paths.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 4148d50c980e20a71b5e284e93863b4f36f4fbe4 Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan@archlinux.org>
-Date: Fri, 3 Feb 2012 15:01:34 -0600
-Subject: [PATCH 8/8] Use realpath() to canonicalize provided paths
-
-The existing function choked in several corner cases:
-* '/tmp/../tmp' was seen as absolute, so not cleaned up.
-* '/tmp/' and '/tmp' were not equal, causing depmod to act differently
-  when called with the -b option for the two paths.
-
-Don't reinvent the wheel; just use the standard library function.
-
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- libkmod/libkmod-module.c |    6 +++---
- libkmod/libkmod-util.c   |   36 ------------------------------------
- libkmod/libkmod-util.h   |    2 --
- libkmod/libkmod.c        |   13 +++++++++----
- tools/kmod-depmod.c      |    8 ++++++--
- 5 files changed, 18 insertions(+), 47 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 48e4aa1..48e7286 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -326,10 +326,10 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- 	if (ctx == NULL || path == NULL || mod == NULL)
- 		return -ENOENT;
- 
--	abspath = path_make_absolute_cwd(path);
-+	abspath = canonicalize_file_name(path);
- 	if (abspath == NULL) {
--		DBG(ctx, "no absolute path for %s\n", path);
--		return -ENOMEM;
-+		DBG(ctx, "no canonical filename returned for %s\n", path);
-+		return -errno;
- 	}
- 
- 	err = stat(abspath, &st);
-diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
-index 6a9f697..02b7f63 100644
---- a/libkmod/libkmod-util.c
-+++ b/libkmod/libkmod-util.c
-@@ -301,42 +301,6 @@ char *strchr_replace(char *s, int c, char r)
- 	return s;
- }
- 
--bool path_is_absolute(const char *p)
--{
--	assert(p != NULL);
--
--	return p[0] == '/';
--}
--
--char *path_make_absolute_cwd(const char *p)
--{
--	char *cwd, *r;
--	size_t plen;
--	size_t cwdlen;
--
--	if (path_is_absolute(p))
--		return strdup(p);
--
--	cwd = get_current_dir_name();
--	if (cwd == NULL)
--		return NULL;
--
--	plen = strlen(p);
--	cwdlen = strlen(cwd);
--
--	/* cwd + '/' + p + '\0' */
--	r = realloc(cwd, cwdlen + 1 + plen + 1);
--	if (r == NULL) {
--		free(cwd);
--		return NULL;
--	}
--
--	r[cwdlen] = '/';
--	memcpy(&r[cwdlen + 1], p, plen + 1);
--
--	return r;
--}
--
- #define USEC_PER_SEC  1000000ULL
- #define NSEC_PER_USEC 1000ULL
- unsigned long long ts_usec(const struct timespec *ts)
-diff --git a/libkmod/libkmod-util.h b/libkmod/libkmod-util.h
-index c9a1a21..63c348f 100644
---- a/libkmod/libkmod-util.h
-+++ b/libkmod/libkmod-util.h
-@@ -19,8 +19,6 @@ ssize_t write_str_safe(int fd, const char *buf, size_t buflen) __attribute__((no
- int read_str_long(int fd, long *value, int base) __must_check __attribute__((nonnull(2)));
- int read_str_ulong(int fd, unsigned long *value, int base) __must_check __attribute__((nonnull(2)));
- char *strchr_replace(char *s, int c, char r);
--bool path_is_absolute(const char *p) __must_check __attribute__((nonnull(1)));
--char *path_make_absolute_cwd(const char *p) __must_check __attribute__((nonnull(1)));
- int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len) __must_check __attribute__((nonnull(1,2)));
- char *modname_normalize(const char *modname, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(1, 2)));
- char *path_to_modname(const char *path, char buf[PATH_MAX], size_t *len) __attribute__((nonnull(2)));
-diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 800a178..c578afb 100644
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -160,13 +160,18 @@ static int log_priority(const char *priority)
- 
- static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules";
- 
--static char *get_kernel_release(const char *dirname)
-+static char *get_kernel_release(struct kmod_ctx *ctx, const char *dirname)
- {
- 	struct utsname u;
- 	char *p;
- 
--	if (dirname != NULL)
--		return path_make_absolute_cwd(dirname);
-+	if (dirname != NULL) {
-+		p = canonicalize_file_name(dirname);
-+		if (p)
-+			return p;
-+		INFO(ctx, "could not canonicalize directory %s: %m\n", dirname);
-+		return strdup(dirname);
-+	}
- 
- 	if (uname(&u) < 0)
- 		return NULL;
-@@ -215,7 +220,7 @@ KMOD_EXPORT struct kmod_ctx *kmod_new(const char *dirname,
- 	ctx->log_data = stderr;
- 	ctx->log_priority = LOG_ERR;
- 
--	ctx->dirname = get_kernel_release(dirname);
-+	ctx->dirname = get_kernel_release(ctx, dirname);
- 
- 	/* environment overwrites config */
- 	env = getenv("KMOD_LOG");
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 0cf28f6..72180ef 100644
---- a/tools/kmod-depmod.c
-+++ b/tools/kmod-depmod.c
-@@ -1160,7 +1160,7 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
- 		}
- 	}
- 
--	DBG("add %p kmod=%p, path=%s\n", mod, kmod, mod->path);
-+	DBG("add %p kmod=%p, path=%s, relpath=%s\n", mod, kmod, mod->path, mod->relpath);
- 
- 	return 0;
- }
-@@ -2547,7 +2547,11 @@ static int do_depmod(int argc, char *argv[])
- 			maybe_all = 1;
- 			break;
- 		case 'b':
--			root = path_make_absolute_cwd(optarg);
-+			root = canonicalize_file_name(optarg);
-+			if (!root) {
-+				CRIT("could not resolve path %s\n", optarg);
-+				goto cmdline_failed;
-+			}
- 			break;
- 		case 'C': {
- 			size_t bytes = sizeof(char *) * (n_config_paths + 2);
--- 
-1.7.9
-
diff --git a/testing/koffice/PKGBUILD b/testing/koffice/PKGBUILD
deleted file mode 100644
index 6ced44d5f..000000000
--- a/testing/koffice/PKGBUILD
+++ /dev/null
@@ -1,306 +0,0 @@
-# $Id: PKGBUILD 148183 2012-01-30 18:47:50Z ibiru $
-# 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=12
-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' 'libgsf')
-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' 'libgsf')
-	optdepends=('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')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kword"
-        make DESTDIR="${pkgdir}" install
-
-        # some sed lines to have python2 in extension scripts
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py"
-}
-
-#package_koffice-kword-doc(){
-#	pkgdesc="Documentation for kword"
-#        cd ${srcdir}/build/doc/kword
-#        make DESTDIR="${pkgdir}" install
-#}
-
-##### package apps done #####
-
-#package_koffice-kchart(){
-#	pkgdesc="Charting tool for KDE"
-#	depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates')
-#        optdepends=('koffice-filters: import/export filters')
-#	install=koffice.install
-#        cd "${srcdir}/build/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kchart-doc(){
-#	pkgdesc="Documentation for kchart"
-#        cd "${srcdir}/build/doc/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kdgantt(){
-#	pkgdesc="Gantt for KDE"
-#        cd "${srcdir}/build/kdgantt"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-handbook() {
-	pkgdesc="Documentation for koffice"
-	cd "${srcdir}/build/doc/koffice"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-thesaurus-doc(){
-	pkgdesc="Documentation for koffice-thesaurus"
-	cd "${srcdir}/build/doc/thesaurus"
-        make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/koffice/filters.install b/testing/koffice/filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/testing/koffice/filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/koffice/gcc46.patch b/testing/koffice/gcc46.patch
deleted file mode 100644
index dcf8a4f85..000000000
--- a/testing/koffice/gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
-+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
-@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
-         return IT_FLOAT16;
-     case Imf::FLOAT:
-         return IT_FLOAT32;
-+    default:
-+    // shouldn't reach here
-+        return IT_UNSUPPORTED;
-     }
- }
- 
-@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
-     case IT_UNKNOWN:
-     case IT_UNSUPPORTED:
-         return 0;
-+    default:
-+    // shouldn't reach here
-+        return 0;
-     }
- }
- 
diff --git a/testing/koffice/kde4-koffice-libwpg02.patch b/testing/koffice/kde4-koffice-libwpg02.patch
deleted file mode 100644
index e2a55a216..000000000
--- a/testing/koffice/kde4-koffice-libwpg02.patch
+++ /dev/null
@@ -1,1323 +0,0 @@
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt
---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt	2011-01-18 07:40:25.000000000 +0100
-@@ -1,16 +1,11 @@
- 
--
- include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
- 
--set(wpgimport_PART_SRCS 
--WPGImport.cpp 
--OdgExporter.cxx
--FileOutputHandler.cxx
--GraphicsElement.cxx)
-+set(wpgimport_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
--target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,95 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "FileOutputHandler.hxx"
--
--FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
--	mbIsTagOpened(false),
--	mContentStream(contentStream)
--{
--}
--
--void FileOutputHandler::startDocument()
--{
--}
--
--void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << "<" << psName;
--
--	for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
--	{
--		mContentStream << " " <<  (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
--	}
--	mbIsTagOpened = true;
--	msOpenedTagName = psName;
--}
--
--void FileOutputHandler::endElement(const char *psName)
--{
--	if (mbIsTagOpened)
--	{
--		if( msOpenedTagName == psName )
--		{
--			mContentStream << "/>";
--			mbIsTagOpened = false;
--		}
--		else // should not happen, but handle it
--		{
--			mContentStream << ">";
--			mContentStream << "</" << psName << ">";
--			mbIsTagOpened = false;
--		}
--	}
--	else
--	{
--		mContentStream << "</" << psName << ">";
--		mbIsTagOpened = false;
--	}
--}
--
--void FileOutputHandler::characters(const std::string &sCharacters)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << sCharacters.c_str();
--}
--
--void FileOutputHandler::endDocument()
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,49 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef FILEOUTPUTHANDLER_H
--#define FILEOUTPUTHANDLER_H
--
--#include <iostream>
--#include <sstream>
--#include <string>
--#include "GraphicsHandler.hxx"
--
--class FileOutputHandler : public GraphicsHandler
--{
--  public:
--        explicit FileOutputHandler(std::ostringstream &contentStream);
--        virtual void startDocument();
--        virtual void endDocument();
--        virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
--        virtual void endElement(const char *psName);
--        virtual void characters(const std::string &sCharacters);
--
--  private:
--	bool mbIsTagOpened;
--	std::string msOpenedTagName;
--	std::ostringstream &mContentStream;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <string.h>
--
--#define ASCII_SPACE 0x0020
--
--void TagGraphicsElement::print() const
--{
--}
--
--void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->startElement(getTagName().c_str(), maAttrList);
--}
--
--void OpenTagGraphicsElement::print() const
--{ 
--	TagGraphicsElement::print(); 	
--}
--
--void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
--{
--	std::pair<std::string, std::string> tmpAttribute;
--	tmpAttribute.first = szAttributeName;
--	tmpAttribute.second = sAttributeValue;
--        maAttrList.push_back(tmpAttribute);
--}
--
--void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--
--	pHandler->endElement(getTagName().c_str());
--}
--
--void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->characters(msData);
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpd.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef _GRAPHICSELEMENT_H
--#define _GRAPHICSELEMENT_H
--#include <string>
--#include <map>
--#include <vector>
--
--#include "GraphicsHandler.hxx"
--
--class GraphicsElement
--{
--public:	
--	virtual ~GraphicsElement() {}
--	virtual void write(GraphicsHandler *pHandler) const = 0;
--	virtual void print() const {}
--};
--
--class TagGraphicsElement : public GraphicsElement
--{
--public:
--	explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
--	const std::string &getTagName() const { return msTagName; }
--	virtual void print() const;
--private:
--	const std::string msTagName;
--};
--
--class OpenTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	~OpenTagGraphicsElement() {}
--	void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
--	virtual void write(GraphicsHandler *pHandler) const;
--	virtual void print () const;
--private:
--	std::vector<std::pair<std::string, std::string> > maAttrList;
--};
--
--class CloseTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--};
--
--class CharDataGraphicsElement : public GraphicsElement
--{
--public:
--	CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--private:
--	std::string msData;
--};
--
--
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
-- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--#ifndef _GRAPHICSHANDLER_H
--#define _GRAPHICSHANDLER_H
--#include <string>
--#include <map>
--#include <vector>
--
--class GraphicsHandler
--{
--public:
--	virtual ~GraphicsHandler() {}
--        virtual void startDocument() = 0;
--        virtual void endDocument() = 0;
--        virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
--        virtual void endElement(const char *psName) = 0;
--        virtual void characters(const std::string &sCharacters) = 0;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,662 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "OdgExporter.hxx"
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <locale.h>
--
--static std::string doubleToString(const double value)
--{
--  std::ostringstream tempStream;
--  tempStream << value;
--  std::string decimalPoint(localeconv()->decimal_point);
--  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
--    return tempStream.str();
--  std::string stringValue(tempStream.str());
--  if (!stringValue.empty())
--  {
--    std::string::size_type pos;
--    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
--          stringValue.replace(pos,decimalPoint.size(),".");
--  }
--  return stringValue;
--}
--
--
--OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
--        mpHandler(pHandler),
--        m_fillRule(AlternatingFill),
--        m_gradientIndex(1),
--        m_dashIndex(1),
--        m_styleIndex(1),
--        m_width(0.0f),
--        m_height(0.0f),
--        m_isFlatXML(isFlatXML)
--{
--}
--
--OdgExporter::~OdgExporter()
--{
--        for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                delete (*iterStroke);
--
--        for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                delete (*iterGradient);
--
--        for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                delete (*iterAutomaticStyles);
--
--        for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--                delete (*bodyIter);
--}
--
--void OdgExporter::startGraphics(double width, double height)
--{
--        m_gradientIndex = 1;
--        m_dashIndex = 1;
--        m_styleIndex = 1;
--        m_width = width;
--        m_height = height;
--
--
--        mpHandler->startDocument();
--        OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
--        tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
--        tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
--        tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
--        if (m_isFlatXML)
--                        tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
--        tmpOfficeDocumentContent.write(mpHandler);
--
--        OpenTagGraphicsElement("office:settings").write(mpHandler);
--
--        OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
--        configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
--        configItemSetOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement configItemOpenElement1("config:config-item");
--        configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
--        configItemOpenElement1.addAttribute("config:type", "int");
--        configItemOpenElement1.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement2("config:config-item");
--        configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
--        configItemOpenElement2.addAttribute("config:type", "int");
--        configItemOpenElement2.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement3("config:config-item");
--        configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
--        configItemOpenElement3.addAttribute("config:type", "int");
--        configItemOpenElement3.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * width);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement4("config:config-item");
--        configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
--        configItemOpenElement4.addAttribute("config:type", "int");
--        configItemOpenElement4.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * height);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        mpHandler->endElement("config:config-item-set");
--
--        mpHandler->endElement("office:settings");
--
--}
--
--void OdgExporter::endGraphics()
--{
--        OpenTagGraphicsElement("office:styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                (*iterStroke)->write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                (*iterGradient)->write(mpHandler);
--
--        mpHandler->endElement("office:styles");
--
--        OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                (*iterAutomaticStyles)->write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
--        tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
--        tmpStylePageLayoutOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
--        m_value.str("");
--        m_value <<  doubleToString(m_width) << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(m_height)  << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
--        m_value.str("");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
--        tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:page-layout-properties");
--
--        mpHandler->endElement("style:page-layout");
--
--        OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
--        tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
--        tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
--        tmpStyleStyleOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
--        // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
--        tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
--        tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:drawing-page-properties");
--
--        mpHandler->endElement("style:style");
--
--        mpHandler->endElement("office:automatic-styles");
--
--        OpenTagGraphicsElement("office:master-styles").write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
--        tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
--        tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
--        tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpStyleMasterPageOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:master-page");
--
--        mpHandler->endElement("office:master-styles");
--
--        OpenTagGraphicsElement("office:body").write(mpHandler);
--
--        OpenTagGraphicsElement("office:drawing").write(mpHandler);
--
--        OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
--        tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
--        tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
--        tmpDrawPageOpenElement.write(mpHandler);
--
--        for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--        {
--                (*bodyIter)->write(mpHandler);
--        }
--
--        mpHandler->endElement("draw:page");
--        mpHandler->endElement("office:drawing");
--        mpHandler->endElement("office:body");
--        mpHandler->endElement("office:document");
--
--        mpHandler->endDocument();
--}
--
--void OdgExporter::setPen(const libwpg::WPGPen& pen)
--{
--        m_pen = pen;
--}
--
--void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
--{
--        m_brush = brush;
--}
--
--void OdgExporter::setFillRule(FillRule rule)
--{
--        m_fillRule = rule;
--}
--
--void OdgExporter::startLayer(unsigned int)
--{
--}
--
--void OdgExporter::endLayer(unsigned int)
--{
--}
--
--void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawRectElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x2-rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y2-rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rx) << "in";
--        // FIXME: what to do when rx != ry ?
--        pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
--}
--
--void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.x - rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.y - ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
--}
--
--void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
--{
--        if(vertices.count() < 2)
--                return;
--
--        if(vertices.count() == 2)
--        {
--                const libwpg::WPGPoint& p1 = vertices[0];
--                const libwpg::WPGPoint& p2 = vertices[1];
--
--                writeStyle();
--                OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
--                m_value.str("");
--                m_value << "gr" << m_styleIndex-1;
--                pDrawLineElement->addAttribute("draw:style-name", m_value.str());
--                m_value.str("");
--                pDrawLineElement->addAttribute("draw:text-style-name", "P1");
--                pDrawLineElement->addAttribute("draw:layer", "layout");
--                m_value << doubleToString(p1.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x1", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p1.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y1", m_value.str());
--                m_value.str("");
--                m_value  << doubleToString(p2.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x2", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p2.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y2", m_value.str());
--                m_value.str("");
--                mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
--                mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
--        }
--        else
--        {
--                // draw as path
--                libwpg::WPGPath path;
--                path.moveTo(vertices[0]);
--                for(unsigned long ii = 1; ii < vertices.count(); ii++)
--                        path.lineTo(vertices[ii]);
--                path.closed = true;
--                drawPath(path);
--        }
--}
--
--void OdgExporter::drawPath(const libwpg::WPGPath& path)
--{
--        if(path.count() == 0)
--                return;
--
--        // try to find the bounding box
--        // this is simple convex hull technique, the bounding box might not be
--        // accurate but that should be enough for this purpose
--        libwpg::WPGPoint p = path.element(0).point;
--        libwpg::WPGPoint q = path.element(0).point;
--        for(unsigned k = 0; k < path.count(); k++)
--        {
--                libwpg::WPGPathElement element = path.element(k);
--                p.x = (p.x > element.point.x) ? element.point.x : p.x;
--                p.y = (p.y > element.point.y) ? element.point.y : p.y;
--                q.x = (q.x < element.point.x) ? element.point.x : q.x;
--                q.y = (q.y < element.point.y) ? element.point.y : q.y;
--                if(element.type == libwpg::WPGPathElement::CurveToElement)
--                {
--                        p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
--                        p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
--                        q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
--                        q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
--                        p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
--                        p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
--                        q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
--                        q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
--                }
--        }
--        double vw = q.x - p.x;
--        double vh = q.y - p.y;
--
--        writeStyle();
--
--        OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawPathElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        pDrawPathElement->addAttribute("draw:text-style-name", "P1");
--        pDrawPathElement->addAttribute("draw:layer", "layout");
--        m_value << doubleToString(p.x)  << "in";
--        pDrawPathElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(p.y)  << "in";
--        pDrawPathElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vw) << "in";
--        pDrawPathElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vh) << "in";
--        pDrawPathElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
--        pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
--        m_value.str("");
--
--        for(unsigned i = 0; i < path.count(); i++)
--        {
--                libwpg::WPGPathElement element = path.element(i);
--                libwpg::WPGPoint point = element.point;
--                switch(element.type)
--                {
--                        // 2540 is 2.54*1000, 2.54 in = 1 in
--                        case libwpg::WPGPathElement::MoveToElement:
--                                m_value << "M" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::LineToElement:
--                                m_value << "L" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::CurveToElement:
--                                m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra1.y-p.y)*2540) << " ";
--                                m_value << (int)((element.extra2.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra2.y-p.y)*2540) << " ";
--                                m_value << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        default:
--                                break;
--                }
--        }
--        if(path.closed)
--                m_value << " Z";
--        pDrawPathElement->addAttribute("svg:d", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
--}
--
--
--void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
--{
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary;
--        bitmap.generateBase64DIB(base64Binary);
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
--{
--        if (binaryData.mimeType.length() <= 0)
--                return;
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary = binaryData.getBase64Data();
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--
--static std::string colorToHex(const libwpg::WPGColor& color)
--{
--        char hexdigits[] = "0123456789abcdef";
--        char buffer[] = "123456";
--        buffer[0] = hexdigits[(color.red >> 4) & 15];
--        buffer[1] = hexdigits[color.red & 15];
--        buffer[2] = hexdigits[(color.green >> 4) & 15];
--        buffer[3] = hexdigits[color.green & 15];
--        buffer[4] = hexdigits[(color.blue >> 4) & 15];
--        buffer[5] = hexdigits[color.blue & 15];
--        return std::string(buffer);
--}
--
--void OdgExporter::writeStyle()
--{
--        m_value.str("");
--        m_name.str("");
--
--        if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
--        {
--                // ODG only supports dashes with the same length of spaces inbetween
--                // here we take the first space and assume everything else the same
--                // note that dash length is written in percentage
--                double distance = m_pen.dashArray.at(1);
--                OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
--                tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
--                m_value << "Dash_" << m_dashIndex++;
--                tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(distance*100) << "%";
--                tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
--                m_value.str("");
--                for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
--                {
--                        m_name << "draw:dots" << i+1;
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
--                        m_name.str("");
--                        m_name << "draw:dots" << i+1 << "-length";
--                        m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
--                        m_name.str("");
--                        m_value.str("");
--                }
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
--                tmpDrawGradientElement->addAttribute("draw:style", "linear");
--                m_value << "Gradient_" << m_gradientIndex++;
--                tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--
--                // ODG angle unit is 0.1 degree
--                double angle = -m_brush.gradient.angle();
--                while(angle < 0)
--                        angle += 360;
--                while(angle > 360)
--                        angle -= 360;
--
--                m_value << (unsigned)(angle*10);
--                tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
--                m_value.str("");
--
--                libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
--                libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
--                m_value << "#" << colorToHex(startColor);
--                tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(stopColor);
--                tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
--                m_value.str("");
--                tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:border", "0%");
--                mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
--                mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
--        }
--
--        OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
--        m_value << "gr" << m_styleIndex;
--        tmpStyleStyleElement->addAttribute("style:name", m_value.str());
--        m_value.str("");
--        tmpStyleStyleElement->addAttribute("style:family", "graphic");
--        tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
--
--        OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
--
--        if(m_pen.width > 0.0)
--        {
--                m_value << doubleToString(m_pen.width) << "in";
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(m_pen.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
--                m_value.str("");
--
--                if(!m_pen.solid)
--                {
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
--                        m_value << "Dash_" << m_dashIndex-1;
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
--                        m_value.str("");
--                }
--        }
--        else
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::NoBrush)
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::Solid)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
--                m_value << "#" << colorToHex(m_brush.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
--                m_value.str("");
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
--                m_value << "Gradient_" << m_gradientIndex-1;
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
--                m_value.str("");
--        }
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
--        m_styleIndex++;
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,116 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef __ODGEXPORTER_H__
--#define __ODGEXPORTER_H__
--
--#include <iostream>
--#include <sstream>
--#include <string>
--
--#include <libwpg/libwpg.h>
--#include "GraphicsElement.hxx"
--
--class OdgExporter : public libwpg::WPGPaintInterface {
--public:
--	explicit OdgExporter(GraphicsHandler *pHandler,
--			     const bool isFlatXML = false);
--	~OdgExporter();
--
--#if LIBWPG_VERSION_MINOR<2
--	void startGraphics(double imageWidth, double imageHeight);
--	void endGraphics();
--	void startLayer(unsigned int id);
--	void endLayer(unsigned int id);
--
--	void setPen(const libwpg::WPGPen& pen);
--	void setBrush(const libwpg::WPGBrush& brush);
--	void setFillRule(FillRule rule);
--
--	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
--	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
--	void drawPolygon(const libwpg::WPGPointArray& vertices);
--	void drawPath(const libwpg::WPGPath& path);
--	void drawBitmap(const libwpg::WPGBitmap& bitmap);
--	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	libwpg::WPGPen m_pen;
--	libwpg::WPGBrush m_brush;
--	FillRule m_fillRule;
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#else
--	virtual void startGraphics(const ::WPXPropertyList &propList);
--	virtual void endGraphics();
--	virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
--	virtual void startLayer(const ::WPXPropertyList &propList);
--	virtual void endLayer();
--	virtual void drawRectangle(const ::WPXPropertyList& propList);
--	virtual void drawEllipse(const ::WPXPropertyList& propList);
--	virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
--	virtual void drawPath(const ::WPXPropertyListVector &path);
--	virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
--	virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
--	virtual void endEmbeddedGraphics();
--	virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
--	virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
--	virtual void endTextObject();
--	virtual void startTextLine(const ::WPXPropertyList &propList);
--	virtual void endTextLine();
--	virtual void startTextSpan(const ::WPXPropertyList &propList);
--	virtual void endTextSpan();
--	virtual void insertText(const ::WPXString &str);
--
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#endif
--};
--
--#endif // __ODGEXPORTER_H__
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp
---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp	2011-01-02 17:46:15.000000000 +0100
-@@ -20,28 +20,26 @@
- #include <WPGImport.h>
- #include <WPGImport.moc>
- 
--#include <QBuffer>
--#include <QByteArray>
--#include <QString>
--
--#include <kdebug.h>
- #include <KoFilterChain.h>
- #include <KoGlobal.h>
- #include <KoUnit.h>
-+#include <KoXmlWriter.h>
-+
- #include <kpluginfactory.h>
-+#include <KDebug>
- 
--#include <KoXmlWriter.h>
-+
-+#include <QtCore/QString>
-+#include <QtCore/QFile>
- 
- #include <libwpg/libwpg.h>
- #if LIBWPG_VERSION_MINOR<2
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
--#include "FileOutputHandler.hxx"
--#include "OdgExporter.hxx"
--
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +54,13 @@
- {
- }
- 
--static QByteArray createManifest()
--{
--    KoXmlWriter* manifestWriter;
--    QByteArray manifestData;
--    QBuffer manifestBuffer(&manifestData);
--
--    manifestBuffer.open(QIODevice::WriteOnly);
--    manifestWriter = new KoXmlWriter(&manifestBuffer);
--
--    manifestWriter->startDocument("manifest:manifest");
--    manifestWriter->startElement("manifest:manifest");
--    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
--    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
--    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
--    manifestWriter->addManifestEntry("content.xml", "text/xml");
--    manifestWriter->endElement();
--    manifestWriter->endDocument();
--    delete manifestWriter;
--
--    return manifestData;
--}
--
- 
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
--    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,59 +82,31 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
--        std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
-+        kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    // do the conversion
--    std::ostringstream tmpStringStream;
--    FileOutputHandler tmpHandler(tmpStringStream);
--    OdgExporter exporter(&tmpHandler);
--    libwpg::WPGraphics::parse(input, &exporter);
--    delete input;
--
--
--    // create output store
--    KoStore* storeout;
--    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
--                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
--
--    if (!storeout) {
--        kWarning() << "Couldn't open the requested file.";
--        return KoFilter::FileNotFound;
--    }
--
--#if 0
--    if (!storeout->open("styles.xml")) {
--        kWarning() << "Couldn't open the file 'styles.xml'.";
--        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
--    //storeout->write( createStyles() );
--    storeout->close();
--#endif
- 
--    if (!storeout->open("content.xml")) {
--        kWarning() << "Couldn't open the file 'content.xml'.";
--        return KoFilter::CreationError;
--    }
--    storeout->write(tmpStringStream.str().c_str());
--    storeout->close();
-+    delete input;
- 
--    // store document manifest
--    storeout->enterDirectory("META-INF");
--    if (!storeout->open("manifest.xml")) {
--        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
--        return KoFilter::CreationError;
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-     }
--    storeout->write(createManifest());
--    storeout->close();
- 
--    // we are done!
--    delete storeout;
-+    outputFile.write(output.cstr());
-+    outputFile.close();
- 
-     return KoFilter::OK;
- }
-
diff --git a/testing/koffice/koffice.install b/testing/koffice/koffice.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/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/testing/koffice/krita.install b/testing/koffice/krita.install
deleted file mode 100644
index 5d458de55..000000000
--- a/testing/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/testing/koffice/qt48fix.patch b/testing/koffice/qt48fix.patch
deleted file mode 100644
index de72926d5..000000000
--- a/testing/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/testing/lablgtk2/PKGBUILD b/testing/lablgtk2/PKGBUILD
deleted file mode 100644
index d259a5a19..000000000
--- a/testing/lablgtk2/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 148185 2012-01-30 18:47:52Z ibiru $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=lablgtk2
-pkgver=2.14.2
-pkgrel=5
-pkgdesc=" An Objective Caml interface to gtk2"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://lablgtk.forge.ocamlcore.org/"
-depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2')
-makedepends=('ocaml')
-optdepends=('ocaml: for using the tools')
-DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u')
-source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz)
-options=(!makeflags)
-md5sums=('bad77680a72dab8b915cae99d1ec9b1f')
-
-build() {
-  cd "${srcdir}/lablgtk-${pkgver}"
-  ./configure --prefix=/usr
-  make world
-  make opt
-}
-
-package() {
-  cd "${srcdir}/lablgtk-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/"
-}
diff --git a/testing/lbreakout2/PKGBUILD b/testing/lbreakout2/PKGBUILD
deleted file mode 100644
index cf0b7b616..000000000
--- a/testing/lbreakout2/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 148187 2012-01-30 18:47:55Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=lbreakout2
-pkgver=2.6.3
-pkgrel=3
-pkgdesc="A breakout game with nice effects, graphics, and sounds"
-arch=('i686' 'x86_64')
-url="http://lgames.sourceforge.net"
-license=('GPL')
-depends=('sdl_mixer' 'libpng')
-backup=('var/games/lbreakout2/lbreakout2.hscr')
-source=("http://downloads.sourceforge.net/lgames/${pkgname}-${pkgver/_/-}.tar.gz"
-        'lbreakout2.desktop'
-	'lbreakout2.png')
-md5sums=('43900187bc935475cd6489569cd2230a'
-         '14cd34a72a8f4e3b8f385f9023625241'
-         '94e2fa393eb2a7d4494641dec580573b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-
-  ./configure --prefix=/usr \
-              --localstatedir=/var/games/lbreakout2 
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-
-  make DESTDIR=${pkgdir}/ doc_dir=/usr/share/doc install
-  
-  chmod -R 755 ${pkgdir}/usr
-  chown root:games ${pkgdir}/var/games
-  chmod 775 ${pkgdir}/var/games
-  chown root:games ${pkgdir}/var/games/lbreakout2
-  chmod 755 ${pkgdir}/var/games/lbreakout2
-  chown root:games ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr
-  chmod 775 ${pkgdir}/var/games/lbreakout2/lbreakout2.hscr
-
-  install -Dm644 ${srcdir}/lbreakout2.png ${pkgdir}/usr/share/pixmaps/lbreakout2.png
-  install -Dm644 ${srcdir}/lbreakout2.desktop ${pkgdir}/usr/share/applications/lbreakout2.desktop
-}
diff --git a/testing/lbreakout2/lbreakout2.desktop b/testing/lbreakout2/lbreakout2.desktop
deleted file mode 100644
index c8ef945da..000000000
--- a/testing/lbreakout2/lbreakout2.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Linux Breakout 2
-Comment=Breakout and Arkanoid style arcade game
-Icon=/usr/share/pixmaps/lbreakout2.png
-TryExec=lbreakout2
-Exec=lbreakout2
-Terminal=false
-Categories=Application;Game;
diff --git a/testing/lbreakout2/lbreakout2.png b/testing/lbreakout2/lbreakout2.png
deleted file mode 100644
index f9541e184..000000000
--- a/testing/lbreakout2/lbreakout2.png
+++ /dev/null
diff --git a/testing/lcms/PKGBUILD b/testing/lcms/PKGBUILD
deleted file mode 100644
index e3c3e255a..000000000
--- a/testing/lcms/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148189 2012-01-30 18:47:57Z ibiru $
-# Maintainer: Tobias Kieslich <neri@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-pkgname=lcms
-pkgver=1.19
-pkgrel=2
-pkgdesc="Lightweight color management development library/engine"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('libtiff')
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8af94611baf20d9646c7c2c285859818')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm 644 COPYING \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/lcms2/PKGBUILD b/testing/lcms2/PKGBUILD
deleted file mode 100644
index 3ea0520ab..000000000
--- a/testing/lcms2/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148191 2012-01-30 18:47:59Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=lcms2
-pkgver=2.3
-pkgrel=2
-pkgdesc="Small-footprint color management engine, version 2"
-arch=('i686' 'x86_64')
-license=('MIT')
-depends=('libtiff')
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD
deleted file mode 100644
index 874ee1890..000000000
--- a/testing/less/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 149663 2012-02-08 23:59:35Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=less
-pkgver=444
-pkgrel=3
-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
-}
diff --git a/testing/libbonoboui/PKGBUILD b/testing/libbonoboui/PKGBUILD
deleted file mode 100644
index cc206725e..000000000
--- a/testing/libbonoboui/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148193 2012-01-30 18:48:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libbonoboui
-pkgver=2.24.5
-pkgrel=2
-pkgdesc="User Interface library for Bonobo"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('libgnomecanvas' 'libgnome')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop"
-}
diff --git a/testing/libdmapsharing/PKGBUILD b/testing/libdmapsharing/PKGBUILD
deleted file mode 100644
index a879dd0c5..000000000
--- a/testing/libdmapsharing/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 148195 2012-01-30 18:48:03Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libdmapsharing
-pkgver=2.9.12
-pkgrel=2
-pkgdesc="A library that implements the DMAP family of protocols"
-arch=('i686' 'x86_64')
-url="http://www.flyn.org/projects/libdmapsharing/index.html"
-license=('LGPL2.1')
-depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2')
-options=('!libtool')
-source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ec34948df21e9ba0656c917b10fed1c3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --with-mdns=avahi
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
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 3a6b333f2..000000000
--- a/testing/libdrm/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 149600 2012-02-08 16:02:53Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libdrm
-pkgver=2.4.31
-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
-#	git_fixes.diff
-)
-md5sums=('b8cf744ec113c6028fe0975b1133b649'
-         'fb8a15bf4aff5646c517373e8277f440'
-         'ba65e71c481b94ef0fb6c23c7f21ffa1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
-
-  # git fixes - currently none
-#  patch -Np1 -i ${srcdir}/git_fixes.diff
-  
-  #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/git_fixes.diff b/testing/libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/testing/libdrm/git_fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 19441f3..eb9dd32 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
- 				      bufmgr_gem->vma_cache.next,
- 				      vma_list);
- 		assert(bo_gem->map_count == 0);
--		DRMLISTDEL(&bo_gem->vma_list);
-+		DRMLISTDELINIT(&bo_gem->vma_list);
- 
- 		if (bo_gem->mem_virtual) {
- 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 03bb66953..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,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/testing/libgdiplus/PKGBUILD b/testing/libgdiplus/PKGBUILD
deleted file mode 100644
index 7ebba2deb..000000000
--- a/testing/libgdiplus/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 148197 2012-01-30 18:48:05Z ibiru $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=libgdiplus
-pkgver=2.10
-pkgrel=2
-pkgdesc="An Open Source Implementation of the GDI+ API"
-arch=(i686 x86_64)
-license=('MPL' 'LGPL')
-url="http://www.mono-project.com"
-depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch)
-md5sums=('451966e8f637e3a1f02d1d30f900255d'
-         'a2d143676bbaceeb88b4c34069e93986')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 <../libpng15.patch
-  ./configure --prefix=/usr --with-cairo=system || return 1
-  
-  make || return 1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/testing/libgdiplus/gdiplus-png14.patch b/testing/libgdiplus/gdiplus-png14.patch
deleted file mode 100644
index d13260812..000000000
--- a/testing/libgdiplus/gdiplus-png14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pngcodec.c.orig	2010-01-16 23:47:17.000000000 +0100
-+++ src/pngcodec.c	2010-01-16 23:49:49.000000000 +0100
-@@ -352,7 +352,7 @@
- 						info_ptr->palette[i].blue,
- 						info_ptr->palette[i].green,
- 						info_ptr->palette[i].red,
--						info_ptr->trans[i]); /* alpha */
-+						info_ptr->trans_alpha[i]); /* alpha */
- 			}
- 		}
- 
-@@ -418,7 +418,7 @@
- 		}
- 
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		}
- 
- 		if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
diff --git a/testing/libgdiplus/libpng15.patch b/testing/libgdiplus/libpng15.patch
deleted file mode 100644
index 31a1c0162..000000000
--- a/testing/libgdiplus/libpng15.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2011/01/21 10:21:51 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/pngcodec.c.orig	2010-11-03 16:52:54.000000000 +0000
-+++ src/pngcodec.c
-@@ -116,10 +116,15 @@ gdip_load_png_properties (png_structp pn
- 	bitmap_data->dpi_horz = png_get_x_pixels_per_inch(png_ptr, info_ptr);
- 	bitmap_data->dpi_vert = png_get_y_pixels_per_inch(png_ptr, info_ptr);
- #elif defined(PNG_pHYs_SUPPORTED)
--	if ((info_ptr->valid & PNG_INFO_pHYs) && (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)) {
--		bitmap_data->image_flags |= ImageFlagsHasRealDPI;
--		bitmap_data->dpi_horz = info_ptr->x_pixels_per_unit * 0.0254;
--		bitmap_data->dpi_vert = info_ptr->y_pixels_per_unit * 0.0254;
-+	if (png_get_valid (png_ptr, info_ptr, PNG_INFO_pHYs)) {
-+		png_uint_32 res_x, res_y;
-+		int unit_type;
-+		png_get_pHYs (png_ptr, info_ptr, &res_x, &res_y, &unit_type);
-+		if (unit_type == PNG_RESOLUTION_METER) {
-+			bitmap_data->image_flags |= ImageFlagsHasRealDPI;
-+			bitmap_data->dpi_horz = res_x * 0.0254;
-+			bitmap_data->dpi_vert = res_y * 0.0254;
-+		}
- 	}
- #endif
- 	/* default to screen resolution (if nothing was provided or available) */
-@@ -130,7 +135,7 @@ gdip_load_png_properties (png_structp pn
- #if defined(PNG_iCCP_SUPPORTED)
- 	{
- 		png_charp	name;
--		png_charp	profile;
-+		png_bytep	profile;
- 		png_uint_32	proflen;
- 		int		compression_type;
- 
-@@ -292,6 +297,11 @@ gdip_load_png_image_from_file_or_stream 
- 		ImageFlags	colourspace_flag;
- 		int		i;
- 		int		j;
-+		png_colorp	png_palette;
-+		int		png_num_palette;
-+		png_bytep	trans_alpha;
-+		int		num_trans;
-+		png_color_16p	trans_color;
- 
- 		width = png_get_image_width (png_ptr, info_ptr);
- 		height = png_get_image_height (png_ptr, info_ptr);
-@@ -309,6 +319,8 @@ gdip_load_png_image_from_file_or_stream 
- 		}
- 
- 		/* Copy palette. */
-+		png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
-+
- 		num_colours = 1 << bit_depth;
- 
- 		if (png_get_color_type (png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) {
-@@ -321,8 +333,8 @@ gdip_load_png_image_from_file_or_stream 
- 			colourspace_flag = ImageFlagsColorSpaceRGB;
- 
- 			palette_entries = num_colours;
--			if (palette_entries > info_ptr->num_palette) {
--				palette_entries = info_ptr->num_palette;
-+			if (palette_entries > png_num_palette) {
-+				palette_entries = png_num_palette;
- 			}
- 
- 			palette = GdipAlloc (sizeof(ColorPalette) + (num_colours - 1) * sizeof(ARGB));
-@@ -331,29 +343,30 @@ gdip_load_png_image_from_file_or_stream 
- 
- 			for (i=0; i < palette_entries; i++) {
- 				set_pixel_bgra (&palette->Entries[i], 0,
--						info_ptr->palette[i].blue,
--						info_ptr->palette[i].green,
--						info_ptr->palette[i].red,
-+						png_palette[i].blue,
-+						png_palette[i].green,
-+						png_palette[i].red,
- 						0xFF); /* alpha */
- 			}
- 		}
- 
-+		png_get_tRNS (png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
- 		/* Make sure transparency is respected. */
--		if (info_ptr->num_trans > 0) {
-+		if (num_trans > 0) {
- 			palette->Flags |= PaletteFlagsHasAlpha;
- 			colourspace_flag |= ImageFlagsHasAlpha;
- 
--			if (info_ptr->num_trans > info_ptr->num_palette) {
--				info_ptr->num_trans = info_ptr->num_palette;
-+			if (num_trans > png_num_palette) {
-+				num_trans = png_num_palette;
- 			}
- 
--			for (i=0; i < info_ptr->num_trans; i++) {
-+			for (i=0; i < num_trans; i++) {
- 				set_pixel_bgra(&palette->Entries[i], 0,
--						info_ptr->palette[i].blue,
--						info_ptr->palette[i].green,
--						info_ptr->palette[i].red,
-+						png_palette[i].blue,
-+						png_palette[i].green,
-+						png_palette[i].red,
- #if PNG_LIBPNG_VER > 10399
--						info_ptr->trans_alpha [i]); /* alpha */
-+						trans_alpha [i]); /* alpha */
- #else
- 						info_ptr->trans[i]); /* alpha */
- #endif
-@@ -398,6 +411,8 @@ gdip_load_png_image_from_file_or_stream 
- 		BYTE		bit_depth;
- 		int		stride;
- 		int		interlace;
-+		png_colorp	png_palette;
-+		int		png_num_palette;
- 		png_bytep *row_pointers;
- 		BYTE *rawptr;
- 		int i, j;
-@@ -490,32 +505,33 @@ gdip_load_png_image_from_file_or_stream 
- 							png_byte palette = 0;
- 							png_byte pix = *rowp++;
- 
-+							png_get_PLTE (png_ptr, info_ptr, &png_palette, &png_num_palette);
- 							palette = (pix >> 6) & 0x03;
- 							set_pixel_bgra (rawptr, 0,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 
- 							palette = (pix >> 4) & 0x03;
- 							set_pixel_bgra (rawptr, 4,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 
- 							palette = (pix >> 2) & 0x03;
- 							set_pixel_bgra (rawptr, 8,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 
- 							palette = pix & 0x03;
- 							set_pixel_bgra (rawptr, 12,
--								info_ptr->palette[palette].blue,
--								info_ptr->palette[palette].green,
--								info_ptr->palette[palette].red,
-+								png_palette[palette].blue,
-+								png_palette[palette].green,
-+								png_palette[palette].red,
- 								0xFF); /* alpha */
- 							rawptr += 16;
- 						}
diff --git a/testing/libgnome-media-profiles/PKGBUILD b/testing/libgnome-media-profiles/PKGBUILD
deleted file mode 100644
index a175b4073..000000000
--- a/testing/libgnome-media-profiles/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 148201 2012-01-30 18:48:10Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libgnome-media-profiles
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Library for management of audio recording profiles"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!emptydirs' '!libtool')
-install=libgnome-media-profiles.install
-source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-static -disable-scrollkeeper \
-    --disable-schemas-install
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-audio-profiles "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libgnome-media-profiles/libgnome-media-profiles.install b/testing/libgnome-media-profiles/libgnome-media-profiles.install
deleted file mode 100644
index 22b4c8f12..000000000
--- a/testing/libgnome-media-profiles/libgnome-media-profiles.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=libgnome-media-profiles
-
-post_install(){
-    usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/libgnomecanvas/PKGBUILD b/testing/libgnomecanvas/PKGBUILD
deleted file mode 100644
index a928bf3f8..000000000
--- a/testing/libgnomecanvas/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148199 2012-01-30 18:48:07Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomecanvas
-pkgver=2.30.3
-pkgrel=2
-pkgdesc="The GNOME Canvas library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21')
-makedepends=('pkg-config' 'intltool')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static \
-      --enable-glade
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgnomeui/PKGBUILD b/testing/libgnomeui/PKGBUILD
deleted file mode 100644
index 85b03abc8..000000000
--- a/testing/libgnomeui/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148540 2012-02-03 15:59:35Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomeui
-pkgver=2.24.5
-pkgrel=1
-pkgdesc="User Interface library for GNOME"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libbonoboui' 'libgnome-keyring' 'libsm')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2)
-sha256sums=('ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/libgnomeui
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD
deleted file mode 100644
index b995ad986..000000000
--- a/testing/libgpod/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 148205 2012-01-30 18:48:15Z ibiru $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.2
-pkgrel=3
-pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings')
-url="http://www.gtkpod.org/libgpod/"
-source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --enable-udev --with-python=/usr/bin/python2
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/libgtkhtml/PKGBUILD b/testing/libgtkhtml/PKGBUILD
deleted file mode 100644
index bd58d8f4a..000000000
--- a/testing/libgtkhtml/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148207 2012-01-30 18:48:17Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgtkhtml
-pkgver=2.11.1
-pkgrel=4
-pkgdesc="An HTML library for GTK"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk2>=2.22.1' 'libxml2>=2.7.8')
-makedepends=('perlxml')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a1d1a197dcff8c4571659deef5495e24')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libmp3splt/PKGBUILD b/testing/libmp3splt/PKGBUILD
deleted file mode 100644
index 4cc2de5ae..000000000
--- a/testing/libmp3splt/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 149665 2012-02-08 23:59:37Z allan $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=libmp3splt
-pkgver=0.7
-pkgrel=2
-pkgdesc="Library for splitting mp3 and ogg files without decoding"
-arch=('i686' 'x86_64')
-url="http://mp3splt.sourceforge.net"
-license=('GPL')
-depends=('libmad' 'libvorbis' 'libid3tag' 'libtool')
-makedepends=('git')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz)
-md5sums=('dadb166361e2a28955032a1b9f10ed38')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  libtoolize --copy --force
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() { 
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-}
diff --git a/testing/libpano13/PKGBUILD b/testing/libpano13/PKGBUILD
deleted file mode 100644
index bfb14a2be..000000000
--- a/testing/libpano13/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148209 2012-01-30 18:48:19Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libpano13
-pkgver=2.9.18
-pkgrel=2
-pkgdesc="Basic library to calculate panoramical pictures - core functions of the panotools"
-arch=('i686' 'x86_64')
-url="http://panotools.sourceforge.net/"
-license=('GPL2')
-depends=('libpng' 'libtiff')
-makedepends=('openjdk6')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9c3a4fce8b6f1d79e395896ce5d8776e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME}
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libpng/PKGBUILD b/testing/libpng/PKGBUILD
deleted file mode 100644
index a87bf974f..000000000
--- a/testing/libpng/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 148513 2012-02-02 22:26:40Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Travis Willard <travis@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=libpng
-pkgver=1.5.8
-_apngver=1.5.7
-pkgrel=1
-pkgdesc="A collection of routines used to create PNG format graphics files"
-arch=('i686' 'x86_64')
-url="http://www.libpng.org/pub/png/libpng.html"
-license=('custom')
-depends=('zlib' 'sh')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
-        "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('0f7ae352beadaff78073733905613041'
-         '6c6a674048cec94db1bc35decf0d142c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "$srcdir/libpng-$_apngver-apng.patch"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-  install -m755 png2pnm pnm2png "$pkgdir/usr/bin/"
-  install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libreoffice/PKGBUILD.next_stable b/testing/libreoffice/PKGBUILD.next_stable
deleted file mode 100644
index a8cb4c5ad..000000000
--- a/testing/libreoffice/PKGBUILD.next_stable
+++ /dev/null
@@ -1,631 +0,0 @@
-# $Id: PKGBUILD 142692 2011-11-12 20:22:14Z ibiru $
-# 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-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder')
-_LOver=3.4.99.3
-pkgver=3.5.0beta3
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment'
-              #'saxon' - currently broken 
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	     'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-	#${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
-	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810)
-noextract=(053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-	7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-#	cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
-)
-md5sums=('3f223ec797a100e557f7138c8ab4a91b'
-         'bb08c856e5c9a7a8bcf22fefdb7cf13f'
-         '83bd4be3370840de3e535b2c974e8af5'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '053a35c244bf132f806e198ac4d960aa'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         'e1c178b18f130b40494561f02bc1a948'
-         '7c2549f6b0a8bb604e6c4c729ffdcfe6'
-         '185d60944ea767075d27247c3162b3bc'
-         '60ce5dc9bd098f95c2e621a930c98dd9'
-         '661a52a02a31b3afbe4b3b3146061afd')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-        cd ${srcdir}/libreoffice-core-$_LOver
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
-	ln -s ../libreoffice-translations-$_LOver/translations .
-
-	# buildfixes & bugfixes
-	# one late fix to solve make distro-pack-install issue
-	patch -Np1 -i ${srcdir}/gmake_install.diff
-	patch -Np1 -i ${srcdir}/smp_buildfix.diff
-	
-	# unset C(XX)FLAGS
-	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
-#	unset CFLAGS
-#	unset CXXFLAGS
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-#	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-#	touch autogen.lastrun
-	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-lockdown\
-		--enable-mergelibs \
-		--enable-opengl \
-		--enable-odk\
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-sampleicc \
-		--without-system-libexttextcat \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--disable-mozilla \
-		--without-system-mozilla \
-		--without-system-mozilla-headers \
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--with-install-dirname="${pkgbase}" 
-#		--enable-cairo\
-#		--with-system-libtextcat \
-#		--with-external-libtextcat-data \
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             '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'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #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}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-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}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
-        -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/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}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
diff --git a/testing/librsvg/PKGBUILD b/testing/librsvg/PKGBUILD
deleted file mode 100644
index dd830cee2..000000000
--- a/testing/librsvg/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148386 2012-01-30 22:52:09Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=librsvg
-pkgver=2.34.2
-pkgrel=3
-pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2>=2.24.1-3' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk2')
-optdepends=('gtk2: for rsvg-view support')
-options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
-install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz)
-sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \
-      --with-croco --disable-static \
-      --with-svgz
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/librsvg/librsvg.install b/testing/librsvg/librsvg.install
deleted file mode 100644
index 4d48b071f..000000000
--- a/testing/librsvg/librsvg.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD
deleted file mode 100644
index 76eabb1f2..000000000
--- a/testing/libssh2/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148465 2012-02-01 13:38:10Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: ice-man <icemanf@gmail.com>
-
-pkgname=libssh2
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
-url="http://www.libssh2.org/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('openssl')
-makedepends=('zlib')
-provides=('libssh2.so=1-64')
-options=('!libtool')
-source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc})
-md5sums=('ee670161d8c5dff93ae84a3f34f15669'
-         'd30af693479e5e88036ffb61ab8d0dc9')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libtiff/PKGBUILD b/testing/libtiff/PKGBUILD
deleted file mode 100644
index fd35c4a19..000000000
--- a/testing/libtiff/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 148217 2012-01-30 18:48:31Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=libtiff
-pkgver=4.0.0
-pkgrel=1
-pkgdesc="Library for manipulation of TIFF images"
-arch=('i686' 'x86_64')
-url="http://www.remotesensing.org/libtiff/"
-license=('custom')
-depends=('libjpeg' 'zlib' 'xz')
-makedepends=('freeglut')
-optdepends=('freeglut: for using tiffgt')
-options=('!libtool')
-source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
-sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522')
-
-build() {
-  cd "${srcdir}/tiff-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/tiff-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/tiff-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD
deleted file mode 100644
index 6916421cd..000000000
--- a/testing/libtool/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 149667 2012-02-08 23:59:39Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuilt with each new gcc version
-
-pkgname=('libtool' 'libltdl')
-pkgver=2.4.2
-pkgrel=3
-pkgdesc="A generic library support script"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make check
-}
-
-package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.2')
-  groups=('base-devel')
-  install=libtool.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
-                         install-ltdlincludeHEADERS install-data-local
-  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
-}
diff --git a/testing/libtool/libtool.install b/testing/libtool/libtool.install
deleted file mode 100644
index 73cf56422..000000000
--- a/testing/libtool/libtool.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/libunique3/PKGBUILD b/testing/libunique3/PKGBUILD
deleted file mode 100644
index 0f0046ae3..000000000
--- a/testing/libunique3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148219 2012-01-30 18:48:33Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=libunique3
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="Library for writing single instance applications for GTK3"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-url="http://live.gnome.org/LibUnique"
-source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz)
-sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038')
-
-build() {
-  cd "$srcdir/libunique-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-dbus
-  make
-}
-
-package() {
-  cd "$srcdir/libunique-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
deleted file mode 100644
index 1d7f99e56..000000000
--- a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c
---- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c	2006-02-06 05:47:26.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c	2007-07-04 18:12:58.000000000 +1000
-@@ -282,7 +282,7 @@
- 
- void render_deformation(JessPrivate *priv, int defmode)
- {
--	uint32_t bmax;
-+	intptr_t bmax;
- 	uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i;
- 	uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux;
- 
-@@ -294,7 +294,7 @@
- 		tab2 = priv->table2;
- 		tab3 = priv->table3;
- 		tab4 = priv->table4;
--		bmax = priv->resx * priv->resy + (uint32_t) priv->pixel;
-+		bmax = priv->resx * priv->resy + (intptr_t) priv->pixel;
- 
- 		switch(defmode)
- 		{
-@@ -352,7 +352,7 @@
- 		}
- 		for (i = 0; i < priv->resy * priv->resx; i++)
- 		{
--			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer);
-+			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer);
- 			*(pix++) = *(aux++) ;
- 			*(pix++) = *(aux++);  
- 			*(pix++) = *(aux);  
-@@ -373,7 +373,8 @@
- 	/* j'ai mis pixel par defaut... */
- 
- 	uint8_t *pix = priv->pixel;
--	uint32_t bmax,pitch_4;
-+	intptr_t bmax;
-+	uint32_t pitch_4;
- 	
- 	pix = priv->pixel;
- 	if (priv->pixel == NULL)
-@@ -387,7 +388,7 @@
- 	if (priv->video == 8)
- 	{
- 		if (visual_cpu_get_mmx ()) {
--			bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel;
-+			bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel;
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
- 			__asm __volatile
- 				("\n\t pxor %%mm6, %%mm6"
-@@ -423,7 +424,7 @@
- 	else
- 	{
- 		pitch_4 = priv->pitch+4;
--		bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel;
-+		bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel;
- 
- 		if (visual_cpu_get_mmx ()) {
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
diff --git a/testing/libvisual-plugins/03_build_against_gl_fixes.patch b/testing/libvisual-plugins/03_build_against_gl_fixes.patch
deleted file mode 100644
index b21558232..000000000
--- a/testing/libvisual-plugins/03_build_against_gl_fixes.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_bumpscope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_bumpscope_la_LDFLAGS = -module -avoid-version 
-+actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_bumpscope_la_SOURCES = actor_bumpscope.c \
- 			  actor_bumpscope.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_corona.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- actor_corona_la_LDFLAGS = -module -avoid-version
-+actor_corona_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_corona_la_SOURCES = actor_corona.cpp \
- 			  autopal.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am	2006-02-24 00:34:48.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version 
-+actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS)
- 
- actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_gstreamer.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_gstreamer_la_LDFLAGS = -module -avoid-version 
-+actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
- 
- actor_gstreamer_la_SOURCES = actor_gstreamer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_infinite.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_infinite_la_LDFLAGS = -module -avoid-version 
-+actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_infinite_la_SOURCES = compute.c compute.h \
- 			    display.c display.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_jakdaw.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_jakdaw_la_LDFLAGS = -module -avoid-version 
-+actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_jakdaw_la_SOURCES = actor_jakdaw.c \
- 			  actor_jakdaw.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_JESS.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_JESS_la_LDFLAGS = -module -avoid-version
-+actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\
- 			distorsion.c distorsion.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_analyzer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_lv_analyzer_la_LDFLAGS = -module -avoid-version 
-+actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_lv_gltest_la_LDFLAGS = -module -avoid-version 
--actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- actor_lv_gltest_la_SOURCES = actor_lv_gltest.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am	2006-02-23 20:03:29.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_scope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_lv_scope_la_LDFLAGS = -module -avoid-version 
-+actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_scope_la_SOURCES = actor_lv_scope.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -10,5 +10,5 @@
- 
- actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\"
- actor_madspin_la_LDFLAGS = -module -avoid-version 
--actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
-+actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
- actor_madspin_la_SOURCES = madspin.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am	2006-02-24 22:24:50.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_nastyfft_la_LDFLAGS = -module -avoid-version 
--actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
-+actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
- actor_nastyfft_la_SOURCES = actor_nastyfft.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am	2006-02-23 20:03:31.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_oinksie.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_oinksie_la_LDFLAGS = -module -avoid-version 
-+actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_oinksie_la_SOURCES = actor_oinksie.c\
- 			   oinksie.c oinksie.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am	2006-03-09 00:06:58.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,7 +4,7 @@
- 
- actor_flower_la_LDFLAGS = -module -avoid-version 
- actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
--actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- 
- actor_flower_la_SOURCES = \
- 	actor_flower.c \
-diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am	2006-02-23 20:03:35.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_alsa.la
- 
--LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_alsa_la_LDFLAGS = -module -avoid-version 
-+input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS)
- 
- input_alsa_la_SOURCES = input_alsa.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am	2006-02-23 20:03:36.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_debug.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_debug_la_LDFLAGS = -module -avoid-version 
-+input_debug_la_LIBADD = $(LIBVISUAL_LIBS)
- input_debug_la_SOURCES = input_debug.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_esd.la
- 
--LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- input_esd_la_LDFLAGS = -module -avoid-version 
-+input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
- input_esd_la_SOURCES = input_esd.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- input_plugin_LTLIBRARIES = input_jack.la
- 
--LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_jack_la_LDFLAGS = -module -avoid-version 
-+input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
- 
- input_jack_la_SOURCES = input_jack.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_mplayer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_mplayer_la_LDFLAGS = -module -avoid-version 
-+input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS)
- input_mplayer_la_SOURCES = input_mplayer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_alphablend.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_alphablend_la_LDFLAGS = -module -avoid-version 
-+morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_alphablend_la_SOURCES = morph_alphablend.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_flash.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_flash_la_LDFLAGS = -module -avoid-version 
-+morph_flash_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_flash_la_SOURCES = morph_flash.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_slide.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_slide_la_LDFLAGS = -module -avoid-version 
-+morph_slide_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_slide_la_SOURCES = morph_slide.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_tentacle.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_tentacle_la_LDFLAGS = -module -avoid-version 
-+morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_tentacle_la_SOURCES = morph_tentacle.c
diff --git a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
deleted file mode 100644
index 1fc5f7fc7..000000000
--- a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac
---- libvisual-plugins-0.4.0/configure.ac	2006-03-17 03:50:41.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/configure.ac	2007-07-04 18:22:38.000000000 +1000
-@@ -361,7 +361,7 @@
-   [ENABLE_ANALYZER=$enableval],
-   [ENABLE_ANALYZER=yes])
- 
--if test "$ENABLE_ANALYZER" = xyes; then
-+if test "$ENABLE_ANALYZER" = "yes"; then
-   build_actor_plugins="$build_actor_plugins lv_analyzer"
- fi
- 
diff --git a/testing/libvisual-plugins/050_all_automagic.patch b/testing/libvisual-plugins/050_all_automagic.patch
deleted file mode 100644
index 9c25fac72..000000000
--- a/testing/libvisual-plugins/050_all_automagic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.ac.old	2007-02-24 23:09:08.000000000 +0100
-+++ configure.ac	2007-02-24 23:13:15.000000000 +0100
-@@ -89,7 +89,18 @@
- 
- dnl Libraries
- 
-+dnl List of plugins to build
-+build_input_plugins=""
-+build_actor_plugins=""
-+build_morph_plugins=""
-+
- dnl EsounD
-+AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd],
-+	[Do not build esound input plugin @<:@default=enabled@:>@]),
-+	[ENABLE_INPUT_ESD=$enableval],
-+	[ENABLE_INPUT_ESD=yes])
-+
-+if test "$ENABLE_INPUT_ESD" = "yes"; then
- PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version],
-   [HAVE_ESD="yes"], [HAVE_ESD="no"])
- 
-@@ -98,8 +109,15 @@
- else
-   AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built])
- fi
-+fi
- 
- dnl JACK
-+AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack],
-+	[Do not build jack input plugin @<:@default=enabled@:>@]),
-+        [ENABLE_INPUT_JACK=$enableval],
-+	[ENABLE_INPUT_JACK=yes])
-+
-+if test "$ENABLE_INPUT_JACK" = "yes"; then
- PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"])
- if test "$HAVE_JACK" = "yes"; then
-   build_input_plugins="$build_input_plugins jack"
-@@ -107,11 +125,7 @@
-   AC_MSG_WARN([*** libjack is too old. You can download a newer version at
-              http://jackit.sf.net/. The jackit input plugin won't be built])
- fi
--
--dnl List of plugins to build
--build_input_plugins=""
--build_actor_plugins=""
--build_morph_plugins=""
-+fi
- 
- dnl GdkPixbuf
- AC_ARG_ENABLE([gdkpixbuf-plugin],
diff --git a/testing/libvisual-plugins/05_fix_po.patch b/testing/libvisual-plugins/05_fix_po.patch
deleted file mode 100644
index a5413ef1b..000000000
--- a/testing/libvisual-plugins/05_fix_po.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in
---- libvisual-plugins-0.4.0/po/Makefile.in.in	2006-03-21 05:48:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/po/Makefile.in.in	2007-07-09 21:50:13.000000000 +1000
-@@ -28,7 +28,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
-diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs
---- libvisual-plugins-0.4.0/po/mkinstalldirs	1970-01-01 10:00:00.000000000 +1000
-+++ libvisual-plugins-0.4.0.new/po/mkinstalldirs	2006-03-21 05:48:42.000000000 +1100
-@@ -0,0 +1,111 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
-+
-+errstatus=0
-+dirmode=""
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage" 1>&2
-+      exit 0
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
-+
-+for file
-+do
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+case $dirmode in
-+  '')
-+    if mkdir -p -- . 2>/dev/null; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    fi
-+    ;;
-+esac
-+
-+for file
-+do
-+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+  shift
-+
-+  pathcomp=
-+  for d
-+  do
-+    pathcomp="$pathcomp$d"
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+  	errstatus=$lasterr
-+      else
-+  	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+    	  lasterr=""
-+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+  	  if test ! -z "$lasterr"; then
-+  	    errstatus=$lasterr
-+  	  fi
-+  	fi
-+      fi
-+    fi
-+
-+    pathcomp="$pathcomp/"
-+  done
-+done
-+
-+exit $errstatus
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# End:
-+# mkinstalldirs ends here
diff --git a/testing/libvisual-plugins/PKGBUILD b/testing/libvisual-plugins/PKGBUILD
deleted file mode 100644
index 7a2d49087..000000000
--- a/testing/libvisual-plugins/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 148221 2012-01-30 18:48:36Z ibiru $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=libvisual-plugins
-pkgver=0.4.0
-pkgrel=5
-pkgdesc="plugins for libvisual"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://www.localhost.nl/~synap/libvisual/"
-depends=('libvisual' 'gtk2' 'mesa' 'alsa-lib' 'jack')
-makedepends=('pkgconfig' 'namcap')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz
-        02_64-bit_JESS_fix.patch
-        03_build_against_gl_fixes.patch
-        04_lv_analyzer_build_fix.patch
-        05_fix_po.patch
-        050_all_automagic.patch)
-md5sums=('4330e9287f9d6fae02f482f428a1e77b'
-         'f9cfb607bfcbfef60830fae4e7dc6963'
-         '116701408747dbb87dc134434478ebe2'
-         '01678a8f1584c76a44e59d81003a1109'
-         '6189b7427c4e11c8b8d6c6266d6a1629'
-         'b50ae94c424a5f0af235deffa8451eb6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch"
-  patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch"
-  patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch"
-  patch -Np0 -i "${srcdir}/050_all_automagic.patch"
-
-  autoreconf -fi
-  # Apply later as autoreconf overwrites po/Makefile.in.in
-  patch -Np1 -i "${srcdir}/05_fix_po.patch"
-
-  ./configure --prefix=/usr \
-      --disable-gstreamer-plugin \
-      --disable-gforce \
-      --disable-esd
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libvpx/PKGBUILD b/testing/libvpx/PKGBUILD
deleted file mode 100644
index be5b7375e..000000000
--- a/testing/libvpx/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 149119 2012-02-05 21:34:27Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libvpx
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="The VP8 Codec SDK"
-arch=('i686' 'x86_64')
-url="http://www.webmproject.org/"
-license=('BSD')
-depends=('glibc')
-makedepends=('yasm')
-source=(http://webm.googlecode.com/files/$pkgname-v$pkgver.tar.bz2)
-sha1sums=('2919e11074fef72fc61ef1a75160050ffaad6074')
-
-build() {
-    cd "$srcdir/$pkgname-v$pkgver"
-    ./configure --prefix=/usr --enable-vp8 \
-        --enable-runtime-cpu-detect \
-        --enable-shared \
-        --enable-postproc \
-        --enable-pic \
-        --disable-install-docs \
-        --disable-install-srcs
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-v$pkgver"
-    make DIST_DIR="$pkgdir/usr" install
-    install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libwebkit/PKGBUILD b/testing/libwebkit/PKGBUILD
deleted file mode 100644
index e7b30f287..000000000
--- a/testing/libwebkit/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 148493 2012-02-02 15:30:16Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit libwebkit3)
-pkgver=1.6.3
-pkgrel=1
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
-options=('!libtool' '!emptydirs')
-install=libwebkit.install
-source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
-sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3')
-
-build() {
-  cd "$srcdir/webkit-$pkgver"
-  mkdir build-gtk{2,3}
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 )
-  ( cd build-gtk3 && _build --with-gtk=3.0 )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype \
-    --with-unicode-backend=icu \
-    --enable-spellcheck "$@"
-  make all stamp-po
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk3"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
-}
diff --git a/testing/libwebkit/libwebkit.install b/testing/libwebkit/libwebkit.install
deleted file mode 100644
index 24072f316..000000000
--- a/testing/libwebkit/libwebkit.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libwmf/PKGBUILD b/testing/libwmf/PKGBUILD
deleted file mode 100644
index aef0d08d4..000000000
--- a/testing/libwmf/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 148225 2012-01-30 18:48:42Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=libwmf
-pkgver=0.2.8.4
-pkgrel=9
-pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
-arch=('i686' 'x86_64')
-url="http://wvware.sourceforge.net/libwmf.html"
-license=('LGPL')
-depends=('libpng' 'libx11' 'libjpeg' 'gsfonts')
-makedepends=('gtk2' 'libxt')
-optdepends=('gdk-pixbuf2: for pixbuf loader')
-options=('!libtool' '!docs' '!emptydirs')
-install=libwmf.install
-source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz
-	libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch)
-sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89'
-          '42aa4c2a82e4e14044c875a7f439baea732a355a'
-          'ea6d28880840e86c96f9079bfd591da54dcffa5c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch"
-  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch"
-  ./configure --prefix=/usr \
-              --with-gsfontdir=/usr/share/fonts/Type1 \
-	      --with-fontdir=/usr/share/fonts/Type1 \
-	      --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  #Remove fonts, these are in gsfonts
-  rm -rf "${pkgdir}/usr/share/fonts"
-  #Remove static GTK loader, can't use it anyways
-  rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a
-}
diff --git a/testing/libwmf/libwmf-0.2.8.4-libpng-1.5.patch b/testing/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
deleted file mode 100644
index 3528c74eb..000000000
--- a/testing/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h
---- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h	2011-05-23 19:14:23.000000000 +0200
-+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2011-05-23 19:15:11.000000000 +0200
-@@ -66,7 +66,7 @@
- 		return;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
- 		png_destroy_write_struct (&png_ptr,&info_ptr);
- 		wmf_free (API,buffer);
diff --git a/testing/libwmf/libwmf-0.2.8.4-useafterfree.patch b/testing/libwmf/libwmf-0.2.8.4-useafterfree.patch
deleted file mode 100644
index 328c5411f..000000000
--- a/testing/libwmf/libwmf-0.2.8.4-useafterfree.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list	2009-04-24 04:06:44.000000000 -0400
-+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c	2009-04-24 04:08:30.000000000 -0400
-@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
- 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
- 		if (more == 0) return;
- 		im->clip->max += 8;
-+                im->clip->list = more;
- 	}
- 	im->clip->list[im->clip->count] = (*rect);
- 	im->clip->count++;
diff --git a/testing/libwmf/libwmf.install b/testing/libwmf/libwmf.install
deleted file mode 100644
index 9c99a901b..000000000
--- a/testing/libwmf/libwmf.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then
-    gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/libxfcegui4/PKGBUILD b/testing/libxfcegui4/PKGBUILD
deleted file mode 100644
index 17e03c01f..000000000
--- a/testing/libxfcegui4/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 148227 2012-01-30 18:48:44Z ibiru $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
-
-pkgname=libxfcegui4
-pkgver=4.8.1
-pkgrel=4
-pkgdesc="Various Gtk widgets for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-depends=('startup-notification' "xfconf>=4.8.0" "libglade" 'libsm'
-         'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libxfcegui4/libxfcegui4.install b/testing/libxfcegui4/libxfcegui4.install
deleted file mode 100644
index abf924aa2..000000000
--- a/testing/libxfcegui4/libxfcegui4.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/lighttpd/PKGBUILD b/testing/lighttpd/PKGBUILD
deleted file mode 100644
index c128ef1cf..000000000
--- a/testing/lighttpd/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 149669 2012-02-08 23:59:41Z allan $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=lighttpd
-pkgver=1.4.30
-pkgrel=3
-pkgdesc='a secure, fast, compliant and very flexible web-server'
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://www.lighttpd.net/"
-depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
-optdepends=('libxml2: mod_webdav'
-            'lua: mod_cml/mod_magnet'
-            'libmysqlclient: mod_mysql_vhost'
-            'sqlite3: mod_webdav')
-backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
-options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
-        "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
-            '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
-            'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
-            '550aa1abaced6bc9e8d65c2b069bfc96bf4d06734b17eeb140c5d00705de1230'
-            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/lighttpd/modules \
-		--sysconfdir=/etc/lighttpd \
-		--with-mysql \
-		--with-ldap \
-		--with-attr \
-		--with-openssl \
-		--with-kerberos5 \
-		--without-fam \
-		--with-webdav-props \
-		--with-webdav-locks \
-		--with-gdbm \
-		--with-memcache \
-		--with-lua
-	make
-}
-
-check() {
-	cd $srcdir/$pkgname-$pkgver
-	make check
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make DESTDIR=$pkgdir install
-
-	install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
-	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
-	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
-	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
-
-	pushd doc/config >/dev/null
-	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
-	popd >/dev/null
-
-	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/testing/lighttpd/lighttpd.conf b/testing/lighttpd/lighttpd.conf
deleted file mode 100644
index ed192352a..000000000
--- a/testing/lighttpd/lighttpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a minimal example config
-# See /usr/share/doc/lighttpd
-# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
-
-server.port		= 80
-server.username		= "http"
-server.groupname	= "http"
-server.document-root	= "/srv/http"
-server.errorlog		= "/var/log/lighttpd/error.log"
-dir-listing.activate	= "enable"
-index-file.names	= ( "index.html" )
-mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png", "" => "application/octet-stream" )
diff --git a/testing/lighttpd/lighttpd.logrotate.d b/testing/lighttpd/lighttpd.logrotate.d
deleted file mode 100644
index 5be47b863..000000000
--- a/testing/lighttpd/lighttpd.logrotate.d
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/lighttpd/*log {
-	missingok
-	copytruncate
-	notifempty
-	sharedscripts
-	postrotate
-	/etc/rc.d/lighttpd reload >/dev/null || true
-	endscript
-}
diff --git a/testing/lighttpd/lighttpd.rc.d b/testing/lighttpd/lighttpd.rc.d
deleted file mode 100644
index 88f0a1474..000000000
--- a/testing/lighttpd/lighttpd.rc.d
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-pid_file='/var/run/lighttpd/lighttpd-angel.pid'
-
-get_pid() {
-	if [ -r "${pid_file}" ]; then
-		cat "${pid_file}"
-	else
-		pgrep -f /usr/sbin/lighttpd-angel
-	fi
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/lighttpd/lighttpd.conf ]; then
-		stat_append '(/etc/lighttpd/lighttpd.conf not found)'
-		stat_die
-	fi
-
-	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
-		stat_die
-	fi
-
-	local piddir=$(dirname "${pid_file}")
-	if [ ! -d "${piddir}" ]; then
-		install -d -m755 -o http -g http "${piddir}"
-	fi
-
-	stat_done
-}
-
-start() {
-	stat_busy 'Starting lighttpd'
-
-	local PID=$(get_pid)
-	if [ -z "$PID" ]; then
-		nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 &
-		if [ $? -gt 0 ]; then
-			stat_die
-		else
-			echo $! > "${pid_file}"
-			add_daemon lighttpd
-			stat_done
-		fi
-	else
-		stat_die
-	fi
-}
-
-stop() {
-	stat_busy 'Stopping lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-gracefull-stop() {
-	stat_busy 'Stopping lighttpd gracefully'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -INT $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-reload() {
-	stat_busy 'Reloading lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_die
-	else
-		stat_done
-	fi
-}
-
-
-case "$1" in
-	start)
-		test_config
-		start
-		;;
-	stop)
-		test_config
-		stop
-		;;
-	gracefull-stop)
-		test_config
-		stop
-		;;
-	reload)
-		test_config
-		reload
-		;;
-	restart)
-		test_config
-		stop
-		while [ -n "$(get_pid)" ]; do
-			sleep 1
-		done
-		start
-		;;
-	status)
-		stat_busy 'Checking lighttpd status'
-		ck_status lighttpd
-		;;
-	*)
-	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD
deleted file mode 100644
index 51bd49e72..000000000
--- a/testing/links/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 148229 2012-01-30 18:48:47Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=links
-pkgver=2.5
-pkgrel=1
-pkgdesc="A text WWW browser, similar to Lynx"
-arch=('i686' 'x86_64')
-url="http://links.twibright.com/"
-license=('GPL')
-depends=('bzip2' 'xz' 'zlib' 'openssl' 'gpm')
-makedepends=('libtiff' 'libpng' 'libxt')
-optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks')
-provides=('links-g')
-conflicts=('links-g')
-replaces=('links-g')
-source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop)
-sha1sums=('fe4bc37be8aebd9196c35ffef724435cea94349c'
-          'f600e27c2a71184444f7dd07a10230aa44463a02')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  (cd intl; ./gen-intl; ./synclang)
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --enable-graphics --with-x --with-fb
-  make
-  mv links xlinks
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --disable-graphics --without-x  --without-fb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
-  ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
-
-  install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
-  install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
-
-  install -d "${pkgdir}/usr/share/doc/links/calibration"
-  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
-}
diff --git a/testing/links/links.desktop b/testing/links/links.desktop
deleted file mode 100644
index 9d6338a5b..000000000
--- a/testing/links/links.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Links
-Exec=xlinks -g
-Icon=links_32x32.xpm
-Type=Application
-Terminal=false
-Categories=Network;WebBrowser;
diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules
deleted file mode 100644
index d2c167324..000000000
--- a/testing/lvm2/11-dm-initramfs.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# needed with new udev/mkinitcpio and as implemented in dracut:
-# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
-SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
deleted file mode 100644
index 28df43607..000000000
--- a/testing/lvm2/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 149163 2012-02-06 03:08:51Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.90
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://sourceware.org/lvm2/"
-license=('GPL2' 'LGPL2.1')
-groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
-        lvm2_install
-        lvm2_hook
-        11-dm-initramfs.rules)
-sha1sums=('de37e533e5f3af6a18c1acadd7a07ae06150d7d6'
-          '61c4b46dff520f9c178062930ea9f169019f57e6'
-          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
-          '7d63aa838703c9f986531a78164b556f765f5cce'
-          'f6a554eea9557c3c236df2943bb6e7e723945c41')
-
-build() {
-  cd "${srcdir}/LVM2.${pkgver}"
-  sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
-  unset LDFLAGS
-  ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib \
-    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
-    --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules
-  make
-}
-
-package_device-mapper() {
-  pkgdesc="Device mapper userspace library and tools"
-  url="http://sourceware.org/dm/"
-  depends=('glibc' 'udev')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_device-mapper
-  # extra udev rule for device-mapper in initramfs
-  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
-}
-
-package_lvm2() {
-  pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
-  conflicts=('lvm' 'mkinitcpio<0.7')
-  backup=('etc/lvm/lvm.conf')
-  options=('!makeflags')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_lvm2
-  # install applib
-  make -C liblvm DESTDIR="${pkgdir}" install
-  # /etc directories
-  install -d "${pkgdir}"/etc/lvm/{archive,backup}
-  # mkinitcpio hook
-  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2"
-  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2"
-}
diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook
deleted file mode 100644
index efb104998..000000000
--- a/testing/lvm2/lvm2_hook
+++ /dev/null
@@ -1,25 +0,0 @@
-# vim:set ft=sh:
-run_hook ()
-{
-    /sbin/modprobe -q dm-mod >/dev/null 2>&1
-    if [ -e "/sys/class/misc/device-mapper" ]; then
-        if [ ! -e "/dev/mapper/control" ]; then
-            local major minor
-            IFS=: read major minor < /sys/class/misc/device-mapper/dev
-            mkdir /dev/mapper
-            mknod "/dev/mapper/control" c ${major} ${minor}
-        fi
-
-        # If the lvmwait= parameter has been specified on the command line
-        # wait for the device(s) before trying to activate the volume group(s)
-        for pvdev in ${lvmwait//,/ }; do
-            poll_device ${pvdev} ${rootdelay}
-        done
-
-        [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
-
-        msg "Activating logical volumes..."
-        [ -d /etc/lvm ] && /sbin/lvm vgscan
-        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
-    fi
-}
diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install
deleted file mode 100644
index 94175b523..000000000
--- a/testing/lvm2/lvm2_install
+++ /dev/null
@@ -1,29 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
-    MODULES=" dm-mod dm-snapshot dm-mirror"
-    BINARIES=""
-    FILES=""
-    SCRIPT="lvm2"
-
-    add_binary "/sbin/lvm"
-    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/udev/rules.d/11-dm-lvm.rules"
-    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for an LVM2 root device.
-
-  The optional lvmwait= parameter followed by a comma-separated
-  list of device names can be given on the command line.
-  It will cause the hook to wait until all given devices exist
-  before trying to scan and activate any volume groups.
-HELPEOF
-}
diff --git a/testing/mediastreamer/PKGBUILD b/testing/mediastreamer/PKGBUILD
deleted file mode 100644
index d0c29868d..000000000
--- a/testing/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 149141 2012-02-05 21:37:56Z ibiru $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.8.0
-pkgrel=2
-pkgdesc="A library written in C that allows you to create and run audio and video streams"
-arch=('i686' 'x86_64')
-url="http://www.linphone.org/"
-license=('GPL')
-depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
-#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('79f6e4d927ebf15e9967511d8a88ce74')
-options=('!libtool')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/metacity/PKGBUILD b/testing/metacity/PKGBUILD
deleted file mode 100644
index 95489550f..000000000
--- a/testing/metacity/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148231 2012-01-30 18:48:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=metacity
-pkgver=2.34.1
-pkgrel=2
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm')
-makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/metacity \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/metacity/metacity.install b/testing/metacity/metacity.install
deleted file mode 100644
index 2eb1e5094..000000000
--- a/testing/metacity/metacity.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=metacity
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/metalog/PKGBUILD b/testing/metalog/PKGBUILD
deleted file mode 100644
index df9190292..000000000
--- a/testing/metalog/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149671 2012-02-08 23:59:44Z allan $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=metalog
-pkgver=1.0
-pkgrel=3
-pkgdesc="Metalog is a modern replacement for syslogd and klogd"
-url="http://metalog.sourceforge.net"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('pcre')
-provides=('logger')
-backup=('etc/metalog.conf' 'etc/conf.d/metalog')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma"
-        'metalog'
-        'metalog.confd')
-md5sums=('df4ec89f6a0df24a43f9592ee80ab6be'
-         'cdd1d34eedbfbc2d9e659bf0a0f58f56'
-         '86bccd5a02996921e29eff8a0394d11f')
-
-build() {
-  cd $srcdir/$pkgname-1
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-1
-  make DESTDIR=$pkgdir install
-  install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
-  install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
-  install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
-}
diff --git a/testing/metalog/metalog b/testing/metalog/metalog
deleted file mode 100644
index d30f47289..000000000
--- a/testing/metalog/metalog
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/metalog ] && . /etc/conf.d/metalog
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/metalog`
-case "$1" in
-  start)
-    stat_busy "Starting Metalog"
-    [ -z "$PID" ] && /usr/sbin/metalog -B $METALOG_OPTS 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/metalog.pid
-      add_daemon metalog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Metalog"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon metalog
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}" 
-esac
-exit 0 
diff --git a/testing/metalog/metalog.confd b/testing/metalog/metalog.confd
deleted file mode 100644
index 3d76ffab3..000000000
--- a/testing/metalog/metalog.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters to be passed to metalog
-#
-
-# NOTE: Since v.0.7, metalog disables buffering by default.
-# Add '-a' if you want buffering.
-
-METALOG_OPTS=""
diff --git a/testing/mjpegtools/PKGBUILD b/testing/mjpegtools/PKGBUILD
deleted file mode 100644
index 99447ca94..000000000
--- a/testing/mjpegtools/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148233 2012-01-30 18:48:52Z ibiru $
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Maintainer: Roberto Carvajal <roberto@archlinux.org>
-
-pkgname=mjpegtools
-pkgver=2.0.0
-pkgrel=2
-pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://mjpeg.sourceforge.net/"
-depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv')
-makedepends=('gtk2' 'v4l-utils')
-optdepends=('gtk2: glav GUI')
-options=('!makeflags' '!libtool')
-install=mjpegtools.install
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
-        mjpegtools-v4l-2.6.38.patch)
-md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
-         '44006d6f844017fe57aa123aa43f4508')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
-  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-  ./configure --prefix=/usr --enable-largefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
-}
diff --git a/testing/mjpegtools/mjpegtools-v4l-2.6.38.patch b/testing/mjpegtools/mjpegtools-v4l-2.6.38.patch
deleted file mode 100644
index 6adeb921c..000000000
--- a/testing/mjpegtools/mjpegtools-v4l-2.6.38.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: lavtools/lavvideo.c
-===================================================================
---- lavtools/lavvideo.c.orig
-+++ lavtools/lavvideo.c
-@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler.
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- 
- #include <videodev_mjpeg.h>
- #include <frequencies.h>
-Index: lavtools/liblavplay.c
-===================================================================
---- lavtools/liblavplay.c.orig
-+++ lavtools/liblavplay.c
-@@ -68,7 +68,8 @@
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
-+#define BASE_VIDIOCPRIVATE  192     /* 192-255 are private */
- #else
- #define VIDEO_MODE_PAL		0
- #define VIDEO_MODE_NTSC		1
-Index: lavtools/liblavrec.c
-===================================================================
---- lavtools/liblavrec.c.orig
-+++ lavtools/liblavrec.c
-@@ -63,7 +63,8 @@
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
-+#define BASE_VIDIOCPRIVATE  192     /* 192-255 are private */
- #ifdef HAVE_SYS_SOUNDCARD_H
- #include <sys/soundcard.h>
- #endif
-Index: lavtools/testrec.c
-===================================================================
---- lavtools/testrec.c.orig
-+++ lavtools/testrec.c
-@@ -89,7 +89,7 @@
-  * errors here, check your linux/time.h && sys/time.h header setup.
-  */
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <linux/soundcard.h>
- 
- /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit
- AS_IF([test "x$with_v4l" != "xno"], [
- case $host in
-   *-*-linux*)
--  AC_CHECK_HEADER(linux/videodev.h,
-+  AC_CHECK_HEADER(libv4l1-videodev.h,
-                   [have_video4linux=true
-                    AC_DEFINE(HAVE_V4L, 1,
- 		             [Building for Linux - using the video4linux API])], [])
-@@ -173,7 +173,7 @@ esac])
- 
- AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"],
-         [have_video4linux=false
--	 AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])])
-+	 AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])])
- AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
- 
- dnl *********************************************************************
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then :
- 
- case $host in
-   *-*-linux*)
--  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
-+  ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
- if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
-   have_video4linux=true
- 
-@@ -16407,8 +16407,8 @@ fi
- 
- if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then :
-   have_video4linux=false
--	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5
--$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;}
-+	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5
-+$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;}
- fi
-  if test x$have_video4linux = xtrue; then
-   HAVE_V4L_TRUE=
diff --git a/testing/mjpegtools/mjpegtools.install b/testing/mjpegtools/mjpegtools.install
deleted file mode 100644
index 4d1231686..000000000
--- a/testing/mjpegtools/mjpegtools.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file=mjpeg-howto.info
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/ncurses/PKGBUILD b/testing/ncurses/PKGBUILD
deleted file mode 100644
index 3192caa4f..000000000
--- a/testing/ncurses/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 149466 2012-02-08 09:26:45Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=ncurses
-pkgver=5.9
-pkgrel=3
-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 \
-     --enable-pc-files
-  # 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
-
-  # Fool packages looking to link to non-wide-character ncurses libraries
-  for lib in ncurses form panel menu; do
-    echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so
-    ln -s lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a
-  done
-  ln -s libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a
-
-  for lib in ncurses ncurses++ form panel menu; do
-    ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc
-  done
-
-  # Some packages look for -lcurses during build
-  echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so
-  ln -s libncurses.so ${pkgdir}/usr/lib/libcurses.so
-  ln -s libncursesw.a ${pkgdir}/usr/lib/libcursesw.a
-  ln -s 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 -s 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/netpbm/PKGBUILD b/testing/netpbm/PKGBUILD
deleted file mode 100644
index 51b6ee526..000000000
--- a/testing/netpbm/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 148237 2012-01-30 18:48:57Z ibiru $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-
-pkgname=netpbm
-pkgver=10.57.1
-pkgrel=1
-pkgdesc="A toolkit for manipulation of graphic images"
-arch=('i686' 'x86_64')
-license=('custom' 'BSD' 'GPL' 'LGPL')
-url="http://netpbm.sourceforge.net/"
-depends=('perl' 'libpng' 'libtiff' 'libxml2')
-makedepends=('python2')
-options=('!makeflags')
-# Releases after 10.34 are available via SVN only.
-# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball
-# Get version number from version.mk
-# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
-source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \
-        ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \
-        netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
-sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e'
-          'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'
-          'b79cf9d42488fea065ba16262ed97694c47af08d'
-          '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5'
-          '2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
-
-build() {
-  cd "${srcdir}/advanced"
-  patch -p1 < ../netpbm-CAN-2005-2471.patch
-  patch -p1 < ../netpbm-security-code.patch
-  patch -p1 < ../netpbm-security-scripts.patch
-  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' buildtools/makeman
-  sed -i 's|@python|@python2|' buildtools/manpage.mk
-
-  cp config.mk.in  config.mk
-  [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk
-  echo "NETPBM_DOCURL = file://${srcdir}/doc" >> config.mk
-  echo 'TIFFLIB = libtiff.so' >> config.mk
-  echo 'JPEGLIB = libjpeg.so' >> config.mk
-  echo 'PNGLIB = libpng.so' >> config.mk
-  echo 'ZLIB = libz.so' >> config.mk
- 
-  sed -i 's|misc|share/netpbm|' common.mk
-  sed -i 's|/link|/lib|' lib/Makefile
-  sed -i 's|install.manweb install.man|install.man|' GNUmakefile
-
-  make
-
-  # Generating useful man pages with html doc
-  cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \
-    -f "${srcdir}/advanced/buildtools/manpage.mk" manpages
-}
-
-package() {
-  cd "${srcdir}/advanced"
-  make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
-
-# Removing dummy man pages
-  rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
-
-  cd  "${srcdir}/doc"
-  make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
-    -f "${srcdir}/advanced/buildtools/manpage.mk" installman
-
-# Replace obsolete utility
-  echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm"
-
-# Licensing.  Note that each program in the package has a separate license.
-  install -D -m644 "${srcdir}/advanced/doc/copyright_summary" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt"
-}
diff --git a/testing/netpbm/netpbm-CAN-2005-2471.patch b/testing/netpbm/netpbm-CAN-2005-2471.patch
deleted file mode 100644
index 3759d7ebe..000000000
--- a/testing/netpbm/netpbm-CAN-2005-2471.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
-+++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
-@@ -711,11 +711,11 @@
-                    ghostscriptProg, arg0,
-                    deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
-                    "-q", "-dNOPAUSE", 
--                   "-dSAFER", "-");
-+                   "-dPARANOIDSAFER", "-");
-     }
- 
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-dSAFER", "-", NULL);
-+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
-     
-     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
-              ghostscriptProg, errno, strerror(errno));
diff --git a/testing/netpbm/netpbm-security-code.patch b/testing/netpbm/netpbm-security-code.patch
deleted file mode 100644
index da67a8f92..000000000
--- a/testing/netpbm/netpbm-security-code.patch
+++ /dev/null
@@ -1,1668 +0,0 @@
-diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c
---- netpbm-10.47.04/analyzer/pgmtexture.c.security	2009-10-21 13:38:55.000000000 +0200
-+++ netpbm-10.47.04/analyzer/pgmtexture.c	2009-10-21 15:09:33.000000000 +0200
-@@ -79,6 +79,9 @@ vector (int nl, int nh)
- {
-     float *v;
- 
-+    if(nh < nl)
-+	pm_error("assert: h < l");
-+    overflow_add(nh - nl, 1);
-     MALLOCARRAY(v, (unsigned) (nh - nl + 1));
-     if (v == NULL)
-         pm_error("Unable to allocate memory for a vector.");
-@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n
-     float **m;
- 
-     /* allocate pointers to rows */
-+    if(nrh < nrl)
-+	pm_error("assert: h < l");
-+    overflow_add(nrh - nrl, 1);
-     MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
-     if (m == NULL)
-         pm_error("Unable to allocate memory for a matrix.");
-@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
-     assert (nch >= ncl);
- 
-     /* allocate rows and set pointers to them */
-+    if(nch < ncl)
-+        pm_error("assert: h < l");
-+    overflow_add(nch - ncl, 1);
-     for (i = nrl; i <= nrh; ++i) {
-         MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
-         if (m[i] == NULL)
-diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
---- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -106,6 +106,7 @@ main(argc, argv)
- 
- 	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
- 
-+    overflow_add(cols, padright);
-     { 
-         /* allocate input row data structure */
-         int plane;
-diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c
---- netpbm-10.47.04/converter/other/jpegtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/jpegtopnm.c	2009-10-21 15:54:30.000000000 +0200
-@@ -861,6 +861,8 @@ convertImage(FILE *                     
-     /* Calculate output image dimensions so we can allocate space */
-     jpeg_calc_output_dimensions(cinfoP);
- 
-+    overflow2(cinfoP->output_width, cinfoP->output_components);
-+
-     /* Start decompressor */
-     jpeg_start_decompress(cinfoP);
- 
-diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c
---- netpbm-10.47.04/converter/other/pbmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pbmtopgm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
-                  "than the image height (%u rows)", height, rows);
- 
-     outrow = pgm_allocrow(cols) ;
-+    overflow2(width, height);
-     maxval = MIN(PGM_OVERALLMAXVAL, width*height);
-     pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
- 
-diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c
-diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c
---- netpbm-10.47.04/converter/other/pnmtoddif.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtoddif.c	2009-10-21 15:09:33.000000000 +0200
-@@ -632,6 +632,7 @@ main(int argc, char *argv[]) {
-     switch (PNM_FORMAT_TYPE(format)) {
-     case PBM_TYPE:
-         ip.bits_per_pixel = 1;
-+        overflow_add(cols, 7);
-         ip.bytes_per_line = (cols + 7) / 8;
-         ip.spectral = 2;
-         ip.components = 1;
-@@ -647,6 +648,7 @@ main(int argc, char *argv[]) {
-         ip.polarity = 2;
-         break;
-     case PPM_TYPE:
-+        overflow2(cols, 3);
-         ip.bytes_per_line = 3 * cols;
-         ip.bits_per_pixel = 24;
-         ip.spectral = 5;
-diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c
---- netpbm-10.47.04/converter/other/pnmtojpeg.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtojpeg.c	2009-10-21 15:56:32.000000000 +0200
-@@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci
-            want JPOOL_PERMANENT.  
-         */
-         const unsigned int scan_info_size = nscans * sizeof(jpeg_scan_info);
--        jpeg_scan_info * const scan_info = 
-+        const jpeg_scan_info * scan_info;
-+      
-+        overflow2(nscans, sizeof(jpeg_scan_info));
-+      
-+        scan_info =
-             (jpeg_scan_info *)
-             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-                                         scan_info_size);
-@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const
-   const long half_maxval = maxval / 2;
-   long val;
- 
-+  overflow_add(maxval, 1);
-+  overflow2(maxval+1, sizeof(JSAMPLE));
-   *rescale_p = (JSAMPLE *)
-     (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
-                               (size_t) (((long) maxval + 1L) * 
-@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s
-     */
- 
-   /* Allocate the libpnm output and compressor input buffers */
-+  overflow2(cinfo_p->image_width, cinfo_p->input_components);
-   buffer = (*cinfo_p->mem->alloc_sarray)
-     ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
-      (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
-diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
---- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
-@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
-     }
- }
- 
-+static void *
-+xmalloc2(int x, int y)
-+{
-+    void *mem;
-+
-+    overflow2(x,y);
-+    if( x * y == 0 )
-+        return NULL;
-+
-+    mem = malloc2(x, y);
-+    if( mem == NULL )
-+        pm_error("out of memory allocating %d bytes", x * y);
-+    return mem;
-+}
-+
-+
- static void
- put_big_short(short s)
- {
-@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int 
- #endif
- 
-     if( storage != STORAGE_VERBATIM ) {
-+        overflow2(channels, rows);
-         MALLOCARRAY_NOFAIL(table, channels * rows);
-         MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
-     }
-@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no,
-             break;
-         case STORAGE_RLE:
-             tabrow = chan_no * rows + row;
-+            overflow2(chan_no, rows);
-+            overflow_add(chan_no* rows, row);
-             len = rle_compress(temp, cols);    /* writes result into rletemp */
-             channel[chan_no][row].length = len;
-             MALLOCARRAY(p, len);
-diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c
---- netpbm-10.47.04/converter/other/rletopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/rletopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -19,6 +19,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /*
-  * rletopnm - A conversion program to convert from Utah's "rle" image format
-diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
---- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -252,10 +252,14 @@ read_channels(ifp, head, table, func, oc
-         MALLOCARRAY_NOFAIL(image, head->ysize);
-     } else {
-         maxchannel = MIN(3, head->zsize);
-+        overflow2(head->ysize, maxchannel);
-         MALLOCARRAY_NOFAIL(image, head->ysize * maxchannel);
-     }
--    if (table) 
-+    if (table) {
-+        overflow2(head->xsize, 2);
-+        overflow_add(head->xsize*2, 2);
-         MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
-+    }
- 
-     for(channel = 0; channel < maxchannel; ++channel) {
-         unsigned int row;
-diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
---- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -69,6 +69,7 @@ char* argv[];
- 	    }
- 	    break;
- 	case PPM_TYPE:
-+	    overflow3(cols, rows, 3);
- 	    picsize = cols * rows * 3;
- 	    planesize = cols * rows;
-             if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
-diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c
---- netpbm-10.47.04/converter/other/tifftopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/tifftopnm.c	2009-10-21 15:49:29.000000000 +0200
-@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut *       const
-     if (scanbuf == NULL)
-         pm_error("can't allocate memory for scanline buffer");
- 
--    MALLOCARRAY(samplebuf, cols * spp);
-+    /* samplebuf is unsigned int * !!! */
-+    samplebuf = (unsigned int *) malloc3(cols , sizeof(unsigned int) , spp);
-+
-     if (samplebuf == NULL)
-         pm_error("can't allocate memory for row buffer");
- 
-diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c
---- netpbm-10.47.04/converter/other/xwdtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/xwdtopnm.c	2009-10-21 15:53:27.000000000 +0200
-@@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader *  cons
-         *colorsP = pnm_allocrow(2);
-         PNM_ASSIGN1((*colorsP)[0], 0);
-         PNM_ASSIGN1((*colorsP)[1], *maxvalP);
-+        overflow_add(h10P->pixmap_width, 15);
-+        if(h10P->pixmap_width < 0)
-+            pm_error("assert: negative width");
-+        overflow2((((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width), 8);
-         *padrightP =
-             (((h10P->pixmap_width + 15) / 16) * 16 - h10P->pixmap_width) * 8;
-         *bits_per_itemP = 16;
-@@ -634,6 +638,7 @@ processX11Header(X11WDFileHeader *  cons
- 
-     *colsP = h11FixedP->pixmap_width;
-     *rowsP = h11FixedP->pixmap_height;
-+    overflow2(h11FixedP->bytes_per_line, 8);
-     *padrightP =
-         h11FixedP->bytes_per_line * 8 -
-         h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
-diff -up netpbm-10.47.04/converter/other/sunicontopnm.c.security netpbm-10.47.04/converter/other/sunicontopnm.c
---- netpbm-10.47.04/converter/other/sunicontopnm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sunicontopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -11,6 +11,7 @@
- */
- 
- #include <string.h>
-+#include <limits.h>
- 
- #include "nstring.h"
- #include "pbm.h"
-@@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
-     if (*heightP <= 0)
-         pm_error("invalid height (must be positive): %d", *heightP);
- 
-+    if ( *widthP > INT_MAX - 16 || *widthP < 0)
-+        pm_error( "invalid width: %d", *widthP);
-+    
-+    overflow2(*widthP + 16, *heightP);
-+    
- }
- 
-  
-diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
---- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -245,10 +245,13 @@ main(int argc, char **argv) {
-         pm_readlittleshort(infile, &yy); nInCols = yy;
-     }
-     
-+    overflow2(nOutCols, 8);
-     nOutCols = 8 * nInCols;
-     nOutRows = nInRows;
--    if (bScale) 
-+    if (bScale) {
-+        overflow2(nOutRows, 2);
-         nOutRows *= 2;
-+    }
- 
-     data = pbm_allocarray(nOutCols, nOutRows);
-     
-diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c
---- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
-     if (head.h_high < ' ' || head.l_high < ' ')
-         pm_error("Invalid width field in MGR header");
-     
-+    overflow_add(*colsP, pad);
-+
-     *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
-     *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
-     *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
-diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c
---- netpbm-10.47.04/converter/pbm/pbmto10x.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmto10x.c	2009-10-21 15:09:33.000000000 +0200
-@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
-         res_60x72();
- 
-     pm_close(ifp);
--    exit(0);
-+    return 0;
- }
- 
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c
---- netpbm-10.47.04/converter/pbm/pbmto4425.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmto4425.c	2009-10-21 15:09:33.000000000 +0200
-@@ -2,6 +2,7 @@
- 
- #include "nstring.h"
- #include "pbm.h"
-+#include <string.h>
- 
- static char bit_table[2][3] = {
- {1, 4, 0x10},
-@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
-     xres = vmap_width * 2;
-     yres = vmap_height * 3;
- 
--    vmap = malloc(vmap_width * vmap_height * sizeof(char));
-+    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
-     if(vmap == NULL)
- 	{
-         pm_error( "Cannot allocate memory" );
-diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
---- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
-@@ -123,6 +123,7 @@ putinit (rows, cols)
-   bitsperitem = 0;
-   bitshift = 7;
-   outcol = 0;
-+  overflow_add(cols, 7);
-   outmax = (cols + 7) / 8;
-   outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
-   lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
-diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c
---- netpbm-10.47.04/converter/pbm/pbmtogo.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtogo.c	2009-10-21 15:09:33.000000000 +0200
-@@ -158,6 +158,7 @@ main(int           argc,
-     bitrow = pbm_allocrow(cols);
- 
-     /* Round cols up to the nearest multiple of 8. */
-+    overflow_add(cols, 7);
-     rucols = ( cols + 7 ) / 8;
-     bytesperrow = rucols;       /* GraphOn uses bytes */
-     rucols = rucols * 8;
-diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
---- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
-@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
- static void
- allocateBuffers(unsigned int const cols) {
- 
-+    overflow_add(cols, 8);
-     rowBufferSize = (cols + 7) / 8;
-+    overflow_add(rowBufferSize, 128);
-+    overflow_add(rowBufferSize, rowBufferSize+128);
-+    overflow_add(rowBufferSize+10, rowBufferSize/8);
-     packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
-     deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c
---- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c	2009-10-21 15:09:33.000000000 +0200
-@@ -101,6 +101,7 @@ char *argv[];
-   if( !lflg )
-     left = 0;
- 
-+  overflow_add(left, MAX_COLS - 1);
-   if( rflg )
-   { if( right - left >= MAX_COLS )
-       right = left + MAX_COLS - 1;
-@@ -111,6 +112,8 @@ char *argv[];
-   if( !tflg )
-     top = 0;
- 
-+  overflow_add(top, MAX_LINES - 1);
-+
-   if( bflg )
-   { if( bottom - top >= MAX_LINES )
-       bottom = top + MAX_LINES - 1;
-diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c
---- netpbm-10.47.04/converter/pbm/pbmtomda.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtomda.c	2009-10-21 15:09:33.000000000 +0200
-@@ -179,6 +179,7 @@ int main(int argc, char **argv)
-     
-     nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
- 
-+    overflow_add(nOutRowsUnrounded, 3);
-     nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
-         /* MDA wants rows a multiple of 4 */   
-     nOutCols = nInCols / 8;
-diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c
-diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c
---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
-     return 0;
- 
-   case P4:
-+    overflow_add(pbm->width, 7);
-     tmp=(pbm->width+7)/8;
-     tmp2=fread(data,1,tmp,pbm->fptr);
-     if(tmp2 == tmp)
-@@ -129,7 +130,8 @@ void pbm_unreadline (pbm_stat *pbm, void
-     return;
- 
-   pbm->unread = 1;
--  pbm->revdata = malloc ((pbm->width+7)/8);
-+  overflow_add(pbm->width, 7);
-+  pbm->revdata = malloc((pbm->width+7)/8);
-   memcpy (pbm->revdata, data, (pbm->width+7)/8);
-   pbm->current_line--;
- }
-diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c
---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c	2009-10-21 15:09:33.000000000 +0200
-@@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
-             pm_error("main(): unrecognized parameter '%s'", argv[argn]);
-     }
- 
-+    overflow_add(Width, 7);
-     Pwidth=(Width+7)/8;
-     printer.fptr=out;
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c
---- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c	2009-10-21 15:36:54.000000000 +0200
-@@ -335,6 +335,8 @@ convertRaster(FILE *          const ifP,
- 
-     unsigned char * bitrow;
-     unsigned int row;
-+    
-+    overflow_add(cols, padright);
- 
-     putinit(xbmVersion);
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c
---- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -45,6 +45,7 @@ main( argc, argv )
-     bitrow = pbm_allocrow(cols);
-     
-     /* Compute padding to round cols up to the nearest multiple of 16. */
-+    overflow_add(cols, 16);
-     padright = ((cols + 15) / 16) * 16 - cols;
- 
-     putinit(cols, rows);
-diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
---- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
-@@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
-     bitrow = pbm_allocrow( cols );
- 
-     /* Compute padding to round cols up to the nearest multiple of 16. */
-+    overflow_add(cols, 16);
-     padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
- 
-     printf( "USHORT %s[] = {\n",name);
-diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c
---- netpbm-10.47.04/converter/pbm/pktopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pktopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
-         if (flagbyte == 7) {            /* long form preamble */
-             integer packetlength = get32() ;    /* character packet length */
-             car = get32() ;         /* character number */
-+            overflow_add(packetlength, pktopbm_pkloc);
-             endofpacket = packetlength + pktopbm_pkloc;
-                 /* calculate end of packet */
-             if ((car >= MAXPKCHAR) || !filename[car]) {
-diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l
---- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l	2009-10-21 15:09:33.000000000 +0200
-@@ -107,7 +107,9 @@ DIG             [0-9]
- <RASTERMODE>\033\*b{DIG}+W  {
-                             int l;
-                             if (rowCount >= rowCapacity) {
-+				overflow_add(rowCapacity, 100);
-                                 rowCapacity += 100;
-+				overflow2(rowCapacity, sizeof *rows);
-                                 rows = realloc (rows, rowCapacity * sizeof *rows);
-                                 if (rows == NULL)
-                                     pm_error ("Out of memory.");
-@@ -217,6 +219,8 @@ yywrap (void)
-     /*
-      * Quite simple since ThinkJet bit arrangement matches PBM
-      */
-+
-+    overflow2(maxRowLength, 8);
-     pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
- 
-     packed_bitrow = malloc(maxRowLength);
-diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
---- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -88,4 +88,5 @@ getinit( file, colsP, rowsP, depthP, pad
- 	pm_error("EOF / read error");
- 
-     *depthP = 1;
-+    overflow_add(*colsP, 15);
-     *padrightP = ((*colsP + 15) / 16) * 16 - *colsP;
-}
-
-diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
---- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -58,6 +58,7 @@ main( argc, argv )
-         pm_error( "depth (%d bits) is too large", depth);
- 
-     pgm_writepgminit( stdout, cols, rows, (gray) maxval, 0 );
-+    overflow_add(cols, 7);
-     grayrow = pgm_allocrow( ( cols + 7 ) / 8 * 8 );
- 
-     for ( row = 0; row < rows; ++row )
-@@ -102,7 +103,9 @@ getinit( file, colsP, rowsP, depthP, pad
-     
-     if ( *depthP == 0 )
- 	*depthP = 1;	/* very old file */
--    
-+
-+    overflow_add((int)colsP, 31);
-+        
-     *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
-     
-     if ( *colsP != (cols_32 - *padrightP) ) {
-diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c
---- netpbm-10.47.04/converter/pgm/psidtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/pgm/psidtopgm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -78,6 +78,7 @@ main(int     argc,
-         pm_error("bits/sample (%d) is too large.", bitspersample);
- 
-     pgm_writepgminit(stdout, cols, rows, maxval, 0);
-+    overflow_add(cols, 7);
-     grayrow = pgm_allocrow((cols + 7) / 8 * 8);
-     for (row = 0; row < rows; ++row) {
-         unsigned int col;
-diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c
---- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -594,6 +594,7 @@ decode_row(FILE *          const ifP,
-     rawtype *chp;
- 
-     cols = bmhdP->w;
-+    overflow_add(cols, 15);
-     bytes = RowBytes(cols);
-     for( plane = 0; plane < nPlanes; plane++ ) {
-         int mask;
-@@ -681,6 +682,23 @@ decode_mask(FILE *          const ifP,
-  Multipalette handling
-  ****************************************************************************/
- 
-+static void *
-+xmalloc2(x, y)
-+    int x;
-+    int y;
-+{
-+    void *mem;
-+
-+    overflow2(x,y);
-+    if( x * y == 0 )
-+        return NULL;
-+
-+    mem = malloc2(x,y);
-+    if( mem == NULL )
-+        pm_error("out of memory allocating %d bytes", x * y);
-+    return mem;
-+}
-+
- 
- static void
- multi_adjust(cmap, row, palchange)
-@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE *         const ifP,
-     if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
-         pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
-     
-+    overflow_add(redmaxval, 1);
-+    overflow_add(greenmaxval, 1);
-+    overflow_add(bluemaxval, 1);
-     MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
-     MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
-     MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
-@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
-             ChangeCount32 = *data++;
-             datasize -= 2;
- 
-+            overflow_add(ChangeCount16, ChangeCount32);
-             changes = ChangeCount16 + ChangeCount32;
-+            overflow_add(changes, 1);
-             for( i = 0; i < changes; i++ ) {
-                 if( totalchanges >= PCHG->TotalChanges ) goto fail;
-                 if( datasize < 2 ) goto fail;
-@@ -1994,6 +2017,9 @@ read_pchg(FILE *     const ifp,
-             cmap->mp_change[i] = NULL;
-         if( PCHG.StartLine < 0 ) {
-             int nch;
-+            if(PCHG.MaxReg < PCHG.MinReg)
-+                pm_error("assert: MinReg > MaxReg");
-+            overflow_add(PCHG.MaxReg-PCHG.MinReg, 2);
-             nch = PCHG.MaxReg - PCHG.MinReg +1;
-             MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
-             for( i = 0; i < nch; i++ )
-@@ -2070,6 +2096,7 @@ process_body( FILE *          const ifp,
-     if( typeid == ID_ILBM ) {
-         int isdeep;
- 
-+        overflow_add(bmhdP->w, 15);
-         MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
-         *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
- 
-diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c
---- netpbm-10.47.04/converter/ppm/imgtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/imgtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
-             len = atoi((char*) buf );
-             if ( fread( buf, len, 1, ifp ) != 1 )
-                 pm_error( "bad colormap buf" );
-+            overflow2(cmaplen, 3);
-             if ( cmaplen * 3 != len )
-             {
-                 pm_message(
-@@ -105,6 +106,7 @@ main(int argc, char ** argv) {
-                 pm_error( "bad pixel data header" );
-             buf[8] = '\0';
-             len = atoi((char*) buf );
-+            overflow2(cols, rows);
-             if ( len != cols * rows )
-                 pm_message(
-                     "pixel data length (%d) does not match image size (%d)",
-diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile
---- netpbm-10.47.04/converter/ppm/Makefile.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/Makefile	2009-10-21 15:09:33.000000000 +0200
-@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
- 
- PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
- 		leaftoppm mtvtoppm neotoppm \
--		pcxtoppm pc1toppm pi1toppm picttoppm pjtoppm \
-+		pcxtoppm pc1toppm pi1toppm pjtoppm \
- 		ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \
- 		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
- 		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
-diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
---- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
-     /*
-      * clear the pixel buffer
-      */
-+    overflow2(bytesperline, 8);
-     npixels = (bytesperline * 8) / bitsperpixel;
-     p    = pixels;
-     while (--npixels >= 0)
-@@ -470,6 +471,7 @@ pcx_16col_to_ppm(FILE *       const ifP,
-     }
- 
-     /*  BytesPerLine should be >= BitsPerPixel * cols / 8  */
-+    overflow2(BytesPerLine, 8);
-     rawcols = BytesPerLine * 8 / BitsPerPixel;
-     if (headerCols > rawcols) {
-         pm_message("warning - BytesPerLine = %d, "
-diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c
---- netpbm-10.47.04/converter/ppm/picttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/picttoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -1,3 +1,5 @@
-+#error "Unfixable. Don't ship me"
-+
- /*
-  * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
-  *
-diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c
---- netpbm-10.47.04/converter/ppm/pjtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/pjtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -127,19 +127,21 @@ main(argc, argv)
-                 case 'V':   /* send plane */
-                 case 'W':   /* send last plane */
-                     if (rows == -1 || r >= rows || image == NULL) {
--                        if (rows == -1 || r >= rows)
-+                        if (rows == -1 || r >= rows) {
-+                            overflow_add(rows, 100);
-                             rows += 100;
-+                        }
-                         if (image == NULL) {
--                            MALLOCARRAY(image, rows * planes);
--                            MALLOCARRAY(imlen, rows * planes);
-+                            image = (unsigned char **)
-+                                malloc3(rows , planes , sizeof(unsigned char *));
-+                            imlen = (int *) malloc3(rows , planes,  sizeof(int));
-                         }
-                         else {
-+                            overflow2(rows,planes);
-                             image = (unsigned char **) 
--                                realloc(image, 
--                                        rows * planes * 
-+                                realloc2(image, rows * planes,
-                                         sizeof(unsigned char *));
--                            imlen = (int *) 
--                                realloc(imlen, rows * planes * sizeof(int));
-+                            imlen = (int *) realloc2(imlen, rows * planes, sizeof(int));
-                         }
-                     }
-                     if (image == NULL || imlen == NULL)
-@@ -212,8 +214,10 @@ main(argc, argv)
-                 for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2)
-                     for (cmd = image[p + r * planes][c],
-                              val = image[p + r * planes][c+1]; 
--                         cmd >= 0 && i < newcols; cmd--, i++) 
-+                         cmd >= 0 && i < newcols; cmd--, i++) {
-                         buf[i] = val;
-+                        overflow_add(i, 1);
-+                    }
-                 cols = cols > i ? cols : i;
-                 free(image[p + r * planes]);
-                 /* 
-@@ -224,6 +228,7 @@ main(argc, argv)
-                 image[p + r * planes] = (unsigned char *) realloc(buf, i);
-             }
-         }
-+        overflow2(cols, 8);
-         cols *= 8;
-     }
-             
-diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c
---- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c	2009-10-21 15:09:33.000000000 +0200
-@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
- 
-     int index;
- 
-+    overflow_add(maxval, 1);
-     MALLOCARRAY_NOFAIL(mult299   , maxval+1);
-     MALLOCARRAY_NOFAIL(mult587   , maxval+1);
-     MALLOCARRAY_NOFAIL(mult114   , maxval+1);
-diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c
---- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c	2009-10-21 15:09:33.000000000 +0200
-@@ -169,7 +169,7 @@ char* argv[];
- 
- 	if (rleflag) {	
- 		pm_message("sending run-length encoded picture data ..." );
--		testimage = (char*) malloc(rows*cols);
-+		testimage = (char*) malloc2(rows, cols);
- 		p = testimage;
- 		for (i=0; i<rows; i++)
- 			for (j=0; j<cols; j++) 
-diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c
---- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c	2009-10-21 15:47:50.000000000 +0200
-@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
- 
-     maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
-     compmethod = 4;     /* RGB8 files are always compressed */
-+    overflow2(cols, 4);
-     MALLOCARRAY_NOFAIL(compr_row, cols * 4);
- 
-     if( maxval != 255 ) {
-@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
- 
-     maskmethod = 0;     /* no masking - RGBN uses genlock bits */
-     compmethod = 4;     /* RGBN files are always compressed */
-+    overflow2(cols, 2);
-     MALLOCARRAY_NOFAIL(compr_row, cols * 2);
- 
-     if( maxval != 15 ) {
-@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval)
-     unsigned int i;
-     int * table;
- 
-+    overflow_add(oldmaxval, 1);
-     MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
-     for (i = 0; i <= oldmaxval; ++i)
-         table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
-@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) {
-         MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
-         for (i = 0; i < RowBytes(cols); ++i)
-             coded_rowbuf[i] = 0;
--        if (DO_COMPRESS)
-+        if (DO_COMPRESS) {
-+            overflow2(cols,2);
-+            overflow_add(cols*2,2);
-             MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
-+	}
-     }
-     
-     switch (mode) {
-diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c
---- netpbm-10.47.04/converter/ppm/ppmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtolj.c	2009-10-21 15:09:33.000000000 +0200
-@@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
- 
-     ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
-     pixelrow = ppm_allocrow( cols );
--
-+    
-+    overflow2(cols, 6);
-     obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
-     cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
-     if (mode == C_TRANS_MODE_DELTA)
-diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c
---- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c	2009-10-21 15:48:30.000000000 +0200
-@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
-         medias = MSize_User;
- 
-     if (dpi300) {
-+        overflow2(medias.maxcols, 2);
-+        overflow2(medias.maxrows, 2);
-         medias.maxcols *= 2;
-         medias.maxrows *= 2;
-     }
-diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
---- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c	2009-10-21 15:09:33.000000000 +0200
-@@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel **            cons
-             else                   Planes = 1;
-         }
-     }
-+    overflow2(BitsPerPixel, cols);
-+    overflow_add(BitsPerPixel * cols, 7);
-     BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
-     MALLOCARRAY_NOFAIL(indexRow, cols);
-     MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
-diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c
---- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
-@@ -245,6 +245,8 @@ char *argv[];
-     putShort(stdout, 0);			/* mode */
- 
-     /* Finally, write out the data. */
-+     overflow_add(cols/MAX_COUNT, 1);
-+     overflow_add(cols, cols/MAX_COUNT+1);
-     packed = malloc((unsigned)(cols+cols/MAX_COUNT+1));
-     for (row = 0, oc = 0; row < rows; row++)
-         oc += putRow(stdout, row, cols, pixels[row], packed);
-diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
---- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
-@@ -179,6 +179,7 @@ char *argv[];
- 	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
- 
- 	pm_close( ifp );
-+	overflow2(cols,2);
- 	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
- 	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
- 
-diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c
---- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c	2009-10-21 15:43:31.000000000 +0200
-@@ -276,6 +276,8 @@ main(int argc, const char * argv[]) {
-         pm_error("image too large; reduce with ppmscale");
-     if (maxval > PCL_MAXVAL)
-         pm_error("color range too large; reduce with ppmcscale");
-+    if (cols < 0 || rows < 0)
-+        pm_error("negative size is not possible");
- 
-     /* Figure out the colormap. */
-     pm_message("Computing colormap...");
-@@ -296,6 +298,8 @@ main(int argc, const char * argv[]) {
-         case 0: /* direct mode (no palette) */
-             bpp = bitsperpixel(maxval); /* bits per pixel */
-             bpg = bpp; bpb = bpp;
-+	    overflow2(bpp, 3);
-+	    overflow_add(bpp*3, 7);
-             bpp = (bpp*3+7)>>3;     /* bytes per pixel now */
-             bpr = (bpp<<3)-bpg-bpb; 
-             bpp *= cols;            /* bytes per row now */
-@@ -305,9 +309,13 @@ main(int argc, const char * argv[]) {
-         case 3: case 7: pclindex++;
-         default:
-             bpp = 8/pclindex;
-+	    overflow_add(cols, bpp);
-+	    if(bpp == 0)
-+		pm_error("assert: no bpp");
-             bpp = (cols+bpp-1)/bpp;      /* bytes per row */
-         }
-     }
-+    overflow2(bpp,2);
-     inrow = (char *)malloc((unsigned)bpp);
-     outrow = (char *)malloc((unsigned)bpp*2);
-     runcnt = (signed char *)malloc((unsigned)bpp);
-diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c
---- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c	2009-10-21 15:44:54.000000000 +0200
-@@ -12,6 +12,7 @@
- 
- #include <math.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "pm_c_util.h"
- #include "winico.h"
-@@ -219,6 +220,7 @@ createAndBitmap (gray ** const ba, int c
-    MALLOCARRAY_NOFAIL(rowData, rows);
-    icBitmap->xBytes = xBytes;
-    icBitmap->data   = rowData;
-+   overflow2(xBytes, rows);
-    icBitmap->size   = xBytes * rows;
-    for (y=0;y<rows;y++) {
-       u1 * row;
-@@ -347,6 +349,7 @@ create4Bitmap (pixel ** const pa, int co
-    MALLOCARRAY_NOFAIL(rowData, rows);
-    icBitmap->xBytes = xBytes;
-    icBitmap->data   = rowData;
-+   overflow2(xBytes, rows);
-    icBitmap->size   = xBytes * rows;
- 
-    for (y=0;y<rows;y++) {
-@@ -407,6 +410,7 @@ create8Bitmap (pixel ** const pa, int co
-    MALLOCARRAY_NOFAIL(rowData, rows);
-    icBitmap->xBytes = xBytes;
-    icBitmap->data   = rowData;
-+   overflow2(xBytes, rows);
-    icBitmap->size   = xBytes * rows;
- 
-    for (y=0;y<rows;y++) {
-@@ -714,6 +718,10 @@ addEntryToIcon(MS_Ico       const MSIcon
-     entry->bitcount      = bpp;
-     entry->ih            = createInfoHeader(entry, xorBitmap, andBitmap);
-     entry->colors        = palette->colors;
-+    overflow2(4, entry->color_count);
-+    overflow_add(xorBitmap->size, andBitmap->size);
-+    overflow_add(xorBitmap->size + andBitmap->size, 40);
-+    overflow_add(xorBitmap->size + andBitmap->size + 40, 4 * entry->color_count);
-     entry->size_in_bytes = 
-         xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
-     if (verbose) 
-diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c
---- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int 
-     unsigned int i;
- 
-     /* Allocate memory for printed number.  Abort if error. */
-+    overflow_add(digits, 1);
-     if (!(str = (char *) malloc(digits + 1)))
-         pm_error("out of memory");
- 
-@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, 
-     unsigned int charsPerPixel;
-     unsigned int xpmMaxval;
-     
-+    if (includeTransparent) overflow_add(ncolors, 1);
-     MALLOCARRAY(cmap, cmapSize);
-     if (cmapP == NULL)
-         pm_error("Out of memory allocating %u bytes for a color map.",
-diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c
---- netpbm-10.47.04/converter/ppm/qrttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/qrttoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -46,7 +46,7 @@ main( argc, argv )
- 
-     ppm_writeppminit( stdout, cols, rows, maxval, 0 );
-     pixelrow = ppm_allocrow( cols );
--    buf = (unsigned char *) malloc( 3 * cols );
-+    buf = (unsigned char *) malloc2( 3 , cols );
-     if ( buf == (unsigned char *) 0 )
- 	pm_error( "out of memory" );
- 
-diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c
---- netpbm-10.47.04/converter/ppm/sldtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/sldtoppm.c	2009-10-21 15:44:11.000000000 +0200
-@@ -455,6 +455,8 @@ slider(slvecfn   slvec,
-     
-     /* Allocate image buffer and clear it to black. */
-     
-+    overflow_add(ixdots,1);
-+    overflow_add(iydots,1);
-     pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
-     PPM_ASSIGN(rgbcolor, 0, 0, 0);
-     ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
-diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c
---- netpbm-10.47.04/converter/ppm/ximtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ximtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -117,6 +117,7 @@ ReadXimHeader(FILE *     const in_fp,
-     header->bits_channel = atoi(a_head.bits_per_channel);
-     header->alpha_flag = atoi(a_head.alpha_channel);
-     if (strlen(a_head.author)) {
-+    	overflow_add(strlen(a_head.author),1);
-         if (!(header->author = calloc((unsigned int)strlen(a_head.author)+1,
-                 1))) {
-             pm_message("ReadXimHeader: can't calloc author string" );
-@@ -126,6 +127,7 @@ ReadXimHeader(FILE *     const in_fp,
-         strncpy(header->author, a_head.author, strlen(a_head.author));
-     }
-     if (strlen(a_head.date)) {
-+        overflow_add(strlen(a_head.date),1);
-         if (!(header->date =calloc((unsigned int)strlen(a_head.date)+1,1))){
-             pm_message("ReadXimHeader: can't calloc date string" );
-             return(0);
-@@ -134,6 +136,7 @@ ReadXimHeader(FILE *     const in_fp,
-         strncpy(header->date, a_head.date, strlen(a_head.date));
-     }
-     if (strlen(a_head.program)) {
-+        overflow_add(strlen(a_head.program),1);
-         if (!(header->program = calloc(
-                     (unsigned int)strlen(a_head.program) + 1, 1))) {
-             pm_message("ReadXimHeader: can't calloc program string" );
-@@ -160,6 +163,7 @@ ReadXimHeader(FILE *     const in_fp,
-     if (header->nchannels == 3 && header->bits_channel == 8)
-         header->ncolors = 0;
-     else if (header->nchannels == 1 && header->bits_channel == 8) {
-+	overflow2(header->ncolors, sizeof(Color));
-         header->colors = (Color *)calloc((unsigned int)header->ncolors,
-                 sizeof(Color));
-         if (header->colors == NULL) {
-diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c
---- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c
-                        &ncolors, colorsP, &ptab);
-         *transparentP = -1;  /* No transparency in version 1 */
-     }
-+    overflow2(*widthP, *heightP);
-     totalpixels = *widthP * *heightP;
-     MALLOCARRAY(*dataP, totalpixels);
-     if (*dataP == NULL)
-diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c
---- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -72,6 +72,7 @@ main(argc, argv)
- 
- 	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
- 	pixrow = ppm_allocrow(cols);
-+    overflow_add(cols, 1);
-     MALLOCARRAY(yuvbuf, (cols+1)/2);
-     if (yuvbuf == NULL)
-         pm_error("Unable to allocate YUV buffer for %d columns.", cols);
-diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c
---- netpbm-10.47.04/editor/pamcut.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pamcut.c	2009-10-21 15:29:36.000000000 +0200
-@@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
- 
-     outpam = inpam;    /* Initial value -- most fields should be same */
-     outpam.file   = ofP;
-+    overflow_add(rightcol, 1);
-+    overflow_add(bottomrow, 1);
-     outpam.width  = rightcol - leftcol + 1;
-     outpam.height = bottomrow - toprow + 1;
- 
-diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
---- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
-@@ -94,6 +94,7 @@ main( argc, argv )
-     if (halftone == QT_FS) {
-         unsigned int col;
-         /* Initialize Floyd-Steinberg. */
-+        overflow_add(newcols, 2);
-         MALLOCARRAY(thiserr, newcols + 2);
-         MALLOCARRAY(nexterr, newcols + 2);
-         if (thiserr == NULL || nexterr == NULL)
-diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c
---- netpbm-10.47.04/editor/pnmgamma.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmgamma.c	2009-10-21 15:09:34.000000000 +0200
-@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
-                   xelval **             const btableP) {
- 
-     /* Allocate space for the tables. */
-+    overflow_add(maxval, 1);
-     MALLOCARRAY(*rtableP, maxval+1);
-     MALLOCARRAY(*gtableP, maxval+1);
-     MALLOCARRAY(*btableP, maxval+1);
-diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c
---- netpbm-10.47.04/editor/pnmhisteq.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmhisteq.c	2009-10-21 15:09:34.000000000 +0200
-@@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const *
-     unsigned int pixelCount;
-     unsigned int * lumahist;
- 
-+    overflow_add(maxval, 1);
-     MALLOCARRAY(lumahist, maxval + 1);
-     if (lumahist == NULL)
-         pm_error("Out of storage allocating array for %u histogram elements",
-diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh
---- netpbm-10.47.04/editor/pnmindex.csh.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmindex.csh	2009-10-21 15:09:34.000000000 +0200
-@@ -1,5 +1,8 @@
- #!/bin/csh -f
- #
-+echo "Unsafe code, needs debugging, do not ship"
-+exit 1
-+#
- # pnmindex - build a visual index of a bunch of anymaps
- #
- # Copyright (C) 1991 by Jef Poskanzer.
-diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c
---- netpbm-10.47.04/editor/pnmpad.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmpad.c	2009-10-21 15:33:51.000000000 +0200
-@@ -527,6 +527,8 @@ main(int argc, const char ** argv) {
- 
-     computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
- 
-+    overflow_add(cols, lpad);
-+    overflow_add(cols + lpad, rpad);
-     newcols = cols + lpad + rpad;
- 
-     if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
-diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c
-diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c
---- netpbm-10.47.04/editor/pnmremap.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmremap.c	2009-10-21 15:28:20.000000000 +0200
-@@ -408,7 +408,7 @@ initFserr(struct pam *   const pamP,
-     unsigned int plane;
- 
-     unsigned int const fserrSize = pamP->width + 2;
--
-+    overflow_add(pamP->width, 2);
-     fserrP->width = pamP->width;
- 
-     MALLOCARRAY(fserrP->thiserr, pamP->depth);
-@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st
- 
-     int col;
-     
-+    overflow_add(pamP->width, 2);
-     for (col = 0; col < pamP->width + 2; ++col) {
-         unsigned int plane;
-         for (plane = 0; plane < pamP->depth; ++plane) 
-diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c
---- netpbm-10.47.04/editor/pnmscalefixed.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmscalefixed.c	2009-10-21 15:09:34.000000000 +0200
-@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c
-                           const int rows, const int cols,
-                           int * newrowsP, int * newcolsP) {
- 
-+    overflow2(rows, cols);
-+
-     if (cmdline.pixels) {
-         if (rows * cols <= cmdline.pixels) {
-             *newrowsP = rows;
-@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c
- 
-     if (*newcolsP < 1) *newcolsP = 1;
-     if (*newrowsP < 1) *newrowsP = 1;
-+    
-+    overflow2(*newcolsP, *newrowsP);
- }        
- 
- 
-@@ -443,6 +447,9 @@ main(int argc, char **argv ) {
-        unfilled.  We can address that by stretching, whereas the other
-        case would require throwing away some of the input.
-     */
-+    
-+    overflow2(newcols, SCALE);
-+    overflow2(newrows, SCALE);
-     sxscale = SCALE * newcols / cols;
-     syscale = SCALE * newrows / rows;
- 
-diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c
---- netpbm-10.47.04/editor/pnmshear.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmshear.c	2009-10-21 15:31:26.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <assert.h>
- #include <math.h>
- #include <string.h>
-+#include <limits.h>
- 
- #include "pm_c_util.h"
- #include "ppm.h"
-@@ -236,6 +237,11 @@ main(int argc, char * argv[]) {
- 
-     shearfac = fabs(tan(cmdline.angle));
- 
-+    if(rows * shearfac >= INT_MAX-1)
-+      pm_error("image too large");
-+    
-+    overflow_add(rows * shearfac, cols+1);
-+
-     newcols = rows * shearfac + cols + 0.999999;
- 
-     pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
-diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
---- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
-+++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
-@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
-     tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
-     pm_close(ifp);
- 
-+    overflow_add(inpam.maxval, 1);
-     MALLOCARRAY(hist, inpam.maxval + 1);
-     if (hist == NULL)
-         pm_error("Unable to allocate memory for histogram.");
-diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
---- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
-@@ -96,12 +96,14 @@ parseCommandLine(int argc, const char **
-         
-         for (i = 1; i < argc; ++i) {
-             if (i > 1) {
-+                overflow_add(totaltextsize, 1);
-                 totaltextsize += 1;
-                 text = realloc(text, totaltextsize);
-                 if (text == NULL)
-                     pm_error("out of memory allocating space for input text");
-                 strcat(text, " ");
-             } 
-+            overflow_add(totaltextsize, strlen(argv[i]));
-             totaltextsize += strlen(argv[i]);
-             text = realloc(text, totaltextsize);
-             if (text == NULL)
-@@ -711,6 +713,7 @@ getText(const char          cmdline_text
-                 pm_error("A line of input text is longer than %u characters."
-                          "Cannot process.", sizeof(buf)-1);
-             if (lineCount >= maxlines) {
-+                overflow2(maxlines, 2);
-                 maxlines *= 2;
-                 REALLOCARRAY(text_array, maxlines);
-                 if (text_array == NULL)
-@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) {
-             hmargin = fontP->maxwidth;
-         } else {
-             vmargin = fontP->maxheight;
-+	    overflow2(2, fontP->maxwidth);
-             hmargin = 2 * fontP->maxwidth;
-         }
-     }
-diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c
---- netpbm-10.47.04/generator/pgmcrater.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pgmcrater.c	2009-10-21 15:09:34.000000000 +0200
-@@ -130,7 +130,7 @@ static void gencraters()
-     /* Acquire the elevation array and initialize it to mean
-        surface elevation. */
- 
--    MALLOCARRAY(aux, SCRX * SCRY);
-+    aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
-     if (aux == NULL) 
-         pm_error("out of memory allocating elevation array");
- 
-diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c
---- netpbm-10.47.04/generator/pgmkernel.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pgmkernel.c	2009-10-21 15:09:34.000000000 +0200
-@@ -68,7 +68,7 @@ main ( argc, argv )
-     kycenter = (fysize - 1) / 2.0;
-     ixsize = fxsize + 0.999;
-     iysize = fysize + 0.999;
--    MALLOCARRAY(fkernel, ixsize * iysize);
-+    fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
-     for (i = 0; i < iysize; i++) 
-         for (j = 0; j < ixsize; j++) {
-             fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
-diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c
---- netpbm-10.47.04/lib/libpam.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpam.c	2009-10-21 15:09:34.000000000 +0200
-@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam
-     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
-     tuple * tuplerow;
- 
--    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
-+    overflow_add(sizeof(tuple *), bytesPerTuple);
-+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
-                       
-     if (tuplerow != NULL) {
-         /* Now we initialize the pointers to the individual tuples
-diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c
---- netpbm-10.47.04/lib/libpammap.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpammap.c	2009-10-21 15:09:34.000000000 +0200
-@@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const
-     */
-     struct tupleint_list_item * retval;
- 
-+    overflow2(pamP->depth, sizeof(sample));
-+    overflow_add(sizeof(*retval)-sizeof(retval->tupleint.tuple), pamP->depth*sizeof(sample));
-     unsigned int const size = 
-         sizeof(*retval) - sizeof(retval->tupleint.tuple) 
-         + pamP->depth * sizeof(sample);
-diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
---- netpbm-10.47.04/lib/libpbm1.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpbm1.c	2009-10-21 15:09:34.000000000 +0200
-@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
-         pm_message("pm_filepos passed to pm_check() is %u bytes",
-                    sizeof(pm_filepos));
- #endif
-+        overflow2(bytes_per_row, rows);
-         pm_check(file, check_type, need_raster_size, retval_p);
-     }
- }
---- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
-@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
- }
- 
- 
-+/*
-+ *	Maths wrapping
-+ */
-+ 
-+void __overflow2(int a, int b)
-+{
-+	if(a < 0 || b < 0)
-+		pm_error("object too large");
-+	if(b == 0)
-+		return;
-+	if(a > INT_MAX / b)
-+		pm_error("object too large");
-+}
-+
-+void overflow3(int a, int b, int c)
-+{
-+	overflow2(a,b);
-+	overflow2(a*b, c);
-+}
-+
-+void overflow_add(int a, int b)
-+{
-+	if( a > INT_MAX - b)
-+		pm_error("object too large");
-+}
-+
-+void *malloc2(int a, int b)
-+{
-+	overflow2(a, b);
-+	if(a*b == 0)
-+		pm_error("Zero byte allocation");
-+	return malloc(a*b);
-+}
-+
-+void *malloc3(int a, int b, int c)
-+{
-+	overflow3(a, b, c);
-+	if(a*b*c == 0)
-+		pm_error("Zero byte allocation");
-+	return malloc(a*b*c);
-+}
-+
-+void *realloc2(void * a, int b, int c)
-+{
-+	overflow2(b, c);
-+	if(b*c == 0)
-+		pm_error("Zero byte allocation");
-+	return realloc(a, b*c);
-+}
- 
-diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
---- netpbm-10.47.04/lib/pm.h.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/pm.h	2009-10-21 15:09:34.000000000 +0200
-@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg);
- #endif
- 
- 
-+void *malloc2(int, int);
-+void *malloc3(int, int, int);
-+#define overflow2(a,b) __overflow2(a,b)
-+void __overflow2(int, int);
-+void overflow3(int, int, int);
-+void overflow_add(int, int);
-+
- #endif
-diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c
---- netpbm-10.47.04/other/pnmcolormap.c.security	2009-10-21 13:38:54.000000000 +0200
-+++ netpbm-10.47.04/other/pnmcolormap.c	2009-10-21 15:09:34.000000000 +0200
-@@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
-             pamP->width = intsqrt;
-         else 
-             pamP->width = intsqrt + 1;
-+            overflow_add(intsqrt, 1);
-     }
-     {
-         unsigned int const intQuotient = colormap.size / pamP->width;
-diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
---- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_addhist.c - Add to the HISTORY comment in header
-@@ -76,13 +78,19 @@ rle_addhist(char *          argv[],
-         return;
-     
-     length = 0;
--    for (i = 0; argv[i]; ++i)
-+    for (i = 0; argv[i]; ++i) {
-+	overflow_add(length, strlen(argv[i]));
-+	overflow_add(length+1, strlen(argv[i]));
-         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
-+    }
- 
-     time(&temp);
-     timedate = ctime(&temp);
-     length += strlen(timedate);        /* length of date and time in ASCII. */
- 
-+    overflow_add(strlen(padding), 4);
-+    overflow_add(strlen(histoire), strlen(padding) + 4);
-+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
-     length += strlen(padding) + 3 + strlen(histoire) + 1;
-         /* length of padding, "on "  and length of history name plus "="*/
-     if (in_hdr) /* if we are interested in the old comments... */
-@@ -90,9 +98,12 @@ rle_addhist(char *          argv[],
-     else
-         old = NULL;
-     
--    if (old && *old)
-+    if (old && *old) {
-+	overflow_add(length, strlen(old));
-         length += strlen(old);       /* add length if there. */
-+    }
- 
-+    overflow_add(length, 1);
-     ++length;                               /*Cater for the null. */
- 
-     MALLOCARRAY(newc, length);
-diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c
---- netpbm-10.47.04/urt/rle_getrow.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_getrow.c	2009-10-21 15:09:34.000000000 +0200
-@@ -17,6 +17,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_getrow.c - Read an RLE file in.
-@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) {
-         register char * cp;
- 
-         VAXSHORT( comlen, infile ); /* get comment length */
-+	overflow_add(comlen, 1);
-         evenlen = (comlen + 1) & ~1;    /* make it even */
-         if ( evenlen )
-         {
-diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
---- netpbm-10.47.04/urt/rle_hdr.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_hdr.c	2009-10-21 15:09:34.000000000 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_hdr.c - Functions to manipulate rle_hdr structures.
-@@ -79,7 +81,10 @@ int img_num;
-     /* Fill in with copies of the strings. */
-     if ( the_hdr->cmd != pgmname )
-     {
--	char *tmp = (char *)malloc( strlen( pgmname ) + 1 );
-+	char *tmp ;
-+
-+	overflow_add(strlen(pgmname), 1);
-+	tmp = malloc( strlen( pgmname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, pgmname );
- 	the_hdr->cmd = tmp;
-@@ -87,7 +92,9 @@ int img_num;
- 
-     if ( the_hdr->file_name != fname )
-     {
--	char *tmp = (char *)malloc( strlen( fname ) + 1 );
-+	char *tmp;
-+	overflow_add(strlen(fname), 1);
-+	tmp = malloc( strlen( fname ) + 1 );
- 	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
- 	strcpy( tmp, fname );
- 	the_hdr->file_name = tmp;
-@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->bg_color )
-     {
- 	int size = to_hdr->ncolors * sizeof(int);
-+	overflow2(to_hdr->ncolors, sizeof(int));
- 	to_hdr->bg_color = (int *)malloc( size );
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
- 	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
-@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
-     if ( to_hdr->cmap )
-     {
- 	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
--	to_hdr->cmap = (rle_map *)malloc( size );
-+	to_hdr->cmap = (rle_map *)malloc3( to_hdr->ncmap, 1<<to_hdr->cmaplen, sizeof(rle_map));
- 	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
- 	memcpy( to_hdr->cmap, from_hdr->cmap, size );
-     }
-@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
- 	int size = 0;
- 	CONST_DECL char **cp;
- 	for ( cp=to_hdr->comments; *cp; cp++ )
-+	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Count the comments. */
-+ 	}
- 	/* Check if there are really any comments. */
- 	if ( size )
- 	{
-+	    overflow_add(size, 1);
- 	    size++;		/* Copy the NULL pointer, too. */
-+	    overflow2(size, sizeof(char *));
- 	    size *= sizeof(char *);
- 	    to_hdr->comments = (CONST_DECL char **)malloc( size );
- 	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
-diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
---- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
-@@ -163,64 +163,7 @@ dealWithSubprocess(const char *  const f
-                    bool *        const noSubprocessP,
-                    const char ** const errorP) {
- 
--#ifdef NO_OPEN_PIPES
-     *noSubprocessP = TRUE;
--#else
--    const char *cp;
--
--    reapChildren(catchingChildrenP, pids);
--
--    /*  Real file, not stdin or stdout.  If name ends in ".Z",
--     *  pipe from/to un/compress (depending on r/w mode).
--     *  
--     *  If it starts with "|", popen that command.
--     */
--        
--    cp = file_name + strlen(file_name) - 2;
--    /* Pipe case. */
--    if (file_name[0] == '|') {
--        pid_t thepid;     /* PID from my_popen */
--
--        *noSubprocessP = FALSE;
--
--        *fpP = my_popen(file_name + 1, mode, &thepid);
--        if (*fpP == NULL)
--            *errorP = "%s: can't invoke <<%s>> for %s: ";
--        else {
--            /* One more child to catch, eventually. */
--            if (*catchingChildrenP < MAX_CHILDREN)
--                pids[(*catchingChildrenP)++] = thepid;
--        }
--    } else if (cp > file_name && *cp == '.' && *(cp + 1) == 'Z' ) {
--        /* Compress case. */
--        pid_t thepid;     /* PID from my_popen. */
--        const char * command;
--
--        *noSubprocessP = FALSE;
--        
--        if (*mode == 'w')
--            pm_asprintf(&command, "compress > %s", file_name);
--        else if (*mode == 'a')
--            pm_asprintf(&command, "compress >> %s", file_name);
--        else
--            pm_asprintf(&command, "compress -d < %s", file_name);
--        
--        *fpP = my_popen(command, mode, &thepid);
--
--        if (*fpP == NULL)
--            *errorP = "%s: can't invoke 'compress' program, "
--                "trying to open %s for %s";
--        else {
--            /* One more child to catch, eventually. */
--            if (*catchingChildrenP < MAX_CHILDREN)
--                pids[(*catchingChildrenP)++] = thepid;
--        }
--        pm_strfree(command);
--    } else {
--        *noSubprocessP = TRUE;
--        *errorP = NULL;
--    }
--#endif
- }
- 
- 
-diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c
---- netpbm-10.47.04/urt/rle_putcom.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_putcom.c	2009-10-21 15:09:34.000000000 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_putcom.c - Add a picture comment to the header struct.
-@@ -98,12 +100,14 @@ rle_putcom(const char * const value,
-         const char * v;
-         const char ** old_comments;
-         int i;
--        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp)
-+        for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) {
-+	    overflow_add(i, 1);
-             if (match(value, *cp) != NULL) {
-                 v = *cp;
-                 *cp = value;
-                 return v;
-             }
-+	}
-         /* Not found */
-         /* Can't realloc because somebody else might be pointing to this
-          * comments block.  Of course, if this were true, then the
-diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
---- netpbm-10.47.04/urt/Runput.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/Runput.c	2009-10-21 15:09:34.000000000 +0200
-@@ -17,6 +17,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * Runput.c - General purpose Run Length Encoding.
-@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
-     if ( the_hdr->background != 0 )
-     {
- 	register int i;
--	register rle_pixel *background =
--	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
-+	register rle_pixel *background;
- 	register int *bg_color;
-+
-+	overflow_add(the_hdr->ncolors,1);
-+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
- 	/* 
- 	 * If even number of bg color bytes, put out one more to get to 
- 	 * 16 bit boundary.
-@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
- 	/* Big-endian machines are harder */
- 	register int i, nmap = (1 << the_hdr->cmaplen) *
- 			       the_hdr->ncmap;
--	register char *h_cmap = (char *)malloc( nmap * 2 );
-+	register char *h_cmap = (char *)malloc2( nmap, 2 );
- 	if ( h_cmap == NULL )
- 	{
- 	    fprintf( stderr,
-diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
---- netpbm-10.47.04/urt/scanargs.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/scanargs.c	2009-10-21 15:09:34.000000000 +0200
-@@ -38,6 +38,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- 
- #include "rle.h"
-@@ -65,8 +67,8 @@ typedef int *ptr;
- /* 
-  * Storage allocation macros
-  */
--#define NEW( type, cnt )	(type *) malloc( (cnt) * sizeof( type ) )
--#define RENEW( type, ptr, cnt )	(type *) realloc( ptr, (cnt) * sizeof( type ) )
-+#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
-+#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
- 
- #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
- #define USE_PROTOTYPES
---- advanced/urt/rle_hdr.c.old	2012-01-21 05:57:25.000000000 -0500
-+++ advanced/urt/rle_hdr.c	2012-01-21 05:57:50.000000000 -0500
-@@ -29,6 +29,18 @@
- 
- #include <string.h>
- 
-+/* 
-+ * Provided by pm library
-+ */
-+ 
-+extern void overflow_add(int, int);
-+#define overflow2(a,b) __overflow2(a,b)
-+extern void __overflow2(int, int);
-+extern void overflow3(int, int, int);
-+extern void *malloc2(int, int);
-+/*extern void *malloc3(int, int, int);*/
-+extern void *realloc2(void *, int, int);
-+
- /*****************************************************************
-  * TAG( rle_names )
-  *
diff --git a/testing/netpbm/netpbm-security-scripts.patch b/testing/netpbm/netpbm-security-scripts.patch
deleted file mode 100644
index 557914b66..000000000
--- a/testing/netpbm/netpbm-security-scripts.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-diff -up netpbm-10.47.05/converter/other/anytopnm.security-scripts netpbm-10.47.05/converter/other/anytopnm
---- netpbm-10.47.05/converter/other/anytopnm.security-scripts	2009-12-10 08:34:36.000000000 +0100
-+++ netpbm-10.47.05/converter/other/anytopnm	2010-03-16 21:28:09.000000000 +0100
-@@ -510,10 +510,7 @@ else
-     inputFile="-"
- fi
- 
--tempdir="${TMPDIR-/tmp}/anytopnm.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting."; exit 1;}
--trap 'rm -rf $tempdir' 0
-+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
- 
- # Take out all spaces
- # Find the filename extension for last-ditch efforts later
-@@ -539,9 +536,17 @@ if [ "$filetype" = "unknown" ]; then
-     echo "$progname: unknown file type.  " \
-         "'file' says mime type is '$mimeType', " 1>&2
-     echo "type description is '$typeDescription'" 1>&2
-+    if [ -d "$tempdir" ] ; then
-+        rm -rf "$tempdir"
-+    fi
-+
-     exit 1
-     fi
- 
- convertIt $file $filetype
- 
-+if [ -d "$tempdir" ] ; then
-+    rm -rf "$tempdir"
-+fi
-+
- exit 0
-diff -up netpbm-10.47.05/editor/pamstretch-gen.security-scripts netpbm-10.47.05/editor/pamstretch-gen
---- netpbm-10.47.05/editor/pamstretch-gen.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/pamstretch-gen	2010-03-16 21:28:47.000000000 +0100
-@@ -31,13 +31,9 @@ if [ "$1" = "" ]; then
-   exit 1
- fi
- 
--tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting."; exit 1;}
-+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
- trap 'rm -rf $tempdir' 0 1 3 15
- 
--tempfile=$tempdir/pnmig
--
- if ! cat $2 >$tempfile 2>/dev/null; then
-   echo 'pamstretch-gen: error reading file' 1>&2
-   exit 1
-diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts netpbm-10.47.05/editor/pnmmargin
---- netpbm-10.47.05/editor/pnmmargin.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/pnmmargin	2010-03-16 21:28:09.000000000 +0100
-@@ -11,15 +11,11 @@
- # documentation.  This software is provided "as is" without express or
- # implied warranty.
- 
--tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting." 1>&2; exit 1;}
--trap 'rm -rf $tempdir' 0 1 3 15
--
--tmp1=$tempdir/pnmm1
--tmp2=$tempdir/pnmm2
--tmp3=$tempdir/pnmm3
--tmp4=$tempdir/pnmm4
-+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
-+tmp1="$tmpdir/tmp1"
-+tmp2="$tmpdir/tmp2"
-+tmp3="$tmpdir/tmp3"
-+tmp4="$tmpdir/tmp4"
- 
- color="-gofigure"
- plainopt=""
-@@ -90,6 +86,7 @@ else
-         -white | -black )
-         pnmpad $plainopt $color \
-             -left=$size -right=$size -top=$size -bottom=$size $tmp1
-+	rm -rf "$tmpdir"
-         exit
-         ;;
-         * )
-@@ -102,7 +99,4 @@ else
-     pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
-     pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3
- fi
--
--
--
--
-+rm -rf "$tmpdir"
-diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade
---- netpbm-10.47.05/editor/ppmfade.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmfade	2010-03-16 21:28:09.000000000 +0100
-@@ -14,6 +14,7 @@
- #
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- use strict;
-+use File::Temp "tempdir";
- 
- my $SPREAD =  1;
- my $SHIFT =   2;
-@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
- 
- print("Frames are " . $width . "W x " . $height . "H\n");
- 
-+#
-+# We create a tmp-directory right here
-+#
-+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
-+
-+
- if ($first_file eq "undefined") {
-     print "Fading from black to ";
--    system("ppmmake \\#000 $width $height >junk1$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
- } else {
-     print "Fading from $first_file to ";
--    system("cp", $first_file, "junk1$$.ppm");
-+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
- }
- 
- if ($last_file eq "undefined") {
-     print "black.\n";
--    system("ppmmake \\#000 $width $height >junk2$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
- } else {
-     print "$last_file\n";
--    system("cp", $last_file, "junk2$$.ppm");
-+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
- }
- 
- #
-@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
- #
- 
- # Here's what our temporary files are:
--#   junk1$$.ppm: The original (fade-from) image
--#   junk2$$.ppm: The target (fade-from) image
--#   junk3$$.ppm: The frame of the fade for the current iteration of the 
--#                the for loop.
--#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
--#                 image to another, this is the first frame of that 
--#                 sequence.
--#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
-+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
-+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
-+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
-+#                	 the for loop.
-+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-+#                         image to another, this is the first frame of that 
-+#                         sequence.
-+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
- 
- my $i;    # Frame number
- for ($i = 1; $i <= $nframes; $i++) {
-@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
-     if ($mode eq $SPREAD) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10]) * 100;
--            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10])*100;
--            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $SHIFT) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10])*100;
--            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10]) * 100;
--            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $RELIEF) {
-         if ($i == 1) {
--            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
-+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
-+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
-         }
-     } elsif ($mode eq $OIL) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $EDGE) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         } 
-     } elsif ($mode eq $BENTLEY) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $BLOCK) {
-         if ($i <= 10) {
-             my $n = 1 - 1.9*$spline20[$i];
--            system("pamscale $n junk1$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = 1 - 1.9*$spline20[31-$i];
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk2a$$.ppm");
-+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
-         }    
-     } elsif ($mode eq $MIX) {
-         my $fade_factor = sqrt(1/($nframes-$i+1));
--        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
-+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-     } else {
-         print("Internal error: impossible mode value '$mode'\n");
-     }
- 
-     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
--    system("cp", "junk3$$.ppm", $outfile);
-+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
- }
- 
- #
- #  Clean up shop.
- #
--system("rm junk*$$.ppm");
-+system("rm $tmpdir/junk*$$.ppm");
- 
- exit(0);
-diff -up netpbm-10.47.05/editor/ppmquantall.security-scripts netpbm-10.47.05/editor/ppmquantall
---- netpbm-10.47.05/editor/ppmquantall.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmquantall	2010-03-16 21:28:09.000000000 +0100
-@@ -70,12 +70,8 @@ for i in ${files[@]}; do
-     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
- done
- 
--tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting."; exit 1;}
--trap 'rm -rf $tempdir' 0 1 3 15
--
--all=$tempdir/pqa.all.$$
-+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
-+rm -f $all
- 
- pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all
- if [ $? != 0 ]; then
-diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/editor/ppmshadow
---- netpbm-10.47.05/editor/ppmshadow.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmshadow	2010-03-16 21:28:09.000000000 +0100
-@@ -72,9 +72,10 @@ sub makeConvolutionKernel($$) {
- 
- 
- my $tmpdir = $ENV{TMPDIR} || "/tmp";
--my $ourtmp = "$tmpdir/ppmshadow$$";
--mkdir($ourtmp, 0777) or
--    die("Unable to create directory for temporary files '$ourtmp");
-+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
-+if ($? >> 8) {
-+    die "Can't create directory for temporary files";
-+}
- 
- #   Process command line options
- 
diff --git a/testing/neverball/PKGBUILD b/testing/neverball/PKGBUILD
deleted file mode 100644
index b26cf2586..000000000
--- a/testing/neverball/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 148239 2012-01-30 18:49:01Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=neverball
-pkgver=1.5.4
-pkgrel=4
-pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
-arch=('i686' 'x86_64')
-url="http://neverball.org/"
-license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
-makedepends=('mesa')
-source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch)
-sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
-          'f71982b7187d569c57b30c4c40fedd6c0e72baca')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
-  patch -p0 -i ../neverball-1.5.4-underlink.patch
-
-  if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
-  else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
-  fi
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
-  install -d "${pkgdir}"/usr/share/man/man{1,6}
-
-  install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
-  cp -r locale/* "${pkgdir}/usr/share/locale/"
-  cp -r data/* "${pkgdir}/usr/share/neverball/"
-  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
-  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
-  install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
-  install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
-
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
-  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-}
diff --git a/testing/neverball/neverball-1.5.4-underlink.patch b/testing/neverball/neverball-1.5.4-underlink.patch
deleted file mode 100644
index 1a848cad3..000000000
--- a/testing/neverball/neverball-1.5.4-underlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.old	2011-06-22 06:30:52.441788160 +0200
-+++ Makefile	2011-06-22 06:31:59.754087534 +0200
-@@ -138,7 +138,7 @@
- endif
- 
- ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
--    -lvorbisfile $(OGL_LIBS)
-+    -lvorbisfile $(OGL_LIBS) -lX11
- 
- #------------------------------------------------------------------------------
- 
---- Makefile.old	2012-01-18 21:28:23.000000000 -0500
-+++ Makefile	2012-01-18 21:28:55.000000000 -0500
-@@ -131,7 +131,7 @@
-     OGL_LIBS  := -framework OpenGL
- endif
- 
--BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
-+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
- 
- ifdef DARWIN
-     BASE_LIBS += -L/opt/local/lib
diff --git a/testing/nmap/ChangeLog b/testing/nmap/ChangeLog
deleted file mode 100644
index a1ef5e062..000000000
--- a/testing/nmap/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-
-2008-10-28  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Python 2.6 rebuild.
-
-2008-07-23  Hugo Doria  <hugo@archlinux.org>
-
-	* Added pygtk in optdepends: 4.68-3
-
-2008-07-09  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Fixing the pixmaps path for i686: 4.68
-
-2008-07-09  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 4.68
-
diff --git a/testing/nmap/PKGBUILD b/testing/nmap/PKGBUILD
deleted file mode 100644
index 272ac00de..000000000
--- a/testing/nmap/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 149735 2012-02-09 20:44:02Z heftig $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=nmap
-pkgver=5.51
-pkgrel=3
-pkgdesc="A network exploration tool and security/port scanner"
-arch=('i686' 'x86_64')
-url="http://nmap.org"
-license=('GPL')
-depends=('pcre' 'openssl' 'libpcap' 'lua')
-# python is needed for zenmap
-makedepends=('python2')
-optdepends=('pygtk: gui for nmap')
-options=('!makeflags')
-source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0b80d2cb92ace5ebba8095a4c2850275')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop 
-  echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop 
-
-  # Force usage of external libpcap
-  # OSX bug check fails because of missing types
-  # autoreconf fails because our autotools are too new (?)
-  sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure
-
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --libexecdir=/usr/lib
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # remove zenmap uninstall script
-  rm "${pkgdir}/usr/bin/uninstall_zenmap"
-
-  # install custom GPL2 license
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/ntfs-3g_ntfsprogs/PKGBUILD b/testing/ntfs-3g_ntfsprogs/PKGBUILD
deleted file mode 100644
index 54fe384b6..000000000
--- a/testing/ntfs-3g_ntfsprogs/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 149639 2012-02-08 22:27:28Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Bächler <thomas.archlinux.org>
-
-pkgbase=ntfs-3g_ntfsprogs
-pkgname=('ntfs-3g' 'ntfsprogs')
-pkgver=2012.1.15
-pkgrel=1
-url="http://www.tuxera.com"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('glibc' 'fuse')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
-sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
-    --with-fuse=external --disable-static \
-    --mandir=/usr/share/man
-  make
-}
-
-package_ntfs-3g() {
-  pkgdesc="Stable read and write NTFS driver"
-
-  for DIR in src libntfs-3g include; do
-    cd "$srcdir/$pkgbase-$pkgver/$DIR"
-    make DESTDIR="$pkgdir" install
-  done
-
-  ln -s /bin/ntfs-3g "$pkgdir/sbin/mount.ntfs"
-}
-
-package_ntfsprogs() {
-  pkgdesc="NTFS filesystem utilities"
-  depends=('util-linux' 'ntfs-3g')
-
-  cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/testing/nx-common/NXproto.h.64bit.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- nxcomp.old/NXproto.h	2006-06-19 19:55:56.000000000 +0200
-+++ nxcomp/NXproto.h	2007-02-12 18:17:41.000000000 +0100
-@@ -26,6 +26,30 @@
- #include <X11/Xmd.h>
- #include <X11/Xproto.h>
- 
-+/*
-+  Copied from Xproto.h
-+ */
-+
-+/* For the purpose of the structure definitions in this file,
-+we must redefine the following types in terms of Xmd.h's types, which may
-+include bit fields.  All of these are #undef'd at the end of this file,
-+restoring the definitions in X.h.  */
-+
-+#define Window CARD32
-+#define Drawable CARD32
-+#define Font CARD32
-+#define Pixmap CARD32
-+#define Cursor CARD32
-+#define Colormap CARD32
-+#define GContext CARD32
-+#define Atom CARD32
-+#define VisualID CARD32
-+#define Time CARD32
-+#define KeyCode CARD8
-+#define KeySym CARD32
-+
-+/* End copied from Xproto.h */
-+
- #define sz_xNXGetControlParametersReq           4
- #define sz_xNXGetCleanupParametersReq           4
- #define sz_xNXGetImageParametersReq             4
-@@ -343,9 +367,9 @@
-     CARD8    dstDepth;
-     CARD32   srcLength B32;
-     CARD32   dstLength B32;
--    INT16    srcX B16, srcY B16;
-+    CARD16    srcX B16, srcY B16;
-     CARD16   srcWidth B16, srcHeight B16;
--    INT16    dstX B16, dstY B16;
-+    CARD16    dstX B16, dstY B16;
-     CARD16   dstWidth B16, dstHeight B16;
- } xNXPutPackedImageReq;
- 
-@@ -463,4 +487,20 @@
- }
- #endif
- 
-+/* Copied from Xproto.h */
-+
-+/* restore these definitions back to the typedefs in X.h */
-+#undef Window
-+#undef Drawable
-+#undef Font
-+#undef Pixmap
-+#undef Cursor
-+#undef Colormap
-+#undef GContext
-+#undef Atom
-+#undef VisualID
-+#undef Time
-+#undef KeyCode
-+#undef KeySym
-+
- #endif /* NXproto_H */
diff --git a/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD
deleted file mode 100644
index 71f34f2a8..000000000
--- a/testing/nx-common/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 148241 2012-01-30 18:49:03Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nx-common
-pkgver=3.5.0
-pkgrel=3
-pkgdesc="NoMachine NX common package for client and server"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://nomachine.com/"
-depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
-	http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz
-	http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
-	nxcompsh-gcc43.patch
-	nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('ad8c0f133122c6d07732ca69c8759410'
-         '84ade443b79ea079380b754aba9d392e'
-         'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '2966353cabb96829eab291212ef078dc')
-
-build() {
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-
-  ./configure --prefix=/opt/NX
-  make
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- 
-  ./configure --prefix=/opt/NX
-  make
-  # nxssh
-  cd ${srcdir}/nxssh
-  ./configure --prefix=/opt/NX
-  make
-}
-
-package() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib 
-
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
-  # nxssh
-  cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
-}
diff --git a/testing/nx-common/nx-3.5.0-libpng15.patch b/testing/nx-common/nx-3.5.0-libpng15.patch
deleted file mode 100644
index c8f2a9559..000000000
--- a/testing/nx-common/nx-3.5.0-libpng15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
---- nxcomp.orig/Pgn.cpp	2010-03-01 19:18:59.000000000 +0200
-+++ nxcomp/Pgn.cpp	2011-09-13 16:35:12.000000000 +0300
-@@ -414,7 +414,7 @@
- 
-   png_read_info(pngPtr, infoPtr);
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -565,7 +565,7 @@
- 
-   png_read_info( pngPtr, infoPtr ) ;
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -709,7 +709,7 @@
-   png_read_info(pngPtr, infoPtr) ;
- 
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
diff --git a/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/testing/nx-common/nxcompsh-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nxcompsh/Misc.h~	2007-06-04 13:39:49.000000000 +0200
-+++ nxcompsh/Misc.h	2008-04-12 12:46:24.000000000 +0200
-@@ -18,10 +18,12 @@
- #ifndef Misc_H
- #define Misc_H
- 
--#include <iostream.h>
-+#include <iostream>
- 
--#include <errno.h>
--#include <string.h>
-+#include <cerrno>
-+#include <cstring>
-+
-+using namespace std;
- 
- //
- // Error handling macros.
- 
diff --git a/testing/nxserver/NXproto.h.64bit.diff b/testing/nxserver/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/testing/nxserver/NXproto.h.64bit.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- nxcomp.old/NXproto.h	2006-06-19 19:55:56.000000000 +0200
-+++ nxcomp/NXproto.h	2007-02-12 18:17:41.000000000 +0100
-@@ -26,6 +26,30 @@
- #include <X11/Xmd.h>
- #include <X11/Xproto.h>
- 
-+/*
-+  Copied from Xproto.h
-+ */
-+
-+/* For the purpose of the structure definitions in this file,
-+we must redefine the following types in terms of Xmd.h's types, which may
-+include bit fields.  All of these are #undef'd at the end of this file,
-+restoring the definitions in X.h.  */
-+
-+#define Window CARD32
-+#define Drawable CARD32
-+#define Font CARD32
-+#define Pixmap CARD32
-+#define Cursor CARD32
-+#define Colormap CARD32
-+#define GContext CARD32
-+#define Atom CARD32
-+#define VisualID CARD32
-+#define Time CARD32
-+#define KeyCode CARD8
-+#define KeySym CARD32
-+
-+/* End copied from Xproto.h */
-+
- #define sz_xNXGetControlParametersReq           4
- #define sz_xNXGetCleanupParametersReq           4
- #define sz_xNXGetImageParametersReq             4
-@@ -343,9 +367,9 @@
-     CARD8    dstDepth;
-     CARD32   srcLength B32;
-     CARD32   dstLength B32;
--    INT16    srcX B16, srcY B16;
-+    CARD16    srcX B16, srcY B16;
-     CARD16   srcWidth B16, srcHeight B16;
--    INT16    dstX B16, dstY B16;
-+    CARD16    dstX B16, dstY B16;
-     CARD16   dstWidth B16, dstHeight B16;
- } xNXPutPackedImageReq;
- 
-@@ -463,4 +487,20 @@
- }
- #endif
- 
-+/* Copied from Xproto.h */
-+
-+/* restore these definitions back to the typedefs in X.h */
-+#undef Window
-+#undef Drawable
-+#undef Font
-+#undef Pixmap
-+#undef Cursor
-+#undef Colormap
-+#undef GContext
-+#undef Atom
-+#undef VisualID
-+#undef Time
-+#undef KeyCode
-+#undef KeySym
-+
- #endif /* NXproto_H */
diff --git a/testing/nxserver/PKGBUILD b/testing/nxserver/PKGBUILD
deleted file mode 100644
index d51e594f6..000000000
--- a/testing/nxserver/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 148243 2012-01-30 18:49:06Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nxserver
-pkgver=3.5.0
-pkgrel=5
-pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
-arch=(i686 x86_64)
-url="http://nomachine.com/"
-license=('GPL')
-depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
-	 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
-         'xorg-sessreg')
-makedepends=('imake')
-source=(
-#X11 support programs and libraries
-http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common
-#X11 Agent sources
-http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common
-#Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
-# gcc 43 fix
-nxcompsh-gcc43.patch
-nx-3.5.0-libpng15.patch)
-options=(!libtool) 
-md5sums=('12060433a74ac61a1c776d1d6d136117'
-         '84c7f1575d9a1506370125ed050514ab'
-         'cf38ec1e5a5f6453946cd387c14f2684'
-         'ad8c0f133122c6d07732ca69c8759410'
-         '0a36c7e6a86c6c741179464b8f79c487'
-         '84ade443b79ea079380b754aba9d392e'
-         '488bb4d9b8e9f82dc272b4e6e9c57d30'
-         'abde2ccc33e31fc695031c2cfb60f3dd'
-         '90a762dd9eb19c8c97876ad837923857'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '2966353cabb96829eab291212ef078dc')
-
-build() {
-  cd ${srcdir}
-
-  # nxcomp   
-  cd ${srcdir}/nxcomp
-  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-  ./configure --prefix=/opt/NX
-  make
-  # nxcompshad
-  cd ${srcdir}/nxcompshad
-  ./configure --prefix=/opt/NX
-  make
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
-  ./configure --prefix=/opt/NX
-  make
-  # nxproxy
-  cd ${srcdir}/nxproxy
-  ./configure --prefix=/opt/NX
-  make
-  # nx-X11
-  cd ${srcdir}/nx-X11
-  make World
-  # nxcompext
-  cd ${srcdir}/nxcompext 
-  ./configure --prefix=/opt/NX
-  make
-}
-
-package() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib
-
-  # nxcompshad
-  cd ${srcdir}/nxcompshad
-  cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib
-  # nxproxy
-  cd ${srcdir}/nxproxy
-  make prefix=${pkgdir}/opt/NX install
-  # nx-X11
-  cd ${srcdir}/nx-X11
-  cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib
-  cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib
-  cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib
-  install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent
-  install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth
-  # nxcompext
-  cd ${srcdir}/nxcompext 
-  cp -a libXcompext.so* ${pkgdir}/opt/NX/lib
-}
\ No newline at end of file
diff --git a/testing/nxserver/nx-3.5.0-libpng15.patch b/testing/nxserver/nx-3.5.0-libpng15.patch
deleted file mode 100644
index c8f2a9559..000000000
--- a/testing/nxserver/nx-3.5.0-libpng15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
---- nxcomp.orig/Pgn.cpp	2010-03-01 19:18:59.000000000 +0200
-+++ nxcomp/Pgn.cpp	2011-09-13 16:35:12.000000000 +0300
-@@ -414,7 +414,7 @@
- 
-   png_read_info(pngPtr, infoPtr);
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -565,7 +565,7 @@
- 
-   png_read_info( pngPtr, infoPtr ) ;
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
-@@ -709,7 +709,7 @@
-   png_read_info(pngPtr, infoPtr) ;
- 
- 
--  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
-+  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_set_expand(pngPtr);
-   }
diff --git a/testing/nxserver/nxcompsh-gcc43.patch b/testing/nxserver/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/testing/nxserver/nxcompsh-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- nxcompsh/Misc.h~	2007-06-04 13:39:49.000000000 +0200
-+++ nxcompsh/Misc.h	2008-04-12 12:46:24.000000000 +0200
-@@ -18,10 +18,12 @@
- #ifndef Misc_H
- #define Misc_H
- 
--#include <iostream.h>
-+#include <iostream>
- 
--#include <errno.h>
--#include <string.h>
-+#include <cerrno>
-+#include <cstring>
-+
-+using namespace std;
- 
- //
- // Error handling macros.
- 
diff --git a/testing/octave/PKGBUILD b/testing/octave/PKGBUILD
deleted file mode 100644
index efdc54153..000000000
--- a/testing/octave/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 149675 2012-02-08 23:59:49Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : shining <shiningxc.at.gmail.com>
-# Contributor : cyberdune <cyberdune@gmail.com>
-
-pkgname=octave
-pkgver=3.4.3
-pkgrel=2
-pkgdesc="A high-level language, primarily intended for numerical computations."
-arch=('i686' 'x86_64')
-url="http://www.octave.org"
-license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 'fltk')
-optdepends=('texinfo: for help-support in octave'
-            'gnuplot: alternative plotting'
-	    'umfpack: LU decomposition of some large sparse matrices'
-	    'fltk: alternative plotting')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
-options=('!emptydirs')
-install=octave.install
-sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')
-	
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # http://www.nabble.com/Random-rounding-errors-td16010966.html
-  FFLAGS="-O -ffloat-store" \
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static --with-quantum-depth=16
-
-  LANG=C make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-
-  # add octave library path to ld.so.conf.d
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/${pkgname}-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-}
diff --git a/testing/octave/curlfix.patch b/testing/octave/curlfix.patch
deleted file mode 100644
index 26f3d92f9..000000000
--- a/testing/octave/curlfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DLD-FUNCTIONS/urlwrite.cc.old	2011-07-02 16:39:22.466603778 +0200
-+++ src/DLD-FUNCTIONS/urlwrite.cc	2011-07-02 16:39:54.543269859 +0200
-@@ -52,7 +52,6 @@
- 
- #include <curl/curl.h>
- #include <curl/curlver.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- static int
diff --git a/testing/octave/imread.patch b/testing/octave/imread.patch
deleted file mode 100644
index 4a7b73ea0..000000000
--- a/testing/octave/imread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/DLD-FUNCTIONS/__magick_read__.cc.orig	2010-03-06 08:05:25.000000000 +0000
-+++ src/DLD-FUNCTIONS/__magick_read__.cc	2009-08-25 09:26:01.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "defun-dld.h"
- #include "error.h"
- #include "ov-struct.h"
-+#include "oct-env.h"
- 
- #ifdef HAVE_MAGICK
- 
-@@ -359,6 +358,18 @@
- 
- #ifdef HAVE_MAGICK
- 
-+  static bool initialized = false;
-+
-+  if (! initialized)
-+    {
-+      std::string program_name = octave_env::get_program_invocation_name ();
-+
-+      Magick::InitializeMagick (program_name.c_str ());
-+
-+      initialized = true;
-+    }
-+
-+
-   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
-       || nargout > 3)
-     {
diff --git a/testing/octave/octave-3.4.0-gcc46.patch b/testing/octave/octave-3.4.0-gcc46.patch
deleted file mode 100644
index c174204ac..000000000
--- a/testing/octave/octave-3.4.0-gcc46.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
---- octave-3.4.0/liboctave/oct-alloc.h.gcc46	2011-02-08 03:00:51.000000000 -0700
-+++ octave-3.4.0/liboctave/oct-alloc.h	2011-02-08 09:41:23.984081687 -0700
-@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
- #if !defined (octave_oct_alloc_h)
- #define octave_oct_alloc_h 1
- 
-+#include <cstddef>
-+
- class
- OCTAVE_API
- octave_allocator
-diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
---- octave-3.4.0/src/pr-output.cc.gcc46	2011-02-08 03:00:52.000000000 -0700
-+++ octave-3.4.0/src/pr-output.cc	2011-02-08 09:55:16.149662744 -0700
-@@ -3024,7 +3024,7 @@ abs (T x)
- }
- 
- #define INSTANTIATE_ABS(T) \
--  template /* static */ inline T abs (T)
-+  template /* static */ T abs (T)
- 
- INSTANTIATE_ABS(signed char);
- INSTANTIATE_ABS(short);
diff --git a/testing/octave/octave.install b/testing/octave/octave.install
deleted file mode 100644
index 8ee77c430..000000000
--- a/testing/octave/octave.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD
deleted file mode 100644
index 9fd9c104a..000000000
--- a/testing/opal/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 149137 2012-02-05 21:34:57Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.10.2
-pkgrel=4
-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 291aa342f..000000000
--- a/testing/opencv/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 148245 2012-01-30 18:49:08Z 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_a
-_realver=2.3.1
-pkgrel=4
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('opencv-docs'
-            'opencv-samples'
-            'eigen2'
-            'python2-numpy: Python 2.x interface')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
-md5sums=('82e4b6bfa349777233eea09b075e931e')
-
-_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-$_realver"
-
-  # x64, i.e "Athlon64" and upwards, can use SSE3
-  [ $CARCH = x86_64 ] && \
-    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
-
-  cmake ${_cmakeopts[@]} .
-
-  make
-}
-
-package_opencv() {
-  cd "$srcdir/$_realname-$_realver"
-
-  make DESTDIR="$pkgdir" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/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)"
-  unset depends
-  unset optdepends
-  options=('docs')
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_opencv-samples() {
-  pkgdesc+=" (samples)"
-  depends=('bash')
-  unset optdepends
-  unset options
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/opengtl/PKGBUILD b/testing/opengtl/PKGBUILD
deleted file mode 100644
index ba03186c2..000000000
--- a/testing/opengtl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148247 2012-01-30 18:49:10Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andries Radu <admiral0@live.it>
-
-pkgname=opengtl
-pkgver=0.9.16
-pkgrel=1
-pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
-url="http://www.opengtl.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc-libs' 'llvm')
-makedepends=('cmake' 'libpng')
-optdepends=('libpng: for using the png extension')
-source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../OpenGTL-${pkgver} \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/openjdk6/PKGBUILD b/testing/openjdk6/PKGBUILD
deleted file mode 100644
index 2df623d78..000000000
--- a/testing/openjdk6/PKGBUILD
+++ /dev/null
@@ -1,180 +0,0 @@
-# $Id: PKGBUILD 148420 2012-01-31 18:28:42Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=('openjdk6' 'openjdk6-src')
-pkgbase="openjdk6"
-_javaver=6
-_icedteaver=1.11
-_openjdk_version=b24
-_openjdk_date=14_nov_2011
-pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
-url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64')
-license=('custom')
-makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java' 
-	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6')
-options=('!emptydirs') # 'force') # force needed for hg shots
-source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
-	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/drops/jaxp144_03.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
-	fix_jdk_cmds_path.diff
-	fix_corba_cmds_path.diff
-	fontconfig-paths.diff
-	nonreparenting-wm.diff
-	openjdk6.profile
-	openjdk6.profile.csh)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	jaxp144_03.zip
-	jdk6-jaxws2_1_6-2011_06_13.zip
-	jdk6-jaf-b20.zip)
-md5sums=('10c1cea1d24c064572abfe9687567948'
-         '0eabdd360169144336e50081b8d01001'
-         '9eea471ad474040265c688858fcf09aa'
-         '8fd91b09b643a19a912b8a75e7a7a9d5'
-         'bc95c133620bd68c161cac9891592901'
-         '5da3e39fa60985576c4f37d1491efbe2'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'ee1afda124d5927345014ab382ef581e'
-         '9b4d368f5ee08de248eaf029303a446c'
-         '74c4a7adc782edd087802bf92ae3d6d0'
-         'fdf295e2f186dfa4d308691a3d7ac8c5')
-
-build() {
-
-  unset JAVA_HOME
-  unset CLASSPATH
-  
-    [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-
-  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-
-  autoreconf -i
-
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-  unset MAKEFLAGS
-
-  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-ant-home=/usr/share/java/apache-ant \
-	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
-	--with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
-  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
-	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--disable-bootstrap
-  LD_PRELOAD="" make 
-}
-
-package_openjdk6() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
- backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
-            'alsa-lib: for sound'
-            'giflib: for gif format support')
- conflicts=('java-environment' 'java-runtime')
- provides=('java-environment=6' 'java-runtime=6')
- install=openjdk6.install
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-
-   # Install main files.
-  cp -a bin include lib ${pkgdir}/${_jvmdir}/ 
-  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ 
-
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src 
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc 
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
-   # Install man pages.
-  install -m755 -d ${pkgdir}/usr/share/man/man1
-  install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ 
-  
-   # Install demos and samples.
-  cp -a demo ${pkgdir}/${_jvmdir}/ 
-  install -m755 -d sample/rmi
-  mv bin/java-rmi.cgi sample/rmi 
-  cp -a sample ${pkgdir}/${_jvmdir}/ 
-  popd
-
-  # Install icons and menu entries.
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
-    install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-      ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png 
-  done
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-
-  # link binaries into /usr/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} \
-      ${pkgdir}/usr/bin 
-  done
-  popd
-
-  # link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
- 
-  # set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh 
-  install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh 
-  
-  # install license
-  install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openjdk6-src() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
- depends=('openjdk6')
- 
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-  
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-   # Install src.zip file
-  cp -a src.zip ${pkgdir}/${_jvmdir}/ 
-}
diff --git a/testing/openjdk6/fix_corba_cmds_path.diff b/testing/openjdk6/fix_corba_cmds_path.diff
deleted file mode 100644
index 842657880..000000000
--- a/testing/openjdk6/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/testing/openjdk6/fix_jdk_cmds_path.diff b/testing/openjdk6/fix_jdk_cmds_path.diff
deleted file mode 100644
index 7e16e1744..000000000
--- a/testing/openjdk6/fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -76,10 +76,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -126,7 +126,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -173,7 +173,7 @@
-   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
- 
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/testing/openjdk6/fontconfig-paths.diff b/testing/openjdk6/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/testing/openjdk6/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/testing/openjdk6/nonreparenting-wm.diff b/testing/openjdk6/nonreparenting-wm.diff
deleted file mode 100644
index 65fa66e89..000000000
--- a/testing/openjdk6/nonreparenting-wm.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-index 68d1ff7..878327e 100644
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -99,7 +99,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
-     }
- 
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants {
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             }
-             /*
-              * Check for legacy WMs.
-@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants {
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants {
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/testing/openjdk6/openjdk6.install b/testing/openjdk6/openjdk6.install
deleted file mode 100644
index 653c8fe2f..000000000
--- a/testing/openjdk6/openjdk6.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/openjdk6.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/testing/openjdk6/openjdk6.profile b/testing/openjdk6/openjdk6.profile
deleted file mode 100644
index 9da4421ef..000000000
--- a/testing/openjdk6/openjdk6.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/testing/openjdk6/openjdk6.profile.csh b/testing/openjdk6/openjdk6.profile.csh
deleted file mode 100644
index 3cb15fd49..000000000
--- a/testing/openjdk6/openjdk6.profile.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk"
-setenv J2REDIR "$J2SDKDIR/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD
deleted file mode 100644
index 4d03efa39..000000000
--- a/testing/pcre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 149677 2012-02-08 23:59:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=pcre
-pkgver=8.30
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64')
-url="http://www.pcre.org/"
-license=('BSD')
-depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('98e8928cccc945d04279581e778fbdff'
-         '01eee0333fa71687e0b6756db77f94ad')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --enable-pcre16 --enable-jit \
-    --enable-utf8 --enable-unicode-properties
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/pekwm/PKGBUILD b/testing/pekwm/PKGBUILD
deleted file mode 100644
index a9e7ce8ca..000000000
--- a/testing/pekwm/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 148251 2012-01-30 18:49:17Z ibiru $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Eddie Lozon <almostlucky@attbi.com>
-
-pkgname=pekwm
-pkgver=0.1.13
-pkgrel=2
-pkgdesc="A small, fast, functional, and flexible window manager"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://pekwm.org/"
-depends=('gcc-libs' 'libjpeg>=7' 'libpng' 'libxft' 'libxinerama' 'libxpm'
-'libxrandr')
-backup=(etc/pekwm/config
-  etc/pekwm/vars
-  etc/pekwm/autoproperties
-  etc/pekwm/start
-  etc/pekwm/keys
-  etc/pekwm/mouse
-  etc/pekwm/menu)
-source=(http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2
-pekwm.desktop libpng-1.4.patch)
-md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5'
-         '075bf1b9d32bf94780329499e4fa40e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-#  patch -p1 < ../libpng-1.4.patch || return 1
-  # Default settings:
-  #    --enable-shape --enable-xinerama --enable-menus \
-  #    --enable-harbour --disable-debug --disable-pedantic \
-  #    --enable-xft --enable-image-xpm --enable-image-jpeg \
-  #    --enable-image-png --enable-xrandr
-  ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/${pkgname}.desktop" \
-                   "${pkgdir}/usr/share/xsessions/${pkgname}.desktop"
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/pekwm/libpng-1.4.patch b/testing/pekwm/libpng-1.4.patch
deleted file mode 100644
index bc4df2c4d..000000000
--- a/testing/pekwm/libpng-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur pekwm-0.1.11-orig/src/PImageLoaderPng.cc pekwm-0.1.11/src/PImageLoaderPng.cc
---- pekwm-0.1.11-orig/src/PImageLoaderPng.cc	2010-01-22 01:57:08.000000000 -0500
-+++ pekwm-0.1.11/src/PImageLoaderPng.cc	2010-01-22 02:00:02.000000000 -0500
-@@ -108,7 +108,7 @@
-     
-     // gray -> 8 bit gray
-     if (color_type == PNG_COLOR_TYPE_GRAY && (bpp < 8)) {
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-@@ -179,7 +179,7 @@
- 
-     status = fread(sig, 1, PImageLoaderPng::PNG_SIG_BYTES, fp);
-     if (status == PImageLoaderPng::PNG_SIG_BYTES) {
--        return (png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) != 0);
-+      return (png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) == 0);
-     }
-     return false;
- }
diff --git a/testing/pekwm/pekwm.desktop b/testing/pekwm/pekwm.desktop
deleted file mode 100644
index 2f59528bd..000000000
--- a/testing/pekwm/pekwm.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pekwm
-Comment=The pekwm window manager
-Exec=pekwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/testing/perl-tk/PKGBUILD b/testing/perl-tk/PKGBUILD
deleted file mode 100644
index 656f645b1..000000000
--- a/testing/perl-tk/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 148253 2012-01-30 18:49:20Z ibiru $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
-# Contributor: Jason Chu <jchu@xentac.net>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=perl-tk
-_cpanname=Tk
-pkgver=804.030
-pkgrel=2
-pkgdesc="A graphical user interface toolkit for Perl"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/${_cpanname}"
-license=('PerlArtistic' 'GPL' 'custom')
-depends=('libpng' 'libjpeg' 'tk' 'perl')
-options=('!emptydirs')
-replaces=('perltk')
-provides=('perltk')
-source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('13275e85f99ee467a86d9598a437abff')
-
-build() {
-  cd "$srcdir/${_cpanname}-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-#check() {
-#  cd "$srcdir/${_cpanname}-$pkgver"
-#  make test
-#}
-
-package() {
-  cd "$srcdir/${_cpanname}-$pkgver"
-  make install DESTDIR="$pkgdir"
-
-  # license
-  install -D -m644 pTk/license.terms \
-                   "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
-  install -D -m644 pTk/Tix.license \
-                   "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
-}
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
deleted file mode 100644
index 8b5285ca1..000000000
--- a/testing/php/PKGBUILD
+++ /dev/null
@@ -1,368 +0,0 @@
-# $Id: PKGBUILD 149679 2012-02-08 23:59:58Z allan $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=php
-pkgname=('php'
-         'php-cgi'
-         'php-apache'
-         'php-fpm'
-         'php-embed'
-         'php-pear'
-         'php-enchant'
-         'php-gd'
-         'php-intl'
-         'php-ldap'
-         'php-mcrypt'
-         'php-mssql'
-         'php-odbc'
-         'php-pgsql'
-         'php-pspell'
-         'php-snmp'
-         'php-sqlite'
-         'php-tidy'
-         'php-xsl')
-pkgver=5.3.10
-_suhosinver=5.3.9-0.9.10
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
-             'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
-             'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
-             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
-        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'pcre_info.patch')
-md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
-         'c099b3d7eac95018ababd41ded7f3066'
-         'c15d18f846be1d69144a5d0056ee6506'
-         'ffc338e8ce2a990f6f2a486355bbab65'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         'b01be5f816988fcee7e78225836e5e27'
-         '740ec5fe2ecfd9d7febd4081c90ec65b'
-         '07c4e412909ac65a44ec90e7a2c4bade'
-         '8d3806bbb19e390f9b32ccf21611d937')
-
-build() {
-	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
-		--prefix=/usr \
-		--sysconfdir=/etc/php \
-		--localstatedir=/var \
-		--with-layout=GNU \
-		--with-config-file-path=/etc/php \
-		--with-config-file-scan-dir=/etc/php/conf.d \
-		--enable-inline-optimization \
-		--disable-debug \
-		--disable-rpath \
-		--disable-static \
-		--enable-shared \
-		--mandir=/usr/share/man \
-		--without-pear \
-		"
-
-	phpextensions="--enable-bcmath=shared \
-		--enable-calendar=shared \
-		--enable-dba=shared \
-		--enable-exif=shared \
-		--enable-ftp=shared \
-		--enable-gd-native-ttf \
-		--enable-intl=shared \
-		--enable-json=shared \
-		--enable-mbregex \
-		--enable-mbstring \
-		--enable-pdo \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-session \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sqlite-utf8 \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-xml \
-		--enable-zip=shared \
-		--with-bz2=shared \
-		--with-curl=shared \
-		--with-db4=/usr \
-		--with-enchant=shared,/usr \
-		--with-freetype-dir=shared,/usr \
-		--with-gd=shared \
-		--with-gdbm=shared \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-icu-dir=/usr \
-		--with-imap-ssl=shared \
-		--with-imap=shared \
-		--with-jpeg-dir=shared,/usr \
-		--with-ldap=shared \
-		--with-ldap-sasl \
-		--with-mcrypt=shared \
-		--with-mhash \
-		--with-mssql=shared \
-		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
-		--with-mysql=shared,mysqlnd \
-		--with-mysqli=shared,mysqlnd \
-		--with-openssl=shared \
-		--with-pcre-regex=/usr \
-		--with-pdo-mysql=shared,mysqlnd \
-		--with-pdo-odbc=shared,unixODBC,/usr \
-		--with-pdo-pgsql=shared \
-		--with-pdo-sqlite=shared,/usr \
-		--with-pgsql=shared \
-		--with-png-dir=shared,/usr \
-		--with-pspell=shared \
-		--with-regex=php \
-		--with-snmp=shared \
-		--with-sqlite3=shared,/usr \
-		--with-sqlite=shared \
-		--with-tidy=shared \
-		--with-unixODBC=shared,/usr \
-		--with-xmlrpc=shared \
-		--with-xsl=shared \
-		--with-zlib \
-		--without-db2 \
-		--without-db3 \
-		"
-
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
-	export PEAR_INSTALLDIR
-
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	patch -p1 -i ${srcdir}/pcre_info.patch
-
-	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
-	# adjust paths
-	patch -p0 -i ${srcdir}/php.ini.patch
-	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-
-	# php
-	mkdir ${srcdir}/build-php
-	cd ${srcdir}/build-php
-	ln -s ../${pkgbase}-${pkgver}/configure
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		${phpextensions}
-	make
-
-	# cgi and fcgi
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${srcdir}/build-php ${srcdir}/build-cgi
-	cd ${srcdir}/build-cgi
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-cgi \
-		${phpextensions}
-	make
-
-	# apache
-	cp -a ${srcdir}/build-php ${srcdir}/build-apache
-	cd ${srcdir}/build-apache
-	./configure ${phpconfig} \
-		--disable-cli \
-		--with-apxs2 \
-		${phpextensions}
-	make
-
-	# fpm
-	cp -a ${srcdir}/build-php ${srcdir}/build-fpm
-	cd ${srcdir}/build-fpm
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
-		${phpextensions}
-	make
-
-	# embed
-	cp -a ${srcdir}/build-php ${srcdir}/build-embed
-	cd ${srcdir}/build-embed
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-embed=shared \
-		${phpextensions}
-	make
-
-	# pear
-	cp -a ${srcdir}/build-php ${srcdir}/build-pear
-	cd ${srcdir}/build-pear
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		--with-pear \
-		${phpextensions}
-	make
-}
-
-# check() {
-# 	cd ${srcdir}/build-php
-# 	make test
-# }
-
-package_php() {
-	pkgdesc='An HTML-embedded scripting language'
-	depends=('pcre' 'libxml2' 'bzip2' 'curl')
-	replaces=('php-fileinfo' 'php-gmp' 'php-curl')
-	provides=('php-fileinfo' 'php-gmp' 'php-curl')
-	conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
-	backup=('etc/php/php.ini')
-
-	cd ${srcdir}/build-php
-	make -j1 INSTALL_ROOT=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/pear
-	# install php.ini
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
-	install -d -m755 ${pkgdir}/etc/php/conf.d/
-
-	# remove static modules
-	rm -f ${pkgdir}/usr/lib/php/modules/*.a
-	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
-	# remove empty directory
-	rmdir ${pkgdir}/usr/include/php/include
-}
-
-package_php-cgi() {
-	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
-}
-
-package_php-apache() {
-	pkgdesc='Apache SAPI for PHP'
-	depends=('php' 'apache')
-	backup=('etc/httpd/conf/extra/php5_module.conf')
-
-	install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
-	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
-}
-
-package_php-fpm() {
-	pkgdesc='FastCGI Process Manager for PHP'
-	depends=('php')
-	backup=('etc/php/php-fpm.conf')
-
-	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
-	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
-	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
-	install -d -m755 ${pkgdir}/etc/php/fpm.d
-}
-
-package_php-embed() {
-	pkgdesc='Embed SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
-}
-
-package_php-pear() {
-	pkgdesc='PHP Extension and Application Repository'
-	depends=('php')
-	backup=('etc/php/pear.conf')
-
-	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
-}
-
-package_php-enchant() {
-	depends=('php' 'enchant')
-	pkgdesc='enchant module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
-}
-
-package_php-gd() {
-	depends=('php' 'libpng' 'libjpeg' 'freetype2')
-	pkgdesc='gd module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
-}
-
-package_php-intl() {
-	depends=('php' 'icu')
-	pkgdesc='intl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
-}
-
-package_php-ldap() {
-	depends=('php' 'libldap')
-	pkgdesc='ldap module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
-}
-
-package_php-mcrypt() {
-	depends=('php' 'libmcrypt' 'libltdl')
-	pkgdesc='mcrypt module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
-}
-
-package_php-mssql() {
-	depends=('php' 'freetds')
-	pkgdesc='mssql module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
-}
-
-package_php-odbc() {
-	depends=('php' 'unixodbc')
-	pkgdesc='ODBC modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
-}
-
-package_php-pgsql() {
-	depends=('php' 'postgresql-libs')
-	pkgdesc='PostgreSQL modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
-}
-
-package_php-pspell() {
-	depends=('php' 'aspell')
-	pkgdesc='pspell module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
-}
-
-package_php-snmp() {
-	depends=('php' 'net-snmp')
-	pkgdesc='snmp module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
-}
-
-package_php-sqlite() {
-	depends=('php' 'sqlite3')
-	pkgdesc='sqlite3 module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
-}
-
-package_php-tidy() {
-	depends=('php' 'tidyhtml')
-	pkgdesc='tidy module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
-}
-
-package_php-xsl() {
-	depends=('php' 'libxslt')
-	pkgdesc='xsl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
-}
diff --git a/testing/php/apache.conf b/testing/php/apache.conf
deleted file mode 100644
index c3ca0aad5..000000000
--- a/testing/php/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php5_module
-
-<IfModule dir_module>
-	<IfModule php5_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm
deleted file mode 100644
index 7a1ba2597..000000000
--- a/testing/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/php-fpm.log {
-	missingok
-	postrotate
-	/etc/rc.d/php-fpm logrotate >/dev/null || true
-	endscript
-}
diff --git a/testing/php/pcre_info.patch b/testing/php/pcre_info.patch
deleted file mode 100644
index e6d10df06..000000000
--- a/testing/php/pcre_info.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- php-5.3.10/ext/pcre/php_pcre.c	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.c	2012-02-06 13:31:36.198935107 +0100
-@@ -241,6 +241,7 @@
- 	char				*pattern;
- 	int					 do_study = 0;
- 	int					 poptions = 0;
-+	int				count = 0;
- 	unsigned const char *tables = NULL;
- #if HAVE_SETLOCALE
- 	char				*locale = setlocale(LC_CTYPE, NULL);
-@@ -252,10 +252,10 @@
- 	   back the compiled pattern, otherwise go on and compile it. */
- 	if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
- 		/*
--		 * We use a quick pcre_info() check to see whether cache is corrupted, and if it
-+		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
- 		 * is, we flush it and compile the pattern from scratch.
- 		 */
--		if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
-+		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
- 			zend_hash_clean(&PCRE_G(pcre_cache));
- 		} else {
- #if HAVE_SETLOCALE
---- php-5.3.10/ext/pcre/php_pcre.def	2009-01-11 14:59:00.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.def	2012-02-06 13:31:47.775299315 +0100
-@@ -4,7 +4,6 @@
- php_pcre_exec
- php_pcre_get_substring
- php_pcre_get_substring_list
--php_pcre_info
- php_pcre_maketables
- php_pcre_study
- php_pcre_version
---- php-5.3.10/main/php_compat.h	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/main/php_compat.h	2012-02-06 13:26:59.272834580 +0100
-@@ -34,7 +34,6 @@
- #define pcre_exec			php_pcre_exec
- #define pcre_get_substring		php_pcre_get_substring
- #define pcre_get_substring_list		php_pcre_get_substring_list
--#define pcre_info			php_pcre_info
- #define pcre_maketables			php_pcre_maketables
- #define pcre_study			php_pcre_study
- #define pcre_version			php_pcre_version
diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch
deleted file mode 100644
index b923edb38..000000000
--- a/testing/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-01-11 10:50:14.905161442 +0100
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
- ;  - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
- 
- ; Error log file
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -140,7 +140,8 @@
- ;                            specific port;
- ;   '/path/to/unix/socket' - to listen on a unix socket.
- ; Note: This value is mandatory.
--listen = 127.0.0.1:9000
-+;listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm/php-fpm.sock
- 
- ; Set listen(2) backlog. A value of '-1' means unlimited.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -151,9 +152,9 @@
- ; BSD-derived systems allow connections regardless of permissions. 
- ; Default Values: user and group are set as the running user
- ;                 mode is set to 0666
--;listen.owner = @php_fpm_user@
--;listen.group = @php_fpm_group@
--;listen.mode = 0666
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
-+listen.mode = 0660
-  
- ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -442,7 +443,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-  
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
deleted file mode 100644
index 3dc5b6560..000000000
--- a/testing/php/php.ini.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- php.ini-production	2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
- ; or per-virtualhost web server configuration file. This directive is
- ; *NOT* affected by whether Safe Mode is turned On or Off.
- ; http://php.net/open-basedir
--;open_basedir =
-+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
- 
- ; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
- 
- ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
--; extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
- ; On windows:
- ; extension_dir = "ext"
- 
-@@ -950,53 +950,49 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
- ;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--;
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_fileinfo.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_intl.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_exif.dll      ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--
--; The MIBS data available in the PHP distribution must be installed. 
--; See http://www.php.net/manual/en/snmp.installation.php 
--;extension=php_snmp.dll
--
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
-+;extension=bcmath.so
-+;extension=bz2.so
-+;extension=calendar.so
-+extension=curl.so
-+;extension=dba.so
-+;extension=enchant.so
-+;extension=exif.so
-+;extension=ftp.so
-+;extension=gd.so
-+extension=gettext.so
-+;extension=gmp.so
-+;extension=iconv.so
-+;extension=imap.so
-+;extension=intl.so
-+extension=json.so
-+;extension=ldap.so
-+;extension=mcrypt.so
-+;extension=mssql.so
-+;extension=mysqli.so
-+;extension=mysql.so
-+;extension=odbc.so
-+;extension=openssl.so
-+;extension=pdo_mysql.so
-+;extension=pdo_odbc.so
-+;extension=pdo_pgsql.so
-+;extension=pdo_sqlite.so
-+;extension=pgsql.so
-+;extension=phar.so
-+;extension=posix.so
-+;extension=pspell.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=soap.so
-+;extension=sockets.so
-+;extension=sqlite3.so
-+;extension=sqlite.so
-+;extension=sysvmsg.so
-+;extension=sysvsem.so
-+;extension=sysvshm.so
-+;extension=tidy.so
-+;extension=xmlrpc.so
-+;extension=xsl.so
-+;extension=zip.so
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm
deleted file mode 100644
index 54bcf4d5b..000000000
--- a/testing/php/rc.d.php-fpm
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
-	try=0
-	while test $try -lt 35 ; do
-		case "$1" in
-			'created')
-			if [ -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-			'removed')
-			if [ ! -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-		esac
-
-		stat_append '.'
-		try=`expr $try + 1`
-		sleep 1
-	done
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/php/php-fpm.conf ]; then
-		stat_append '(/etc/php/php-fpm.conf not found)'
-		stat_die
-	fi
-
-	local test=$(/usr/sbin/php-fpm -t 2>&1)
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/php/php-fpm.conf)'
-		stat_die
-	elif echo $test | grep -qi 'error'; then
-		stat_append '(error in /etc/php/php.ini)'
-		stat_die
-	fi
-
-	[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			add_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	stop)
-		test_config
-		stat_busy 'Gracefully shutting down php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	force-quit)
-		stat_busy 'Terminating php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	restart)
-		$0 stop
-		$0 start
-	;;
-
-	reload)
-		test_config
-		stat_busy 'Reload service php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	logrotate)
-		stat_busy 'Reopen php-fpm log'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	*)
-		echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
-		exit 1
-	;;
-
-esac
diff --git a/testing/pilot-link/PKGBUILD b/testing/pilot-link/PKGBUILD
deleted file mode 100644
index 83f0d984d..000000000
--- a/testing/pilot-link/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148257 2012-01-30 18:49:26Z ibiru $
-# Maintainer: dale <dale@archlinux.org>
-
-# todo: add perl support, DESTDIR has no affect on perl
-# and it seems that moving the files manually doesn't work
-
-pkgname=pilot-link
-pkgver=0.12.5
-pkgrel=3
-pkgdesc="A suite of tools for connecting to PalmOS handheld devices"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('readline>=6.0' 'libpng>=1.5.0' 'libusb-compat' 'popt' 'bluez>=4.59')
-options=('!libtool')
-url="http://www.pilot-link.org/"
-source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2
-        pilot-link-png14.patch)
-md5sums=('568c55bf504b044f6fbd50baa407c990'
-         'a21a2eeb01544a8a261a75e64a3120c3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/pilot-link-png14.patch"
-  ./configure --prefix=/usr --enable-conduits --enable-libusb \
-    --with-libiconv --with-libpng
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pilot-link/pilot-link-png14.patch b/testing/pilot-link/pilot-link-png14.patch
deleted file mode 100644
index 9d753332e..000000000
--- a/testing/pilot-link/pilot-link-png14.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c pilot-link-0.12.4.png14/src/pilot-read-notepad.c
---- pilot-link-0.12.4/src/pilot-read-notepad.c	2007-02-05 00:06:02.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-notepad.c	2010-01-17 15:04:33.000000000 +0100
-@@ -39,10 +39,6 @@
- 
- #ifdef HAVE_PNG
- #include "png.h"
--#if (PNG_LIBPNG_VER < 10201)
-- #define png_voidp_NULL (png_voidp)NULL
-- #define png_error_ptr_NULL (png_error_ptr)NULL
--#endif
- #endif
- 
- const char *progname;
-@@ -166,8 +162,8 @@
-    width = n->body.width + 8;
- 
-    png_ptr = png_create_write_struct
--     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--       png_error_ptr_NULL, png_error_ptr_NULL);
-+     ( PNG_LIBPNG_VER_STRING, NULL,
-+       NULL, NULL);
- 
-    if(!png_ptr)
-      return;
-diff -ru pilot-link-0.12.4/src/pilot-read-palmpix.c pilot-link-0.12.4.png14/src/pilot-read-palmpix.c
---- pilot-link-0.12.4/src/pilot-read-palmpix.c	2007-02-05 00:06:03.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-palmpix.c	2010-01-17 15:03:20.000000000 +0100
-@@ -42,10 +42,6 @@
- 
- #ifdef HAVE_PNG
- #include "png.h"
--#if (PNG_LIBPNG_VER < 10201)
-- #define png_voidp_NULL (png_voidp)NULL
-- #define png_error_ptr_NULL (png_error_ptr)NULL
--#endif
- #endif
- 
- const char *progname;
-@@ -223,8 +219,8 @@
- 	png_infop info_ptr;
- 
- 	png_ptr = png_create_write_struct
--		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--		png_error_ptr_NULL, png_error_ptr_NULL);
-+		( PNG_LIBPNG_VER_STRING, NULL,
-+		NULL, NULL);
- 
- 	if(!png_ptr)
- 		return;
-diff -ru pilot-link-0.12.4/src/pilot-read-screenshot.c pilot-link-0.12.4.png14/src/pilot-read-screenshot.c
---- pilot-link-0.12.4/src/pilot-read-screenshot.c	2006-11-02 15:54:31.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-screenshot.c	2010-01-17 15:03:52.000000000 +0100
-@@ -40,10 +40,6 @@
- 
- #ifdef HAVE_PNG
- # include "png.h"
--# if (PNG_LIBPNG_VER < 10201)
--#  define png_voidp_NULL (png_voidp)NULL
--#  define png_error_ptr_NULL (png_error_ptr)NULL
--# endif
- #endif
- 
- #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
-@@ -87,8 +83,8 @@
- 		gray_buf = malloc( state->w );
- 
- 	png_ptr = png_create_write_struct
--		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--		png_error_ptr_NULL, png_error_ptr_NULL);
-+		(PNG_LIBPNG_VER_STRING, NULL,
-+		NULL, NULL);
- 
- 	if (!png_ptr)
- 		return;
-diff -ru pilot-link-0.12.4/src/pilot-read-veo.c pilot-link-0.12.4.png14/src/pilot-read-veo.c
---- pilot-link-0.12.4/src/pilot-read-veo.c	2007-02-05 00:06:03.000000000 +0100
-+++ pilot-link-0.12.4.png14/src/pilot-read-veo.c	2010-01-17 15:04:14.000000000 +0100
-@@ -41,10 +41,6 @@
- 
- #ifdef HAVE_PNG
- # include "png.h"
--# if (PNG_LIBPNG_VER < 10201)
--#  define png_voidp_NULL (png_voidp)NULL
--#  define png_error_ptr_NULL (png_error_ptr)NULL
--# endif
- #endif
- 
- #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
-@@ -856,8 +852,8 @@
-    png_infop info_ptr;
- 
-    png_ptr = png_create_write_struct
--	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
--	  png_error_ptr_NULL, png_error_ptr_NULL);
-+	 (PNG_LIBPNG_VER_STRING, NULL,
-+	  NULL, NULL);
- 
-    if (!png_ptr)
- 	 return;
diff --git a/testing/plotutils/PKGBUILD b/testing/plotutils/PKGBUILD
deleted file mode 100644
index 310bedb36..000000000
--- a/testing/plotutils/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148259 2012-01-30 18:49:28Z ibiru $
-# Maintainer: damir <damir@archlinux.org>
-# Packager: Maksim Sipos (maxsipos at gmail dot com)
-
-pkgname=plotutils
-pkgver=2.6
-pkgrel=2
-arch=('x86_64' 'i686')
-pkgdesc="Set of utilities and libraries for plotting."
-url="http://directory.fsf.org/graphics/plotutils.html"
-license=("GPL")
-depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
-options=('!libtool')
-install=plotutils.install
-source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz plotutils-2.6-libpng-1.5.patch)
-sha1sums=('7921301d9dfe8991e3df2829bd733df6b2a70838'
-          '426f6ee04186af5059ab54322efaf0a6a976682b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../plotutils-2.6-libpng-1.5.patch
-  ./configure --prefix=/usr \
-	--with-gnu-ld \
-	--with-x \
-	--enable-libplotter
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/plotutils/plotutils-2.6-libpng-1.5.patch b/testing/plotutils/plotutils-2.6-libpng-1.5.patch
deleted file mode 100644
index b86d9f457..000000000
--- a/testing/plotutils/plotutils-2.6-libpng-1.5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fix building with libpng-1.5
-
---- libplot/z_write.c
-+++ libplot/z_write.c
-@@ -164,7 +164,7 @@
-     }
- 
-   /* cleanup after libpng errors (error handler does a longjmp) */
--  if (setjmp (png_ptr->jmpbuf))
-+  if (png_jmpbuf (png_ptr))
-     {
-       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
-       return -1;
-@@ -444,7 +444,7 @@
- #endif
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
- }
- 
- static void 
-@@ -515,7 +515,7 @@
- #endif
-     }
- 
--  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf (png_ptr), 1);
- }
- 
- static void 
diff --git a/testing/plotutils/plotutils.install b/testing/plotutils/plotutils.install
deleted file mode 100644
index d3d033e0c..000000000
--- a/testing/plotutils/plotutils.install
+++ /dev/null
@@ -1,15 +0,0 @@
-infodir=usr/share/info
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info $infodir/plotutils.info.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  install-info --delete $infodir/plotutils.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD
deleted file mode 100644
index ed3c56fbe..000000000
--- a/testing/poppler/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 148261 2012-01-30 18:49:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.3
-pkgrel=2
-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=('d70d2d63d8acd29c97185f7e5f09c9b4'
-         '9dc64c254a31e570507bdd4ad4ba629a'
-         'af56b7b1b24a08f7498a0c7f5e862b93')
-
-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}
-  LANG=en_US.UTF8 make check
-}
-
-package_poppler() {
-  pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
-  conflicts=("poppler-qt3<${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-}
-
-package_poppler-glib() {
-  pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'glib2')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
-}
-
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
diff --git a/testing/poppler/git-fixes.patch b/testing/poppler/git-fixes.patch
deleted file mode 100644
index 24a66b84f..000000000
--- a/testing/poppler/git-fixes.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 04 Dec 2011 16:29:45 +0000
-Subject: Do not fail if we are trying to save a file with Encrypt but that we have not modified at all
-
-Fixes KDE bug #288045
-(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa)
----
-diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
-index 01d2759..2758206 100644
---- a/poppler/PDFDoc.cc
-+++ b/poppler/PDFDoc.cc
-@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
- 
- int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
- 
--  // we don't support files with Encrypt at the moment
-+  // find if we have updated objects
-+  GBool updated = gFalse;
-+  for(int i=0; i<xref->getNumObjects(); i++) {
-+    if (xref->getEntry(i)->updated) {
-+      updated = gTrue;
-+      break;
-+    }
-+  }
-+
-+  // we don't support rewriting files with Encrypt at the moment
-   Object obj;
-   xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj);
-   if (!obj.isNull())
-   {
-     obj.free();
--    return errEncrypted;
-+    if (!updated && mode == writeStandard) {
-+      // simply copy the original file
-+      saveWithoutChangesAs (outStr);
-+    } else {
-+      return errEncrypted;
-+    }
-   }
--  obj.free();
-+  else
-+  {
-+    obj.free();
- 
--  if (mode == writeForceRewrite) {
--    saveCompleteRewrite(outStr);
--  } else if (mode == writeForceIncremental) {
--    saveIncrementalUpdate(outStr); 
--  } else { // let poppler decide
--    // find if we have updated objects
--    GBool updated = gFalse;
--    for(int i=0; i<xref->getNumObjects(); i++) {
--      if (xref->getEntry(i)->updated) {
--        updated = gTrue;
--        break;
-+    if (mode == writeForceRewrite) {
-+      saveCompleteRewrite(outStr);
-+    } else if (mode == writeForceIncremental) {
-+      saveIncrementalUpdate(outStr); 
-+    } else { // let poppler decide
-+      if(updated) { 
-+        saveIncrementalUpdate(outStr);
-+      } else {
-+        // simply copy the original file
-+        saveWithoutChangesAs (outStr);
-       }
-     }
--    if(updated) { 
--      saveIncrementalUpdate(outStr);
--    } else {
--      // simply copy the original file
--      saveWithoutChangesAs (outStr);
--    }
-   }
- 
-   return errNone;
---
-cgit v0.9.0.2-2-gbebe
-From 03544e2f602319f0b381f5f357e14cc2cc77d2c1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 06 Dec 2011 22:21:15 +0000
-Subject: include strings.h as we use memcpy
-
-Fixes bug 43558
-(cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b)
----
-diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
-index f88c3a7..1fb8cab 100644
---- a/goo/PNGWriter.cc
-+++ b/goo/PNGWriter.cc
-@@ -6,7 +6,7 @@
- //
- // Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
- // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
--// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
-+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
- // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com>
- // Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at>
-@@ -19,6 +19,7 @@
- 
- #include <zlib.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "poppler/Error.h"
- #include "goo/gmem.h"
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/postfix/PKGBUILD b/testing/postfix/PKGBUILD
deleted file mode 100644
index 24633b4fd..000000000
--- a/testing/postfix/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 149681 2012-02-09 00:00:06Z allan $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=postfix
-pkgver=2.9.0
-pkgrel=2
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db')
-backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \
-        'aliases.patch' \
-        'rc.d')
-sha1sums=('a04a72a8b9436279a30b7d1b62197be63124a132'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make makefiles DEBUG='' CCARGS=' \
-		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
-		-DHAS_LDAP \
-		-DUSE_TLS \
-		-DHAS_MYSQL -I/usr/include/mysql \
-		-DHAS_PGSQL -I/usr/include/postgresql \
-		-DHAS_SQLITE \
-	' AUXLIBS=' \
-		-lsasl2 \
-		-lldap -llber \
-		-lssl -lcrypto \
-		-lmysqlclient -lz -lm \
-		-lpq \
-		-lsqlite3 -lpthread \
-	' OPT="${CFLAGS} ${LDFLAGS}"
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sh postfix-install -non-interactive \
-		install_root="${pkgdir}" \
-		daemon_directory="/usr/lib/${pkgname}" \
-		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man"
-
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
-	cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
-}
diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch
deleted file mode 100644
index 6767870b7..000000000
--- a/testing/postfix/aliases.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig	2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf	2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
- 
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi".  This is a separate
-@@ -392,6 +393,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #
diff --git a/testing/postfix/install b/testing/postfix/install
deleted file mode 100644
index cb97e2e6c..000000000
--- a/testing/postfix/install
+++ /dev/null
@@ -1,33 +0,0 @@
-post_install() {
-	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
-	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
-	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
-}
-
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF
-
-==> You must now run "postfix reload" due to inter-daemon protocol change.
-
-EOF
-	fi
-}
-
-pre_remove() {
-	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
-	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
-	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
-}
diff --git a/testing/postfix/rc.d b/testing/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/testing/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	/usr/sbin/postfix start &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	/usr/sbin/postfix stop &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	/usr/sbin/postfix reload &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/testing/psmisc/COMM_LEN-to-18.patch b/testing/psmisc/COMM_LEN-to-18.patch
deleted file mode 100644
index 5cec62507..000000000
--- a/testing/psmisc/COMM_LEN-to-18.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Craig Small <csmall@users.sourceforge.net>
-Date: Fri, 27 Jan 2012 01:02:48 +0000 (+1100)
-Subject: Set COMM_LEN to 18 to include brackets in name
-X-Git-Url: http://psmisc.git.sourceforge.net/git/gitweb.cgi?p=psmisc%2Fpsmisc;a=commitdiff_plain;h=340f81524cb097d814fcf344a3743de17f988e3d
-
-Set COMM_LEN to 18 to include brackets in name
-
-Also use strncpy in case the command names grow.
----
-
-diff --git a/src/comm.h b/src/comm.h
-index 956383d..2b780b0 100644
---- a/src/comm.h
-+++ b/src/comm.h
-@@ -1,18 +1,37 @@
--/* comm.h - command name length definition */
--
--/* Copyright 1995 Werner Almesberger. See file COPYING for details. */
--
-+/*
-+ * comm.h - command name length definition 
-+ *
-+ * Copyright 1995 Werner Almesberger
-+ * Copyright 2012 Craig Small <csmall@enc.com.au>
-+ *
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
- 
- #ifndef COMM_H
- #define COMM_H
- 
--#if 0				/* broken in 1.3.xx */
--#include <linux/sched.h>
--#define COMM_LEN sizeof(dummy.comm)
--extern struct task_struct dummy;
--#else
--#define COMM_LEN 16		/* synchronize with size of comm in struct task_struct in
--				   /usr/include/linux/sched.h */
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
- #endif
- 
-+/*
-+ * COMM_LEN should be the same size as TASK_COMM_LEN in the Linux source
-+ * at include/linux/sched.h
-+ * However, that doesn't include the brackets that may be in the field.
-+ */
-+#define COMM_LEN 18
-+
- #endif
-diff --git a/src/pstree.c b/src/pstree.c
-index 452f823..3129f76 100644
---- a/src/pstree.c
-+++ b/src/pstree.c
-@@ -264,7 +264,7 @@ static PROC *new_proc(const char *comm, pid_t pid, uid_t uid)
-         perror("malloc");
-         exit(1);
-     }
--    strcpy(new->comm, comm);
-+    strncpy(new->comm, comm, COMM_LEN);
-     new->pid = pid;
-     new->uid = uid;
-     new->flags = 0;
-@@ -352,7 +352,7 @@ add_proc(const char *comm, pid_t pid, pid_t ppid, uid_t uid,
-         this = new_proc(comm, pid, uid);
- #endif                                /*WITH_SELINUX */
-     else {
--        strcpy(this->comm, comm);
-+        strncpy(this->comm, comm, COMM_LEN);
-         this->uid = uid;
-     }
-     if (args)
diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD
deleted file mode 100644
index eae984840..000000000
--- a/testing/psmisc/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148578 2012-02-03 23:11:21Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=psmisc
-pkgver=22.15
-pkgrel=1
-pkgdesc="Miscellaneous procfs tools"
-arch=('i686' 'x86_64')
-url="http://psmisc.sourceforge.net/index.html"
-license=('GPL')
-groups=('base')
-depends=('ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz COMM_LEN-to-18.patch)
-sha1sums=('06f507d889afab70ac7ff20fbd419ca2ffcf90c0'
-          '6f45338fc34e453bea5273691a0cf81ed3e20fb8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../COMM_LEN-to-18.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pygtk/PKGBUILD b/testing/pygtk/PKGBUILD
deleted file mode 100644
index aae368ff1..000000000
--- a/testing/pygtk/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 148265 2012-01-30 18:49:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=pygtk
-pkgver=2.24.0
-pkgrel=3
-pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libglade' 'python2-cairo' 'pygobject')
-makedepends=('python2-numpy' 'pygobject2-devel')
-optdepends=('python2-numpy')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        python27.patch)
-sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
-            '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=623965
-  patch -Np1 -i "${srcdir}/python27.patch"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-
-  sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py
-}
diff --git a/testing/pygtk/python27.patch b/testing/pygtk/python27.patch
deleted file mode 100644
index 9bbe2b5ae..000000000
--- a/testing/pygtk/python27.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
-index c0e1493..aa8cf10 100644
---- a/gtk/gtkmodule.c
-+++ b/gtk/gtkmodule.c
-@@ -227,8 +227,12 @@ init_gtk(void)
-     pygtk_add_stock_items(d);
-     
-     /* extension API */
--    PyDict_SetItemString(d, "_PyGtk_API",
--			 o=PyCObject_FromVoidPtr(&functions, NULL));
-+#if PY_VERSION_HEX >= 0x02070000
-+    o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL);
-+#else
-+    o = PyCObject_FromVoidPtr(&functions, NULL);
-+#endif
-+    PyDict_SetItemString(d, "_PyGtk_API", o);
-     Py_DECREF(o);
- 	
-     PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning",
-diff --git a/gtk/pygtk.h b/gtk/pygtk.h
-index 573c3b9..e4c680f 100644
---- a/gtk/pygtk.h
-+++ b/gtk/pygtk.h
-@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
- 
- 
- /* a function to initialise the pygtk functions */
-+
-+/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
-+#if PY_VERSION_HEX >= 0x02070000
-+#define init_pygtk() G_STMT_START { \
-+    void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \
-+    if (!capsule) { \
-+        return; \
-+    } \
-+    _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
-+} G_STMT_END
-+#else /* PY_VERSION_HEX */
-+/* Python 2.6 and earlier use the CObject API */
- #define init_pygtk() G_STMT_START { \
-     PyObject *pygtk = PyImport_ImportModule("gtk"); \
-     if (pygtk != NULL) { \
-@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
-         return; \
-     } \
- } G_STMT_END
-+#endif /* PY_VERSION_HEX */
- 
- #endif
- 
diff --git a/testing/pygtksourceview2/PKGBUILD b/testing/pygtksourceview2/PKGBUILD
deleted file mode 100644
index 15feea29d..000000000
--- a/testing/pygtksourceview2/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148267 2012-01-30 18:49:39Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pygtksourceview2
-pkgver=2.10.1
-pkgrel=4
-pkgdesc="Python bindings for gtksourceview2"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0')
-makedepends=('intltool' 'pkg-config')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2)
-sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974')
-
-build() {
-  cd "${srcdir}/pygtksourceview-${pkgver}"
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-docs
-  make
-}
-
-package() {
-  cd "${srcdir}/pygtksourceview-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/python-notify/PKGBUILD b/testing/python-notify/PKGBUILD
deleted file mode 100644
index ea687e23a..000000000
--- a/testing/python-notify/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 148269 2012-01-30 18:49:41Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Mario Danic <mario.danic@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=python-notify
-pkgver=0.1.1
-pkgrel=11
-pkgdesc="Python bindings for libnotify"
-arch=('i686' 'x86_64')
-url="http://www.galago-project.org/"
-license=('GPL')
-depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
-makedepends=('pkgconfig' 'python2')
-options=(!libtool)
-source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
-        libnotify07.patch
-        notify-python-0.1.1-fix-GTK-symbols.patch)
-md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
-         'b40c4542575d5aef559908fe60a21634'
-         'c6922028da5951e69a6a0167bdb4461c')
-
-build() {
-    cd ${srcdir}/notify-python-${pkgver}
-
-    patch -Np1 -i ${srcdir}/libnotify07.patch
-    patch -Np1 -i ${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch
-
-    ./configure --prefix=/usr
-
-    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
-    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
-    touch src/pynotify.override
-
-    make clean
-    make
-}
-
-package() {
-    cd ${srcdir}/notify-python-${pkgver}
-    make DESTDIR=${pkgdir} install
-}
diff --git a/testing/python-notify/libnotify07.patch b/testing/python-notify/libnotify07.patch
deleted file mode 100644
index 289573d50..000000000
--- a/testing/python-notify/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
-     '("const-gchar*" "summary")
-     '("const-gchar*" "message" (null-ok) (default "NULL"))
-     '("const-gchar*" "icon" (null-ok) (default "NULL"))
--    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
-   )
- )
- 
-@@ -53,24 +52,6 @@
-   )
- )
- 
--(define-method attach_to_widget
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_widget")
--  (return-type "none")
--  (parameters
--    '("GtkWidget*" "attach")
--  )
--)
--
--(define-method attach_to_status_icon
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_status_icon")
--  (return-type "none")
--  (parameters
--    '("GtkStatusIcon*" "attach")
--  )
--)
--
- (define-method show
-   (of-object "NotifyNotification")
-   (c-name "notify_notification_show")
diff --git a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c0136..000000000
--- a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/testing/python-pygame/ChangeLog b/testing/python-pygame/ChangeLog
deleted file mode 100644
index 566be3f65..000000000
--- a/testing/python-pygame/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-2012-01-24  Angel Velasquez <angvp@archlinux.org>
-
-	* Rebuilt against libpng 1.5
-
-2010-08-24  Eric Belanger  <eric@archlinux.org>
-
-	* Rebuilt for python2
-
-2009-08-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to: 1.9.1
-
-2009-08-03  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Adding the examples folder
-
-2009-08-01  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for x86_64: 1.9.0
-
-2008-08-06  Eric Belanger  <eric@archlinux.org>
-
-	* python-pygame 1.8.1-2
-	* Fixed file permissions (close FS#11082)
-
-2008-07-31  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.8.1
-
-2008-03-31  Eric Belanger  <eric@archlinux.org>
-
-	* python-pygame 1.8.0-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/testing/python-pygame/PKGBUILD b/testing/python-pygame/PKGBUILD
deleted file mode 100644
index f197e6655..000000000
--- a/testing/python-pygame/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 148271 2012-01-30 18:49:44Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: john(?)
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=python-pygame
-pkgver=1.9.1
-pkgrel=4
-pkgdesc="Python game library"
-arch=('i686' 'x86_64')
-url="http://www.pygame.org/"
-license=('LGPL')
-depends=('sdl_mixer' 'libvorbis' 'sdl_ttf' 'sdl_image' 'smpeg')
-makedepends=('python2' 'portmidi') 
-replaces=('pygame')
-provides=('pygame')
-changelog=ChangeLog
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz 'config.patch'
-'pygame-v4l.patch')
-md5sums=('1c4cdc708d17c8250a2d78ef997222fc'
-         'aaa668f3cd710d8604114501ea6a6f48'
-         '9915b63865c16519e80007909beed876')
-
-build() {
-	cd "${srcdir}/pygame-${pkgver}release"
-	patch -Np0 -i "${srcdir}/config.patch"
-    patch -Np1 -i "${srcdir}/pygame-v4l.patch"
-}
-
-package() {
-	cd "${srcdir}/pygame-${pkgver}release"
-	python2 config.py -auto
-	python2 setup.py install --root="${pkgdir}" --prefix=/usr
-	# Copying the examples and tests
-	cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
-	cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
-	# Fixing permissions
-	chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
-}
diff --git a/testing/python-pygame/config.patch b/testing/python-pygame/config.patch
deleted file mode 100644
index b3dab162c..000000000
--- a/testing/python-pygame/config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: config_unix.py
-===================================================================
---- config_unix.py	(revision 2567)
-+++ config_unix.py	(working copy)
-@@ -174,7 +174,7 @@
- 
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
-Index: config_msys.py
-===================================================================
---- config_msys.py	(revision 2567)
-+++ config_msys.py	(working copy)
-@@ -283,7 +283,7 @@
-     
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
diff --git a/testing/python-pygame/pygame-v4l.patch b/testing/python-pygame/pygame-v4l.patch
deleted file mode 100644
index 3b5a2b9d2..000000000
--- a/testing/python-pygame/pygame-v4l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
-*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
---- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
-***************
-*** 34,40 ****
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
---- 34,40 ----
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
-diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
-*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
---- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
-***************
-*** 160,179 ****
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-!         if (v4l_open_device(self) == 0) {
-!             v4l2_close_device(self);
-!             return NULL;
-!         } else {
-!             self->camera_type = CAM_V4L;
-!             if (v4l_init_device(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!             if (v4l_start_capturing(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!         }
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
---- 160,167 ----
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-! 	v4l2_close_device(self);
-!         return NULL;
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
-diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
-*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
---- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
-***************
-*** 39,45 ****
-  
-      #include <asm/types.h>          /* for videodev2.h */
-  
--     #include <linux/videodev.h>
-      #include <linux/videodev2.h>
-  #endif
-  
---- 39,44 ----
-***************
-*** 51,57 ****
-  #define RGB_OUT 1
-  #define YUV_OUT 2
-  #define HSV_OUT 4
-- #define CAM_V4L 1
-  #define CAM_V4L2 2
-  
-  struct buffer 
---- 50,55 ----
-***************
-*** 111,118 ****
-  int v4l2_close_device (PyCameraObject* self);
-  int v4l2_open_device (PyCameraObject* self);
-  
-- /* internal functions specific to v4l */
-- int v4l_open_device (PyCameraObject* self);
-- int v4l_init_device(PyCameraObject* self);
-- int v4l_start_capturing(PyCameraObject* self);
-  #endif
---- 109,112 ----
diff --git a/testing/pywebkitgtk/PKGBUILD b/testing/pywebkitgtk/PKGBUILD
deleted file mode 100644
index 6c2dd9d47..000000000
--- a/testing/pywebkitgtk/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148273 2012-01-30 18:49:46Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
-# Contributor: kasa <biuta.jr@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pywebkitgtk
-pkgver=1.1.8
-pkgrel=2
-pkgdesc="Python bindings to the WebKit GTK+ port"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pywebkitgtk/"
-license=('LGPL')
-depends=('libwebkit' 'pygtk')
-options=('!libtool' '!makeflags')
-source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('158335385354ba38090c9324b37bf225')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-}
diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/testing/qemu-kvm/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD
deleted file mode 100644
index 905fec9a0..000000000
--- a/testing/qemu-kvm/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 148277 2012-01-30 18:49:51Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu-kvm
-pkgver=1.0
-pkgrel=3
-pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=(i686 x86_64)
-license=('GPL2' 'LGPL2.1')
-url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse')
-makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu-kvm.install
-conflicts=('qemu')
-provides=('qemu')
-replaces=('kvm')
-source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
-        65-kvm.rules)
-options=(!strip)
-
-build()
-{
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # fix esound building
-    ./configure --prefix=/usr \
-                --python=/usr/bin/python2 \
-                --sysconfdir=/etc \
-                --audio-drv-list=alsa,sdl,oss,pa \
-                --audio-card-list=ac97,sb16,es1370,hda \
-                --enable-docs
-    make
-
-    # Use latest seabios version
-    # https://bugs.archlinux.org/task/27616
-    cd "${srcdir}/"
-    git clone git://git.seabios.org/seabios.git
-    cd seabios
-    find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-    make clean
-    make
-}
-
-package()
-{
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    
-    # Use latest seabios version
-    # https://bugs.archlinux.org/task/27616
-    cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
-
-    # symbolic link for backwards compatibility
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu"
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm"
-    # fix man page
-    mv "${pkgdir}/usr/share/man/man1/qemu.1" \
-                     "${pkgdir}/usr/share/man/man1/qemu-kvm.1"
-    # install udev rules
-    install -D -m644 "${srcdir}/65-kvm.rules" \
-                     "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
-    # strip scripts directory
-    find "${pkgdir}/usr/bin"  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-}
-md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install
deleted file mode 100644
index 84aa773b9..000000000
--- a/testing/qemu-kvm/qemu-kvm.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  groupadd kvm -f -g 78
-  echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
-  echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu-kvm -enable-kvm' to use KVM."
-  echo ""
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  groupdel kvm
-}
diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/testing/qemu/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD
deleted file mode 100644
index 9ca9a9fe6..000000000
--- a/testing/qemu/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 148275 2012-01-30 18:49:48Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu
-pkgver=1.0
-pkgrel=3
-pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://wiki.qemu.org/Index.html"
-makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu.install
-source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz
-        65-kvm.rules)
-options=(!strip)
-
-build()
-{
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/lib64/lib/g' x86_64.ld
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
-              --python=/usr/bin/python2 \
-              --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs
-              make
-  # Use latest seabios version
-  # https://bugs.archlinux.org/task/27616
-  cd "${srcdir}/"
-  git clone git://git.seabios.org/seabios.git
-  cd seabios
-  find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-  make clean
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # Use latest seabios version
-  # https://bugs.archlinux.org/task/27616
-  cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin"
-
-  install -D -m644 "${srcdir}/65-kvm.rules" \
-                   "${pkgdir}/lib/udev/rules.d/65-kvm.rules"
-  # strip scripts directory
-    find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-
-}
-md5sums=('a64b36067a191451323b0d34ebb44954'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install
deleted file mode 100644
index e16ac027c..000000000
--- a/testing/qemu/qemu.install
+++ /dev/null
@@ -1,24 +0,0 @@
-# kvm:  the new package version
-post_install() {
-  #
-  groupadd kvm -f -g 78
-  echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
-  echo ">>>  Add yourself to the group 'kvm'."
-  echo ">>>  Use 'qemu -enable-kvm' to use KVM."
-  echo ""
-  if [ "$(vercmp $2 0.11)" -lt 0 ]; then
-    echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
-    echo "is no longer supported and will be removed from the repositories. You"
-    echo "can safely uninstall it from your system."
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  #
-  groupdel kvm
-}
diff --git a/testing/qiv/PKGBUILD b/testing/qiv/PKGBUILD
deleted file mode 100644
index 73bd20bb9..000000000
--- a/testing/qiv/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 148279 2012-01-30 18:49:54Z ibiru $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=qiv
-pkgver=2.2.4
-pkgrel=2
-pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
-arch=('i686' 'x86_64')
-url="http://spiegl.de/qiv/"
-license=('GPL2')
-depends=('file' 'gtk2' 'imlib2')
-source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz)
-md5sums=('1425f89c90f9c045858fccf24d894c97')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -D -m 0755 qiv "$pkgdir/usr/bin/qiv"
-  install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1"
-}
diff --git a/testing/qrencode/PKGBUILD b/testing/qrencode/PKGBUILD
deleted file mode 100644
index 853ce83e3..000000000
--- a/testing/qrencode/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 148281 2012-01-30 18:49:56Z ibiru $
-# Maintainer: Florian Pritz< flo@xinu.at>
-# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-
-pkgname=qrencode
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="C library for encoding data in a QR Code symbol."
-arch=(i686 x86_64)
-depends=('libpng>=1.5.0')
-makedepends=(sdl)
-url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
-license=('GPL')
-options=(!libtool)
-source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7e90615eb314abcd2eb2eab5c8155b97')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-#  autoreconf
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make prefix="$pkgdir/usr" install
-}
diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD
deleted file mode 100644
index f9633d4fb..000000000
--- a/testing/qt/PKGBUILD
+++ /dev/null
@@ -1,131 +0,0 @@
-# $Id: PKGBUILD 148390 2012-01-30 23:09:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0
-pkgrel=4
-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-${pkgver}"
-source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'fix-qurl.patch')
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
-         'fc211414130ab2764132e7370f8e5caa'
-         '85179f5e0437514f8639957e1d8baf62'
-         'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         '7bc255a36733d0fbc80c1902ade4beca')
-
-build() {
-  cd "${srcdir}"/${_pkgfqn}
-
-  # (FS#27757)
-  patch -p1 -i "${srcdir}"/fix-qurl.patch
-
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -plugindir /usr/lib/qt/plugins \
-    -importdir /usr/lib/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc \
-    -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 \
-    -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/fix-qurl.patch b/testing/qt/fix-qurl.patch
deleted file mode 100644
index 1c666dba4..000000000
--- a/testing/qt/fix-qurl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
---- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile	2011-10-03 22:44:32.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp	2011-10-27 12:58:35.706815049 -0500
-@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
- QString QUrl::toLocalFile() const
- {
-     // the call to isLocalFile() also ensures that we're parsed
--    if (!isLocalFile())
-+    // Treat URLs with no scheme as local for backward compatibility
-+    if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
-         return QString();
- 
-     QString tmp;
diff --git a/testing/qt/linguist.desktop b/testing/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/testing/qt/linguist.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/testing/qt/qt.install b/testing/qt/qt.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/qt/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/qt/qtconfig.desktop b/testing/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/testing/qt/qtconfig.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config 
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/testing/qt3/PKGBUILD b/testing/qt3/PKGBUILD
deleted file mode 100644
index 8a1ff9aba..000000000
--- a/testing/qt3/PKGBUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# $Id: PKGBUILD 148285 2012-01-30 18:50:04Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=qt3
-pkgver=3.3.8
-pkgrel=22
-pkgdesc="The QT3 gui toolkit"
-arch=('i686' 'x86_64')
-url="http://www.trolltech.com/products/qt/index.html"
-license=('GPL')
-depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
-         'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
-        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2
-        qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff
-        mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
-sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
-          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
-          '3d19510c46016a1a211d97bf8f82b01498b1b33c'
-          '9cb2e5bec782069692ee337cfa171539d9d73753'
-          '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
-          'ca5ecb29c7f1c826d48703339a3371038e306bb7'
-          'd928ff55adb52c4bab2fb268df022651551cd70c'
-          'bb6aad81cce143c23ff7840b1d79f6b2007a0c04'
-          '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
-          '1346320614f6f86fbeb10b9fbad721dea29f5b61'
-          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
-
-# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
-# other qt-patches come from fedora and gentoo
-
-build() {
-  unset QMAKESPEC
-  export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
-  export PATH=${QTDIR}/bin:${PATH}
-  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
-  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # apply qt patches from kde.org
-  for i in ../qt-copy-kde-patches/*; do
-    patch -Np0 -i $i 
-  done
-  # apply other qt patches and one security fix from debian/gentoo
-  for i in ../qt-patches/*; do
-    patch -Np1 -i $i 
-  done
-  # fix utf8 bug
-  patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff 
-  # fix asia fonts
-  patch -p0 -i "${srcdir}"/qt-font-default-subst.diff 
-  # fix segfaults on exit when using mysql DB driver
-  patch -p0 -i "${srcdir}"/mysql.patch 
-  # fix CJK font/chars select error (FS#11245)
-  patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff 
-  # fix build problem against new unixODBC
-  patch -p1 -i "${srcdir}"/qt-odbc.patch 
-  # fix build with gcc 4.6.0
-  patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
-  patch -p0 -i "${srcdir}"/qt3-png15.patch 
-  # start compiling qt
-  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-  rm -rf doc/html examples tutorial
-  sed -i "s|sub-tutorial sub-examples||" Makefile
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
-  sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
-  sed -i "s|read acceptance|acceptance=yes|" configure
-
- # remove unwanted mkspecs
-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
-  if [ "$CARCH" = "x86_64" ]; then
-      export ARCH="-64"	
-    else unset ARCH
-  fi
-
-  ./configure -prefix /opt/qt \
-    -platform linux-g++$ARCH \
-    -system-zlib \
-    -qt-gif \
-    -release \
-    -shared \
-    -sm \
-    -nis \
-    -thread \
-    -stl \
-    -system-lib{png,jpeg,mng} \
-    -no-g++-exceptions \
-    -plugin-sql-{mysql,psql,sqlite,odbc}
-
-  # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make -C qmake 
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # fix the broken makefiles
-  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make INSTALL_ROOT="${pkgdir}" install
-  rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
-  install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
-  install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
-  ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
-  rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
-  # install man pages
-  install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
-
-  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-  echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
-}
diff --git a/testing/qt3/eastern_asian_languagues.diff b/testing/qt3/eastern_asian_languagues.diff
deleted file mode 100644
index 7c25eef7d..000000000
--- a/testing/qt3/eastern_asian_languagues.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
- 
- #ifdef Q_WS_X11
-     if (script == QFont::Han) {
--	// modify script according to locale
--	static QFont::Script defaultHan = QFont::UnknownScript;
--	if (defaultHan == QFont::UnknownScript) {
--	    QCString locale = setlocale(LC_ALL, NULL);
--	    if (locale.contains("ko"))
--		defaultHan = QFont::Han_Korean;
--	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
--		defaultHan = QFont::Han_TraditionalChinese;
--	    else if (locale.contains("zh"))
--		defaultHan = QFont::Han_SimplifiedChinese;
--	    else
--		defaultHan = QFont::Han_Japanese;
--	}
--	script = defaultHan;
-+        // modify script according to locale
-+        static QFont::Script defaultHan;
-+        QCString locale = setlocale(LC_ALL, NULL);
-+
-+        if (locale.contains("ko"))
-+            defaultHan = QFont::Han_Korean;
-+        else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-+            defaultHan = QFont::Han_TraditionalChinese;
-+        else if (locale.contains("zh"))
-+            defaultHan = QFont::Han_SimplifiedChinese;
-+        else if (locale.contains("ja"))
-+            defaultHan = QFont::Han_Japanese;
-+        else
-+            defaultHan = QFont::Han; // don't change
-+
-+        script = defaultHan;
-     }
- #endif
- 
diff --git a/testing/qt3/gcc-4.6.patch b/testing/qt3/gcc-4.6.patch
deleted file mode 100644
index bcbffcea6..000000000
--- a/testing/qt3/gcc-4.6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-01-30 21:14:29.275088725 -0600
-@@ -49,6 +49,7 @@
- #include "qvaluelist.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <map>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-01-30 21:14:01.765846592 -0600
-@@ -47,6 +47,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-01-30 21:14:01.765846592 -0600
-@@ -45,6 +45,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <vector>
- #endif
diff --git a/testing/qt3/mysql.patch b/testing/qt3/mysql.patch
deleted file mode 100644
index 5f61edc67..000000000
--- a/testing/qt3/mysql.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sql/drivers/mysql/qsql_mysql.cpp
-+++ src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -37,7 +37,6 @@
- #include "qsql_mysql.h"
- #include <private/qsqlextension_p.h>
- 
--#include <qapplication.h>
- #include <qdatetime.h>
- #include <qvaluevector.h>
- #include <qsqlrecord.h>
-@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
- }
- 
- /////////////////////////////////////////////////////////
--static void qServerEnd()
--{
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID >= 40000
--    mysql_server_end();
--# endif // MYSQL_VERSION_ID
--#endif // Q_NO_MYSQL_EMBEDDED
--}
- 
- static void qServerInit()
- {
-@@ -366,9 +357,7 @@ static void qServerInit()
- 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
- #  endif
-     }
--    qAddPostRoutine(qServerEnd);
-     init = TRUE;    
--    
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- }
-@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
- 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
- 	delete ext;
-     }
-+#ifndef Q_NO_MYSQL_EMBEDDED
-+# if MYSQL_VERSION_ID > 40000
-+    mysql_server_end();
-+# endif
-+#endif
- }
- 
- bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/testing/qt3/qt-copy-kde-patches.tar.bz2 b/testing/qt3/qt-copy-kde-patches.tar.bz2
deleted file mode 100644
index 19d899963..000000000
--- a/testing/qt3/qt-copy-kde-patches.tar.bz2
+++ /dev/null
diff --git a/testing/qt3/qt-font-default-subst.diff b/testing/qt3/qt-font-default-subst.diff
deleted file mode 100644
index 3e286f74e..000000000
--- a/testing/qt3/qt-font-default-subst.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/kernel/qfontdatabase_x11.cpp
-+++ src/kernel/qfontdatabase_x11.cpp
-@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
- 	    if (script == QFont::Latin)
- 		// add Euro character
- 		FcCharSetAddChar(cs, 0x20ac);
--	    if (script == QFont::Han_SimplifiedChinese)
--		FcCharSetAddChar(cs, 0x3400);
--	    if (script == QFont::Han_TraditionalChinese){
--		FcCharSetAddChar(cs, 0x3435);
--		FcCharSetAddChar(cs, 0xE000);
--		FcCharSetAddChar(cs, 0xF6B1);
--	    }
--	    if (script == QFont::MiscellaneousSymbols)
--		FcCharSetAddChar(cs, 0x2714);
- 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- 	    FcCharSetDestroy(cs);
- 	}
-@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
-     FcPatternPrint(pattern);
- #endif
- 
-+    // XftFontMatch calls the right ConfigSubstitute variants, but as we use
-+    // FcFontMatch/Sort here we have to do it manually.
-     FcConfigSubstitute(0, pattern, FcMatchPattern);
-+    XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
-+
- //     qDebug("1: pattern contains:");
- //     FcPatternPrint(pattern);
- 
-@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
- 	    value.u.s = (const FcChar8 *)cs.data();
- 	    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- 	}
--#ifdef FONT_MATCH_DEBUG
--	printf("final pattern contains:\n");
--	FcPatternPrint(pattern);
--#endif
-     }
- 
-     if (script != QFont::Unicode) {
-@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
-         if (script == QFont::Latin)
-             // add Euro character
-             FcCharSetAddChar(cs, 0x20ac);
--	if (script == QFont::Han_SimplifiedChinese)
--	    FcCharSetAddChar(cs, 0x3400);
--	if (script == QFont::Han_TraditionalChinese) {
--	    FcCharSetAddChar(cs, 0x3435);
--	    FcCharSetAddChar(cs, 0xE000);
--	    FcCharSetAddChar(cs, 0xF6B1);
--	}
--	if (script == QFont::MiscellaneousSymbols)
--	    FcCharSetAddChar(cs, 0x2714);
-         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
-         FcCharSetDestroy(cs);
-     }
- 
-+#ifdef FONT_MATCH_DEBUG
-+	printf("final pattern contains:\n");
-+	FcPatternPrint(pattern);
-+#endif
-+
-     QFontEngine *fe = 0;
- 
-     for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
---- src/kernel/qfontdatabase.cpp
-+++ src/kernel/qfontdatabase.cpp
-@@ -554,7 +554,7 @@ static const unsigned short sample_chars
-     // GeometricSymbols,
-     { 0x2500, 0x0 },
-     // MiscellaneousSymbols,
--    { 0x2640, 0x0 },
-+    { 0x2640, 0x2714, 0x0 },
-     // EnclosedAndSquare,
-     { 0x2460, 0x0 },
-     // Braille,
diff --git a/testing/qt3/qt-odbc.patch b/testing/qt3/qt-odbc.patch
deleted file mode 100644
index 6f21e3cf1..000000000
--- a/testing/qt3/qt-odbc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
-+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
-@@ -57,13 +57,13 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
- 
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
diff --git a/testing/qt3/qt-patches.tar.bz2 b/testing/qt3/qt-patches.tar.bz2
deleted file mode 100644
index 3f4aee171..000000000
--- a/testing/qt3/qt-patches.tar.bz2
+++ /dev/null
diff --git a/testing/qt3/qt.install b/testing/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/testing/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/testing/qt3/qt.profile b/testing/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/testing/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/testing/qt3/qt3-png15.patch b/testing/qt3/qt3-png15.patch
deleted file mode 100644
index e64fea36a..000000000
--- a/testing/qt3/qt3-png15.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $
-
---- src/kernel/qpngio.cpp.orig	2007-02-02 10:01:15.000000000 -0400
-+++ src/kernel/qpngio.cpp
-@@ -43,6 +43,7 @@
- #include "qiodevice.h"
- 
- #include <png.h>
-+#include <zlib.h>
- 
- 
- #ifdef Q_OS_TEMP
-@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct
-     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	0, 0, 0);
- 
-+    png_colorp info_ptr_palette = NULL;
-+    int info_ptr_num_palette = 0;
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
-+    }
-+
-+    png_bytep info_ptr_trans_alpha = NULL;
-+    int info_ptr_num_trans = 0;
-+    png_color_16p info_ptr_trans_color = NULL;
-+
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-+	png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
-+    }
-+
-+
-     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
- 	// Black & White or 8-bit grayscale
--	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
-+	if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
- 	    png_set_invert_mono( png_ptr );
- 	    png_read_update_info( png_ptr, info_ptr );
- 	    if (!image.create( width, height, 1, 2, QImage::BigEndian ))
-@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr_trans_color->gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct
- 	}
-     } else if ( color_type == PNG_COLOR_TYPE_PALETTE
-      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
--     && info_ptr->num_palette <= 256 )
-+     && info_ptr_num_palette <= 256 )
-     {
- 	// 1-bit and 8-bit color
- 	if ( bit_depth != 1 )
-@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct
- 	png_read_update_info( png_ptr, info_ptr );
- 	png_get_IHDR(png_ptr, info_ptr,
- 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
--	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
-+	if (!image.create(width, height, bit_depth, info_ptr_num_palette,
- 	    QImage::BigEndian))
- 	    return;
- 	int i = 0;
- 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- 	    image.setAlphaBuffer( TRUE );
--	    while ( i < info_ptr->num_trans ) {
-+	    while ( i < info_ptr_num_trans ) {
- 		image.setColor(i, qRgba(
--		    info_ptr->palette[i].red,
--		    info_ptr->palette[i].green,
--		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr_palette[i].red,
-+		    info_ptr_palette[i].green,
-+		    info_ptr_palette[i].blue,
-+		    info_ptr_trans_alpha[i]
- 		    )
- 		);
- 		i++;
- 	    }
- 	}
--	while ( i < info_ptr->num_palette ) {
-+	while ( i < info_ptr_num_palette ) {
- 	    image.setColor(i, qRgba(
--		info_ptr->palette[i].red,
--		info_ptr->palette[i].green,
--		info_ptr->palette[i].blue,
-+		info_ptr_palette[i].red,
-+		info_ptr_palette[i].green,
-+		info_ptr_palette[i].blue,
- 		0xff
- 		)
- 	    );
-@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio)
- 	return;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	iio->setStatus(-4);
- 	return;
-@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q
- 	return FALSE;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	return FALSE;
-     }
-@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q
- 
-     png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
- 
-+#warning XXXtnn not too sure about this
-+/* 
-+according to png.h, channels is only used on read, not writes, so we
-+should be able to comment this out.
-+
-     info_ptr->channels =
- 	(image.depth() == 32)
- 	    ? (image.hasAlphaBuffer() ? 4 : 3)
- 	    : 1;
-+*/
- 
-     png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
- 	image.depth() == 1 ? 1 : 8 /* per channel */,
-@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q
- 		: PNG_COLOR_TYPE_RGB
- 	    : PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
- 
-+    png_color_8 sig_bit;
-+    sig_bit.red = 8;
-+    sig_bit.green = 8;
-+    sig_bit.blue = 8;
-+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- 
--    //png_set_sBIT(png_ptr, info_ptr, 8);
--    info_ptr->sig_bit.red = 8;
--    info_ptr->sig_bit.green = 8;
--    info_ptr->sig_bit.blue = 8;
- 
-     if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian)
-        png_set_packswap(png_ptr);
-@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q
- 	png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
- 	int* trans = new int[num_palette];
- 	int num_trans = 0;
-+	png_colorp info_ptr_palette = NULL;
-+	int tmp;
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
- 	for (int i=0; i<num_palette; i++) {
- 	    QRgb rgb=image.color(i);
--	    info_ptr->palette[i].red = qRed(rgb);
--	    info_ptr->palette[i].green = qGreen(rgb);
--	    info_ptr->palette[i].blue = qBlue(rgb);
-+	    info_ptr_palette[i].red = qRed(rgb);
-+	    info_ptr_palette[i].green = qGreen(rgb);
-+	    info_ptr_palette[i].blue = qBlue(rgb);
- 	    if (image.hasAlphaBuffer()) {
- 		trans[i] = rgb >> 24;
- 		if (trans[i] < 255) {
-@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q
- 		}
- 	    }
- 	}
-+	png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
- 	if (num_trans) {
- 	    copy_trans = new png_byte[num_trans];
- 	    for (int i=0; i<num_trans; i++)
-@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q
-     }
- 
-     if ( image.hasAlphaBuffer() ) {
--	info_ptr->sig_bit.alpha = 8;
-+        png_color_8p sig_bit;
-+        png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-+        sig_bit->alpha = 8;
-+        png_set_sBIT(png_ptr, info_ptr, sig_bit);
-     }
- 
-     // Swap ARGB to RGBA (normal PNG format) before saving on
-@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 	    return -1;
- 	}
- 
--	if (setjmp((png_ptr)->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	    image = 0;
- 	    return -1;
-@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 
-     if ( !png_ptr ) return 0;
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	image = 0;
- 	state = MovieStart;
-@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn
-     consumer->frameDone(QPoint(offx,offy),r);
-     consumer->end();
-     state = FrameStart;
--    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
-+    unused_data = png_process_data_pause(png, 0);
- }
- 
- #ifdef PNG_USER_CHUNKS_SUPPORTED
diff --git a/testing/qt3/utf8-bug-qt3.diff b/testing/qt3/utf8-bug-qt3.diff
deleted file mode 100644
index 43e84a99f..000000000
--- a/testing/qt3/utf8-bug-qt3.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -154,6 +154,7 @@
- 
- class QUtf8Decoder : public QTextDecoder {
-     uint uc;
-+    uint min_uc;
-     int need;
-     bool headerDone;
- public:
-@@ -167,8 +168,9 @@
- 	result.setLength( len ); // worst case
- 	QChar *qch = (QChar *)result.unicode();
- 	uchar ch;
-+        int error = -1;
- 	for (int i=0; i<len; i++) {
--	    ch = *chars++;
-+	    ch = chars[i];
- 	    if (need) {
- 		if ( (ch&0xc0) == 0x80 ) {
- 		    uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- 			    *qch++ = QChar(high);
- 			    *qch++ = QChar(low);
- 			    headerDone = TRUE;
-+			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                            *qch++ = QChar::replacement;
- 			} else {
- 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
- 				*qch++ = uc;
-@@ -190,6 +194,7 @@
- 		    }
- 		} else {
- 		    // error
-+                    i = error;
- 		    *qch++ = QChar::replacement;
- 		    need = 0;
- 		}
-@@ -200,12 +205,21 @@
- 		} else if ((ch & 0xe0) == 0xc0) {
- 		    uc = ch & 0x1f;
- 		    need = 1;
-+                    error = i;
-+		    min_uc = 0x80;
- 		} else if ((ch & 0xf0) == 0xe0) {
- 		    uc = ch & 0x0f;
- 		    need = 2;
-+                    error = i;
-+		    min_uc = 0x800;
- 		} else if ((ch&0xf8) == 0xf0) {
- 		    uc = ch & 0x07;
- 		    need = 3;
-+                    error = i;
-+                    min_uc = 0x10000;
-+                } else {
-+                    // error
-+                    *qch++ = QChar::replacement;
- 		}
- 	    }
- 	}
---- src/tools/qstring.cpp
-+++ src/tools/qstring.cpp
-@@ -5805,6 +5805,7 @@
-     result.setLength( len ); // worst case
-     QChar *qch = (QChar *)result.unicode();
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -5822,6 +5823,12 @@
- 			unsigned short low = uc%0x400 + 0xdc00;
- 			*qch++ = QChar(high);
- 			*qch++ = QChar(low);
-+		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = QChar(0xdbff);
-+                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
- 		    } else {
- 			*qch++ = uc;
- 		    }
-@@ -5844,14 +5851,17 @@
- 		uc = ch & 0x1f;
- 		need = 1;
- 		error = i;
-+		min_uc = 0x80;
- 	    } else if ((ch & 0xf0) == 0xe0) {
- 		uc = ch & 0x0f;
- 		need = 2;
- 		error = i;
-+		min_uc = 0x800;
- 	    } else if ((ch&0xf8) == 0xf0) {
- 		uc = ch & 0x07;
- 		need = 3;
- 		error = i;
-+		min_uc = 0x10000;
- 	    } else {
- 	        // Error
-                 qch = addOne(qch, result);
diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD
deleted file mode 100644
index 4900ab288..000000000
--- a/testing/qtiplot/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 148287 2012-01-30 18:50:13Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir.archlinux.org>
-# Contributor: Gergely Imreh <imrehg@gmail.com>
-
-pkgname=qtiplot
-pkgver=0.9.8.8
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://soft.proindependent.com/qtiplot.html"
-pkgdesc="Data analysis and scientific plotting - free clone of Origin"
-depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
-# build against qwtplot3d provided in the package ...
-# build against qwt provided in the package ...
-# as systemwide one doesn't provide all needed functions
-makedepends=('pkg-config' 'boost')
-license=('GPL2')
-install=${pkgname}.install
-source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
-        $pkgname.desktop
-        $pkgname.png
-        build.conf.archlinux
-        qwtplot3d_gcc.patch
-        qtiplot.xml
-	qtiplot-0.9.8.6-gold.patch
-	qtiplot-0.9.8.6-kde.patch
-	qtiplot-0.9.8.6-tamuanova.patch
-        qwtplot3d-qt-4.8.0.patch
-        qwtplot3d-libpng15.patch)
-sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
-          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
-          '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
-          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
-          '285f57d865956d93250ec548288c5bface096b6b'
-          'b534a609f317cf3117d6495909854cdacea20124'
-          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0'
-          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
-          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # gentoo fixes  
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch"
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch"
-#   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
-
-   # build also static qwtplot3d lib
-   echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
-
-  # install build configuration file
-  install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
-
-  # Make qwt
-  sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
-  patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
-  cd ./3rdparty/qwt
-  qmake
-  make
-
-  # Make qwtplot3d
-  cd ../qwtplot3d
-  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
-  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
-  qmake
-  make
-
-  # Make qtiplot
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  # fix stuff
-  sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
-  sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
-  sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
-
-  qmake qtiplot.pro QMAKESPEC=linux-g++
-  make QTDIR=/usr/ QMAKESPEC=linux-g++
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  INSTALL_ROOT="${pkgdir}" make install
-
-  # make it nice:
-  install -D -m644 "${srcdir}/${pkgname}.png" \
-  	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" \
-  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "${srcdir}/${pkgname}.xml" \
-        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
-}
-
-
diff --git a/testing/qtiplot/build.conf.archlinux b/testing/qtiplot/build.conf.archlinux
deleted file mode 100644
index 7ccded7fa..000000000
--- a/testing/qtiplot/build.conf.archlinux
+++ /dev/null
@@ -1,32 +0,0 @@
-isEmpty( QTI_ROOT ) {
-  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-}
-
-SYS_INCLUDEPATH = /usr/include
-SYS_LIBS = -L/usr/lib -lGLU
-
-MUPARSER_LIBS = -lmuparser 
-GSL_LIBS = -lgsl -lgslcblas
-BOOST_INCLUDEPATH = /usr/include/boost
-BOOST_LIBS = -lboost_date_time -lboost_thread
-QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
-QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
-QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-LIB_ORIGIN_LIBS = -lorigin2
-QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
-TAMUANOVA_LIBS = -ltamuanova
-TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
-LIBPNG_LIBS = -lpng
-
-PYTHON = python2
-LUPDATE = lupdate
-LRELEASE = lrelease
-
-SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
-
-CONFIG          += CustomInstall
-DEFINES         += SCRIPTING_CONSOLE
-
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
deleted file mode 100644
index 3b6757533..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/qtiplot.pro |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 99e0e36..b7cf373 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
- LIBS         += $$QWT_LIBS
- LIBS         += $$QWT3D_LIBS
- LIBS         += $$GSL_LIBS
-+LIBS         += -lz
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
deleted file mode 100644
index 919ec6cc2..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/src/plot2D/Graph.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 626172a..d4eab1b 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -73,6 +73,7 @@
- #include <PatternBox.h>
- #include <SymbolBox.h>
- 
-+#include <QPaintEngine>
- #include <QApplication>
- #include <QBitmap>
- #include <QClipboard>
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
deleted file mode 100644
index 1644266d1..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 95a5f0c..72e99ab 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
- !isEmpty(TAMUANOVA_LIBS) {
- 	DEFINES += HAVE_TAMUANOVA
- 	INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
--	#LIBS        += $$TAMUANOVA_LIBS
--
--	HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
-+	LIBS        += $$TAMUANOVA_LIBS
- }
- 
- ###############################################################
- 
- # At the very end: add global include- and lib path
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
--#unix:LIBS += $$SYS_LIBS
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
- 
- ###############################################################
- ############### Building QtiPlot as a browser plugin ##########
diff --git a/testing/qtiplot/qtiplot.desktop b/testing/qtiplot/qtiplot.desktop
deleted file mode 100644
index ab64b3852..000000000
--- a/testing/qtiplot/qtiplot.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=qtiplot
-Comment=An application for plotting and analysis of data sets and functions
-Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen
-Terminal=false
-Name=QtiPlot
-Protocols=file
-Icon=/usr/share/pixmaps/qtiplot.png
-# Categories=QT;KDE;Science;Utility;X-KDE-More
-# Categories=Qt;KDE;Math;Education
-Categories=Science;X-Plotting;
diff --git a/testing/qtiplot/qtiplot.install b/testing/qtiplot/qtiplot.install
deleted file mode 100644
index 66631520d..000000000
--- a/testing/qtiplot/qtiplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
diff --git a/testing/qtiplot/qtiplot.png b/testing/qtiplot/qtiplot.png
deleted file mode 100644
index 5b4b87b21..000000000
--- a/testing/qtiplot/qtiplot.png
+++ /dev/null
diff --git a/testing/qtiplot/qtiplot.xml b/testing/qtiplot/qtiplot.xml
deleted file mode 100644
index 7ad4c4aa0..000000000
--- a/testing/qtiplot/qtiplot.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-qtiplot-project">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file</comment>
-    <glob pattern="*.qti" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-compressed">
-    <comment>Compressed QtiPlot project file</comment>
-    <glob pattern="*.qti.gz" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-backup">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file backup</comment>
-    <glob pattern="*.qti~" />
-  </mime-type>
-</mime-info>
diff --git a/testing/qtiplot/qwtplot3d-libpng15.patch b/testing/qtiplot/qwtplot3d-libpng15.patch
deleted file mode 100644
index 828f0c6d8..000000000
--- a/testing/qtiplot/qwtplot3d-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
-+++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
-@@ -47,6 +47,7 @@
- #endif
- 
- #if defined(GL2PS_HAVE_LIBPNG)
-+#include <zlib.h>
- #include <png.h>
- #endif
- 
diff --git a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
deleted file mode 100644
index 9d30f6b7b..000000000
--- a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:58:30.000000000 -0500
-@@ -2,12 +2,7 @@
- #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
- 
- #include <time.h>
--
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
- 
- #include "qwt3d_types.h"
- #include "qwt3d_io.h"
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:57:21.000000000 -0500
-@@ -2,11 +2,8 @@
- #define __openglhelper_2003_06_06_15_49__
- 
- #include "qglobal.h"
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
-+#include <GL/glu.h>
- 
- namespace Qwt3D
- {
diff --git a/testing/qtiplot/qwtplot3d_gcc.patch b/testing/qtiplot/qwtplot3d_gcc.patch
deleted file mode 100644
index 06aeb50f5..000000000
--- a/testing/qtiplot/qwtplot3d_gcc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-@@ -1,5 +1,6 @@
- #include "qwt3d_surfaceplot.h"
- #include "qwt3d_function.h"
-+#include <cstdio>
- 
- using namespace Qwt3D;
- 
diff --git a/testing/qtiplot/sip.patch b/testing/qtiplot/sip.patch
deleted file mode 100644
index 146f4c277..000000000
--- a/testing/qtiplot/sip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qtiplot/src/scripting/scripting.pri.bak	2009-09-09 07:18:51.000000000 +0800
-+++ qtiplot/src/scripting/scripting.pri	2009-11-08 12:45:03.000000000 +0800
-@@ -80,7 +80,9 @@
-              $${SIP_DIR}/sipqtiPythonScript.cpp\

-              $${SIP_DIR}/sipqtiPythonScripting.cpp\

-              $${SIP_DIR}/sipqtiFolder.cpp\

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

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

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

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

-              $${SIP_DIR}/sipqtiFit.cpp \

-              $${SIP_DIR}/sipqtiExponentialFit.cpp \

-              $${SIP_DIR}/sipqtiTwoExpFit.cpp \

diff --git a/testing/r/PKGBUILD b/testing/r/PKGBUILD
deleted file mode 100644
index 6bf40c47a..000000000
--- a/testing/r/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 148375 2012-01-30 20:32:31Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: K. Piche <kpiche@rogers.com>
-
-pkgname=r
-pkgver=2.14.1
-pkgrel=2
-pkgdesc="Language and environment for statistical computing and graphics"
-arch=('i686' 'x86_64')
-license=('GPL')
-url=('http://www.r-project.org/')
-depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
-         'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
-         'tk' 'libxt' 'libxmu' 'pango' 'xz')
-makedepends=('openjdk6' 'gcc-fortran')
-backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
-options=('!makeflags')
-source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
-	'r.desktop'
-	'r.png')
-install=r.install
-sha1sums=('5803a213480a749e36bccc155aecb13070ade096'
-          '13aa29219bcaa102e575de8c1c8e0833d233e836'
-          'a69a07ec363440efc18ce0a7f2af103375dea978')
-build() {
-   cd "${srcdir}/R-${pkgver}"
-   sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
-   ./configure  --prefix=/usr \
-		--libdir=/usr/lib \
-		--sysconfdir=/etc/R \
-		--datarootdir=/usr/share \
-		  rsharedir=/usr/share/R/ \
-		  rincludedir=/usr/include/R/ \
-		  rdocdir=/usr/share/doc/R/ \
-                --with-x \
-		--enable-R-shlib \
-                --with-lapack \
-		--with-blas \
-                F77=gfortran \
-		LIBnn=lib
-   make
-}
-
-package() {
-   cd "${srcdir}/R-${pkgver}"
-   make -j1 DESTDIR="${pkgdir}" install
-
-   #  Fixup R wrapper scripts.
-   sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
-   rm "${pkgdir}/usr/lib/R/bin/R"
-   cd "${pkgdir}/usr/lib/R/bin"
-   ln -s ../../../bin/R
-
-  # install some freedesktop.org compatibility
-  install -Dm644 "${srcdir}/r.desktop" \
-	"${pkgdir}/usr/share/applications/r.desktop"
-  install -Dm644 "${srcdir}/r.png" \
-	"${pkgdir}/usr/share/pixmaps/r.png"
-
-  # move the config directory to /etc and create symlinks
-  install -d "${pkgdir}/etc/R"
-  cd "${pkgdir}/usr/lib/R/etc"
-  for i in *; do
-    mv -f ${i} "${pkgdir}/etc/R"
-    ln -s /etc/R/${i} ${i}
-  done
-}
diff --git a/testing/r/r.desktop b/testing/r/r.desktop
deleted file mode 100644
index 68b49c447..000000000
--- a/testing/r/r.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=R
-GenericName=environment for statistical computing
-Comment=language and environment for statistical computing and graphics
-Exec=R
-Icon=/usr/share/pixmaps/r.png
-DocPath=/usr/lib/R/doc/html/index.html
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Education;Science;Math;
diff --git a/testing/r/r.install b/testing/r/r.install
deleted file mode 100644
index d3289ab64..000000000
--- a/testing/r/r.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/testing/r/r.png b/testing/r/r.png
deleted file mode 100644
index 1303ccdb9..000000000
--- a/testing/r/r.png
+++ /dev/null
diff --git a/testing/rrdtool/PKGBUILD b/testing/rrdtool/PKGBUILD
deleted file mode 100644
index 6be86fc5d..000000000
--- a/testing/rrdtool/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148291 2012-01-30 18:50:21Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=rrdtool
-pkgver=1.4.5
-pkgrel=5
-pkgdesc="Data logging and graphing application"
-arch=('i686' 'x86_64')
-url="http://www.rrdtool.org"
-license=('GPL' 'custom')
-depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
-optdepends=('tcl: to use corresponding binding' \
-            'python2: to use corresponding binding' \
-            'ruby: to use corresponding binding' \
-            'lua: to use corresponding binding')
-options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL
-  PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
-    --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
-    --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/sane/PKGBUILD b/testing/sane/PKGBUILD
deleted file mode 100644
index d351dacca..000000000
--- a/testing/sane/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 148293 2012-01-30 18:50:24Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Simo L. <neotuli@yahoo.com>
-# Contributor: eric <eric@archlinux.org>
-
-pkgname=sane
-pkgver=1.0.22
-pkgrel=5
-pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
-makedepends=('texlive-latexextra')
-install=$pkgname.install
-backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
-source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
-        'sane.xinetd'
-        'libv4l-0.8.3.patch'
-        'xerox_mfp_fix_usb_devices.patch')
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
-         'da946cc36fb83612162cf9505986d4b2'
-         'e645a8921cff9f18ffbdabb2ed885060'
-         'cfef73e7db7c28308914d3db6767d852')
-options=(!libtool)
-
-build() {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
-  patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch
-  # fix https://bugs.archlinux.org/task/26114
-  patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --with-docdir=/usr/share/doc/sane \
-    --enable-avahi \
-    --disable-locking
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-backends-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # fix hp officejets
-  echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
-  # install udev files
-  install -D -m0644 tools/udev/libsane.rules \
-    "${pkgdir}/lib/udev/rules.d/53-sane.rules"
-  # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules"
-  
-  # install xinetd file
-  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-}
diff --git a/testing/sane/libv4l-0.8.3.patch b/testing/sane/libv4l-0.8.3.patch
deleted file mode 100644
index 4e240e0cf..000000000
--- a/testing/sane/libv4l-0.8.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb@jblache.org>
-Date:   Wed Feb 16 19:37:43 2011 +0100
-
-    Fix v4l build with libv4l 0.8.3+
-
-    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
-    Conflicts:
-
-    	ChangeLog
-
-    Signed-off-by: Nils Philippsen <nils@redhat.com>
----
- backend/v4l.c |    3 +--
- backend/v4l.h |    3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
- 
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
- 
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
- 
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
- 
-@@ -165,7 +166,7 @@ struct video_channel
- 
- 
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
- 
- #include <../include/sane/sane.h>
- 
--- 
-1.7.4
-
diff --git a/testing/sane/sane.install b/testing/sane/sane.install
deleted file mode 100644
index 5ec361eea..000000000
--- a/testing/sane/sane.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	/bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
diff --git a/testing/sane/sane.xinetd b/testing/sane/sane.xinetd
deleted file mode 100644
index b035664b4..000000000
--- a/testing/sane/sane.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service sane-port
-{
-	port        = 6566
-	socket_type = stream
-	wait        = no
-	user        = root
-	group       = scanner
-	server      = /usr/sbin/saned
-	# disabled by default!
-	disable     = yes
-		  }
diff --git a/testing/sane/xerox_mfp_fix_usb_devices.patch b/testing/sane/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b974..000000000
--- a/testing/sane/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc@telekom.ru>
-Date:   Tue Mar 8 17:57:19 2011 +0300
-
-    keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
- static struct device *devices_head = NULL;	/* sane_get_devices list */
- 
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
-     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
-     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
--    { 0 }
- };
- 
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
-   devices_head = NULL;
- }
- 
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+  if (strncmp("tcp", devname, 3) == 0)
-+    return &available_transports[TRANSPORT_TCP];
-+  return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
-       return SANE_STATUS_GOOD;
-   }
- 
--  for (tr = available_transports; tr->ttype; tr++) {
--    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--      break;
--  }
--  if (!tr->ttype)
--    return SANE_STATUS_INVAL;
-+  tr = tr_from_devname(devname);
- 
-   dev = calloc (1, sizeof (struct device));
-   if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
--    transport *tr;
--
--    for (tr = available_transports; tr->ttype; tr++) {
--	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--	    return tr->configure_device(devname, list_one_device);
--    }
--    return	SANE_STATUS_INVAL;
-+  return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
- 
- SANE_Status
diff --git a/testing/scim-anthy/PKGBUILD b/testing/scim-anthy/PKGBUILD
deleted file mode 100644
index 96d84487d..000000000
--- a/testing/scim-anthy/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148295 2012-01-30 18:50:26Z ibiru $
-# Contributor: damir <damir@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=scim-anthy
-pkgver=1.2.7
-pkgrel=3
-_filecode=37309
-pkgdesc='Japanese input method module for SCIM'
-arch=('i686' 'x86_64')
-url='http://sourceforge.jp/projects/scim-imengine/'
-license=('GPL')
-depends=('scim' 'anthy')
-options=('!libtool')
-source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr --disable-static
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
diff --git a/testing/scim-chewing/PKGBUILD b/testing/scim-chewing/PKGBUILD
deleted file mode 100644
index d4663373a..000000000
--- a/testing/scim-chewing/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148297 2012-01-30 18:50:28Z ibiru $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: whisky <archlinux.cle(at)gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=scim-chewing
-pkgver=0.3.4
-pkgrel=2
-pkgdesc='Traditional Chinese input method module for SCIM'
-arch=('i686' 'x86_64')
-url='http://chewing.csie.net/'
-license=('GPL')
-depends=('scim' 'libchewing')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://chewing.csie.net/download/scim/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --disable-static
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/scim-tables/PKGBUILD b/testing/scim-tables/PKGBUILD
deleted file mode 100644
index 939c9e907..000000000
--- a/testing/scim-tables/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148299 2012-01-30 18:50:30Z ibiru $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Gan Lu <rhythm.gan@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=scim-tables
-pkgver=0.5.10
-pkgrel=2
-pkgdesc='Generic table input method module for SCIM'
-url='http://www.scim-im.org/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('scim')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --enable-static=no
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/scribus/PKGBUILD b/testing/scribus/PKGBUILD
deleted file mode 100644
index a029b0cfa..000000000
--- a/testing/scribus/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 148301 2012-01-30 18:50:32Z ibiru $
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=scribus
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="A desktop publishing program"
-arch=('i686' 'x86_64')
-url="http://www.scribus.net"
-license=('GPL')
-install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
-         'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
-         'desktop-file-utils' 'shared-mime-info')
-makedepends=('cmake')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('ae19e62399941fb8e868d8e762caf494')
-sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809')
-
-build() {
-	cd "${srcdir}"
-	sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-	       -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-               ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-	   -DCMAKE_INSTALL_PREFIX=/usr \
-	   -DCMAKE_BUILD_TYPE=Release \
-	   -DCMAKE_SKIP_RPATH=ON \
-	   -DWANT_CAIRO=1 \
-	   -DLIB_SUFFIX=""
-	make
-}
-
-package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}" install
-
-	# fix icon path in .desktop file
-	sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-	   "${srcdir}/${pkgname}-${pkgver}/scribus.desktop"
-
-	install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \
-	   "${pkgdir}/usr/share/applications/scribus.desktop"
-}
diff --git a/testing/scribus/scribus.install b/testing/scribus/scribus.install
deleted file mode 100644
index 0598e46ed..000000000
--- a/testing/scribus/scribus.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-post_install() {
-  echo "update desktop mime database..."
-  update-mime-database usr/share/mime > /dev/null 2>&1
-  update-desktop-database -q > /dev/null 2>&1
-}
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/sdl_image/PKGBUILD b/testing/sdl_image/PKGBUILD
deleted file mode 100644
index 2900bcf56..000000000
--- a/testing/sdl_image/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 148303 2012-01-30 18:50:35Z ibiru $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sdl_image
-pkgver=1.2.12
-pkgrel=2
-pkgdesc="A simple library to load images of various formats as SDL surfaces"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib')
-options=('!libtool')
-url="http://www.libsdl.org/projects/SDL_image/"
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz)
-md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
-
-build() {
-  cd "$srcdir/SDL_image-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/SDL_image-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/skanlite/PKGBUILD b/testing/skanlite/PKGBUILD
deleted file mode 100644
index 581744b6f..000000000
--- a/testing/skanlite/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 148307 2012-01-30 18:50:40Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=skanlite
-pkgver=0.8
-pkgrel=2
-pkgdesc="Image Scanning Application for KDE"
-arch=('i686' 'x86_64')
-url='http://kde-apps.org/content/show.php?content=109803'
-license=('GPL')
-depends=('kdebase-runtime' 'libksane')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('baa43dbc78be696e121969b0a3d88929')
-
-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/slang/PKGBUILD b/testing/slang/PKGBUILD
deleted file mode 100644
index b490e14f0..000000000
--- a/testing/slang/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 149683 2012-02-09 00:00:10Z allan $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=slang
-pkgver=2.2.4
-pkgrel=2
-pkgdesc="S-Lang is a powerful interpreted language"
-arch=('i686' 'x86_64')
-url="http://www.jedsoft.org/slang/"
-license=('GPL')
-depends=('glibc' 'pcre' 'zlib')
-backup=('etc/slsh.rc')
-options=('!makeflags')
-source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('7fcfd447e378f07dd0c0bae671fe6487'
-         '0e37091fe52b4ef609c3cee8eda0e101')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-all
-}
diff --git a/testing/slim/PKGBUILD b/testing/slim/PKGBUILD
deleted file mode 100644
index f8cbdec4a..000000000
--- a/testing/slim/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 148309 2012-01-30 18:50:44Z ibiru $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-
-pkgname=slim
-pkgver=1.3.2
-pkgrel=7
-pkgdesc='Desktop-independent graphical login manager for X11'
-arch=('i686' 'x86_64')
-url='http://slim.berlios.de/'
-license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'pam.d'
-        'logrotate'
-        'ptr_pam.patch'
-        'no-host.patch'
-        'restart.patch'
-        'sigterm.patch'
-        'session-name.patch'
-        'tty-slowness.patch'
-        'slim-1.3.2-libpng15.patch')
-sha1sums=('e421d5487732c8317f8f591906661e014b036358'
-          '6fe0ba83509af634bce47be34e30995965bffc79'
-          'a0e991ef0ac5120465a3be014a26e70ba073b6ae'
-          'b969cc902c1d9915a5609141a652c77b2732407b'
-          '640668c984a13593a1bfba8d3b503c005d5f401e'
-          'b86eddd083fb9f6259e46c735f55ebe76c655bd3'
-          '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435'
-          '0b35048723c527fb824c5e0f9b9064f751871785'
-          'fdd35562ce010babaeb793f92f9906fdcdaf3f9f'
-          '213fefe8533c845ea8c40585b6a8097820d5e5d2'
-          '3cd674e548f4e0aadbbd32a67b4efd1ed263afef')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i -e 's/png12/png15/g' Makefile
-	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
-	patch -p1 -i ../no-host.patch # cf patch: do not set PAM host
-	patch -p1 -i ../restart.patch # cf patch: restart X server if killed
-	patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd
-	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-	patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start
-	patch -p0 -i ../slim-1.3.2-libpng15.patch
-
-	make USE_PAM=1
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" MANDIR=/usr/share/man install
-
-	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
-	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
-	install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
-
-	# Provide sane defaults
-	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
-	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
-}
diff --git a/testing/slim/install b/testing/slim/install
deleted file mode 100644
index 65aa77d72..000000000
--- a/testing/slim/install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat <<EOF
-
-==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-EOF
-}
diff --git a/testing/slim/logrotate b/testing/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/testing/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/testing/slim/no-host.patch b/testing/slim/no-host.patch
deleted file mode 100644
index c40f25bca..000000000
--- a/testing/slim/no-host.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Datum: Sun, 30 Jan 2011 12:49:00 +0200
-Von: Samuli Suominen <ssuominen@gentoo.org>
-An: jgc@archlinux.org, andyrtr@archlinux.org, thayer@archlinux.org
-Betreff: SLIM and ConsoleKit 0.4.2 (and up)
-
-People have been coming to #xfce after Arch's ConsoleKit 0.4.3 upgrade
-to ask for help why Suspend / Hibernate / and such doesn't work.
-
-It's because SLIM is using pam_ck_connector.so and SLIM sets Host to localhost
-and makes pam_ck_connector.so believe it's actually a *remote host* called
-localhost and will refuse access.
-
-http://bugs.gentoo.org/346037
-https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch?view=log
-
-
-diff -aur old/app.cpp new/app.cpp
---- old/app.cpp	2011-01-30 12:39:34.033337944 +0100
-+++ new/app.cpp	2011-01-30 12:40:25.843337943 +0100
-@@ -228,8 +228,6 @@
-         pam.start("slim");
-         pam.set_item(PAM::Authenticator::TTY, DisplayName);
-         pam.set_item(PAM::Authenticator::Requestor, "root");
--        pam.set_item(PAM::Authenticator::Host, "localhost");
--
-     }
-     catch(PAM::Exception& e){
-         cerr << APPNAME << ": " << e << endl;
diff --git a/testing/slim/pam.d b/testing/slim/pam.d
deleted file mode 100644
index 78a981f74..000000000
--- a/testing/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
-session         optional        pam_ck_connector.so
diff --git a/testing/slim/ptr_pam.patch b/testing/slim/ptr_pam.patch
deleted file mode 100644
index 3a3fbcdb7..000000000
--- a/testing/slim/ptr_pam.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur old/app.cpp new/app.cpp
---- old/app.cpp	2010-07-08 07:04:10.000000000 +0200
-+++ new/app.cpp	2011-05-01 18:30:52.933844872 +0200
-@@ -43,8 +43,8 @@
-     Panel* panel = *static_cast<Panel**>(appdata_ptr);
-     int result = PAM_SUCCESS;
-     for (int i=0; i<num_msg; i++){
--        resp[i]->resp=0;
--        resp[i]->resp_retcode=0;
-+        (*resp)[i].resp=0;
-+        (*resp)[i].resp_retcode=0;
-         switch(msg[i]->msg_style){
-             case PAM_PROMPT_ECHO_ON:
-                 // We assume PAM is asking for the username
-@@ -53,13 +53,13 @@
-                     case Panel::Suspend:
-                     case Panel::Halt:
-                     case Panel::Reboot:
--                        resp[i]->resp=strdup("root");
-+                        (*resp)[i].resp=strdup("root");
-                         break;
- 
-                     case Panel::Console:
-                     case Panel::Exit:
-                     case Panel::Login:
--                        resp[i]->resp=strdup(panel->GetName().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetName().c_str());
-                         break;
-                 }
-                 break;
-@@ -75,7 +75,7 @@
- 
-                     default:
-                         panel->EventHandler(Panel::Get_Passwd);
--                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
-                         break;
-                 }
-                 break;
-@@ -91,9 +91,9 @@
-     }
-     if (result!=PAM_SUCCESS){
-         for (int i=0; i<num_msg; i++){
--            if (resp[i]->resp==0) continue;
--            free(resp[i]->resp);
--            resp[i]->resp=0;
-+            if ((*resp)[i].resp==0) continue;
-+            free((*resp)[i].resp);
-+            (*resp)[i].resp=0;
-         };
-         free(*resp);
-         *resp=0;
diff --git a/testing/slim/rc.d b/testing/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/testing/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/slim/restart.patch b/testing/slim/restart.patch
deleted file mode 100644
index 4e5049000..000000000
--- a/testing/slim/restart.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663
-
-
-diff -aur slim-1.3.2.b/app.cpp slim-1.3.2.c/app.cpp
---- slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-+++ slim-1.3.2.c/app.cpp	2010-08-21 15:11:03.946389843 +0200
-@@ -104,6 +104,11 @@
- 
- extern App* LoginApp;
- 
-+int xioerror(Display *disp) {
-+	LoginApp->RestartServer();
-+    return 0;
-+}
-+
- void CatchSignal(int sig) {
-     cerr << APPNAME << ": unexpected signal " << sig << endl;
- 
-@@ -114,19 +119,6 @@
-     exit(ERR_EXIT);
- }
- 
--
--void AlarmSignal(int sig) {
--    int pid = LoginApp->GetServerPID();
--    if(waitpid(pid, NULL, WNOHANG) == pid) {
--        LoginApp->StopServer();
--        LoginApp->RemoveLock();
--        exit(OK_EXIT);
--    }
--    signal(sig, AlarmSignal);
--    alarm(2);
--}
--
--
- void User1Signal(int sig) {
-     signal(sig, User1Signal);
- }
-@@ -277,7 +269,6 @@
-         signal(SIGHUP, CatchSignal);
-         signal(SIGPIPE, CatchSignal);
-         signal(SIGUSR1, User1Signal);
--        signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-@@ -298,7 +289,6 @@
- 
-         CreateServerAuth();
-         StartServer();
--        alarm(2);
- #endif
- 
-     }
-@@ -614,6 +604,8 @@
-     int status;
-     while (wpid != pid) {
-         wpid = wait(&status);
-+		if (wpid == ServerPID)
-+			xioerror(Dpy);	// Server died, simulate IO error
-     }
-     if (WIFEXITED(status) && WEXITSTATUS(status)) {
-         LoginPanel->Message("Failed to execute login command");
-@@ -659,9 +651,6 @@
- 
- 
- void App::Reboot() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -684,9 +673,6 @@
- 
- 
- void App::Halt() {
--    // Stop alarm clock
--    alarm(0);
--
- #ifdef USE_PAM
-     try{
-         pam.end();
-@@ -772,6 +758,7 @@
- 
-     StopServer(); 
-     RemoveLock();
-+	while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens
-     Run();
- } 
- 
-@@ -842,6 +829,7 @@
- 
-     for(cycles = 0; cycles < ncycles; cycles++) {
-         if((Dpy = XOpenDisplay(DisplayName))) {
-+            XSetIOErrorHandler(xioerror);
-             return 1;
-         } else {
-             if(!ServerTimeout(1, (char *) "X server to begin accepting connections"))
-@@ -926,9 +914,6 @@
-             ServerPID = -1;
-             break;
-         }
--        alarm(15);
--        pause();
--        alarm(0);
- 
-         // Wait for server to start up
-         if(WaitForServer() == 0) {
-@@ -963,15 +948,12 @@
- 
- 
- void App::StopServer() {
--    // Stop alars clock and ignore signals
--    alarm(0);
-     signal(SIGQUIT, SIG_IGN);
-     signal(SIGINT, SIG_IGN);
-     signal(SIGHUP, SIG_IGN);
-     signal(SIGPIPE, SIG_IGN);
-     signal(SIGTERM, SIG_DFL);
-     signal(SIGKILL, SIG_DFL);
--    signal(SIGALRM, SIG_DFL);
- 
-     // Catch X error
-     XSetIOErrorHandler(IgnoreXIO);
-diff -aur slim-1.3.2.b/app.h slim-1.3.2.c/app.h
---- slim-1.3.2.b/app.h	2010-08-21 15:10:40.499582804 +0200
-+++ slim-1.3.2.c/app.h	2010-08-21 15:11:03.946389843 +0200
-@@ -34,6 +34,7 @@
-     ~App();
-     void Run();
-     int GetServerPID();
-+    void RestartServer();
-     void StopServer();
- 
- 	bool serverStarted;
-@@ -49,7 +50,6 @@
-     void Console();
-     void Exit();
-     void KillAllClients(Bool top);
--    void RestartServer();
-     void ReadConfig();
-     void OpenLog();
-     void CloseLog();
diff --git a/testing/slim/session-name.patch b/testing/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/testing/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
-     Root = root;
-     cfg = config;
- 
--    session = "";
-+    session = cfg->nextSession(session);
- 
-     // Init GC
-     XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
- 
- void Panel::ClearPanel() {
--    session = "";
-+    session = cfg->nextSession(session);
-     Reset();
-     XClearWindow(Dpy, Root);
-     XClearWindow(Dpy, Win);
diff --git a/testing/slim/sigterm.patch b/testing/slim/sigterm.patch
deleted file mode 100644
index fbaeb7116..000000000
--- a/testing/slim/sigterm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aur old/panel.cpp new/panel.cpp
---- old/panel.cpp	2011-04-29 15:15:57.210134850 +0200
-+++ new/panel.cpp	2011-04-29 15:16:17.260285407 +0200
-@@ -10,6 +10,7 @@
- */
- 
- #include <sstream>
-+#include <poll.h>
- #include "panel.h"
- 
- using namespace std;
-@@ -288,16 +289,24 @@
-     field=curfield;
-     bool loop = true;
-     OnExpose();
-+
-+    struct pollfd x11_pfd = {0};
-+    x11_pfd.fd = ConnectionNumber(Dpy);
-+    x11_pfd.events = POLLIN;
-     while(loop) {
--        XNextEvent(Dpy, &event);
--        switch(event.type) {
--            case Expose:
--                OnExpose();
--                break;
--
--            case KeyPress:
--                loop=OnKeyPress(event);
--                break;
-+        if(XPending(Dpy) || poll(&x11_pfd, 1, -1) > 0) {
-+            while(XPending(Dpy)) {
-+                XNextEvent(Dpy, &event);
-+                switch(event.type) {
-+                    case Expose:
-+                        OnExpose();
-+                        break;
-+
-+                    case KeyPress:
-+                        loop=OnKeyPress(event);
-+                        break;
-+                }
-+            }
-         }
-     }
- 
diff --git a/testing/slim/slim-1.3.2-libpng15.patch b/testing/slim/slim-1.3.2-libpng15.patch
deleted file mode 100644
index 720608567..000000000
--- a/testing/slim/slim-1.3.2-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- png.c
-+++ png.c
-@@ -57,7 +57,7 @@
-         return(0);
-     }
-   
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
-         fclose(infile);
diff --git a/testing/slim/tty-slowness.patch b/testing/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/testing/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp	2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/testing/sox/PKGBUILD b/testing/sox/PKGBUILD
deleted file mode 100644
index dc37308fe..000000000
--- a/testing/sox/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 148311 2012-01-30 18:50:47Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.3.2
-pkgrel=5
-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.in
-  ./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/streamtuner/PKGBUILD b/testing/streamtuner/PKGBUILD
deleted file mode 100644
index ba6812d9c..000000000
--- a/testing/streamtuner/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 148313 2012-01-30 18:50:49Z ibiru $
-# Contributor: Greg Grabinski <greg@grabinski.ch>
-# Maintainer: ndreas Radke <andyrtr@archlinux.org>
-
-pkgname=streamtuner
-pkgver=0.99.99
-pkgrel=12
-pkgdesc="A stream directory browser"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/streamtuner/"
-license=('custom')
-depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2')
-conflicts=('streamtuner-live365')
-replaces=('streamtuner-live365')
-source=(http://savannah.nongnu.org/download/streamtuner/$pkgname-$pkgver.tar.gz \
-        http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-live365.diff \
-        http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff
-	streamtuner-0.99.99-shoutcast.diff
-	shoutcast-redesign-patch.diff)
-options=('!libtool' '!emptydirs')
-md5sums=('2027b7c34e85b594524b0b4351c14362'
-         '8aa1994a849b05d2b8fffbda702b8a25'
-         '7aff45a41c60358cb2332c7ce644f661'
-         '1eab6edce130e1a1e5f208cd3ed6766a'
-         '8a3a17a1719a79353d6ad7ac8564947b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff
-  # fix http://bugs.archlinux.org/task/10308
-  patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff
-  # fix http://bugs.archlinux.org/task/11463
-  patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff
-  
-  # python2 fixes
-  sed -i "s:^for ac_prog in python:for ac_prog in python2:" ${srcdir}/${pkgname}-${pkgver}/configure
-  
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make prefix=${pkgdir}/usr install
-
-  #Add license file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/testing/streamtuner/shoutcast-redesign-patch.diff b/testing/streamtuner/shoutcast-redesign-patch.diff
deleted file mode 100644
index 644e2273e..000000000
--- a/testing/streamtuner/shoutcast-redesign-patch.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c
---- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c	2008-09-12 18:04:00.229785732 -0400
-+++ streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c	2008-09-12 18:05:56.716440720 -0400
-@@ -37,7 +37,7 @@
- 
- /*** cpp *********************************************************************/
- 
--#define SHOUTCAST_ROOT		"http://www.shoutcast.com/"
-+#define SHOUTCAST_ROOT		"http://classic.shoutcast.com/"
- 
- #define MAX_STREAMS_PER_PAGE	100 /* enforced by SHOUTcast */
- 
diff --git a/testing/streamtuner/streamtuner-0.99.99-shoutcast.diff b/testing/streamtuner/streamtuner-0.99.99-shoutcast.diff
deleted file mode 100644
index e7fcbca94..000000000
--- a/testing/streamtuner/streamtuner-0.99.99-shoutcast.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/plugins/shoutcast/shoutcast.c.orig	2004-12-19 15:21:00.000000000 +0000
-+++ src/plugins/shoutcast/shoutcast.c	2008-03-16 10:39:24.000000000 +0000
-@@ -94,6 +94,8 @@
- 
-   GNode			*parent_node;
-   SHOUTcastStream	*stream;
-+  
-+  int parse_genres;
- } ReloadInfo;
- 
- /*** variable declarations ***************************************************/
-@@ -518,6 +520,7 @@
-       info.npages = 0;
-       info.parent_node = NULL;
-       info.stream = NULL;
-+      info.parse_genres = 0;
- 
-       status = st_transfer_session_get_by_line(session,
- 					       url,
-@@ -565,10 +568,16 @@
-       info->stream = stream_new_cb(NULL);
-       info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1);
-     }
--  else if (info->page < 2
--	   && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\""))
--		|| (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\"")))
--	       && (s2 = strstr(s1, "\">"))))
-+  else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">")))
-+  {
-+  	info->parse_genres = 1;
-+  }
-+  else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>")))
-+  {
-+  	info->parse_genres = 0;
-+  }
-+  else if (info->page < 2 && info->parse_genres == 1
-+	   && ((s1 = st_strstr_span(line, "<OPTION VALUE=\""))  && (s2 = strstr(s1, "\">"))))
-     {
-       STCategory *category;
-       GNode *node;
-
diff --git a/testing/swig/PKGBUILD b/testing/swig/PKGBUILD
deleted file mode 100644
index 4af2a60cd..000000000
--- a/testing/swig/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 149685 2012-02-09 00:00:15Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=swig
-pkgver=2.0.4
-pkgrel=3
-pkgdesc="Generate scripting interfaces to C/C++ code"
-arch=('i686' 'x86_64')
-url="http://www.swig.org/"
-license=('custom')
-depends=('zlib' 'pcre')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('ace563563a8f6f367ba82236e5bea240adea0d94')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-  install -D -m644 LICENSE-UNIVERSITIES "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE-UNIVERSITIES
-}
diff --git a/testing/systemd/0001-mount-fix-automount-regression.patch b/testing/systemd/0001-mount-fix-automount-regression.patch
deleted file mode 100644
index a064f20cf..000000000
--- a/testing/systemd/0001-mount-fix-automount-regression.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt@redhat.com>
-Date: Thu, 26 Jan 2012 01:19:19 +0100
-Subject: [PATCH] mount: fix automount regression
-
-Tom Gundersen noticed a regression where comment=systemd.automount in
-fstab no longer prevented the adding of the After=foo.mount dependency
-into local-fs.target. He bisected it to commit 9ddc4a26.
-
-It turns out that clearing the default_dependencies flag is necessary
-after all, in order to avoid complementing of Wants= with After= in the
-target unit. We still want to add the dependencies on quota units and
-umount.target though.
----
- src/mount.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/src/mount.c b/src/mount.c
-index 6d0af4e..965f705 100644
---- a/src/mount.c
-+++ b/src/mount.c
-@@ -583,6 +583,11 @@ static int mount_load(Unit *u) {
- 
-                 if (UNIT(m)->fragment_path)
-                         m->from_fragment = true;
-+                else if (m->from_etc_fstab)
-+                        /* We always add several default dependencies to fstab mounts,
-+                         * but we do not want the implicit complementing of Wants= with After=
-+                         * in the target unit that this mount unit will be hooked into. */
-+                        UNIT(m)->default_dependencies = false;
- 
-                 if (!m->where)
-                         if (!(m->where = unit_name_to_path(u->id)))
-@@ -615,7 +620,7 @@ static int mount_load(Unit *u) {
-                 if ((r = mount_add_fstab_links(m)) < 0)
-                         return r;
- 
--                if (UNIT(m)->default_dependencies)
-+                if (UNIT(m)->default_dependencies || m->from_etc_fstab)
-                         if ((r = mount_add_default_dependencies(m)) < 0)
-                                 return r;
- 
--- 
-1.7.8.4
-
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
deleted file mode 100644
index 383786889..000000000
--- a/testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 149810 2012-02-11 02:14:31Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=systemd
-pkgver=42
-pkgrel=1
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz')
-makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
-            'dbus-python: systemd-analyze'
-            'initscripts: legacy support for hostname and vconsole setup'
-            'initscripts-systemd: native boot and initialization scripts'
-            'python2-cairo: systemd-analyze'
-            'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-options=('!libtool')
-backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-        etc/dbus-1/system.d/org.freedesktop.login1.conf
-        etc/dbus-1/system.d/org.freedesktop.locale1.conf
-        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-        etc/systemd/system.conf
-        etc/systemd/user.conf
-        etc/systemd/systemd-logind.conf
-        etc/systemd/systemd-journald.conf)
-install="$pkgname.install"
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release")
-md5sums=('7686b44e368d2523901d3e903ed4dcea'
-         '752636def0db3c03f121f8b4f44a63cd')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # Don't unset locale in getty
-  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
-  sed -i -e '/^Environ.*LANG/s/^/#/' \
-         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
-
-  ./configure --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --libdir=/usr/lib \
-              --localstatedir=/var \
-              --with-rootprefix= \
-              --with-rootlibdir=/lib
-
-  make
-
-  # fix .so links in manpages
-  sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
-  sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # symlink to /bin/systemd for compat and sanity
-  ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd
-
-  # fix systemd-analyze for python2
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # rename man pages to avoid conflicts with sysvinit and initscripts
-  cd "$pkgdir/usr/share/man"
-
-  # not building this with systemd
-  rm -f "man1/systemadm.1"
-
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/systemd/os-release b/testing/systemd/os-release
deleted file mode 100644
index 5e24a6031..000000000
--- a/testing/systemd/os-release
+++ /dev/null
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
deleted file mode 100644
index f31642e13..000000000
--- a/testing/systemd/systemd.install
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
-  if ! getent group lock >/dev/null; then
-    groupadd -g 54 lock
-  fi
-}
-
-sd_booted() {
-  [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  echo "systemd has been installed to /bin/systemd. Please ensure you append"
-  echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
-  checkgroups
-
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    systemctl daemon-reexec >/dev/null
-  fi
-
-  newpkgver=${1%-*}
-  oldpkgver=${2%-*}
-
-  # catch v31 need for restarting systemd-logind.service
-  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
-    # but only if systemd is running
-    if sd_booted; then
-      systemctl try-restart systemd-logind.service
-    fi
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/testdisk/PKGBUILD b/testing/testdisk/PKGBUILD
deleted file mode 100644
index 23f2f58c4..000000000
--- a/testing/testdisk/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 149641 2012-02-08 22:34:52Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Michal Krenek <mikos@sg1.cz>
-
-pkgname=testdisk
-pkgver=6.13
-pkgrel=2
-pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-arch=('i686' 'x86_64')
-url="http://www.cgsecurity.org/index.html?testdisk.html"
-license=('GPL')
-depends=('libjpeg' 'openssl' 'progsreiserfs' 'ntfsprogs')
-source=(http://www.cgsecurity.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('3bcbf0722d3823ca155e633969ce9f0b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-              --without-ewf \
-              --enable-sudo
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/thunar/PKGBUILD b/testing/thunar/PKGBUILD
deleted file mode 100644
index aeaa5db16..000000000
--- a/testing/thunar/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 149689 2012-02-09 00:00:23Z allan $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=thunar
-pkgver=1.2.3
-pkgrel=4
-pkgdesc="Modern file manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://thunar.xfce.org"
-license=('GPL2' 'LGPL2.1')
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev'
-         'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'gtk-doc' 'xfce4-panel')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
-            'polkit-gnome: for mounting internal partitions (needs root password)'
-            'xfce4-panel: for trash applet'
-            'tumbler: for thumbnail previews'
-            'thunar-volman: manages removable devices'
-            'thunar-archive-plugin: create and deflate archives'
-            'thunar-media-tags-plugin: view/edit id3/ogg tags')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-$pkgver.tar.bz2)
-sha256sums=('e66aa9ad61a9202e15cc7c5fffc7b961da9ab3b4428f874c1ec8e46eb4ffaca6')
-
-build() {
-  cd "$srcdir/Thunar-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-gio-unix \
-    --enable-dbus \
-    --enable-startup-notification \
-    --enable-gudev \
-    --enable-notifications \
-    --enable-exif \
-    --enable-pcre \
-    --enable-gtk-doc \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/Thunar-$pkgver"
-
-  make DESTDIR=${pkgdir} install
-  sed -i 's:x-directory/gnome-default-handler;::' \
-    "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/thunar/thunar.install b/testing/thunar/thunar.install
deleted file mode 100644
index 87c29e4db..000000000
--- a/testing/thunar/thunar.install
+++ /dev/null
@@ -1,14 +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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/timidity++/2.13.2-gcc4.patch b/testing/timidity++/2.13.2-gcc4.patch
deleted file mode 100644
index af0b5f8f7..000000000
--- a/testing/timidity++/2.13.2-gcc4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur TiMidity++-2.13.2-orig/interface/xaw_i.c TiMidity++-2.13.2/interface/xaw_i.c
---- TiMidity++-2.13.2-orig/interface/xaw_i.c	2005-06-25 21:55:19.000000000 -0400
-+++ TiMidity++-2.13.2/interface/xaw_i.c	2005-06-25 21:56:01.000000000 -0400
-@@ -261,7 +261,7 @@
- String bitmapdir = XAW_BITMAP_DIR;
- Boolean arrangetitle,savelist;
- static char **current_flist = NULL;
--static int voices = 0, last_voice = 0, voices_num_width;
-+static int xaw_i_voices = 0, last_voice = 0, voices_num_width;
- static int maxentry_on_a_menu = 0,submenu_n = 0;
- #define OPTIONS_WINDOW 1
- #define FLIST_WINDOW 2
-@@ -1329,7 +1329,7 @@
-     c= *(local_buf+1);
-     n= atoi(local_buf+2);
-     if(c == 'L')
--      voices = n;
-+      xaw_i_voices = n;
-     else
-       last_voice = n;
-     if(IsTracePlaying()) drawVoices();
-@@ -2070,7 +2070,7 @@
-   XSetForeground(disp, gct, tracecolor);
-   XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
-                  MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);  
--  sprintf(local_buf, "%3d/%d", last_voice, voices);
-+  sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices);
-   XSetForeground(disp, gct, capcolor);  
-   XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
-               MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
diff --git a/testing/timidity++/PKGBUILD b/testing/timidity++/PKGBUILD
deleted file mode 100644
index 675a4f27b..000000000
--- a/testing/timidity++/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 148624 2012-02-04 13:38:04Z andyrtr $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=timidity++
-pkgver=2.13.2
-pkgrel=11
-pkgdesc="A MIDI to WAVE converter and player"
-arch=('i686' 'x86_64')
-url="http://timidity.sourceforge.net"
-license=('GPL')
-depends=('libao' 'libvorbis' 'jack' 'ncurses')
-makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw')
-optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
-            'xaw3d: for using the Xaw interface')
-backup=('etc/timidity++/timidity.cfg')
-source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.bz2 \
-        timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \
-        timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch \
-        timidity++-2.13.2-polling.patch)
-md5sums=('a82ceeb2245e22f4de2b41da21eaee32'
-         '3fcc8f065c959205113fa7e9ab2be3c6'
-         '35606c12af9c6be9361d64fc536f046f'
-         '0868926c5290817cacb9a1849bc043c2'
-         'fcbd27ff83066f69a3f8bd2442a3b3e2'
-         '31bdaea612f18e2c3d45a8a73ab44c81'
-         '16a4adec164836d4390dc6b0f9a69ce9'
-         '3f0034ead451cdd1078868e9e9b0494c')
-sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e'
-          '660b3afbb720d26e8f008034cee66dd8da082d6e'
-          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
-          '8d50618a2379c078b07e8d0fc59457855c16106c'
-          '59b0dbe3cde8f7b41d83676d8c37809255d3fb36'
-          '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60'
-          'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4'
-          '6abaedaecdecabf9dc76c062f7157571aed53984')
-
-build() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
-  patch -p1 < ../2.13.2-gcc4.patch
-  patch -p1 < ../TiMidity++-2.13.2+flac-1.1.3.patch
-  patch -p1 < ../timidity++-2.13.2-exiterror.patch
-  patch -p0 < ../timidity++-2.13.2-gtk26.patch
-  patch -p0 < ../timidity++-2.13.2-polling.patch
-  sed -i 's/tcl8.4/tcl8.5/' configure
-  sed -i 's/tk8.4/tk8.5/' configure
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
-	--enable-server --enable-alsaseq --enable-spectrogram \
-	--enable-audio=alsa,oss,ao,vorbis,flac,jack \
-	--enable-dynamic=ncurses,tcltk,vt100,xaw,gtk \
-	--disable-gtktest
-  make
-}
-
-package() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
-  install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
-}
diff --git a/testing/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch b/testing/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch
deleted file mode 100644
index 200d011a3..000000000
--- a/testing/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff -urN TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in
---- TiMidity++-2.13.2.orig/configure.in	2004-10-03 15:39:52 +0300
-+++ TiMidity++-2.13.2/configure.in	2007-02-19 13:06:42 +0200
-@@ -1216,11 +1216,39 @@
-       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS)
-       LIBS="$LIBS $LIBFLAC_LIBS"
-     ])
--    AM_PATH_LIBOGGFLAC([
--      EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC"
--      EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS)
--      LIBS="$LIBS $LIBOGGFLAC_LIBS"
--    ])
-+    # in FLAC-1.1.3, libOggFLAC was merged into libFLAC
-+    # FLAC_API_VERSION_CURRENT first appears in FLAC-1.1.3
-+    AC_MSG_CHECKING(for legacy libFLAC (<1.1.13))
-+    ac_save_LIBS="$LIBS"
-+    LIBS=
-+    AC_TRY_RUN([
-+    #include <FLAC/export.h>
-+    int main () { return FLAC_API_VERSION_CURRENT<8; }
-+    ],legacy_flac=no,legacy_flac=yes,legacy_flac=no)
-+    AC_MSG_RESULT($legacy_flac)
-+    LIBS="$ac_save_LIBS"
-+    if test "x$legacy_flac" = xyes; then
-+      AM_PATH_LIBOGGFLAC([
-+        EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC"
-+        EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS)
-+        LIBS="$LIBS $LIBOGGFLAC_LIBS"
-+      ])
-+    else
-+      
-+      AC_MSG_CHECKING(for Ogg support in libFLAC )
-+      ac_save_LIBS="$LIBS"
-+      LIBS="-lFLAC -lm -logg"
-+      AC_TRY_RUN([
-+      #include <FLAC/export.h>
-+      int main () { return !FLAC_API_SUPPORTS_OGG_FLAC; }
-+      ],ogg_flac=yes,ogg_flac=yes,ogg_flac=no)
-+      AC_MSG_RESULT($ogg_flac)
-+      LIBS="$ac_save_LIBS"
-+      if test "x$ogg_flac" = xyes; then    
-+        LIBS="$LIBS -logg"
-+        CFLAGS="$CFLAGS -DAU_OGGFLAC"
-+      fi
-+    fi
-   else
-     AC_MSG_RESULT(no)
-   fi
-diff -urN TiMidity++-2.13.2.orig/timidity/flac_a.c TiMidity++-2.13.2/timidity/flac_a.c
---- TiMidity++-2.13.2.orig/timidity/flac_a.c	2004-05-23 07:35:44 +0300
-+++ TiMidity++-2.13.2/timidity/flac_a.c	2007-02-19 13:06:55 +0200
-@@ -38,14 +38,22 @@
- 
- #if defined(AU_FLAC_DLL) || defined(AU_OGGFLAC_DLL)
- #include <windows.h>
--#define FLAC__EXPORT_H  /* don't include "OggFLAC/export.h" */
--#define FLAC_API
--#define OggFLAC__EXPORT_H  /* don't include "FLAC/export.h" */
--#define OggFLAC_API
-+#include <FLAC/export.h> /* need export.h to figure out API version from FLAC_API_VERSION_CURRENT */
-+#undef FLAC_API
-+#undef OggFLAC_API
- #endif
- 
- #include <FLAC/all.h>
--#ifdef AU_OGGFLAC
-+
-+/* by LEGACY_FLAC we mean before FLAC 1.1.3 */
-+/* in FLAC 1.1.3, libOggFLAC is merged into libFLAC and all encoding layers are merged into the stream encoder */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
- #include <OggFLAC/stream_encoder.h>
- #endif
- 
-@@ -100,17 +108,21 @@
-   unsigned long out_bytes;
-   union {
-     FLAC__StreamEncoderState flac;
-+#ifdef LEGACY_FLAC
-     FLAC__SeekableStreamEncoderState s_flac;
- #ifdef AU_OGGFLAC
-     OggFLAC__StreamEncoderState ogg;
- #endif
-+#endif
-   } state;
-   union {
-     union {
-       FLAC__StreamEncoder *stream;
-+#ifdef LEGACY_FLAC
-       FLAC__SeekableStreamEncoder *s_stream;
-+#endif
-     } flac;
--#ifdef AU_OGGFLAC
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
-     union {
-       OggFLAC__StreamEncoder *stream;
-     } ogg;
-@@ -158,7 +170,7 @@
- static long serial_number = 0;
- FLAC_ctx *flac_ctx = NULL;
- 
--#ifdef AU_OGGFLAC
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
- static FLAC__StreamEncoderWriteStatus
- ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder,
- 				  const FLAC__byte buffer[],
-@@ -168,8 +180,13 @@
- static FLAC__StreamEncoderWriteStatus
- flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
- 				   const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
- 				   unsigned bytes, unsigned samples,
-+#else
-+				   size_t bytes, unsigned samples,
-+#endif
- 				   unsigned current_frame, void *client_data);
-+#ifdef LEGACY_FLAC
- static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
- 						  const FLAC__StreamMetadata *metadata,
- 						  void *client_data);
-@@ -181,6 +198,7 @@
- static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder,
- 						  const FLAC__StreamMetadata *metadata,
- 						  void *client_data);
-+#endif
- 
- /* preset */
- void flac_set_compression_level(int compression_level)
-@@ -281,7 +299,11 @@
- #ifdef AU_OGGFLAC
- void flac_set_option_oggflac(int isogg)
- {
-+#ifdef LEGACY_FLAC
-   flac_options.isogg = isogg;
-+#else
-+  flac_options.isogg = (FLAC_API_SUPPORTS_OGG_FLAC && isogg);
-+#endif
- }
- #endif
- 
-@@ -295,6 +317,7 @@
-   dpm.fd = -1;
- 
-   if (ctx != NULL) {
-+#ifdef LEGACY_FLAC
- #ifdef AU_OGGFLAC
-     if (flac_options.isogg) {
-       if (ctx->encoder.ogg.stream) {
-@@ -317,6 +340,12 @@
- 	FLAC__stream_encoder_delete(ctx->encoder.flac.stream);
-       }
-     }
-+#else
-+    if (ctx->encoder.flac.stream) {
-+      FLAC__stream_encoder_finish(ctx->encoder.flac.stream);
-+      FLAC__stream_encoder_delete(ctx->encoder.flac.stream);
-+    }
-+#endif
-     free(ctx);
-     flac_ctx = NULL;
-   }
-@@ -329,6 +358,9 @@
-   FLAC__StreamMetadata padding;
-   FLAC__StreamMetadata *metadata[4];
-   int num_metadata = 0;
-+#ifndef LEGACY_FLAC
-+  FLAC__StreamEncoderInitStatus init_status;
-+#endif
- 
-   FLAC_ctx *ctx;
- 
-@@ -371,6 +403,7 @@
-     metadata[num_metadata++] = &padding;
-   }
- 
-+#ifdef LEGACY_FLAC
- #ifdef AU_OGGFLAC
-   if (flac_options.isogg) {
-     if ((ctx->encoder.ogg.stream = OggFLAC__stream_encoder_new()) == NULL) {
-@@ -542,6 +575,67 @@
-       return -1;
-     }
-   }
-+#else /* !LEGACY_FLAC */
-+	if ((ctx->encoder.flac.stream = FLAC__stream_encoder_new()) == NULL) {
-+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream");
-+		flac_session_close();
-+		return -1;
-+	}
-+
-+#ifdef AU_OGGFLAC
-+  if (flac_options.isogg) {
-+    /* set sequential number for serial */
-+    serial_number++;
-+    if (serial_number == 1) {
-+      srand(time(NULL));
-+      serial_number = rand();
-+    }
-+    FLAC__stream_encoder_set_ogg_serial_number(ctx->encoder.flac.stream, serial_number);
-+  }
-+#endif /* AU_OGGFLAC */
-+	FLAC__stream_encoder_set_channels(ctx->encoder.flac.stream, nch);
-+	/* 16bps only */
-+	FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.stream, 16);
-+
-+	FLAC__stream_encoder_set_verify(ctx->encoder.flac.stream, flac_options.verify);
-+
-+	if (!FLAC__format_sample_rate_is_valid(dpm.rate)) {
-+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", dpm.rate);
-+		flac_session_close();
-+		return -1;
-+	}
-+	FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.stream, dpm.rate);
-+
-+	FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.stream, flac_options.qlp_coeff_precision);
-+	/* expensive! */
-+	FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.stream, flac_options.qlp_coeff_precision_search);
-+
-+	if (nch == 2) {
-+		FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.stream, flac_options.mid_side);
-+		FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.stream, flac_options.adaptive_mid_side);
-+	}
-+
-+	FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.stream, flac_options.max_lpc_order);
-+	FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.stream, flac_options.min_residual_partition_order);
-+	FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order);
-+
-+	FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize);
-+
-+	if (0 < num_metadata)
-+		FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata);
-+
-+#ifdef AU_OGGFLAC
-+  if (flac_options.isogg)
-+		init_status = FLAC__stream_encoder_init_ogg_stream(ctx->encoder.flac.stream, NULL, flac_stream_encoder_write_callback, NULL, NULL, NULL, ctx);
-+  else
-+#endif
-+	init_status = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, flac_stream_encoder_write_callback, NULL, NULL, NULL, ctx);
-+	if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) {
-+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC encoder (init status: %s)", FLAC__StreamEncoderInitStatusString[init_status]);
-+		flac_session_close();
-+		return -1;
-+	}
-+#endif
- 
-   return 0;
- }
-@@ -638,7 +732,7 @@
-   return 0;
- }
- 
--#ifdef AU_OGGFLAC
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
- static FLAC__StreamEncoderWriteStatus
- ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder,
- 				  const FLAC__byte buffer[],
-@@ -658,7 +752,11 @@
- static FLAC__StreamEncoderWriteStatus
- flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
- 				   const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
- 				   unsigned bytes, unsigned samples,
-+#else
-+				   size_t bytes, unsigned samples,
-+#endif
- 				   unsigned current_frame, void *client_data)
- {
-   FLAC_ctx *ctx = (FLAC_ctx *)client_data;
-@@ -670,6 +768,7 @@
-   else
-     return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
- }
-+#ifdef LEGACY_FLAC
- static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
- 						  const FLAC__StreamMetadata *metadata,
- 						  void *client_data)
-@@ -695,6 +794,7 @@
- 						  void *client_data)
- {
- }
-+#endif
- 
- static int output_data(char *buf, int32 nbytes)
- {
-@@ -723,6 +823,7 @@
-     oggbuf[i] = *s++;
-   }
- 
-+#ifdef LEGACY_FLAC
- #ifdef AU_OGGFLAC
-   if (flac_options.isogg) {
-     ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream);
-@@ -793,6 +894,29 @@
-       return -1;
-     }
-   }
-+#else /* !LEGACY_FLAC */
-+  ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream);
-+  if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) {
-+    if (ctx->state.flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR |
-+	FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) {
-+      ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)",
-+		FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.stream)]);
-+    }
-+    else {
-+      ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)",
-+		FLAC__StreamEncoderStateString[ctx->state.flac]);
-+    }
-+    flac_session_close();
-+    return -1;
-+  }
-+
-+  if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.stream, oggbuf,
-+						nbytes / nch / 2 )) {
-+    ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream");
-+    flac_session_close();
-+    return -1;
-+  }
-+#endif
-   ctx->in_bytes += nbytes;
- 
-   free(oggbuf);
-@@ -813,6 +937,7 @@
-     return;
-   }
- 
-+#ifdef LEGACY_FLAC
-   if (flac_options.isogg) {
- #ifdef AU_OGGFLAC
-     if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) {
-@@ -838,6 +963,13 @@
-       /* fall through */
-     }
-   }
-+#else /* !LEGACY_FLAC */
-+  if ((ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream)) != FLAC__STREAM_ENCODER_OK) {
-+    ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)",
-+	      FLAC__StreamEncoderStateString[ctx->state.flac]);
-+    /* fall through */
-+  }
-+#endif
- 
-   ctl->cmsg(CMSG_INFO, VERB_NORMAL, "Wrote %lu/%lu bytes(%g%% compressed)",
-             ctx->out_bytes, ctx->in_bytes, ((double)ctx->out_bytes / (double)ctx->in_bytes) * 100.);
diff --git a/testing/timidity++/timidity++-2.13.2-exiterror.patch b/testing/timidity++/timidity++-2.13.2-exiterror.patch
deleted file mode 100644
index 01a83fead..000000000
--- a/testing/timidity++/timidity++-2.13.2-exiterror.patch
+++ /dev/null
@@ -1,695 +0,0 @@
-diff -ur TiMidity++-2.13.2/interface/alsaseq_c.c TiMidity++-2.13.2-new/interface/alsaseq_c.c
---- TiMidity++-2.13.2/interface/alsaseq_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/alsaseq_c.c	2005-01-02 03:39:15.968158520 +0100
-@@ -177,7 +177,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- /**********************************/
- /* export the interface functions */
-@@ -308,7 +308,7 @@
-         return 0;
- }
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
- 	double btime;
- 	int i, j;
-@@ -323,7 +323,7 @@
- 
- 	if (alsa_seq_open(&alsactx.handle) < 0) {
- 		fprintf(stderr, "error in snd_seq_open\n");
--		return;
-+		return 1;
- 	}
- 	alsactx.queue = -1;
- 	alsactx.client = snd_seq_client_id(alsactx.handle);
-@@ -342,7 +342,7 @@
- 		int port;
- 		port = alsa_create_port(alsactx.handle, i);
- 		if (port < 0)
--			return;
-+			return 1;
- 		alsactx.port[i] = port;
- 		alsa_set_timestamping(&alsactx, port);
- 		printf(" %d:%d", alsactx.client, alsactx.port[i]);
-@@ -411,6 +411,7 @@
- 		server_reset();
- 		doit(&alsactx);
- 	}
-+	return 0;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/emacs_c.c TiMidity++-2.13.2-new/interface/emacs_c.c
---- TiMidity++-2.13.2/interface/emacs_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/emacs_c.c	2005-01-02 03:02:02.000000000 +0100
-@@ -78,7 +78,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static int read_ready(void);
- static int emacs_type = 0; /* 0:emacs, 1:mule, 2:??
-@@ -249,7 +249,7 @@
-     return s;
- }
- 
--static void ctl_pass_playing_list(int argc, char *argv[])
-+static int ctl_pass_playing_list(int argc, char *argv[])
- {
-     int i;
-     char cmd[BUFSIZ];
-@@ -274,7 +274,7 @@
-     {
- 	for(i = 1; i < argc; i++)
- 	    play_midi_file(argv[i]);
--	return;
-+	return 0;
-     }
- 
-     /* Main Loop */
-@@ -296,11 +296,11 @@
- 		ctl_refresh();
- 		break;
- 	      case RC_QUIT:
--		return;
-+		return 0;
- 	    } /* skipping others command */
- 	}
- 	else if(!strncmp(cmd, "QUIT", 4))
--	    return;
-+	    return 0;
- 	else
- 	    continue; /* skipping unknown command */
-     }
-diff -ur TiMidity++-2.13.2/interface/gtk_c.c TiMidity++-2.13.2-new/interface/gtk_c.c
---- TiMidity++-2.13.2/interface/gtk_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/gtk_c.c	2005-01-02 03:35:53.447946272 +0100
-@@ -57,7 +57,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
-@@ -528,7 +528,7 @@
- #endif
- }
- 
--static void
-+static int 
- ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i=0;
-@@ -558,7 +558,7 @@
- 	}
- 	else {
- 	    if (command==RC_QUIT)
--		return;
-+		return 0;
- 	    if (command==RC_ERROR)
- 		command=RC_TUNE_END; /* Launch next file */
- 	    
-@@ -580,6 +580,7 @@
- 	    command = ctl_blocking_read(&val);
- 	}
-     }
-+    return 0;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/mac_c.c TiMidity++-2.13.2-new/interface/mac_c.c
---- TiMidity++-2.13.2/interface/mac_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/mac_c.c	2005-01-02 03:04:13.000000000 +0100
-@@ -71,7 +71,7 @@
- static void ctl_pitch_bend(int channel, int val);
- static void ctl_reset(void);
- static int ctl_open(int using_stdin, int using_stdout);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
-@@ -955,7 +955,7 @@
- }
- 
- 
--static void ctl_pass_playing_list(int init_number_of_files,
-+static int ctl_pass_playing_list(int init_number_of_files,
- 				  char * /*init_list_of_files*/ [])
- {
- 	EventRecord	event;
-@@ -983,6 +983,7 @@
- 		mac_HandleEvent(&event);
- 	}	
- 	Do_Quit();
-+	return 0;
- }
- 
- static Boolean UserWantsControl()
-diff -ur TiMidity++-2.13.2/interface/motif_c.c TiMidity++-2.13.2-new/interface/motif_c.c
---- TiMidity++-2.13.2/interface/motif_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/motif_c.c	2005-01-02 03:05:04.000000000 +0100
-@@ -60,7 +60,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- 
- static int motif_ready = 0;
-@@ -346,12 +346,13 @@
-   return(ctl_blocking_read(valp));
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i=0;
-     char file_to_play[1000];
-     int command;
-     int32 val;
-+    int retval;
- 
-     motif_ready = 1;
- 
-@@ -381,12 +382,13 @@
- 	    else
- 		{
- 		    if (command==RC_QUIT)
--			return;
-+			return 0;
- 
- 		    switch(command)
- 			{
- 			case RC_ERROR:
- 			    m_pipe_int_write(ERROR_MESSAGE);
-+			    retval=1;
- 			    break;
- 			case RC_NONE:
- 			    break;
-@@ -411,6 +413,7 @@
- 		    command = ctl_blocking_read(&val);
- 		}
- 	}
-+    return retval;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/ncurs_c.c TiMidity++-2.13.2-new/interface/ncurs_c.c
---- TiMidity++-2.13.2/interface/ncurs_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/ncurs_c.c	2005-01-02 03:05:48.000000000 +0100
-@@ -174,7 +174,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
-@@ -3100,7 +3100,7 @@
-     reuse_mblock(&tmpbuffer);
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i;
-     int act_number_of_files;
-@@ -3128,7 +3128,7 @@
- 
-     if (file_list.number<0) {
-       cmsg(CMSG_FATAL, VERB_NORMAL, "No MIDI file to play!");
--      return;
-+      return 1;
-     }
- 
-     ctl_listmode_max=1;
-@@ -3169,7 +3169,7 @@
- 		    if(!(ctl.flags & CTLF_LIST_LOOP) || stdin_check)
- 		    {
- 			aq_flush(0);
--			return;
-+			return 0;
- 		    }
- 		    i = 0;
- 		    if(rc == RC_TUNE_END)
-@@ -3187,7 +3187,7 @@
- 
- 		/* else fall through */
- 	    case RC_QUIT:
--		return;
-+		return 0;
- 	    }
- 	  ctl_reset();
- 	}
-diff -ur TiMidity++-2.13.2/interface/portmidisyn_c.c TiMidity++-2.13.2-new/interface/portmidisyn_c.c
---- TiMidity++-2.13.2/interface/portmidisyn_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/portmidisyn_c.c	2005-01-02 03:13:05.000000000 +0100
-@@ -96,7 +96,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- #ifndef __W32__
- static void init_keybord(void);
-@@ -215,17 +215,17 @@
- 
- #ifdef IA_W32G_SYN
- extern void w32g_syn_doit(void);
--extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
-+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
- 
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
--	w32g_syn_ctl_pass_playing_list ( n, args );
-+	return w32g_syn_ctl_pass_playing_list ( n, args );
- }
- #endif
- 
- #ifndef IA_W32G_SYN
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- #else
- // 0: OK, 2: Require to reset.
- int ctl_pass_playing_list2(int n, char *args[])
-@@ -241,7 +241,7 @@
- #ifndef IA_W32G_SYN
- 	if(n > MAX_PORT ){
- 		printf( "Usage: timidity -iW [Midi interface No s]\n");
--		return;
-+		return 1;
- 	}
- #endif
- 
-@@ -347,11 +347,7 @@
- #endif /* USE_GTK_GUI */
- 	rtsyn_close();
- 
--#ifdef IA_W32G_SYN
- 	return 0;
--#else
--	return;
--#endif
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/server_c.c TiMidity++-2.13.2-new/interface/server_c.c
---- TiMidity++-2.13.2/interface/server_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/server_c.c	2005-01-02 03:07:38.000000000 +0100
-@@ -176,7 +176,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- /**********************************/
- /* export the interface functions */
-@@ -356,14 +356,14 @@
- static void compute_sample_increment(void);
- static void server_reset(void);
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
-     int sock;
- 
-     if(n != 2 && n != 1)
-     {
- 	fprintf(stderr, "Usage: timidity -ir control-port [data-port]\n");
--	return;
-+	return 1;
-     }
- 
- #ifdef SIGPIPE
-@@ -379,7 +379,7 @@
-     if (control_port) {
- 	sock = pasv_open(&control_port);
- 	if(sock == -1)
--	    return;
-+	    return 1;
-     }
-     opt_realtime_playing = 1; /* Enable loading patch while playing */
-     allocate_cache_size = 0; /* Don't use pre-calclated samples */
-@@ -404,7 +404,7 @@
- 		    continue;
- 		perror("accept");
- 		close(sock);
--		return;
-+		return 1;
- 	    }
- 	}
- 	else control_fd = 0;
-@@ -446,6 +446,7 @@
- 	if (!control_port)
- 	    break;
-     }
-+    return 0;
- }
- 
- #define MAX_GETCMD_PARAMS 8
-diff -ur TiMidity++-2.13.2/interface/tk_c.c TiMidity++-2.13.2-new/interface/tk_c.c
---- TiMidity++-2.13.2/interface/tk_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/tk_c.c	2005-01-02 03:08:48.000000000 +0100
-@@ -86,7 +86,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_blocking_read(int32 *valp);
- static void ctl_note(int status, int ch, int note, int vel);
- static void ctl_event(CtlEvent *e);
-@@ -587,7 +587,7 @@
- 	return(ctl_blocking_read(valp));
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
- 	int i=0;
- 	char local[1000];
-@@ -618,7 +618,7 @@
- 				/* if really QUIT */
- 				k_pipe_gets(local, sizeof(local)-1);
- 				if (*local == 'Z')
--					return;
-+					return 0;
- 				/* only stop playing..*/
- 			}
- 			if (command==RC_CHANGE_VOLUME) /* init volume */
-@@ -646,6 +646,7 @@
- 			command = ctl_blocking_read(&val);
- 		}
- 	}
-+	return 0;
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/w32g_c.c TiMidity++-2.13.2-new/interface/w32g_c.c
---- TiMidity++-2.13.2/interface/w32g_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/w32g_c.c	2005-01-02 03:10:03.000000000 +0100
-@@ -86,7 +86,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
-@@ -662,7 +662,7 @@
- }
- 
- extern BOOL SetWrdWndActive(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
- 	static int init_flag = 1;
-     int rc;
-@@ -779,7 +779,7 @@
- 		if(ctl.flags & CTLF_AUTOEXIT) {
- 		    if(play_mode->fd != -1)
- 			aq_flush(0);
--		    return;
-+		    return 0;
- 		}
- 		break;
- 	    }
-@@ -803,7 +803,7 @@
- 		if(ctl.flags & CTLF_AUTOEXIT){
- 		    if(play_mode->fd != -1)
- 			aq_flush(0);
--		    return;
-+		    return 0;
- 		}
- 		if((ctl.flags & CTLF_LIST_LOOP) && w32g_nvalid_playlist())
- 		{
-@@ -839,7 +839,7 @@
- 	  case RC_QUIT:
- 	    if(play_mode->fd != -1)
- 		aq_flush(1);
--	    return;
-+	    return 0;
- 
- 	  case RC_CHANGE_VOLUME:
- 	    amplification += value;
-@@ -868,6 +868,7 @@
- 	    PrefSettingApplyReally();
- 	rc = RC_NONE;
-     }
-+	return 0;
- }
- 
- static void ctl_lcd_mark(int flag, int x, int y)
-diff -ur TiMidity++-2.13.2/interface/w32g_syn.c TiMidity++-2.13.2-new/interface/w32g_syn.c
---- TiMidity++-2.13.2/interface/w32g_syn.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/w32g_syn.c	2005-01-02 03:10:49.000000000 +0100
-@@ -281,7 +281,7 @@
- static int wait_for_termination_of_syn_thread ( void );
- int w32g_message_set ( int cmd );
- int w32g_message_get ( w32g_syn_message_t *msg );
--void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
-+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
- int w32g_syn_do_before_pref_apply ( void );
- int w32g_syn_do_after_pref_apply ( void );
- 
-@@ -1403,7 +1403,7 @@
- 	}
- }
- 
--void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
-+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
- {
- 	int i;
- #ifndef TWSYNSRV
-@@ -1471,6 +1471,7 @@
- 	}
- #endif
- 	if ( w32g_syn.quit_state < 2 ) w32g_syn.quit_state = 2;
-+	return 0;
- }
- 
- int w32g_syn_do_before_pref_apply ( void )
-diff -ur TiMidity++-2.13.2/interface/winsyn_c.c TiMidity++-2.13.2-new/interface/winsyn_c.c
---- TiMidity++-2.13.2/interface/winsyn_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/winsyn_c.c	2005-01-02 03:11:36.000000000 +0100
-@@ -88,7 +88,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- #ifndef __W32__
- static void init_keybord(void);
-@@ -207,17 +207,17 @@
- 
- #ifdef IA_W32G_SYN
- extern void w32g_syn_doit(void);
--extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
-+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
- 
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
--	w32g_syn_ctl_pass_playing_list ( n, args );
-+	return w32g_syn_ctl_pass_playing_list ( n, args );
- }
- #endif
- 
- #ifndef IA_W32G_SYN
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- #else
- // 0: OK, 2: Require to reset.
- int ctl_pass_playing_list2(int n, char *args[])
-@@ -233,7 +233,7 @@
- #ifndef IA_W32G_SYN
- 	if(n > MAX_PORT ){
- 		printf( "Usage: timidity -iW [Midi interface No s]\n");
--		return;
-+		return 1;
- 	}
- #endif
- 
-@@ -339,11 +339,7 @@
- #endif /* USE_GTK_GUI */
- 	rtsyn_close();
- 
--#ifdef IA_W32G_SYN
- 	return 0;
--#else
--	return;
--#endif
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/xaw_c.c TiMidity++-2.13.2-new/interface/xaw_c.c
---- TiMidity++-2.13.2/interface/xaw_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/xaw_c.c	2005-01-02 03:11:57.000000000 +0100
-@@ -55,7 +55,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- 
- static void a_pipe_open(void);
-@@ -463,7 +463,7 @@
-   }
- }
- 
--static void ctl_pass_playing_list(int init_number_of_files,
-+static int ctl_pass_playing_list(int init_number_of_files,
-                   char *init_list_of_files[]) {
-   int current_no,command=RC_NONE,i,j;
-   int32 val;
-diff -ur TiMidity++-2.13.2/interface/xskin_c.c TiMidity++-2.13.2-new/interface/xskin_c.c
---- TiMidity++-2.13.2/interface/xskin_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/xskin_c.c	2005-01-02 03:12:31.000000000 +0100
-@@ -55,7 +55,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static void ctl_speana_data(double *val, int size);
- static void initialize_exp_hz_table( void );
-@@ -342,7 +342,7 @@
-   }
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
- 
-   int current_no,command,i;
-   int32 val;
-@@ -403,7 +403,7 @@
-       command=play_midi_file(list_of_files[file_table[current_no]]);
-     } else {
-       /* Quit timidity*/
--      if (exitflag) return;
-+      if (exitflag) return 0;
-       /* Stop playing */
-       if (command==RC_QUIT) {
- 	sprintf(local_buf,"T 00:00");
-@@ -461,6 +461,7 @@
-       command=ctl_blocking_read(&val);
-     }
-   }
-+  return 0;
- }
- 
- /* ------ Pipe handlers ----- */
-diff -ur TiMidity++-2.13.2/timidity/controls.h TiMidity++-2.13.2-new/timidity/controls.h
---- TiMidity++-2.13.2/timidity/controls.h	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/controls.h	2005-01-02 02:59:37.000000000 +0100
-@@ -147,7 +147,7 @@
- 
-   int  (*open)(int using_stdin, int using_stdout);
-   void (*close)(void);
--  void (*pass_playing_list)(int number_of_files, char *list_of_files[]);
-+  int (*pass_playing_list)(int number_of_files, char *list_of_files[]);
-   int  (*read)(int32 *valp);
-   int  (*cmsg)(int type, int verbosity_level, char *fmt, ...);
-   void (*event)(CtlEvent *ev);	/* Control events */
-diff -ur TiMidity++-2.13.2/timidity/playmidi.c TiMidity++-2.13.2-new/timidity/playmidi.c
---- TiMidity++-2.13.2/timidity/playmidi.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/playmidi.c	2005-01-02 03:15:55.000000000 +0100
-@@ -8562,7 +8562,7 @@
-     return rc;
- }
- 
--void dumb_pass_playing_list(int number_of_files, char *list_of_files[])
-+int dumb_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     #ifndef CFG_FOR_SF
-     int i = 0;
-@@ -8586,12 +8586,12 @@
- 	    aq_flush(0);
- 
- 	    if(!(ctl->flags & CTLF_LIST_LOOP))
--		return;
-+		return 0;
- 	    i = 0;
- 	    break;
- 
- 	    case RC_QUIT:
--		return;
-+		return 0;
- 	}
-     }
-     #endif
-diff -ur TiMidity++-2.13.2/timidity/playmidi.h TiMidity++-2.13.2-new/timidity/playmidi.h
---- TiMidity++-2.13.2/timidity/playmidi.h	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/playmidi.h	2005-01-02 03:16:07.000000000 +0100
-@@ -577,7 +577,7 @@
- extern int opt_pan_delay;
- 
- extern int play_midi_file(char *fn);
--extern void dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
-+extern int dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
- extern void default_ctl_lyric(int lyricid);
- extern int check_apply_control(void);
- extern void recompute_freq(int v);
-diff -ur TiMidity++-2.13.2/timidity/sndfont.c TiMidity++-2.13.2-new/timidity/sndfont.c
---- TiMidity++-2.13.2/timidity/sndfont.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/sndfont.c	2005-01-02 03:15:27.000000000 +0100
-@@ -1893,7 +1893,7 @@
- 
- #if CFG_FOR_SF_SUPPORT_FFT
- int check_apply_control(void) { return 0; } // not pass
--void dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {}
-+int dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {return 0;}
- void recompute_freq(int v) {} // not pass
- int32 control_ratio = 0;
- int reduce_quality_flag = 0;
-diff -ur TiMidity++-2.13.2/timidity/timidity.c TiMidity++-2.13.2-new/timidity/timidity.c
---- TiMidity++-2.13.2/timidity/timidity.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/timidity.c	2005-01-02 02:59:29.000000000 +0100
-@@ -5291,6 +5291,7 @@
-     int need_stdin = 0, need_stdout = 0;
-     int i;
-     int output_fail = 0;
-+    int retval;
- 
-     if(nfiles == 0 && !strchr(INTERACTIVE_INTERFACE_IDS, ctl->id_character))
- 	return 0;
-@@ -5410,7 +5411,7 @@
- 	ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY,
- 		  "pass_playing_list() nfiles=%d", nfiles);
- 
--	ctl->pass_playing_list(nfiles, files);
-+	retval=ctl->pass_playing_list(nfiles, files);
- 
- 	if(intr)
- 	    aq_flush(1);
-@@ -5451,7 +5452,7 @@
-     url_news_connection_cache(URL_NEWS_CLOSE_CACHE);
- #endif /* SUPPORT_SOCKET */
- 
--    return 0;
-+    return retval;
- }
- 
- #ifdef IA_W32GUI
diff --git a/testing/timidity++/timidity++-2.13.2-gtk26.patch b/testing/timidity++/timidity++-2.13.2-gtk26.patch
deleted file mode 100644
index 73dc8de6c..000000000
--- a/testing/timidity++/timidity++-2.13.2-gtk26.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- interface/gtk_i.c	2004/12/21 16:59:33	1.1
-+++ interface/gtk_i.c	2004/12/21 16:59:41
-@@ -365,6 +365,7 @@ void
- Launch_Gtk_Process(int pipe_number)
- {
-     int	argc = 0;
-+    gchar **argv = NULL;
-     GtkWidget *button, *mbar, *swin;
-     GtkWidget *table, *align, *handlebox;
-     GtkWidget *vbox, *hbox, *vbox2, *scrolled_win;
-@@ -373,7 +374,7 @@ Launch_Gtk_Process(int pipe_number)
-     /* enable locale */
-     gtk_set_locale ();
- 
--    gtk_init (&argc, NULL);
-+    gtk_init (&argc, &argv);
- 
-     ttip = create_yellow_tooltips();
-     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/testing/timidity++/timidity++-2.13.2-polling.patch b/testing/timidity++/timidity++-2.13.2-polling.patch
deleted file mode 100644
index a9638dba1..000000000
--- a/testing/timidity++/timidity++-2.13.2-polling.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- interface/alsaseq_c.c	2006/12/13 23:22:53	1.28
-+++ interface/alsaseq_c.c	2008/04/16 00:14:45	1.29
-@@ -501,6 +501,8 @@
- 
- static void doit(struct seq_context *ctxp)
- {
-+	fd_set rfds;
-+	struct timeval timeout;
- 	for (;;) {
- 		while (snd_seq_event_input_pending(ctxp->handle, 1)) {
- 			if (do_sequencer(ctxp))
-@@ -528,15 +530,17 @@
- 			play_event(&ev);
- 			aq_fill_nonblocking();
- 		}
--		if (! ctxp->active || ! IS_STREAM_TRACE) {
--			fd_set rfds;
--			struct timeval timeout;
--			FD_ZERO(&rfds);
--			FD_SET(ctxp->fd, &rfds);
-+
-+		FD_ZERO(&rfds);
-+		FD_SET(ctxp->fd, &rfds);
-+		if (ctxp->active) {
- 			timeout.tv_sec = 0;
- 			timeout.tv_usec = 10000; /* 10ms */
- 			if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0)
- 				goto __done;
-+		} else {
-+			if (select(ctxp->fd + 1, &rfds, NULL, NULL, NULL) < 0)
-+				goto __done;
- 		}
- 	}
- 
diff --git a/testing/timidity++/timidity++.sh b/testing/timidity++/timidity++.sh
deleted file mode 100644
index 3fa13cea9..000000000
--- a/testing/timidity++/timidity++.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/timidity`
-case "$1" in
-   start)
-     stat_busy "Starting Timidity++ ALSA Daemon"
-     [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/timidity.pid
-       add_daemon timidity++
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Timidity++ ALSA Daemon"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/timidity.pid
-       rm_daemon timidity++
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/timidity++/timidity.cfg b/testing/timidity++/timidity.cfg
deleted file mode 100644
index 59bbfa935..000000000
--- a/testing/timidity++/timidity.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-# details on this file and other examples see here:
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/
-#----------------------------------------------------------------
-# SoundFont extension configuration
-#
-# soundfont <filename> [order={0|1}] [remove]
-#    <filename> is the path of SoundFont file.
-#    order: 0(preload) or 1(load after GUS).
-#    remove: disable specified soundfont.
-#
-# font exclude <tonebank> [<preset> [<keynote>]]
-# font order {0|1} <tonebank> [<preset> [<keynote>]]
-#    <tonebank>: 0-127
-#
-# font exclude 128 [<drumset> [<key>]]
-# font order {0|1} 128 [<drumset> [<key>]]
-#----------------------------------------------------------------
-
-# change the next line to point to a soundfont you have
-# soundfonts can be found e.g. here: http://www.hammersound.net/
-# soundfont /usr/share/soundfonts/DX7Piano.SF2
-
-# you can do manipulations of the soundfont you load like this:
-# e.g. removing drumset 99
-# font exclude 128 99
-
-# load drum samples after GUS patches
-# font order 1 128
diff --git a/testing/tracker/PKGBUILD b/testing/tracker/PKGBUILD
deleted file mode 100644
index 76bd7ed5f..000000000
--- a/testing/tracker/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 148319 2012-01-30 18:50:58Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.12.9
-_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=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
-              'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
-              'libvorbis: Vorbis metadata extractor'
-              'flac: FLAC metadata extractor'
-              'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-### Split libtracker-sparql
-
-  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
-
-  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
-    "$srcdir/sparql/usr/lib/tracker-$_tver"
-
-  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
-    "$srcdir/sparql/usr/share/vala/vapi"
-
-  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/testing/tracker/tracker.install b/testing/tracker/tracker.install
deleted file mode 100644
index 95114273e..000000000
--- a/testing/tracker/tracker.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/transcode/PKGBUILD b/testing/transcode/PKGBUILD
deleted file mode 100644
index 3de62545c..000000000
--- a/testing/transcode/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 148321 2012-01-30 18:51:01Z ibiru $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=4
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool')
-source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
-        ffmpeg-0.10.patch)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae'
-          '3c03111cfae88db918afff3837cec7db32ace3cc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch"
-  ./configure --prefix=/usr \
-    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
-    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
-    --enable-libdv --enable-libxml2 --enable-v4l \
-    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
-    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
-    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
-  make
-
-  cd "${srcdir}/subtitleripper"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
-  sed -e 's|^\(.*lppm.*\)$|#\1|' \
-      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
-      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-      -i Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/subtitleripper"
-  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
-  install -m 755 srttool "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
-  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}
diff --git a/testing/transcode/ffmpeg-0.10.patch b/testing/transcode/ffmpeg-0.10.patch
deleted file mode 100644
index 5965c180c..000000000
--- a/testing/transcode/ffmpeg-0.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c
---- transcode-1.1.7.orig/filter/filter_pp.c	2012-01-27 19:55:13.706613234 +0000
-+++ transcode-1.1.7/filter/filter_pp.c	2012-01-27 19:56:04.719541629 +0000
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
diff --git a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch b/testing/transcode/subtitleripper-0.3.4-linkingorder.patch
deleted file mode 100644
index 7efe22346..000000000
--- a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch
deleted file mode 100644
index 2af11d257..000000000
--- a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/testing/transfig/LICENSE b/testing/transfig/LICENSE
deleted file mode 100644
index b944bb992..000000000
--- a/testing/transfig/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * TransFig: Facility for Translating Fig code
- * Copyright (c) 1991 by Micah Beck
- * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
- *
- * Any party obtaining a copy of these files is granted, free of charge, a
- * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
- * nonexclusive right and license to deal in this software and
- * documentation files (the "Software"), including without limitation the
- * rights to use, copy, modify, merge, publish and/or distribute copies of
- * the Software, and to permit persons who receive copies from any such 
- * party to do so, with the only requirement being that this copyright 
- * notice remain intact.
- *
- */
-
-THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/testing/transfig/PKGBUILD b/testing/transfig/PKGBUILD
deleted file mode 100644
index c0f82aeb1..000000000
--- a/testing/transfig/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 148323 2012-01-30 18:51:04Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=transfig
-pkgver=3.2.5d
-pkgrel=1
-pkgdesc="Format conversion utility that can be used with xfig"
-arch=('i686' 'x86_64')
-url="http://www.xfig.org"
-license=('custom')
-depends=('libpng' 'libxpm')
-makedepends=('imake')
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \
-        transfig-3.2.5d-libpng-1.5.patch)
-sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc'
-          'b8b712871615308b8b6add92f86d218437d652f2'
-          '9f9f332b0b31e58e59542bc1568df9617b71710a')
-
-build() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-  sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile
-  sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile
-  patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch
-
-  xmkmf
-  make FIG2DEV_LIBDIR=/usr/share/fig2dev Makefiles
-  make FIG2DEV_LIBDIR=/usr/share/fig2dev XFIGLIBDIR=/usr/share/xfig
-}
-
-package() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-
-  make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \
-    FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \
-    install install.man
-  install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/transfig/transfig-3.2.5d-libpng-1.5.patch b/testing/transfig/transfig-3.2.5d-libpng-1.5.patch
deleted file mode 100644
index e6f15e43e..000000000
--- a/testing/transfig/transfig-3.2.5d-libpng-1.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=356751
-
-Index: transfig.3.2.5d/fig2dev/dev/readpng.c
-===================================================================
---- transfig.3.2.5d.orig/fig2dev/dev/readpng.c
-+++ transfig.3.2.5d/fig2dev/dev/readpng.c
-@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly)
-     }
- 
-     /* set long jump here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	return 0;
-@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly)
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    if (info_ptr->valid & PNG_INFO_gAMA)
--	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
--    else
--	png_set_gamma(png_ptr, 2.2, 0.45);
-+    png_fixed_point gamma = 0.45;
-+    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    png_set_gamma(png_ptr, 2.2, gamma);
- 
--    if (info_ptr->valid & PNG_INFO_bKGD)
-+    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
- 	/* set the background to the one supplied */
--	png_set_background(png_ptr, &info_ptr->background,
-+    	png_color_16p background;
-+	png_get_bKGD(png_ptr,info_ptr,&background);
-+	png_set_background(png_ptr, background,
- 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+    }
-     else {
- 	/* blend the canvas background using the alpha channel */
- 	if (bgspec) {
diff --git a/testing/tumbler/PKGBUILD b/testing/tumbler/PKGBUILD
deleted file mode 100644
index c9bced30c..000000000
--- a/testing/tumbler/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 148325 2012-01-30 18:51:06Z ibiru $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan Jezek <honzin.jezek@gmail.com>
-
-pkgname=tumbler
-pkgver=0.1.23
-pkgrel=4
-pkgdesc="D-Bus service for applications to request thumbnails"
-arch=('i686' 'x86_64')
-url="http://git.xfce.org/xfce/tumbler/"
-license=('GPL2' 'LGPL')
-groups=('xfce4')
-depends=('dbus-glib' 'gdk-pixbuf2')
-makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10' 'poppler-glib'
-             'libgsf' 'libopenraw' 'freetype2')
-optdepends=('ffmpegthumbnailer: for video thumbnails'
-            'gstreamer0.10: for video thumbnails'
-            'poppler-glib: for PDF thumbnails'
-            'libgsf: for ODF thumbnails'
-            'libopenraw: for RAW thumbnails'
-            'freetype2: for font thumbnails')
-options=('!libtool')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/tuxpuck/PKGBUILD b/testing/tuxpuck/PKGBUILD
deleted file mode 100644
index 2d6b5ce5e..000000000
--- a/testing/tuxpuck/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 148327 2012-01-30 18:51:09Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=tuxpuck
-pkgver=0.8.2
-pkgrel=5
-pkgdesc="Airhockey with tux"
-arch=('i686' 'x86_64')
-url="http://home.no.net/munsuun/tuxpuck/"
-license=('GPL2')
-depends=('libjpeg' 'sdl' 'libpng' 'libvorbis')
-makedepends=('freetype2')
-options=('!makeflags')
-source=("http://ftp.de.debian.org/debian/pool/main/t/${pkgname}/${pkgname}_$pkgver.orig.tar.gz"
-        'tuxpuck-0.8.2-ldflags.patch'
-        'tuxpuck-0.8.2-libpng15.patch')
-md5sums=('fc839abc2b1f3eafae397e1ed6487079'
-         'cb914d211bf3f519b7700fda180612b0'
-         'a4da530d670a0c30ac0840aab1db0dca')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  sed -i 's|usr/man|usr/share/man|' Makefile
-  sed -i -e 's/-Werror//' \
-         -e '/^CC/d' \
-         Makefile \
-         utils/Makefile \
-         data/Makefile
-
-  patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-ldflags.patch"
-  patch -Np0 -i "${srcdir}/tuxpuck-0.8.2-libpng15.patch"
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/tuxpuck/tuxpuck-0.8.2-ldflags.patch b/testing/tuxpuck/tuxpuck-0.8.2-ldflags.patch
deleted file mode 100644
index 28fcef48a..000000000
--- a/testing/tuxpuck/tuxpuck-0.8.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-10-05 10:34:57.000000000 +0200
-+++ Makefile	2010-10-05 10:35:28.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- $(NAME) : $(OBJS)
- 	cd data; $(MAKE)
--	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
- 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
- 
- w32icon.o : data/icons/tuxpuck.ico
diff --git a/testing/tuxpuck/tuxpuck-0.8.2-libpng15.patch b/testing/tuxpuck/tuxpuck-0.8.2-libpng15.patch
deleted file mode 100644
index ca9539f39..000000000
--- a/testing/tuxpuck/tuxpuck-0.8.2-libpng15.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- png.c.old	2011-09-14 16:25:54.415338149 +0200
-+++ png.c	2011-09-14 17:41:02.190803110 +0200
-@@ -38,6 +38,8 @@
-   png_color_16 *transv;
-   SDL_RWops *src = NULL;
-   Uint32 size;
-+  int num_palette;
-+  png_colorp png_palette;
- 
-   memcpy(&size, data, sizeof(Uint32));
-   if (memcounter)
-@@ -74,7 +76,7 @@
-    * the normal method of doing things with libpng).  REQUIRED unless you
-    * set up your own error handlers in png_create_read_struct() earlier.
-    */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     SDL_SetError("Error reading the PNG file.");
-     goto done;
-   }
-@@ -142,9 +144,9 @@
-       Rmask = 0x000000FF;
-       Gmask = 0x0000FF00;
-       Bmask = 0x00FF0000;
--      Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+      Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
-     } else {
--      int s = (info_ptr->channels == 4) ? 0 : 8;
-+      int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
-       Rmask = 0xFF000000 >> s;
-       Gmask = 0x00FF0000 >> s;
-       Bmask = 0x0000FF00 >> s;
-@@ -152,7 +154,7 @@
-     }
-   }
-   surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			     bit_depth * info_ptr->channels, Rmask, Gmask,
-+			     bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask,
- 			     Bmask, Amask);
-   if (surface == NULL) {
-     SDL_SetError("Out of memory");
-@@ -197,12 +199,15 @@
- 	palette->colors[i].g = i;
- 	palette->colors[i].b = i;
-       }
--    } else if (info_ptr->num_palette > 0) {
--      palette->ncolors = info_ptr->num_palette;
--      for (i = 0; i < info_ptr->num_palette; ++i) {
--	palette->colors[i].b = info_ptr->palette[i].blue;
--	palette->colors[i].g = info_ptr->palette[i].green;
--	palette->colors[i].r = info_ptr->palette[i].red;
-+    } else {
-+      png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+      if (num_palette > 0) {
-+        palette->ncolors = num_palette;
-+	for (i = 0; i < num_palette; ++i) {
-+	  palette->colors[i].b = png_palette[i].blue;
-+	  palette->colors[i].g = png_palette[i].green;
-+	  palette->colors[i].r = png_palette[i].red;
-+	}
-       }
-     }
-   }
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
deleted file mode 100644
index 89a2a2d2f..000000000
--- a/testing/udev/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 149552 2012-02-08 14:02:25Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=udev
-pkgver=181
-pkgrel=2
-pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils')
-install=udev.install
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
-	initcpio-hooks-udev
-	initcpio-install-udev)
-url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
-backup=(etc/udev/udev.conf)
-groups=('base')
-options=(!makeflags !libtool)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
-              --with-rootprefix= \
-              --sysconfdir=/etc \
-              --libdir=/usr/lib \
-              --libexecdir=/lib \
-              --with-systemdsystemunitdir=/lib/systemd/system \
-              --enable-udev_acl
-
-  make
-}
-  
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # /dev/loop0 is created for convenience, to autoload the module if necessary
-  # this is no longer needed when util-linux-2.21 is released as /dev/loop-control
-  # will be used instead. Support for this will go away in a future version of udev
-  install -d -m755 ${pkgdir}/lib/udev/devices/
-  mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0
-  chgrp disk ${pkgdir}/lib/udev/devices/loop0
- 
-  # udevd moved, symlink to make life easy for restarting udevd manually
-  ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  for i in $pkgdir/lib/udev/rules.d/*.rules; do
-    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
-               s#GROUP="tape"#GROUP="storage"#g;
-               s#GROUP="cdrom"#GROUP="optical"#g' $i
-  done
-
-  # install the mkinitpcio hook
-  install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev
-  install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev
-}
-md5sums=('0d7af750702620a871b9f9b98d8ad859'
-         'a4dd853050bf2e0ae6b2e3d2c75499c2'
-         'ee0bfe91a20fff12cc25ab1d1e024853')
diff --git a/testing/udev/initcpio-hooks-udev b/testing/udev/initcpio-hooks-udev
deleted file mode 100644
index 87aa7960f..000000000
--- a/testing/udev/initcpio-hooks-udev
+++ /dev/null
@@ -1,9 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    msg -n ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-    msg "done."
-}
diff --git a/testing/udev/initcpio-install-udev b/testing/udev/initcpio-install-udev
deleted file mode 100644
index e7e2c0f60..000000000
--- a/testing/udev/initcpio-install-udev
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    FILES="/etc/udev/udev.conf"
-    SCRIPT="udev"
-
-    add_binary /lib/udev/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
-        add_file "/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/lib/udev/$tool"
-    done
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/udev/udev.install b/testing/udev/udev.install
deleted file mode 100644
index 7c866c2a3..000000000
--- a/testing/udev/udev.install
+++ /dev/null
@@ -1,73 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo "ATTENTION UDEV:"
-    echo "----------"
-    if [ "$(vercmp $2 168)" -lt 0 ]; then
-      echo "Kernel 2.6.32 or newer is now required."
-      echo "  --"
-      echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
-      echo "  --"
-      echo "Arch specific cd symlinks are now no longer created."
-      echo "  --"
-      echo "cd and net persistent rules will no longer be autogenerated,"
-      echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
-      echo "  --"
-      echo "Errors are now logged (possibly to the console) by default."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 171)" -lt 0 ]; then
-      echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
-      echo "blacklisting in MODULES no longer works."
-      echo "See 'man modprobe.conf' for a replacement to blacklisting."
-      echo "To disable a module mod1 on the kernel command line, use"
-      echo "mod1.disable=1"
-      echo "or"
-      echo "modprobe.blacklist=mod1"
-      echo "  --"
-      echo "The following modules are no longer unconditionally loaded:"
-      echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
-      echo "Add them to MODULES in rc.conf if you need them."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 172)" -lt 0 ]; then
-      echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
-      echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
-      echo "takes precedence."
-      echo "  --"
-      echo "kbd and rtc devices are no longer world readable."
-      echo "  --"
-      echo "rtc is no longer in the audio group and fb devices are no longer in"
-      echo "the video group, as permissions and ownership of fb devices are controlled"
-      echo "by X."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 174)" -lt 0 ]; then
-      echo "We now use upstream rules for assigning devices to the 'disk', 'optical',"
-      echo "'scanner' and 'video' groups. Beware of any changes."
-      echo "  --"
-      echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-      echo "  --"
-      echo "For security reasons, we no longer add devices to the 'storage' group. Use"
-      echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-      echo "this functionality back."
-      echo " --"
-      echo "We no longer create the static nodes on install needed for an initrd-less boot"
-      echo "where devtmpfs is not mounted by the kernel, this only affects fresh installs."
-      echo " --"
-    fi
-    if [ "$(vercmp $2 175)" -lt 0 ]; then
-      echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels"
-      echo "have this enabled."
-      echo " --"
-    fi
-    echo "udev-compat has been removed, and should be uninstalled."
-    echo " --"
-    echo "Framebuffers are no longer blacklisted by default."
-    echo " --"
-    echo "binaries moved from /sbin to /usr/bin"
-    echo "---------------"
-  fi
-}
diff --git a/testing/unison/PKGBUILD b/testing/unison/PKGBUILD
deleted file mode 100644
index 5777976f5..000000000
--- a/testing/unison/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 148329 2012-01-30 18:51:12Z ibiru $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=unison
-pkgver=2.40.63
-pkgrel=3
-pkgdesc="Unison is a file-synchronization tool"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.cis.upenn.edu/~bcpierce/unison"
-depends=('glibc')
-makedepends=('ocaml' 'lablgtk2' 'imagemagick')
-optdepends=('gtk2: for gtk2 support')
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz
-        $pkgname.desktop)
-md5sums=('3281207850cf6f0a17fe73f371893bd3'
-         '2daecba7705455a8e4b769e48b059872')
-options=(!makeflags)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  CFLAGS=""
-  make clean
-  make mkProjectInfo 
-  make UISTYLE=text DEBUGGING=false THREADS=true 
-  mv unison unison-text
- 
- # clean the builddir and rebuild with gtk support
-  # broken at the moment!
-  # make clean
-  # make mkProjectInfo
-  # make UISTYLE=gtk DEBUGGING=false THREADS=true
-  # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk
- # clean the builddir and rebuild with gtk2 support
-  make clean
-  make mkProjectInfo
-  make UISTYLE=gtk2 DEBUGGING=false THREADS=true
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -Dm755 unison-text "$pkgdir"/usr/bin/unison
-  install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2
- # install a .desktop file; create a compliant icon from ico file and install the png
-  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  convert win32rc/U.ico unison.png
-  install -Dm644 ${pkgname}-1.png  "$pkgdir"/usr/share/pixmaps/$pkgname.png
- # make symlink for .desktop file
-  cd "$pkgdir"/usr/bin
-  ln -s unison-gtk2 unison-x11
-}
diff --git a/testing/unison/unison-ssh-ocaml.patch b/testing/unison/unison-ssh-ocaml.patch
deleted file mode 100644
index 1b9c66c7f..000000000
--- a/testing/unison/unison-ssh-ocaml.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: src/terminal.ml
-===================================================================
---- src/terminal.ml	(révision 463)
-+++ src/terminal.ml	(copie de travail)
-@@ -191,7 +191,6 @@
-             exit 127
-           end
-       | childPid ->
--          Unix.close slaveFd;
-           (Some masterFd, childPid)
-       end
- 
-Index: src/update.mli
-===================================================================
---- src/update.mli	(révision 463)
-+++ src/update.mli	(copie de travail)
-@@ -1,7 +1,7 @@
- (* Unison file synchronizer: src/update.mli *)
- (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
- 
--module NameMap : Map.S with type key = Name.t
-+module NameMap : MyMap.S with type key = Name.t
- 
- type archive =
-     ArchiveDir of Props.t * archive NameMap.t
diff --git a/testing/unison/unison.desktop b/testing/unison/unison.desktop
deleted file mode 100644
index 3a7e1d762..000000000
--- a/testing/unison/unison.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Name[de]=unison
-Comment=File synchronisation tool for X11
-Comment[de]=Datei Abgleicher und Synchronisierer
-TryExec=unison-x11
-Exec=unison-x11
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true
diff --git a/testing/unison/unison.install b/testing/unison/unison.install
deleted file mode 100644
index a3790ab7d..000000000
--- a/testing/unison/unison.install
+++ /dev/null
@@ -1,28 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo "NOTE:"
-  echo "  For gtk1 frontend please add 'gtk' package."
-  echo "  For gtk2 frontend please add 'gtk2' package."
-  echo "  Default X11 frontend is set to gtk2. "
-  echo ""
-  echo "  If you want to default to gtk1 unison:" 
-  echo "  'rm /usr/bin/unison-x11'"
-  echo "  'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'"
-  echo ""
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
diff --git a/testing/varnish/PKGBUILD b/testing/varnish/PKGBUILD
deleted file mode 100644
index 931f3bbb1..000000000
--- a/testing/varnish/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 149691 2012-02-09 00:00:25Z allan $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Douglas Soares de Andrade
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=varnish
-pkgver=3.0.2
-pkgrel=5
-pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
-url="http://www.varnish-cache.org/"
-license=('BSD')
-depends=('gcc' 'libedit' 'pcre')
-backup=('etc/conf.d/varnish'
-        'etc/varnish/default.vcl')
-install=$pkgname.install
-options=('!libtool')
-source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
-        "$pkgname.conf.d"
-        "rc.$pkgname")
-md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a'
-         'edd1237d097d72173d9772754335890c'
-         '8366f51568c0bbb3d3891aa0cc724369')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var/lib
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
-  install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/varnish/rc.varnish b/testing/varnish/rc.varnish
deleted file mode 100644
index 2841665e5..000000000
--- a/testing/varnish/rc.varnish
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/varnish
-
-reload_vcl() {
-  local activecfg newcfg
-
-  if [[ -z $VARNISH_CFG ]]; then
-    printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n'
-    return 1
-  fi
-
-  activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
-  if [[ -z $activecfg ]]; then
-    printf '==> ERROR: No active VCL found!\n'
-    return 1
-  fi
-
-  printf -v newcfg 'vcl-%(%s)T' -1
-
-  varnishadm "vcl.load $newcfg $VARNISH_CFG" &&
-  varnishadm "vcl.use $newcfg" &&
-  varnishadm "vcl.discard $activecfg" || return 1
-}
-
-pidfile=/run/varnish.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-    if [[ ! -d /proc/$PID ]]; then
-      # stale pidfile
-      unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Varnish Reverse Proxy"
-    if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
-      add_daemon varnish
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Varnish Reverse Proxy"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon varnish
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Recompiling and Reloading VCL"
-    reload_vcl && stat_done || stat_fail
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-  ;;
-esac
diff --git a/testing/varnish/varnish.conf.d b/testing/varnish/varnish.conf.d
deleted file mode 100644
index 904ca119f..000000000
--- a/testing/varnish/varnish.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Command line options to varnishd
-#
-
-VARNISHD_OPTS="-a 0.0.0.0:80 \
-               -b localhost:8080 \
-               -T localhost:6082 \
-               -s malloc,64M
-               -u nobody -g nobody"
-
-VARNISH_CFG="/etc/varnish/default.vcl"
diff --git a/testing/varnish/varnish.install b/testing/varnish/varnish.install
deleted file mode 100644
index 1cbb1f16e..000000000
--- a/testing/varnish/varnish.install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# remove localstatedir -- compiled VCL and slab files will still be here.
-post_remove() {
-  rm -rf var/lib/varnish
-}
diff --git a/testing/vice/PKGBUILD b/testing/vice/PKGBUILD
deleted file mode 100644
index df9620dba..000000000
--- a/testing/vice/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 148331 2012-01-30 18:51:15Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=vice
-pkgver=2.3
-pkgrel=5
-pkgdesc="A Versatile Commodore Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.viceteam.org/"
-depends=('alsa-lib' 'gcc-libs' 'giflib' 'lame' 'libxrandr' 
-         'libxv' 'libjpeg' 'libpng' 'libxaw' 'libxxf86vm')
-makedepends=('xorg-font-utils')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz"
-        'vice-2.3-x11video.patch')
-md5sums=('b48d137874daad50c087a0686cbdde34'
-         '088292ce9efe785edfb2b0c7c670785e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ${srcdir}/vice-2.3-x11video.patch
-  ./configure --prefix=/usr \
-              --with-alsa \
-              --enable-fullscreen
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vice/vice-2.3-x11video.patch b/testing/vice/vice-2.3-x11video.patch
deleted file mode 100644
index d698638c6..000000000
--- a/testing/vice/vice-2.3-x11video.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/arch/unix/x11/xaw/x11video.c	2011-01-18 23:59:00.000000000 +0100
-+++ b/src/arch/unix/x11/xaw/x11video.c	2011-02-27 18:40:52.000000000 +0100
-@@ -60,6 +60,8 @@
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/testing/vigra/PKGBUILD b/testing/vigra/PKGBUILD
deleted file mode 100644
index e6dfaa465..000000000
--- a/testing/vigra/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 148333 2012-01-30 18:51:18Z ibiru $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgbase=vigra
-pkgname=('vigra' 'vigra-doc')
-pkgver=1.8.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://hci.iwr.uni-heidelberg.de/vigra/"
-license=('custom:MIT')
-makedepends=(# runtime deps
-             'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
-	     # additional makedeps
-             'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
-options=('!libtool')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
-	vigra-1.7.1.gcc460.patch)
-md5sums=('15c5544448e529ee60020758ab6be264'
-         '25ef8bc26bc38ee67e5b512d2acd0166')
-sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
-          '1de6381a74dd136ea25df5a27f249187b0dbd17e')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-      -DWITH_VIGRANUMPY=1 \
-      -DDOCINSTALL=share/doc 
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make -k check || /bin/true # i686 fails
-}
-
-package_vigra() {
-  pkgdesc="Computer vision library"
-  depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
-  optdepends=('python2: for python bindings'
-              'boost-libs: for python bindings')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # license
-  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-  
-  # remove doc
-  rm -rf "${pkgdir}"/usr/share/doc
-  
-  #fix shebang for python2
-  sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config
-}
-
-package_vigra-doc() {
-  pkgdesc="Computer vision library - documentation and examples"
-  #depends=('vigra')
-  #arch=('any')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # cleanup
-  rm -rf "${pkgdir}"/usr/{bin,include,lib}
-
-  # license
-  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/vigra/vigra-1.7.1.gcc460.patch b/testing/vigra/vigra-1.7.1.gcc460.patch
deleted file mode 100644
index 46f194dbc..000000000
--- a/testing/vigra/vigra-1.7.1.gcc460.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx
---- vigra-1.7.1.old/include/vigra/random_forest.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/random_forest.hxx	2011-01-28 00:16:32.000000000 +0000
-@@ -43,6 +43,7 @@
- #include <set>
- #include <list>
- #include <numeric>
-+#include <stddef.h>
- #include "mathutil.hxx"
- #include "array_vector.hxx"
- #include "sized_int.hxx"
-diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
---- vigra-1.7.1.old/include/vigra/sifImport.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/sifImport.hxx	2011-01-28 00:23:31.000000000 +0000
-@@ -57,6 +57,7 @@
- #include <fstream>
- #include <cstring>
- #include <vector> 
-+#include <stddef.h>
- #include "vigra/multi_array.hxx"
- 
- namespace vigra {
-diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
---- vigra-1.7.1.old/include/vigra/multi_iterator.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/multi_iterator.hxx	2011-01-28 00:23:31.000000000 +0000
-@@ -41,6 +41,7 @@
- #define VIGRA_MULTI_ITERATOR_HXX
- 
- #include <sys/types.h>
-+#include <stddef.h>
- #include "tinyvector.hxx"
- #include "iteratortags.hxx"
- 
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
deleted file mode 100644
index 7eec6e572..000000000
--- a/testing/vlc/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 149139 2012-02-05 21:34: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.13
-pkgrel=6
-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'  'xcb-util-keysyms'
-         '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"
-        'vlc-1.1.13-skin2_theme_loader.patch'
-        'vlc-1.1.13-youtube.patch')
-md5sums=('9678fb7a04808b6e0de63746d35e4bb1'
-         'f7c2ea18da9570d633f5fd834a1f72c8'
-         '26dbd3574219daf4babc2f127a3229bc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/vlc-1.1.13-skin2_theme_loader.patch"
-  patch -Np1 -i "${srcdir}/vlc-1.1.13-youtube.patch"
-  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-1.1.13-skin2_theme_loader.patch b/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch
deleted file mode 100644
index 5230b6485..000000000
--- a/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:07.000000000 +0100
-+++ b/modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:19.000000000 +0100
-@@ -768,7 +768,7 @@
-     {
-         void *toClose = currentGzVp;
-         currentGzVp = NULL;  currentGzFd = -1;
--        return gzclose( toClose );
-+        return gzclose( (gzFile) toClose );
-     }
-     return -1;
- }
-@@ -777,7 +777,7 @@
- {
-     if( currentGzVp != NULL && fd != -1 )
-     {
--        return gzread( currentGzVp, p_buffer, i_length );
-+        return gzread( (gzFile) currentGzVp, p_buffer, i_length );
-     }
-     return -1;
- }
-@@ -786,7 +786,7 @@
- {
-     if( currentGzVp != NULL && fd != -1 )
-     {
--        return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length );
-+        return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length );
-     }
-     return -1;
- }
diff --git a/testing/vlc/vlc-1.1.13-youtube.patch b/testing/vlc/vlc-1.1.13-youtube.patch
deleted file mode 100644
index e1a0f49b4..000000000
--- a/testing/vlc/vlc-1.1.13-youtube.patch
+++ /dev/null
@@ -1,221 +0,0 @@
---- a/share/lua/playlist/youtube.lua	2011-08-06 11:30:49.000000000 +0200
-+++ b/share/lua/playlist/youtube.lua	2012-02-02 16:05:32.000000000 +0100
-@@ -1,7 +1,7 @@
- --[[
-  $Id$
- 
-- Copyright © 2007-2009 the VideoLAN team
-+ Copyright © 2007-2011 the VideoLAN team
- 
-  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
-@@ -24,13 +24,27 @@
-     return res
- end
- 
--function get_arturl( path, video_id )
--    if string.match( vlc.path, "iurl=" ) then
--        return vlc.strings( get_url_param( vlc.path, "iurl" ) )
-+function get_arturl()
-+    local iurl = get_url_param( vlc.path, "iurl" )
-+    if iurl then
-+        return iurl
-     end
--    if not arturl then
--        return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
-+    local video_id = get_url_param( vlc.path, "v" )
-+    if not video_id then
-+        return nil
-+    end
-+    return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
-+end
-+
-+function get_prefres()
-+    local prefres = -1
-+    if vlc.var and vlc.var.inherit then
-+        prefres = vlc.var.inherit(nil, "preferred-resolution")
-+        if prefres == nil then
-+            prefres = -1
-+        end
-     end
-+    return prefres
- end
- 
- -- Probe function.
-@@ -47,18 +61,17 @@
-             return false
-         end
-     end
--    return (  string.match( vlc.path, "watch%?v=" ) -- the html page
--            or string.match( vlc.path, "watch_fullscreen%?video_id=" ) -- the fullscreen page
--            or string.match( vlc.path, "p.swf" ) -- the (old?) player url
--            or string.match( vlc.path, "jp.swf" ) -- the (new?) player url (as of 24/08/2007)
--            or string.match( vlc.path, "player2.swf" ) ) -- another player url
-+    return (  string.match( vlc.path, "/watch%?" ) -- the html page
-+            or string.match( vlc.path, "/v/" ) -- video in swf player
-+            or string.match( vlc.path, "/player2.swf" ) ) -- another player url
- end
- 
- -- Parse function.
- function parse()
--    if string.match( vlc.path, "watch%?v=" )
-+    if string.match( vlc.path, "/watch%?" )
-     then -- This is the HTML page's URL
--        -- fmt is the format of the video: 18 is HQ (mp4)
-+        -- fmt is the format of the video
-+        -- (cf. http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs)
-         fmt = get_url_param( vlc.path, "fmt" )
-         while true do
-             -- Try to find the video's title
-@@ -71,27 +84,42 @@
-             end
-             if string.match( line, "<meta name=\"description\"" ) then
-                -- Don't ask me why they double encode ...
--                _,_,description = vlc.strings.resolve_xml_special_chars(vlc.strings.resolve_xml_special_chars(string.find( line, "content=\"(.-)\"" )))
-+                _,_,description = string.find( line, "content=\"(.-)\"" )
-+                description = vlc.strings.resolve_xml_special_chars( description )
-+                description = vlc.strings.resolve_xml_special_chars( description )
-             end
--            if string.match( line, "subscribe_to_user=" ) then
--                _,_,artist = string.find( line, "subscribe_to_user=([^&]*)" )
-+            if string.match( line, "<meta property=\"og:image\"" ) then
-+                _,_,arturl = string.find( line, "content=\"(.-)\"" )
-             end
--            -- CURRENT: var swfConfig = { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
--            -- OLD 1: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
--            -- OLD 2: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="};
--            -- OLD 3: 'SWF_ARGS': { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
--            if ( string.match( line, "PLAYER_CONFIG" ) or string.match( line, "swfConfig" ) or string.match( line, "SWF_ARGS" ) or string.match( line, "swfArgs" ) ) and string.match( line, "video_id" ) then
--                if string.match( line, "BASE_YT_URL" ) then
--                    _,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" )
-+            if string.match( line, " rel=\"author\"" ) then
-+                _,_,artist = string.find( line, "href=\"/user/([^\"]*)\"" )
-+            end
-+            -- JSON parameters, also formerly known as "swfConfig",
-+            -- "SWF_ARGS", "swfArgs", "PLAYER_CONFIG" ...
-+            if string.match( line, "playerConfig" ) then
-+                if not fmt then
-+                    prefres = get_prefres()
-+                    if prefres >= 0 then
-+                        fmt_list = string.match( line, "\"fmt_list\": \"(.-)\"" )
-+                        if fmt_list then
-+                            for itag,height in string.gmatch( fmt_list, "(%d+)\\/%d+x(%d+)\\/[^,]+" ) do
-+                                -- Apparently formats are listed in quality
-+                                -- order, so we take the first one that works,
-+                                -- or fallback to the lowest quality
-+                                fmt = itag
-+                                if tonumber(height) <= prefres then
-+                                    break
-+                                end
-+                            end
-+                        end
-+                    end
-                 end
--                _,_,t = string.find( line, "\"t\": \"(.-)\"" )
--                -- vlc.msg.err( t )
--                -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" )
--                fmt_url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
--                if fmt_url_map then
-+
-+                url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
-+                if url_map then
-                     -- FIXME: do this properly
--                    fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" )
--                    for url,itag in string.gmatch( fmt_url_map, "url=([^&,]+).-&itag=(%d+)" ) do
-+                    url_map = string.gsub( url_map, "\\u0026", "&" )
-+                    for url,itag in string.gmatch( url_map, "url=([^&,]+)[^,]*&itag=(%d+)" ) do
-                         -- Apparently formats are listed in quality order,
-                         -- so we can afford to simply take the first one
-                         if not fmt or tonumber( itag ) == tonumber( fmt ) then
-@@ -101,75 +129,37 @@
-                         end
-                     end
-                 end
--            -- Also available on non-HTML5 pages: var swfHTML = (isIE) ? "<object [...]><param name=\"flashvars\" value=\"rv.2.thumbnailUrl=http%3A%2F%2Fi4.ytimg.com%2Fvi%2F3MLp7YNTznE%2Fdefault.jpg&rv.7.length_seconds=384 [...] &video_id=OHVvVmUNBFc [...] &t=OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp [...]
--            elseif string.match( line, "swfHTML" ) and string.match( line, "video_id" ) then
--                _,_,t = string.find( line, "&t=(.-)&" )
--            -- Also available in HTML5 pages: videoPlayer.setAvailableFormat("http://v6.lscache4.c.youtube.com/videoplayback?ip=82.0.0.0&sparams=id%2Cexpire%2Cip%2Cipbits%2Citag%2Calgorithm%2Cburst%2Cfactor&algorithm=throttle-factor&itag=45&ipbits=8&burst=40&sver=3&expire=1275688800&key=yt1&signature=6ED860441298D1157FF3013A5D72727F25831F09.4C196BEA9F8F9B83CE678D79AD918B83D5E98B46&factor=1.25&id=7117715cf57d18d4", "video/webm; codecs=&quot;vp8.0, vorbis&quot;", "hd720");
--            elseif string.match( line, "videoPlayer%.setAvailableFormat" ) then
--                url,itag = string.match( line, "videoPlayer%.setAvailableFormat%(\"(.-itag=(%d+).-)\",.+%)" )
--                if url then
--                    -- For now, WebM formats are listed only in the HTML5
--                    -- section, that is also only when HTML5 is enabled.
--                    -- Format 45 is 720p, and 43 is lower resolution.
--                    if tonumber( itag ) == 45  or ( tonumber( itag ) == 43 and not webm_path ) then
--                        webm_path = url
--                    end
--                    -- Grab something if fmt_url_map failed
--                    if not path and ( not fmt or tonumber( itag ) == tonumber( fmt ) ) then
--                        path = url
--                    end
--                end
-+            -- There is also another version of the parameters, encoded
-+            -- differently, as an HTML attribute of an <object> or <embed>
-+            -- tag; but we don't need it now
-             end
-         end
- 
--        if not video_id then
--            video_id = get_url_param( vlc.path, "v" )
-+        if not path then
-+            vlc.msg.err( "Couldn't extract youtube video URL, please check for updates to this script" )
-+            return { }
-         end
--        arturl = get_arturl( vlc.path, video_id )
- 
--        if not fmt then
--            -- Prefer WebM formats if this is an &html5=True URL
--            html5 = get_url_param( vlc.path, "html5" )
--            if html5 == "True" and webm_path then
--                path = webm_path
--            end
-+        if not arturl then
-+            arturl = get_arturl()
-         end
- 
--        if not path then
--            if not base_yt_url then
--                base_yt_url = "http://youtube.com/"
--            end
--            if fmt then
--                format = "&fmt=" .. fmt
--            else
--                format = ""
--            end
--
--            if t then
--                path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t..format
--            else
--                -- This shouldn't happen ... but keep it as a backup.
--                path = "http://www.youtube.com/v/"..video_id
--            end
--        end
-         return { { path = path; name = name; description = description; artist = artist; arturl = arturl } }
-     else -- This is the flash player's URL
--        if string.match( vlc.path, "title=" ) then
--            name = vlc.strings.decode_uri(get_url_param( vlc.path, "title" ))
--        end
-         video_id = get_url_param( vlc.path, "video_id" )
--        arturl = get_arturl( vlc.path, video_id )
-+        if not video_id then
-+            _,_,video_id = string.find( vlc.path, "/v/([^?]*)" )
-+        end
-+        if not video_id then
-+            vlc.msg.err( "Couldn't extract youtube video URL" )
-+            return { }
-+        end
-         fmt = get_url_param( vlc.path, "fmt" )
-         if fmt then
-             format = "&fmt=" .. fmt
-         else
-             format = ""
-         end
--        if not string.match( vlc.path, "t=" ) then
--            -- This sucks, we're missing "t" which is now mandatory. Let's
--            -- try using another url
--            return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl } }
--        end
--        return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl } }
-+        return { { path = "http://www.youtube.com/watch?v="..video_id..format } }
-     end
- end
diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install
deleted file mode 100644
index dc4961cae..000000000
--- a/testing/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/testing/wesnoth/PKGBUILD b/testing/wesnoth/PKGBUILD
deleted file mode 100644
index 74b2f789b..000000000
--- a/testing/wesnoth/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 148337 2012-01-30 18:51:23Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Jacobo Arvelo <unix4all@ya.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=wesnoth
-pkgver=1.8.6
-pkgrel=4
-pkgdesc="A turn-based strategy game on a fantasy world"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2')
-makedepends=('boost')
-install=wesnoth.install
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        wesnoth-libpng-1.4.0.patch
-        wesnoth-1.8.6-boost-foreach.patch
-        wesnoth.tmpfiles.conf)
-md5sums=('f1c3179869b01b61e253e74aeb241034'
-         '3b0d2edcb45e8ecc8c790f92bdcb0087'
-         'dc414ab7e1334941548e9db6db9c2460'
-         'b8122f5054e3895c9c054e87460869dc')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch"
-  patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch"
-  ./autogen.sh
-  ./configure --prefix=/usr --localstatedir=/var --enable-tools \
-      --enable-editor --enable-server --with-fifodir=/run/wesnothd
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install-exec
-  install -dm755 "$pkgdir/usr/lib/tmpfiles.d/"
-  install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
-
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope"
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint"
-}
diff --git a/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch
deleted file mode 100644
index 5aee3118c..000000000
--- a/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~	2011-07-21 23:05:56.594879049 +0200
-+++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp	2011-07-21 23:28:07.540358742 +0200
-@@ -238,6 +238,17 @@ void ttree_view_node::clear()
- 
- struct ttree_view_node_implementation
- {
-+	template<class W, class It>
-+	static W* find_at_aux(It begin, It end,
-+			      const tpoint& coordinate, const bool must_be_active) {
-+		for (It it = begin; it != end; ++it) {
-+			if(W* widget = it->find_at(coordinate, must_be_active)) {
-+				return widget;
-+			}
-+		}
-+		return NULL;
-+	}
-+
- 	template<class W>
- 	static W* find_at(
- 			  typename tconst_duplicator<W, ttree_view_node>::type&
-@@ -255,13 +266,9 @@ struct ttree_view_node_implementation
- 		}
- 
- 		typedef typename tconst_duplicator<W, ttree_view_node>::type thack;
--		foreach(thack& node, tree_view_node.children_) {
--			if(W* widget = node.find_at(coordinate, must_be_active)) {
--				return widget;
--			}
--		}
--
--		return NULL;
-+		return find_at_aux<W>(tree_view_node.children_.begin(),
-+				      tree_view_node.children_.end(),
-+				      coordinate, must_be_active);
- 	}
- };
- 
-@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size
- 		return size;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz
- 		size.x += (get_indention_level() - 1) * tree_view().indention_step_size_;
- 	}
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
-@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s
- 
- 	DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n";
- 
--	foreach(const ttree_view_node& node, children_) {
-+	for (boost::ptr_vector<ttree_view_node>::const_iterator it
-+	       = children_.begin (); it != children_.end (); ++it) {
-+		const ttree_view_node& node = *it;
- 
- 		if(node.grid_.get_visible() == twidget::INVISIBLE) {
- 			continue;
diff --git a/testing/wesnoth/wesnoth-libpng-1.4.0.patch b/testing/wesnoth/wesnoth-libpng-1.4.0.patch
deleted file mode 100644
index 338f467af..000000000
--- a/testing/wesnoth/wesnoth-libpng-1.4.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp	2010-01-01 15:16:49.000000000 +0200
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp	2010-04-08 17:38:03.066201123 +0300
-@@ -174,8 +174,8 @@
- 	//TODO: review whether providing NULL error handlers is something
- 	//sensible
- 	png_struct* png_ptr = png_create_write_struct
--		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL),
--		 png_error_ptr_NULL, png_error_ptr_NULL);
-+		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL),
-+		 NULL, NULL);
- 	if(!png_ptr)
- 		throw exploder_failure("Unable to initialize the png write structure");
- 
---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600
-+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600
-@@ -15,6 +15,7 @@
- #include "exploder_utils.hpp"
- #include "game_config.hpp"
- #include "serialization/string_utils.hpp"
-+#include <zlib.h>
- #include <png.h>
-
- exploder_point::exploder_point(const std::string &s)
diff --git a/testing/wesnoth/wesnoth.install b/testing/wesnoth/wesnoth.install
deleted file mode 100644
index 4f1e419ae..000000000
--- a/testing/wesnoth/wesnoth.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-cat << EOF
-Note:
-==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma"
-==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth
-==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
-EOF
-}
diff --git a/testing/wesnoth/wesnoth.tmpfiles.conf b/testing/wesnoth/wesnoth.tmpfiles.conf
deleted file mode 100644
index 3ec0f6013..000000000
--- a/testing/wesnoth/wesnoth.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/wesnothd 0700 root root -
diff --git a/testing/windowmaker-crm-git/PKGBUILD b/testing/windowmaker-crm-git/PKGBUILD
deleted file mode 100644
index 31eb55aa3..000000000
--- a/testing/windowmaker-crm-git/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148341 2012-01-30 18:51:29Z ibiru $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=windowmaker-crm-git
-pkgver=20120109
-pkgrel=2
-pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra"
-arch=(i686 x86_64)
-url="http://www.windowmaker.org"
-license=('GPL' 'custom')
-depends=('libxinerama' 'libxrandr' 'libpng' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu')
-options=('!libtool')
-provides=('windowmaker')
-conflicts=('windowmaker')
-source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)
-md5sums=('abe70f9cc7606c73a9bbe498cacf925a'
-         '2fba97bebfd691836b92b8f0db79ff13')
-
-build() {
-  cd $srcdir/windowmaker-$pkgver
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
-    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
-    --enable-usermenu --enable-modelock --enable-xrandr
-  make
-}
-
-package() {
-  cd $srcdir/windowmaker-$pkgver
-  
-  make DESTDIR=$pkgdir install
-  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
-  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
-
-}
diff --git a/testing/windowmaker-crm-git/libpng-1.4.patch b/testing/windowmaker-crm-git/libpng-1.4.patch
deleted file mode 100644
index 5dbe5fd25..000000000
--- a/testing/windowmaker-crm-git/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur windowmaker-20091221-orig/wrlib/load.c windowmaker-20091221/wrlib/load.c
---- windowmaker-20091221-orig/wrlib/load.c	2010-01-21 17:01:10.000000000 -0500
-+++ windowmaker-20091221/wrlib/load.c	2010-01-21 17:02:38.000000000 -0500
-@@ -327,7 +327,7 @@
- 
- #ifdef USE_PNG
- 	/* check for PNG */
--	if (png_check_sig(buffer, 8))
-+	if (!png_sig_cmp(buffer, 0, 8))
- 		return IM_PNG;
- #endif
- 
diff --git a/testing/windowmaker-crm-git/wmaker.desktop b/testing/windowmaker-crm-git/wmaker.desktop
deleted file mode 100644
index f819c7577..000000000
--- a/testing/windowmaker-crm-git/wmaker.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=windowmaker
-Exec=/usr/bin/wmaker
-Type=Application
diff --git a/testing/windowmaker/PKGBUILD b/testing/windowmaker/PKGBUILD
deleted file mode 100644
index 6dd5054e9..000000000
--- a/testing/windowmaker/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148339 2012-01-30 18:51:26Z ibiru $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-pkgname=windowmaker
-pkgver=0.95.0
-pkgrel=2
-pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
-arch=(i686 x86_64)
-url="http://www.windowmaker.org/"
-license=('GPL' 'custom')
-depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)  
-md5sums=('2d89834b4019e0a08641709ea7235db2'
-         '2fba97bebfd691836b92b8f0db79ff13')
-
-build() {
-  cd $srcdir/windowmaker-$pkgver
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
-    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
-    --enable-usermenu --enable-modelock --enable-xrandr
-  make
-}
-
-package() {
-  cd $srcdir/windowmaker-$pkgver
-  
-  make DESTDIR=$pkgdir install
-  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
-  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
-}
-
diff --git a/testing/windowmaker/libpng-1.4.patch b/testing/windowmaker/libpng-1.4.patch
deleted file mode 100644
index 419e8faca..000000000
--- a/testing/windowmaker/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c
---- WindowMaker-0.92.0-orig/wrlib/load.c	2010-01-21 16:10:39.000000000 -0500
-+++ WindowMaker-0.92.0/wrlib/load.c	2010-01-21 16:13:15.000000000 -0500
-@@ -348,7 +348,7 @@
- 
- #ifdef USE_PNG
-     /* check for PNG */
--    if (png_check_sig(buffer, 8))
-+    if (!png_sig_cmp(buffer, 0, 8))
-         return IM_PNG;
- #endif
- 
diff --git a/testing/windowmaker/windowmaker-gcc4.patch.tar.bz2 b/testing/windowmaker/windowmaker-gcc4.patch.tar.bz2
deleted file mode 100644
index fae12a98d..000000000
--- a/testing/windowmaker/windowmaker-gcc4.patch.tar.bz2
+++ /dev/null
diff --git a/testing/windowmaker/wmaker.desktop b/testing/windowmaker/wmaker.desktop
deleted file mode 100644
index f819c7577..000000000
--- a/testing/windowmaker/wmaker.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=windowmaker
-Exec=/usr/bin/wmaker
-Type=Application
diff --git a/testing/wv/PKGBUILD b/testing/wv/PKGBUILD
deleted file mode 100644
index 6a8501425..000000000
--- a/testing/wv/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 148343 2012-01-30 18:51:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=wv
-pkgver=1.2.9
-pkgrel=1
-pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/wvware"
-license=('GPL')
-depends=('libgsf' 'libpng' 'sh')
-makedepends=('pkg-config')
-options=('!libtool')
-source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/wv/fix-soname.patch b/testing/wv/fix-soname.patch
deleted file mode 100644
index 81dff86e6..000000000
--- a/testing/wv/fix-soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure
---- wv-1.2.7.orig//configure	2009-09-21 12:22:46.000000000 +0200
-+++ wv-1.2.7//configure	2010-06-08 12:00:27.948857203 +0200
-@@ -2082,8 +2082,8 @@
- WV_MAJOR_VERSION=1
- WV_MINOR_VERSION=2
- WV_MICRO_VERSION=7
--WV_INTERFACE_AGE=3
--WV_BINARY_AGE=3
-+WV_INTERFACE_AGE=4
-+WV_BINARY_AGE=4
- WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION
- 
- 
diff --git a/testing/wxgtk/PKGBUILD b/testing/wxgtk/PKGBUILD
deleted file mode 100644
index 406bc4251..000000000
--- a/testing/wxgtk/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 148345 2012-01-30 18:51:33Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=wxgtk
-pkgver=2.8.12.1
-pkgrel=3
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
-
-build() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
-#  cd "${srcdir}/wxGTK-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=builtin \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
-    --disable-precomp-headers
-  make
-  make -C locale allmo
-  cd contrib/src
-  make
-}
-
-package() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
-#  cd "${srcdir}/wxGTK-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  cd contrib/src
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD
deleted file mode 100644
index 292840a72..000000000
--- a/testing/x264/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 149117 2012-02-05 21:34:25Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20120204
-pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('4d793ecc4f9d308724ea47edf400f312')
-
-build() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable"
-
-    ./configure --enable-shared
-
-    make
-}
-package() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable"
-
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xaos/PKGBUILD b/testing/xaos/PKGBUILD
deleted file mode 100644
index 887f24325..000000000
--- a/testing/xaos/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148347 2012-01-30 18:51:36Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xaos
-pkgver=3.5
-pkgrel=5
-pkgdesc="A fast portable real-time interactive fractal zoomer"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/xaos/"
-license=('GPL')
-depends=('gsl' 'libpng' 'aalib')
-options=('!makeflags')
-install=xaos.install
-source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch)
-sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801'
-          '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../xaos-3.5-libpng15.patch
-  ./configure --prefix=/usr --with-gsl --with-aa-driver
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/xaos/xaos-3.5-libpng15.patch b/testing/xaos/xaos-3.5-libpng15.patch
deleted file mode 100644
index beece8339..000000000
--- a/testing/xaos/xaos-3.5-libpng15.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-http://code.google.com/p/gnuxaos/issues/detail?id=55
-
---- src/util/png.c
-+++ src/util/png.c
-@@ -3,6 +3,7 @@
- #include <aconfig.h>
- #ifdef USE_PNG
- #include <png.h>
-+#include <zlib.h>
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-@@ -31,6 +32,9 @@
-     png_structp png_ptr;
-     png_infop info_ptr;
-     png_color palette[256];
-+    png_color_8 sig_bit;
-+    int color_type;
-+    int bit_depth;
-     volatile unsigned short a = 255;
-     volatile unsigned char *b = (volatile unsigned char *) &a;
- #ifdef _undefined_
-@@ -59,7 +63,7 @@
- 	png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- 	return "No memory to create png info structure";
-     }
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	fclose(file);
- 	return strerror(errno);
-@@ -78,57 +82,70 @@
-     png_set_compression_window_bits(png_ptr, 15);
-     png_set_compression_method(png_ptr, 8);
- 
--    info_ptr->width = image->width;
--    info_ptr->height = image->height;
--    /*info_ptr->gamma=1.0; */
--    info_ptr->gamma = 0.5;
--    info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
--    info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
--    info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
-+    switch (image->palette->type)
-+    {
-+    case C256:
-+	color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth = image->bytesperpixel * 8;
-+	break;
-+    case SMALLITER:
-+    case LARGEITER:
-+    case GRAYSCALE:
-+	color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth = image->bytesperpixel * 8;
-+	break;
-+    case TRUECOLOR:
-+    case TRUECOLOR24:
-+    case TRUECOLOR16:
-+	color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth = 8;
-+	break;
-+    }
- 
-+    png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
-+		  color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+		  PNG_FILTER_TYPE_BASE);
- 
-     switch (image->palette->type) {
-     case C256:
- 	{
- 	    int i;
--	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--	    info_ptr->bit_depth = image->bytesperpixel * 8;
--	    info_ptr->palette = palette;
--	    info_ptr->valid |= PNG_INFO_PLTE;
-+	    png_color png_palette[257];
-+	    int png_num_palette;
- 	    for (i = 0; i < image->palette->end; i++)
--		info_ptr->palette[i].red = image->palette->rgb[i][0],
--		    info_ptr->palette[i].green = image->palette->rgb[i][1],
--		    info_ptr->palette[i].blue = image->palette->rgb[i][2],
--		    info_ptr->num_palette = image->palette->end;
-+		png_palette[i].red = image->palette->rgb[i][0],
-+		    png_palette[i].green = image->palette->rgb[i][1],
-+		    png_palette[i].blue = image->palette->rgb[i][2],
-+		    png_num_palette = image->palette->end;
-+	    png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
- 	}
- 	break;
--    case SMALLITER:
--    case LARGEITER:
--    case GRAYSCALE:
--	info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
--	info_ptr->bit_depth = image->bytesperpixel * 8;
--	break;
-     case TRUECOLOR:
-     case TRUECOLOR24:
-     case TRUECOLOR16:
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->bit_depth = 8;
--	info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
--	info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
--	info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	sig_bit.red = 8 - image->palette->info.truec.rprec;
-+	sig_bit.green = 8 - image->palette->info.truec.gprec;
-+	sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+	png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- 	break;
-     }
--    info_ptr->interlace_type = 0;
-+
-+    png_write_info (png_ptr, info_ptr);
-+
- #ifdef _undefined_
-     png_set_text(png_ptr, info_ptr, comments,
- 		 sizeof(comments) / sizeof(png_text));
- #endif
- 
--    png_write_info(png_ptr, info_ptr);
-+    png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
-+    png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
-+		 (png_uint_32) (100 / image->pixelheight),
-+		 PNG_RESOLUTION_UNKNOWN);
-+
-     /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
-     png_set_packing(png_ptr);
-     if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
--	png_set_shift(png_ptr, &(info_ptr->sig_bit));
-+	png_set_shift (png_ptr, &sig_bit);
-     if (*b == 255)
- 	png_set_swap(png_ptr);
-     png_set_bgr(png_ptr);
diff --git a/testing/xaos/xaos.install b/testing/xaos/xaos.install
deleted file mode 100644
index afee50a72..000000000
--- a/testing/xaos/xaos.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(xaos.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/xaw3d/PKGBUILD b/testing/xaw3d/PKGBUILD
deleted file mode 100644
index a0b8a637c..000000000
--- a/testing/xaw3d/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 148620 2012-02-04 13:37:58Z andyrtr $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xaw3d
-pkgver=1.6
-pkgrel=1
-pkgdesc="Three-D Athena widgets"
-arch=('i686' 'x86_64')
-url="http://directory.fsf.org/project/xaw3d/"
-license=('MIT')
-depends=('libxmu')
-makedepends=('xorg-util-macros')
-options=('!libtool')
-source=(http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-${pkgver}.tar.bz2)
-md5sums=('db88f0c5afc5f285e046d84e15ad30de')
-
-build() {
-  cd "${srcdir}/libXaw3d-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/libXaw3d-${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/xaw3d/xaw3d.patch b/testing/xaw3d/xaw3d.patch
deleted file mode 100644
index d126f7c5c..000000000
--- a/testing/xaw3d/xaw3d.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig	2003-02-10 18:22:26.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c	2008-10-06 10:07:46.000000000 +0200
-@@ -1087,7 +1087,11 @@ static void NotifyThumb (w, event, param
-     Cardinal *num_params;	/* unused */
- {
-     register ScrollbarWidget sbw = (ScrollbarWidget) w;
--    float top = sbw->scrollbar.top;
-+    union {
-+	XtPointer pt;
-+	float	  top;
-+    } foo;
-+    foo.top = sbw->scrollbar.top;
- 
- #ifndef XAW_ARROW_SCROLLBARS
-     if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */
-@@ -1116,10 +1120,10 @@ static void NotifyThumb (w, event, param
-     /* Removed the dependancy on scrollbar arrows. Xterm as distributed in
-        X11R6.6 by The XFree86 Project wants this correction, with or without
-        the arrows. */
--    top += 0.0001;
-+    foo.top += 0.0001;
- /* #endif */
--    XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top);
--    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top);
-+    XtCallCallbacks (w, XtNthumbProc, foo.pt);
-+    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
- }
- 
- 
diff --git a/testing/xawtv/PKGBUILD b/testing/xawtv/PKGBUILD
deleted file mode 100644
index 1141328da..000000000
--- a/testing/xawtv/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 148349 2012-01-30 18:51:39Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=xawtv
-pkgver=3.101
-pkgrel=2
-pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux"
-arch=('i686' 'x86_64')
-url="http://git.linuxtv.org/xawtv3.git"
-license=('GPL')
-depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm')
-makedepends=('mesa')
-source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
-md5sums=('330ce1789595e370be34ad4cae3dc3fa')
-                  
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  autoconf
-  autoheader
-  ./configure --prefix=/usr --disable-motif --disable-quicktime
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/xbill/03_fix_ftbfs_binutils_gold.diff b/testing/xbill/03_fix_ftbfs_binutils_gold.diff
deleted file mode 100644
index 09436cd79..000000000
--- a/testing/xbill/03_fix_ftbfs_binutils_gold.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix FTBFS with binutils-gold
-Author: Vincent Legout <vincent@legout.info>
-Bug-Debian: http://bugs.debian.org/556690
-Last-Update: 2009-12-08
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -21,7 +21,7 @@
- VPATH = @srcdir@
- 
- ALL_CFLAGS =	$(CFLAGS) $(CPPFLAGS) -I$(srcdir)
--ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS)
-+ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS) -lXpm
- IMAGE_DEFINES=-DIMAGES=\"${datadir}/xbill\"
- SCORE_DEFINES=-DSCOREFILE=\"${localstatedir}/xbill.scores\"
- 
diff --git a/testing/xbill/PKGBUILD b/testing/xbill/PKGBUILD
deleted file mode 100644
index 5245aabe0..000000000
--- a/testing/xbill/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 148626 2012-02-04 13:38:07Z andyrtr $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xbill
-pkgver=2.1
-pkgrel=8
-pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
-arch=('i686' 'x86_64')
-url="http://www.xbill.org/"
-license=('GPL')
-depends=('xaw3d>=1.6')
-makedepends=('libxaw')
-install=xbill.install
-source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz
-        03_fix_ftbfs_binutils_gold.diff)
-md5sums=('585e4866b15255a24203db9959407b2f'
-         'e260a6cd4f9af003d249961cb60e2d01')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # taken from Debian
-  patch -Np1 -i ${srcdir}/03_fix_ftbfs_binutils_gold.diff
-  autoconf -v -f
-  ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
-    --disable-motif  --enable-athena --disable-gtk
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-# set appropriate permissions and destinations
-  chown root:games "${pkgdir}/usr/bin/xbill"
-  chmod 2755 "${pkgdir}/usr/bin/xbill"
-
-  chown root:games "${pkgdir}/var/games"
-  chmod 775 "${pkgdir}/var/games"
-  chown root:games "${pkgdir}/var/games/xbill"
-  chmod 775 "${pkgdir}/var/games/xbill"
-
-# Handle the scores file creation in the install script
-  rm "${pkgdir}/var/games/xbill/scores"
-}
diff --git a/testing/xbill/xbill.install b/testing/xbill/xbill.install
deleted file mode 100644
index b68d88071..000000000
--- a/testing/xbill/xbill.install
+++ /dev/null
@@ -1,26 +0,0 @@
-pre_install() {
-  if [ ! -e var/games/xbill/scores -a -e usr/var/xbill/scores ]; then
-    mkdir -p var/games/xbill
-    mv usr/var/xbill/scores var/games/xbill/scores
-  fi
-}
-
-post_install() {
-  touch var/games/xbill/scores
-  chown root:games var/games/xbill/scores
-  chmod 664 var/games/xbill/scores
-}
-
-pre_upgrade() {
-  pre_install $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  if [ -e var/games/xbill/scores ]; then
-    mv var/games/xbill/scores var/games/xbill/scores.pacsave
-  fi
-}
diff --git a/testing/xf86-video-sis/sis-0.10.3-git.patch b/testing/xf86-video-sis/sis-0.10.3-git.patch
deleted file mode 100644
index d355e15b1..000000000
--- a/testing/xf86-video-sis/sis-0.10.3-git.patch
+++ /dev/null
@@ -1,1460 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 33c0d65..036a448 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,54 +20,53 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-sis],
--        0.10.3,
-+        [0.10.3],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-sis)
--
-+        [xf86-video-sis])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
--XORG_PROG_RAWCPP
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-                                   [Disable DRI support [[default=auto]]]),
-               [DRI="$enableval"],
-               [DRI=auto])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
-+# Obtain compiler/linker options for the driver dependencies
-+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto >= 2.1 $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
-@@ -76,9 +75,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "$DRI" != no; then
-         AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-@@ -118,20 +114,19 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
--    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
-+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
-     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([DRI_CFLAGS])
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=sis
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 1b26ac2..9ceb36f 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MANDEFS =  \
--	-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
--	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
--	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
--	-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
--	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
--	-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
--	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
--	-D__xconfigfile__=xorg.conf \
--	-D__xservername__=Xorg
--
--# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
--# to cpp, because that trick does not work on all ANSI C preprocessors.
--# Delete line numbers from the cpp output (-P is not portable, I guess).
--# Allow XCOMM to be preceded by whitespace and provide a means of generating
--# output lines with trailing backslashes.
--# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
--
--CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
--                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
--                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
--                       -e '/\@\@$$/s/\@\@$$/\\/'
--
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- .man.$(DRIVER_MAN_SUFFIX):
--	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
- 
-diff --git a/man/sis.man b/man/sis.man
-index 9ae4a1b..578bb68 100644
---- a/man/sis.man
-+++ b/man/sis.man
-@@ -1,17 +1,5 @@
--.\" $XFree86$
--.\" $XdotOrg$
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
--#ifdef __xservername__
--#define __myservername__ __xservername__
--#else
--#define __myservername__ XFree86
--#endif
--#ifdef __xconfigfile__
--#define __myxconfigfile__ __xconfigfile__
--#else
--#define __myxconfigfile__ XF86Config
--#endif
- .TH SIS __drivermansuffix__ __vendorversion__
- .SH NAME
- sis \- SiS and XGI video driver
-@@ -25,7 +13,7 @@ sis \- SiS and XGI video driver
- .fi
- .SH DESCRIPTION
- .B sis
--is an __myservername__ driver for SiS (Silicon Integrated Systems) and XGI video
-+is an __xservername__ driver for SiS (Silicon Integrated Systems) and XGI video
- chips. The driver is accelerated and provides support for colordepths of 8, 16
- and 24 bpp. XVideo, Render and other extensions are supported as well.
- .SH SUPPORTED HARDWARE
-@@ -60,7 +48,7 @@ for SiS315, 55x, 330, 661/741/76x (plus M, FX, MX, GX variants thereof), 340
- and all XGI chips.
- .PP
- .SH CONFIGURATION DETAILS
--Please refer to __myxconfigfile__(__filemansuffix__) for general configuration
-+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details.  This section only covers configuration details specific to this
- driver.
- .PP
-@@ -428,11 +416,7 @@ The amount is to be specified in megabyte, the default is 8.
- .SH "KNOWN BUGS"
- none.
- .SH "SEE ALSO"
--#ifdef __xservername__
- __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
--#else
--XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
--#endif
- .PP
- .B "http://www.winischhofer.eu/linuxsisvga.shtml"
- for more information and updates
-diff --git a/src/initextx.c b/src/initextx.c
-index 5c00398..1e84d0f 100644
---- a/src/initextx.c
-+++ b/src/initextx.c
-@@ -238,10 +238,10 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 	 continue;
-       }
- 
--      if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+      if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
-       memset(new, 0, sizeof(DisplayModeRec));
--      if(!(new->name = xalloc(10))) {
--	 xfree(new);
-+      if(!(new->name = malloc(10))) {
-+	 free(new);
- 	 return first;
-       }
-       if(!first) first = new;
-@@ -385,11 +385,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 		     }
- 		  }
- 
--		  if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+		  if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
- 
- 		  memset(new, 0, sizeof(DisplayModeRec));
--		  if(!(new->name = xalloc(12))) {
--		     xfree(new);
-+		  if(!(new->name = malloc(12))) {
-+		     free(new);
- 		     return first;
- 		  }
- 		  if(!first) first = new;
-@@ -470,11 +470,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 
- 	 if(pSiS->SiS_Pr->CP_DataValid[i]) {
- 
--	    if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+	    if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
- 
- 	    memset(new, 0, sizeof(DisplayModeRec));
--	    if(!(new->name = xalloc(10))) {
--	       xfree(new);
-+	    if(!(new->name = malloc(10))) {
-+	       free(new);
- 	       return first;
- 	    }
- 	    if(!first) first = new;
-diff --git a/src/osdef.h b/src/osdef.h
-index cd6b907..5776910 100644
---- a/src/osdef.h
-+++ b/src/osdef.h
-@@ -110,12 +110,12 @@
- #warning sisfb will not work!
- #endif
- 
--#define OutPortByte(p,v) outb((u8)(v),(IOADDRESS)(p))
--#define OutPortWord(p,v) outw((u16)(v),(IOADDRESS)(p))
--#define OutPortLong(p,v) outl((u32)(v),(IOADDRESS)(p))
--#define InPortByte(p)    inb((IOADDRESS)(p))
--#define InPortWord(p)    inw((IOADDRESS)(p))
--#define InPortLong(p)    inl((IOADDRESS)(p))
-+#define OutPortByte(p,v) outb((u8)(v),(unsigned long)(p))
-+#define OutPortWord(p,v) outw((u16)(v),(unsigned long)(p))
-+#define OutPortLong(p,v) outl((u32)(v),(unsigned long)(p))
-+#define InPortByte(p)    inb((unsigned long)(p))
-+#define InPortWord(p)    inw((unsigned long)(p))
-+#define InPortLong(p)    inl((unsigned long)(p))
- #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)
- 
- #endif /* LINUX_KERNEL */
-@@ -129,12 +129,12 @@
- #define SIS300
- #define SIS315H
- 
--#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v))
--#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v))
--#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v))
--#define InPortByte(p)    inSISREG((IOADDRESS)(p))
--#define InPortWord(p)    inSISREGW((IOADDRESS)(p))
--#define InPortLong(p)    inSISREGL((IOADDRESS)(p))
-+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v))
-+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v))
-+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v))
-+#define InPortByte(p)    inSISREG((unsigned long)(p))
-+#define InPortWord(p)    inSISREGW((unsigned long)(p))
-+#define InPortLong(p)    inSISREGL((unsigned long)(p))
- #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
- 
- #endif /* XF86 */
-diff --git a/src/sis.h b/src/sis.h
-index 400b83f..9af31a5 100644
---- a/src/sis.h
-+++ b/src/sis.h
-@@ -86,6 +86,14 @@
- #include "xf86cmap.h"
- #include "vbe.h"
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+#define _swapl(x, n) swapl(x,n)
-+#define _swaps(x, n) swaps(x,n)
-+#else
-+#define _swapl(x, n) swapl(x)
-+#define _swaps(x, n) swaps(x)
-+#endif
-+
- #define SIS_HaveDriverFuncs 0
- 
- #undef SISISXORG6899900
-@@ -251,7 +259,6 @@
- #endif
- 
- /* Need that for SiSCtrl and Pseudo-Xinerama */
--#define NEED_REPLIES				/* ? */
- #define EXTENSION_PROC_ARGS void *
- #include "extnsionst.h" 			/* required */
- #include <X11/extensions/panoramiXproto.h> 	/* required */
-@@ -971,7 +978,7 @@ typedef struct {
-     void 		*RealFbBase;	/* Real VRAM virtual linear address (for DHM and SiS76x UMA skipping) */
-     CARD32		IOAddress;	/* MMIO physical address */
-     void		*IOBase;	/* MMIO linear address */
--    IOADDRESS		IODBase;	/* Base of PIO memory area */
-+    unsigned long	IODBase;	/* Base of PIO memory area */
- #ifdef __alpha__
-     void		*IOBaseDense;	/* MMIO for Alpha platform */
- #endif
-@@ -1348,7 +1355,7 @@ typedef struct {
-     Bool		skipswitchcheck;
-     unsigned int	VBFlagsInit;
-     DisplayModePtr	currentModeLast;
--    IOADDRESS		MyPIOOffset;
-+    unsigned long	MyPIOOffset;
-     Bool		OverruleRanges;
-     Bool		BenchMemCpy;
-     Bool		NeedCopyFastVidCpy;
-diff --git a/src/sis6326_video.c b/src/sis6326_video.c
-index c6b18e2..66352b7 100644
---- a/src/sis6326_video.c
-+++ b/src/sis6326_video.c
-@@ -170,7 +170,7 @@ void SIS6326InitVideo(ScreenPtr pScreen)
- 		adaptors = &newAdaptor;
- 	} else {
- 		/* need to free this someplace */
--		newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+		newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- 		if(newAdaptors) {
- 			memcpy(newAdaptors, adaptors, num_adaptors *
- 				sizeof(XF86VideoAdaptorPtr));
-@@ -185,7 +185,7 @@ void SIS6326InitVideo(ScreenPtr pScreen)
- 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
-@@ -531,7 +531,7 @@ SIS6326SetupImageVideo(ScreenPtr pScreen)
-        return NULL;
- #endif
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISPortPrivRec) +
-                             sizeof(DevUnion))))
-        return NULL;
-diff --git a/src/sis_dga.c b/src/sis_dga.c
-index d358645..16b0ee4 100644
---- a/src/sis_dga.c
-+++ b/src/sis_dga.c
-@@ -150,18 +150,18 @@ SISSetupDGAMode(
- 
- 	if(pMode->HDisplay != otherPitch) {
- 
--	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
- 	    oneMore  = TRUE;
- 
- 	} else {
- 
--	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
- 	    oneMore  = FALSE;
- 
- 	}
- 
- 	if(!newmodes) {
--	    xfree(modes);
-+	    free(modes);
- 	    return NULL;
- 	}
- 	modes = newmodes;
-diff --git a/src/sis_dri.c b/src/sis_dri.c
-index 3a476a2..97ed951 100644
---- a/src/sis_dri.c
-+++ b/src/sis_dri.c
-@@ -149,19 +149,19 @@ SISInitVisualConfigs(ScreenPtr pScreen)
-   case 32:
-     numConfigs = (useZ16) ? 8 : 16;
- 
--    if(!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
-+    if(!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
- 						   numConfigs))) {
-        return FALSE;
-     }
--    if(!(pSISConfigs = (SISConfigPrivPtr)xcalloc(sizeof(SISConfigPrivRec),
-+    if(!(pSISConfigs = (SISConfigPrivPtr)calloc(sizeof(SISConfigPrivRec),
- 						    numConfigs))) {
--       xfree(pConfigs);
-+       free(pConfigs);
-        return FALSE;
-     }
--    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)xcalloc(sizeof(SISConfigPrivPtr),
-+    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)calloc(sizeof(SISConfigPrivPtr),
- 							  numConfigs))) {
--       xfree(pConfigs);
--       xfree(pSISConfigs);
-+       free(pConfigs);
-+       free(pSISConfigs);
-        return FALSE;
-     }
-     for(i=0; i<numConfigs; i++) pSISConfigPtrs[i] = &pSISConfigs[i];
-@@ -319,7 +319,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
-      pDRIInfo->busIdString = DRICreatePCIBusID(pSIS->PciInfo);
-   } else {
- #endif
--     pDRIInfo->busIdString = xalloc(64);
-+     pDRIInfo->busIdString = malloc(64);
-      sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
- 	     pSIS->PciBus, pSIS->PciDevice, pSIS->PciFunc);
- #ifdef SISHAVECREATEBUSID
-@@ -383,7 +383,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
-   pDRIInfo->SAREASize = SAREA_MAX;
- #endif
- 
--  if(!(pSISDRI = (SISDRIPtr)xcalloc(sizeof(SISDRIRec), 1))) {
-+  if(!(pSISDRI = (SISDRIPtr)calloc(sizeof(SISDRIRec), 1))) {
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-      pSIS->pDRIInfo = 0;
-      return FALSE;
-@@ -401,7 +401,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
- 
-   if(!DRIScreenInit(pScreen, pDRIInfo, &pSIS->drmSubFD)) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] DRIScreenInit failed. Disabling the DRI.\n");
--     xfree(pDRIInfo->devPrivate);
-+     free(pDRIInfo->devPrivate);
-      pDRIInfo->devPrivate = 0;
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-      pSIS->pDRIInfo = 0;
-@@ -794,7 +794,7 @@ SISDRICloseScreen(ScreenPtr pScreen)
- 
-   if(pSIS->pDRIInfo) {
-      if(pSIS->pDRIInfo->devPrivate) {
--	xfree(pSIS->pDRIInfo->devPrivate);
-+	free(pSIS->pDRIInfo->devPrivate);
- 	pSIS->pDRIInfo->devPrivate = NULL;
-      }
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-@@ -802,12 +802,12 @@ SISDRICloseScreen(ScreenPtr pScreen)
-   }
- 
-   if(pSIS->pVisualConfigs) {
--     xfree(pSIS->pVisualConfigs);
-+     free(pSIS->pVisualConfigs);
-      pSIS->pVisualConfigs = NULL;
-   }
- 
-   if(pSIS->pVisualConfigsPriv) {
--     xfree(pSIS->pVisualConfigsPriv);
-+     free(pSIS->pVisualConfigsPriv);
-      pSIS->pVisualConfigsPriv = NULL;
-   }
- 
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index d95b5f1..7ac9487 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -74,8 +74,7 @@
- 
- #include "sis_driver.h"
- 
--#define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- 
- #include "globals.h"
- 
-@@ -91,6 +90,26 @@
- #include "dri.h"
- #endif
- 
-+/*
-+ * LookupWindow was removed with video abi 11.
-+ */
-+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
-+#ifndef DixGetAttrAccess
-+#define DixGetAttrAccess   (1<<4)
-+#endif
-+#endif
-+
-+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 2)
-+static inline int
-+dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
-+{
-+    *pWin = LookupWindow(id, client);
-+    if (!*pWin)
-+	return BadWindow;
-+    return Success;
-+}
-+#endif
-+
- /* Globals (yes, these ARE really required to be global) */
- 
- #ifdef SISUSEDEVPORT
-@@ -299,9 +318,9 @@ SISFreeRec(ScrnInfoPtr pScrn)
-     pSiSEnt = pSiS->entityPrivate;
- #endif
- 
--    if(pSiS->pstate) xfree(pSiS->pstate);
-+    if(pSiS->pstate) free(pSiS->pstate);
-     pSiS->pstate = NULL;
--    if(pSiS->fonts) xfree(pSiS->fonts);
-+    if(pSiS->fonts) free(pSiS->fonts);
-     pSiS->fonts = NULL;
- 
- #ifdef SISDUALHEAD
-@@ -312,11 +331,11 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	   * and we need the BIOS image and SiS_Private for the first
- 	   * head.
- 	   */
--	  if(pSiSEnt->BIOS) xfree(pSiSEnt->BIOS);
-+	  if(pSiSEnt->BIOS) free(pSiSEnt->BIOS);
- 	  pSiSEnt->BIOS = pSiS->BIOS = NULL;
--	  if(pSiSEnt->SiS_Pr) xfree(pSiSEnt->SiS_Pr);
-+	  if(pSiSEnt->SiS_Pr) free(pSiSEnt->SiS_Pr);
- 	  pSiSEnt->SiS_Pr = pSiS->SiS_Pr = NULL;
--	  if(pSiSEnt->RenderAccelArray) xfree(pSiSEnt->RenderAccelArray);
-+	  if(pSiSEnt->RenderAccelArray) free(pSiSEnt->RenderAccelArray);
- 	  pSiSEnt->RenderAccelArray = pSiS->RenderAccelArray = NULL;
- 	  pSiSEnt->pScrn_1 = NULL;
-        } else {
-@@ -327,21 +346,21 @@ SISFreeRec(ScrnInfoPtr pScrn)
-        }
-     } else {
- #endif
--       if(pSiS->BIOS) xfree(pSiS->BIOS);
-+       if(pSiS->BIOS) free(pSiS->BIOS);
-        pSiS->BIOS = NULL;
--       if(pSiS->SiS_Pr) xfree(pSiS->SiS_Pr);
-+       if(pSiS->SiS_Pr) free(pSiS->SiS_Pr);
-        pSiS->SiS_Pr = NULL;
--       if(pSiS->RenderAccelArray) xfree(pSiS->RenderAccelArray);
-+       if(pSiS->RenderAccelArray) free(pSiS->RenderAccelArray);
-        pSiS->RenderAccelArray = NULL;
- #ifdef SISDUALHEAD
-     }
- #endif
- #ifdef SISMERGED
--    if(pSiS->CRT2HSync) xfree(pSiS->CRT2HSync);
-+    if(pSiS->CRT2HSync) free(pSiS->CRT2HSync);
-     pSiS->CRT2HSync = NULL;
--    if(pSiS->CRT2VRefresh) xfree(pSiS->CRT2VRefresh);
-+    if(pSiS->CRT2VRefresh) free(pSiS->CRT2VRefresh);
-     pSiS->CRT2VRefresh = NULL;
--    if(pSiS->MetaModes) xfree(pSiS->MetaModes);
-+    if(pSiS->MetaModes) free(pSiS->MetaModes);
-     pSiS->MetaModes = NULL;
-     if(pSiS->CRT2pScrn) {
-        if(pSiS->CRT2pScrn->modes) {
-@@ -353,10 +372,10 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	     while(pSiS->CRT2pScrn->monitor->Modes)
- 	        xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
- 	  }
--	  if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC);
--	  xfree(pSiS->CRT2pScrn->monitor);
-+	  if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC);
-+	  free(pSiS->CRT2pScrn->monitor);
-        }
--       xfree(pSiS->CRT2pScrn);
-+       free(pSiS->CRT2pScrn);
-        pSiS->CRT2pScrn = NULL;
-     }
-     if(pSiS->CRT1Modes) {
-@@ -366,8 +385,8 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	     do {
- 	        DisplayModePtr p = pScrn->currentMode->next;
- 	        if(pScrn->currentMode->Private)
--	 	  xfree(pScrn->currentMode->Private);
--	        xfree(pScrn->currentMode);
-+	 	  free(pScrn->currentMode->Private);
-+	        free(pScrn->currentMode);
- 	        pScrn->currentMode = p;
- 	     } while(pScrn->currentMode != pScrn->modes);
- 	  }
-@@ -380,7 +399,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- #endif
-     while(pSiS->SISVESAModeList) {
-        sisModeInfoPtr mp = pSiS->SISVESAModeList->next;
--       xfree(pSiS->SISVESAModeList);
-+       free(pSiS->SISVESAModeList);
-        pSiS->SISVESAModeList = mp;
-     }
-     if(pSiS->pVbe) vbeFree(pSiS->pVbe);
-@@ -392,7 +411,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 
-     if(pScrn->driverPrivate == NULL)
-         return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -501,7 +520,7 @@ SISProbe(DriverPtr drv, int flags)
- 			numDevSections, drv, &usedChipsXGI);
- 
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
- 
-     numUsed = numUsedSiS + numUsedXGI;
- 
-@@ -577,8 +596,8 @@ SISProbe(DriverPtr drv, int flags)
- 
-     }
- 
--    if(usedChipsSiS) xfree(usedChipsSiS);
--    if(usedChipsXGI) xfree(usedChipsXGI);
-+    if(usedChipsSiS) free(usedChipsSiS);
-+    if(usedChipsXGI) free(usedChipsXGI);
- 
-     return foundScreen;
- }
-@@ -642,10 +661,10 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
-    if(!(nramp = xf86GetGammaRampSize(pScreen))) return;
- 
-    for(i=0; i<3; i++) {
--      ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort));
-+      ramp[i] = (UShort *)malloc(nramp * sizeof(UShort));
-       if(!ramp[i]) {
--	 if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; }
--	 if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; }
-+	 if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; }
-+	 if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; }
- 	 return;
-       }
-    }
-@@ -705,9 +724,9 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
- 
-    xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]);
- 
--   xfree(ramp[0]);
--   xfree(ramp[1]);
--   xfree(ramp[2]);
-+   free(ramp[0]);
-+   free(ramp[1]);
-+   free(ramp[2]);
-    ramp[0] = ramp[1] = ramp[2] = NULL;
- }
- #endif
-@@ -1135,10 +1154,10 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-     DisplayModePtr mode;
-     int dx = 0,dy = 0;
- 
--    if(!((mode = xalloc(sizeof(DisplayModeRec))))) return dest;
-+    if(!((mode = malloc(sizeof(DisplayModeRec))))) return dest;
-     memcpy(mode, i, sizeof(DisplayModeRec));
--    if(!((mode->Private = xalloc(sizeof(SiSMergedDisplayModeRec))))) {
--       xfree(mode);
-+    if(!((mode->Private = malloc(sizeof(SiSMergedDisplayModeRec))))) {
-+       free(mode);
-        return dest;
-     }
-     ((SiSMergedDisplayModePtr)mode->Private)->CRT1 = i;
-@@ -1223,8 +1242,8 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		"Skipped \"%s\" (%dx%d), not enough video RAM or beyond hardware specs\n",
- 		mode->name, mode->HDisplay, mode->VDisplay);
--       xfree(mode->Private);
--       xfree(mode);
-+       free(mode->Private);
-+       free(mode);
- 
-        return dest;
-     }
-@@ -2131,10 +2150,10 @@ SiSProcXineramaQueryVersion(ClientPtr client)
-     rep.majorVersion = SIS_XINERAMA_MAJOR_VERSION;
-     rep.minorVersion = SIS_XINERAMA_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -2147,19 +2166,20 @@ SiSProcXineramaGetState(ClientPtr client)
-     WindowPtr			pWin;
-     xPanoramiXGetStateReply	rep;
-     register int		n;
-+    int				rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
--    pWin = LookupWindow(stuff->window, client);
--    if(!pWin) return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-     rep.sequenceNumber = client->sequence;
-     rep.state = !SiSnoPanoramiXExtension;
-     if(client->swapped) {
--       swaps (&rep.sequenceNumber, n);
--       swapl (&rep.length, n);
--       swaps (&rep.state, n);
-+       _swaps (&rep.sequenceNumber, n);
-+       _swapl (&rep.length, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
-     return client->noClientException;
-@@ -2172,19 +2192,20 @@ SiSProcXineramaGetScreenCount(ClientPtr client)
-     WindowPtr				pWin;
-     xPanoramiXGetScreenCountReply	rep;
-     register int			n;
-+    int					rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
--    pWin = LookupWindow(stuff->window, client);
--    if(!pWin) return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-     rep.sequenceNumber = client->sequence;
-     rep.ScreenCount = SiSXineramaNumScreens;
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swaps(&rep.ScreenCount, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
-     return client->noClientException;
-@@ -2197,10 +2218,12 @@ SiSProcXineramaGetScreenSize(ClientPtr client)
-     WindowPtr				pWin;
-     xPanoramiXGetScreenSizeReply	rep;
-     register int			n;
-+    int					rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
--    pWin = LookupWindow (stuff->window, client);
--    if(!pWin)  return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-@@ -2208,10 +2231,10 @@ SiSProcXineramaGetScreenSize(ClientPtr client)
-     rep.width  = SiSXineramadataPtr[stuff->screen].width;
-     rep.height = SiSXineramadataPtr[stuff->screen].height;
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swaps(&rep.width, n);
--       swaps(&rep.height, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.width, n);
-+       _swapl(&rep.height, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
-     return client->noClientException;
-@@ -2230,9 +2253,9 @@ SiSProcXineramaIsActive(ClientPtr client)
-     rep.state = !SiSnoPanoramiXExtension;
-     if(client->swapped) {
- 	register int n;
--	swaps(&rep.sequenceNumber, n);
--	swapl(&rep.length, n);
--	swapl(&rep.state, n);
-+	_swaps(&rep.sequenceNumber, n);
-+	_swapl(&rep.length, n);
-+	_swapl(&rep.state, n);
-     }
-     WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
-     return client->noClientException;
-@@ -2251,9 +2274,9 @@ SiSProcXineramaQueryScreens(ClientPtr client)
-     rep.length = rep.number * sz_XineramaScreenInfo >> 2;
-     if(client->swapped) {
-        register int n;
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.number, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.number, n);
-     }
-     WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
- 
-@@ -2268,10 +2291,10 @@ SiSProcXineramaQueryScreens(ClientPtr client)
- 	  scratch.height = SiSXineramadataPtr[i].height;
- 	  if(client->swapped) {
- 	     register int n;
--	     swaps(&scratch.x_org, n);
--	     swaps(&scratch.y_org, n);
--	     swaps(&scratch.width, n);
--	     swaps(&scratch.height, n);
-+	     _swaps(&scratch.x_org, n);
-+	     _swaps(&scratch.y_org, n);
-+	     _swaps(&scratch.width, n);
-+	     _swaps(&scratch.height, n);
- 	  }
- 	  WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch);
-        }
-@@ -2308,7 +2331,7 @@ SiSSProcXineramaQueryVersion (ClientPtr client)
- {
-     REQUEST(xPanoramiXQueryVersionReq);
-     register int n;
--    swaps(&stuff->length,n);
-+    _swaps(&stuff->length,n);
-     REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
-     return SiSProcXineramaQueryVersion(client);
- }
-@@ -2318,7 +2341,7 @@ SiSSProcXineramaGetState(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetStateReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-     return SiSProcXineramaGetState(client);
- }
-@@ -2328,7 +2351,7 @@ SiSSProcXineramaGetScreenCount(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetScreenCountReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-     return SiSProcXineramaGetScreenCount(client);
- }
-@@ -2338,7 +2361,7 @@ SiSSProcXineramaGetScreenSize(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetScreenSizeReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-     return SiSProcXineramaGetScreenSize(client);
- }
-@@ -2348,7 +2371,7 @@ SiSSProcXineramaIsActive(ClientPtr client)
- {
-     REQUEST(xXineramaIsActiveReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
-     return SiSProcXineramaIsActive(client);
- }
-@@ -2358,7 +2381,7 @@ SiSSProcXineramaQueryScreens(ClientPtr client)
- {
-     REQUEST(xXineramaQueryScreensReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-     return SiSProcXineramaQueryScreens(client);
- }
-@@ -2389,7 +2412,7 @@ SiSXineramaResetProc(ExtensionEntry* extEntry)
- {
-     /* Called by CloseDownExtensions() */
-     if(SiSXineramadataPtr) {
--       Xfree(SiSXineramadataPtr);
-+       free(SiSXineramadataPtr);
-        SiSXineramadataPtr = NULL;
-     }
- }
-@@ -2454,7 +2477,7 @@ SiSXineramaExtensionInit(ScrnInfoPtr pScrn)
- 	  if(!pSiS->XineramaExtEntry) break;
- 
- 	  if(!(SiSXineramadataPtr = (SiSXineramaData *)
--	        xcalloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
-+	        calloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
- 
- 	  SiSXineramaGeneration = serverGeneration;
- 	  success = TRUE;
-@@ -2493,10 +2516,10 @@ SiSFreeCRT2Structs(SISPtr pSiS)
- 	     while(pSiS->CRT2pScrn->monitor->Modes)
- 		xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
- 	  }
--	  if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC);
--	  xfree(pSiS->CRT2pScrn->monitor);
-+	  if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC);
-+	  free(pSiS->CRT2pScrn->monitor);
-        }
--       xfree(pSiS->CRT2pScrn);
-+       free(pSiS->CRT2pScrn);
-        pSiS->CRT2pScrn = NULL;
-    }
- }
-@@ -2902,22 +2925,22 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 	     Bool gotit = FALSE;
- 
-  	     if(!ioctl(fd, SISFB_GET_INFO_SIZE, &sisfbinfosize)) {
-- 		if((mysisfbinfo = xalloc(sisfbinfosize))) {
-+ 		if((mysisfbinfo = malloc(sisfbinfosize))) {
-  		   if(!ioctl(fd, (SISFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) {
-  		      gotit = TRUE;
-  		   } else {
-- 		      xfree(mysisfbinfo);
-+ 		      free(mysisfbinfo);
-  		      mysisfbinfo = NULL;
-  		   }
-  		}
-  	     } else {
-- 		if((mysisfbinfo = xalloc(sizeof(*mysisfbinfo) + 16))) {
-+ 		if((mysisfbinfo = malloc(sizeof(*mysisfbinfo) + 16))) {
-  		   if(!ioctl(fd, SISFB_GET_INFO_OLD, mysisfbinfo)) {
-  		      gotit = TRUE;
- 		      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 				"Possibly old version of sisfb detected. Please update.\n");
- 		   } else {
--		      xfree(mysisfbinfo);
-+		      free(mysisfbinfo);
- 		      mysisfbinfo = NULL;
- 		   }
- 		}
-@@ -3056,7 +3079,7 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 		      }
- 		   }
- 	        }
--		xfree(mysisfbinfo);
-+		free(mysisfbinfo);
- 		mysisfbinfo = NULL;
- 	     }
- 	     close (fd);
-@@ -3216,7 +3239,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     pSiS->pInt = NULL;
- 
-     /* Save PCI Domain Base */
--#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
-+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) || GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-     pSiS->IODBase = 0;
- #else
-     pSiS->IODBase = pScrn->domainIOBase;
-@@ -4078,7 +4101,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        }
- #endif
-        if(!pSiS->BIOS) {
--	  if(!(pSiS->BIOS = xcalloc(1, BIOS_SIZE))) {
-+	  if(!(pSiS->BIOS = calloc(1, BIOS_SIZE))) {
- 	     xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		"Could not allocate memory for video BIOS image\n");
- 	  } else {
-@@ -4173,7 +4196,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	     } else {
- 	        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 			 "Could not find/read video BIOS\n");
--		xfree(pSiS->BIOS);
-+		free(pSiS->BIOS);
- 		pSiS->BIOS = NULL;
- 	     }
-           }
-@@ -5559,7 +5582,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     /* Do some MergedFB mode initialisation */
- #ifdef SISMERGED
-     if(pSiS->MergedFB) {
--       pSiS->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
-+       pSiS->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
-        if(!pSiS->CRT2pScrn) {
-           SISErrorLog(pScrn, "Failed to allocate memory for 2nd pScrn, %s\n", mergeddisstr);
- 	  pSiS->MergedFB = FALSE;
-@@ -5592,7 +5615,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 		} else {
- 		   SISErrorLog(pScrn, mergednocrt1, mergeddisstr);
- 		}
--		if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+		if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 		pSiS->CRT2pScrn = NULL;
- 		pSiS->MergedFB = FALSE;
- 	     }
-@@ -5639,7 +5662,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 		} else {
- 		   SISErrorLog(pScrn, mergednocrt2, mergeddisstr);
- 		}
--		if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+		if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 		pSiS->CRT2pScrn = NULL;
- 		pSiS->MergedFB = FALSE;
- 	     }
-@@ -6016,7 +6039,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 
- #ifdef SISMERGED
-     if(pSiS->MergedFB) {
--       pSiS->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
-+       pSiS->CRT2pScrn->monitor = malloc(sizeof(MonRec));
-        if(pSiS->CRT2pScrn->monitor) {
- 	  DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
- 	  memcpy(pSiS->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
-@@ -6025,10 +6048,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	  pSiS->CRT2pScrn->monitor->id = (char *)crt2monname;
- 	  tempm = pScrn->monitor->Modes;
- 	  while(tempm) {
--	     if(!(newm = xalloc(sizeof(DisplayModeRec)))) break;
-+	     if(!(newm = malloc(sizeof(DisplayModeRec)))) break;
- 	     memcpy(newm, tempm, sizeof(DisplayModeRec));
--	     if(!(newm->name = xalloc(strlen(tempm->name) + 1))) {
--	        xfree(newm);
-+	     if(!(newm->name = malloc(strlen(tempm->name) + 1))) {
-+	        free(newm);
- 		break;
- 	     }
- 	     strcpy(newm->name, tempm->name);
-@@ -6070,7 +6093,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        } else {
- 	  SISErrorLog(pScrn, "Failed to allocate memory for CRT2 monitor, %s.\n",
- 	  		mergeddisstr);
--	  if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+	  if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 	  pSiS->CRT2pScrn = NULL;
- 	  pSiS->MergedFB = FALSE;
-        }
-@@ -7454,7 +7477,7 @@ SISVESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
- 	     (function == MODE_SAVE)) {
- 	     /* don't rely on the memory not being touched */
- 	     if(!pSiS->pstate) {
--		pSiS->pstate = xalloc(pSiS->stateSize);
-+		pSiS->pstate = malloc(pSiS->stateSize);
- 	     }
- 	     memcpy(pSiS->pstate, pSiS->state, pSiS->stateSize);
- 	  }
-@@ -8675,7 +8698,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pSiS->ShadowFB) {
-        pSiS->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--       pSiS->ShadowPtr = xalloc(pSiS->ShadowPitch * height);
-+       pSiS->ShadowPtr = malloc(pSiS->ShadowPitch * height);
-        displayWidth = pSiS->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-        FBStart = pSiS->ShadowPtr;
-     } else {
-@@ -8849,14 +8872,14 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
- 	  pSiS->CRT2ColNum = 1 << pScrn->rgbBits;
- 
--	  if((pSiS->crt2gcolortable = xalloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
-+	  if((pSiS->crt2gcolortable = malloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
- 	     pSiS->crt2colors = &pSiS->crt2gcolortable[pSiS->CRT2ColNum];
--	     if((pSiS->crt2cindices = xalloc(256 * sizeof(int)))) {
-+	     if((pSiS->crt2cindices = malloc(256 * sizeof(int)))) {
- 		int i = pSiS->CRT2ColNum;
- 		SISCalculateGammaRampCRT2(pScrn);
- 		while(i--) pSiS->crt2cindices[i] = i;
- 	     } else {
--		xfree(pSiS->crt2gcolortable);
-+		free(pSiS->crt2gcolortable);
- 		pSiS->crt2gcolortable = NULL;
- 		pSiS->CRT2SepGamma = FALSE;
- 	     }
-@@ -9941,7 +9964,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     if(pSiS->useEXA) {
-        if(pSiS->EXADriverPtr) {
-           exaDriverFini(pScreen);
--          xfree(pSiS->EXADriverPtr);
-+          free(pSiS->EXADriverPtr);
-           pSiS->EXADriverPtr = NULL;
-           pSiS->exa_scratch = NULL;
-        }
-@@ -9954,33 +9977,33 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
- 
-     if(pSiS->ShadowPtr) {
--       xfree(pSiS->ShadowPtr);
-+       free(pSiS->ShadowPtr);
-        pSiS->ShadowPtr = NULL;
-     }
- 
-     if(pSiS->DGAModes) {
--       xfree(pSiS->DGAModes);
-+       free(pSiS->DGAModes);
-        pSiS->DGAModes = NULL;
-     }
- 
-     if(pSiS->adaptor) {
--       xfree(pSiS->adaptor);
-+       free(pSiS->adaptor);
-        pSiS->adaptor = NULL;
-        pSiS->ResetXv = pSiS->ResetXvGamma = pSiS->ResetXvDisplay = NULL;
-     }
- 
-     if(pSiS->blitadaptor) {
--       xfree(pSiS->blitadaptor);
-+       free(pSiS->blitadaptor);
-        pSiS->blitadaptor = NULL;
-     }
- 
-     if(pSiS->crt2gcolortable) {
--       xfree(pSiS->crt2gcolortable);
-+       free(pSiS->crt2gcolortable);
-        pSiS->crt2gcolortable = NULL;
-     }
- 
-     if(pSiS->crt2cindices) {
--       xfree(pSiS->crt2cindices);
-+       free(pSiS->crt2cindices);
-        pSiS->crt2cindices = NULL;
-     }
- 
-diff --git a/src/sis_memcpy.c b/src/sis_memcpy.c
-index 6ad62e8..3634401 100644
---- a/src/sis_memcpy.c
-+++ b/src/sis_memcpy.c
-@@ -638,13 +638,13 @@ SiS_AllocBuffers(ScrnInfoPtr pScrn, UChar **buf1, UChar **buf2, UChar **buf3)
-     (*buf1) = (UChar *)pSiS->FbBase + offset;
-     (*buf1) = (UChar *)(((ULong)(*buf1) + 31) & ~31);
- 
--    if(!((*buf2) = (UChar *)xalloc(BUFFERSIZE + 15))) {
-+    if(!((*buf2) = (UChar *)malloc(BUFFERSIZE + 15))) {
-        SISFreeFBMemory(pScrn, &handle);
-        return NULL;
-     }
- 
--    if(!((*buf3) = (UChar *)xalloc(BUFFERSIZE + 15))) {
--       xfree((*buf2));
-+    if(!((*buf3) = (UChar *)malloc(BUFFERSIZE + 15))) {
-+       free((*buf2));
-        SISFreeFBMemory(pScrn, &handle);
-        return NULL;
-     }
-@@ -1098,8 +1098,8 @@ SiSVidCopyInitGen(ScreenPtr pScreen, SISMCFuncData *MCFunctions, vidCopyFunc *UM
- 
-     /* Free buffers */
-     SISFreeFBMemory(pScrn, &fbhandle);
--    xfree(buf2);
--    xfree(buf3);
-+    free(buf2);
-+    free(buf3);
- 
-     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- 	       "Using %s method for aligned data transfers %s video RAM\n",
-diff --git a/src/sis_opt.c b/src/sis_opt.c
-index 3517549..d39ff6e 100644
---- a/src/sis_opt.c
-+++ b/src/sis_opt.c
-@@ -448,7 +448,7 @@ SiSOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if(!(pSiS->Options = xalloc(sizeof(SISOptions)))) return;
-+    if(!(pSiS->Options = malloc(sizeof(SISOptions)))) return;
- 
-     memcpy(pSiS->Options, SISOptions, sizeof(SISOptions));
- 
-@@ -888,7 +888,7 @@ SiSOptions(ScrnInfoPtr pScrn)
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2POS))) {
- 	     int result;
- 	     Bool valid = FALSE;
--	     char *tempstr = xalloc(strlen(strptr) + 1);
-+	     char *tempstr = malloc(strlen(strptr) + 1);
- 	     result = sscanf(strptr, "%s %d", tempstr, &ival);
- 	     if(result >= 1) {
- 		if(!xf86NameCmp(tempstr,"LeftOf")) {
-@@ -946,18 +946,18 @@ SiSOptions(ScrnInfoPtr pScrn)
- 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 		    "Except for \"Clone\", the parameter may be followed by an integer.\n");
- 	     }
--	     xfree(tempstr);
-+	     free(tempstr);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_METAMODES))) {
--	     pSiS->MetaModes = xalloc(strlen(strptr) + 1);
-+	     pSiS->MetaModes = malloc(strlen(strptr) + 1);
- 	     if(pSiS->MetaModes) memcpy(pSiS->MetaModes, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2HSYNC))) {
--	     pSiS->CRT2HSync = xalloc(strlen(strptr) + 1);
-+	     pSiS->CRT2HSync = malloc(strlen(strptr) + 1);
- 	     if(pSiS->CRT2HSync) memcpy(pSiS->CRT2HSync, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2VREFRESH))) {
--	     pSiS->CRT2VRefresh = xalloc(strlen(strptr) + 1);
-+	     pSiS->CRT2VRefresh = malloc(strlen(strptr) + 1);
- 	     if(pSiS->CRT2VRefresh) memcpy(pSiS->CRT2VRefresh, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_MERGEDDPI))) {
-diff --git a/src/sis_utility.c b/src/sis_utility.c
-index a9bcd2b..eda194f 100644
---- a/src/sis_utility.c
-+++ b/src/sis_utility.c
-@@ -34,8 +34,6 @@
- #endif
- 
- #include "sis.h"
--#define NEED_REPLIES
--#define NEED_EVENTS
- #include <X11/X.h>
- #include "dixstruct.h"
- 
-@@ -1882,10 +1880,10 @@ SiSProcSiSCtrlQueryVersion(ClientPtr client)
-     rep.majorVersion = SISCTRL_MAJOR_VERSION;
-     rep.minorVersion = SISCTRL_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -1926,15 +1924,15 @@ SiSProcSiSCtrlCommand(ClientPtr client)
-     rep.sequenceNumber = client->sequence;
- 
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.screen, n);
--       swapl(&rep.sdc_id, n);
--       swapl(&rep.sdc_command, n);
--       swapl(&rep.sdc_result_header, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.screen, n);
-+       _swapl(&rep.sdc_id, n);
-+       _swapl(&rep.sdc_command, n);
-+       _swapl(&rep.sdc_result_header, n);
-        for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--	  swapl(&rep.sdc_parm[i], n);
--	  swapl(&rep.sdc_result[i], n);
-+	  _swapl(&rep.sdc_parm[i], n);
-+	  _swapl(&rep.sdc_result[i], n);
-        }
-     }
-     WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep);
-@@ -1961,7 +1959,7 @@ SiSSProcSiSCtrlQueryVersion(ClientPtr client)
- {
-     REQUEST(xSiSCtrlQueryVersionReq);
-     register int n;
--    swaps(&stuff->length, n);
-+    _swaps(&stuff->length, n);
-     REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq);
-     return SiSProcSiSCtrlQueryVersion(client);
- }
-@@ -1972,14 +1970,14 @@ SiSSProcSiSCtrlCommand(ClientPtr client)
-     REQUEST(xSiSCtrlCommandReq);
-     register int n;
-     int i;
--    swaps(&stuff->length, n);
--    swapl(&stuff->screen, n);
--    swapl(&stuff->sdc_id, n);
--    swapl(&stuff->sdc_command, n);
--    swapl(&stuff->sdc_result_header, n);
-+    _swaps(&stuff->length, n);
-+    _swapl(&stuff->screen, n);
-+    _swapl(&stuff->sdc_id, n);
-+    _swapl(&stuff->sdc_command, n);
-+    _swapl(&stuff->sdc_result_header, n);
-     for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--       swapl(&stuff->sdc_parm[i], n);
--       swapl(&stuff->sdc_result[i], n);
-+       _swapl(&stuff->sdc_parm[i], n);
-+       _swapl(&stuff->sdc_result[i], n);
-     }
-     REQUEST_SIZE_MATCH(xSiSCtrlCommandReq);
-     return SiSProcSiSCtrlCommand(client);
-@@ -2007,7 +2005,7 @@ SiSCtrlResetProc(ExtensionEntry* extEntry)
-      * in SiSCtrlExtUnregister())
-      */
-     if(extEntry->extPrivate) {
--       xfree(extEntry->extPrivate);
-+       free(extEntry->extPrivate);
-        extEntry->extPrivate = NULL;
-     }
- }
-@@ -2028,7 +2026,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn)
- 
-    if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) {
- 
--      if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1)))
-+      if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
-          return;
- 
-       if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0,
-@@ -2038,7 +2036,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn)
- 				StandardMinorOpcode))) {
-          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 	 		"Failed to add SISCTRL extension\n");
--	 xfree(myctrl);
-+	 free(myctrl);
- 	 return;
-       }
- 
-diff --git a/src/sis_vga.c b/src/sis_vga.c
-index 3f6219b..4c887b8 100644
---- a/src/sis_vga.c
-+++ b/src/sis_vga.c
-@@ -1429,7 +1429,7 @@ SiSVGASaveFonts(ScrnInfoPtr pScrn)
-     attr10 = SiS_ReadAttr(pSiS, 0x10);
-     if(attr10 & 0x01) return;
- 
--    if(!(pSiS->fonts = xalloc(SIS_FONTS_SIZE * 2))) {
-+    if(!(pSiS->fonts = malloc(SIS_FONTS_SIZE * 2))) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		"Could not save console fonts, mem allocation failed\n");
-        return;
-@@ -1716,8 +1716,8 @@ SiSVGAMapMem(ScrnInfoPtr pScrn)
- 
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
- #if XSERVER_LIBPCIACCESS
--    pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
--			pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize);
-+    (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize,
-+                                 PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase);
- #else
-     pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
- 			pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize);
-@@ -1737,7 +1737,12 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn)
- 
-     if(pSiS->VGAMemBase == NULL) return;
- 
-+#if XSERVER_LIBPCIACCESS
-+    (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#else
-     xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#endif
-+
-     pSiS->VGAMemBase = NULL;
- }
- #endif
-diff --git a/src/sis_video.c b/src/sis_video.c
-index 7322efb..2006858 100644
---- a/src/sis_video.c
-+++ b/src/sis_video.c
-@@ -326,7 +326,7 @@ SISInitVideo(ScreenPtr pScreen)
-        if(newAdaptor)     size++;
-        if(newBlitAdaptor) size++;
- 
--       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
-+       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
-        if(newAdaptors) {
-           if(num_adaptors) {
-              memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
-@@ -356,7 +356,7 @@ SISInitVideo(ScreenPtr pScreen)
-     }
- 
-     if(newAdaptors) {
--       xfree(newAdaptors);
-+       free(newAdaptors);
-     }
- }
- 
-@@ -877,7 +877,7 @@ SISSetupImageVideo(ScreenPtr pScreen)
-     }
- #endif
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISPortPrivRec) +
-                             sizeof(DevUnion)))) {
-        return NULL;
-@@ -4067,7 +4067,7 @@ SISSetupBlitVideo(ScreenPtr pScreen)
-    }
- #endif
- 
--   if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+   if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-     			   (sizeof(DevUnion) * NUM_BLIT_PORTS) +
-                            sizeof(SISBPortPrivRec)))) {
-       return NULL;
-diff --git a/src/sispcirename.h b/src/sispcirename.h
-index c4beac6..54cc07f 100644
---- a/src/sispcirename.h
-+++ b/src/sispcirename.h
-@@ -29,11 +29,35 @@
- #ifndef SISPCIRENAME_H
- #define SISPCIRENAME_H
- 
-+#include <stdint.h>
-+
- enum region_type {
-     REGION_MEM,
-     REGION_IO 
- };
- 
-+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
-+#define PCI_DOM_MASK    0x01fful
-+#else
-+#define PCI_DOM_MASK 0x0ffu
-+#endif
-+
-+#ifndef PCI_DOM_MASK
-+# define PCI_DOM_MASK 0x0ffu
-+#endif
-+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
-+
-+static inline uint32_t
-+pciTag(int busnum, int devnum, int funcnum)
-+{
-+	uint32_t tag;
-+	tag  = (busnum & (PCI_DOMBUS_MASK)) << 16;
-+	tag |= (devnum & 0x00001fu) << 11;
-+	tag |= (funcnum & 0x000007u) << 8;
-+
-+	return tag;
-+}
-+
- #ifndef XSERVER_LIBPCIACCESS
- 
- /* pciVideoPtr */
-diff --git a/src/vgatypes.h b/src/vgatypes.h
-index 4be31e4..d6e7b6e 100644
---- a/src/vgatypes.h
-+++ b/src/vgatypes.h
-@@ -69,8 +69,9 @@ typedef unsigned int BOOLEAN;
- 
- #define SISIOMEMTYPE
- 
--#ifdef SIS_LINUX_KERNEL
- typedef unsigned long SISIOADDRESS;
-+
-+#ifdef SIS_LINUX_KERNEL
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
- #include <linux/types.h>  /* Need __iomem */
- #undef SISIOMEMTYPE
-@@ -78,15 +79,6 @@ typedef unsigned long SISIOADDRESS;
- #endif
- #endif
- 
--#ifdef SIS_XORG_XF86
--#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
--typedef unsigned long IOADDRESS;
--typedef unsigned long SISIOADDRESS;
--#else
--typedef IOADDRESS SISIOADDRESS;
--#endif
--#endif
--
- typedef enum _SIS_CHIP_TYPE {
-     SIS_VGALegacy = 0,
-     SIS_530,
diff --git a/testing/xfce4-datetime-plugin/PKGBUILD b/testing/xfce4-datetime-plugin/PKGBUILD
deleted file mode 100644
index f9f3f58aa..000000000
--- a/testing/xfce4-datetime-plugin/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 148351 2012-01-30 18:51:41Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=xfce4-datetime-plugin
-pkgver=0.6.1
-pkgrel=2
-pkgdesc="A date and time display plugin for the Xfce panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e82f51ff0e75a63e5cbd139e43e094f9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/xfce4-notes-plugin/PKGBUILD b/testing/xfce4-notes-plugin/PKGBUILD
deleted file mode 100644
index 399cf34f3..000000000
--- a/testing/xfce4-notes-plugin/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 148353 2012-01-30 18:51:43Z ibiru $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Ben Mazer <contrasutra@myrealbox.com>
-
-pkgname=xfce4-notes-plugin
-pkgver=1.7.7
-pkgrel=3
-pkgdesc="A notes plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'libunique' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('42b924b23f2fec6a1099e9b7a87db4a3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/xfce4-notes-plugin/xfce4-notes-plugin.install b/testing/xfce4-notes-plugin/xfce4-notes-plugin.install
deleted file mode 100644
index fee9e5d11..000000000
--- a/testing/xfce4-notes-plugin/xfce4-notes-plugin.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/testing/xfce4-quicklauncher-plugin/PKGBUILD b/testing/xfce4-quicklauncher-plugin/PKGBUILD
deleted file mode 100644
index e9b2e2223..000000000
--- a/testing/xfce4-quicklauncher-plugin/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 148355 2012-01-30 18:51:48Z ibiru $
-# Maintainer: 
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-quicklauncher-plugin
-pkgver=1.9.4
-pkgrel=6
-pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.9/${pkgname}-${pkgver}.tar.bz2
-	xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
-	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
-	xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
-	xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
-	xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch)
-md5sums=('299e17f196ecfa5fb018cf65abb19b56'
-         'a7826c9f8199a2f1e914fd39b7f9e2bf'
-         '4ea4d06ab7284e78ddc4d60304f02cdf'
-         '5e8126c05def1211fb4a2a65f2812a1b'
-         '474237b205035214df1c723407251ade'
-         '9e7f789129b08c787978c7a72a55fae7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # Fedora patches
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
-  patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
-  patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
-  patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
-  
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
deleted file mode 100644
index 907c1f23e..000000000
--- a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- panel-plugin/quicklauncher.desktop.in.in.orig	2009-07-04 00:46:34.000000000 +0200
-+++ panel-plugin/quicklauncher.desktop.in.in	2009-07-04 00:46:51.000000000 +0200
-@@ -4,4 +4,6 @@
- _Name=Quicklauncher
- _Comment=Program with several launchers
- Icon=gnome-fs-executable
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
-+X-XFCE-Module=quicklauncher
-+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
-+X-XFCE-Unique=false
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
deleted file mode 100644
index 96f256770..000000000
--- a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
---- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
-+++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100
-@@ -21181,7 +21181,7 @@
- 
- 
- 
--    ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi"
-+    ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi"
- 
- 
- for ac_header in locale.h
-diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po
---- xfce4-quicklauncher-plugin-1.9.4/po/en.po	1970-01-01 01:00:00.000000000 +0100
-+++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po	2008-03-04 22:10:58.000000000 +0100
-@@ -0,0 +1,87 @@
-+# English translation of xfce4-quicklauncher-plugin.
-+# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the xfce4-quicklauncher-plugin package.
-+# Jeff Bailes <thepizzaking@gmail.com>, 2007.
-+# , fuzzy
-+# 
-+# 
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: xfce4-quicklauncher-plugin\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-05-17 21:37+0200\n"
-+"PO-Revision-Date: 2007-03-31 10:17+1000\n"
-+"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
-+"Language-Team: English\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit"
-+
-+#: ../panel-plugin/callbacks.c:79
-+msgid "Configure Quicklauncher"
-+msgstr "Configure Quicklauncher"
-+
-+#: ../panel-plugin/callbacks.c:93
-+msgid "Lines: "
-+msgstr "Lines: "
-+
-+#: ../panel-plugin/callbacks.c:123
-+msgid "Espace entre les lanceurs :"
-+msgstr "Space between launchers"
-+
-+#: ../panel-plugin/callbacks.c:131
-+msgid "afficher les tooltips"
-+msgstr "Show tooltips"
-+
-+#: ../panel-plugin/callbacks.c:135
-+msgid "afficher les labels"
-+msgstr "Show labels"
-+
-+#: ../panel-plugin/callbacks.c:216
-+msgid "icone"
-+msgstr "icon"
-+
-+#: ../panel-plugin/callbacks.c:222
-+msgid "commande"
-+msgstr "command"
-+
-+#: ../panel-plugin/callbacks.c:228
-+msgid "nom"
-+msgstr "name"
-+
-+#: ../panel-plugin/callbacks.c:327
-+msgid "Open icon"
-+msgstr "Open icon"
-+
-+#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2
-+msgid "Quicklauncher"
-+msgstr "Quicklauncher"
-+
-+#: ../panel-plugin/main.c:166
-+msgid "Allows you to add launchers easily and display them on many lines."
-+msgstr "Allows you to add launchers easily and display them on many lines."
-+
-+#: ../panel-plugin/main.c:168
-+msgid "Other plugins available here"
-+msgstr "Other plugins available here"
-+
-+#: ../panel-plugin/main.c:320
-+msgid "Lock"
-+msgstr "Lock"
-+
-+#: ../panel-plugin/main.c:323
-+msgid "Parameters"
-+msgstr "Parameters"
-+
-+#: ../panel-plugin/main.c:326
-+msgid "Applications"
-+msgstr "Applications"
-+
-+#: ../panel-plugin/main.c:329
-+msgid "Help"
-+msgstr "Help"
-+
-+#: ../panel-plugin/quicklauncher.desktop.in.in.h:1
-+msgid "Program with several launchers"
-+msgstr "Program with several launchers"
-+
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
deleted file mode 100644
index 9845ce122..000000000
--- a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
-+++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
-@@ -148,6 +148,7 @@
- 	t_qck_launcher_opt_dlg* dlg;
- 	xfce_panel_plugin_block_menu(plugin);
- 	dlg = create_qck_launcher_dlg();
-+        gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
- 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
- 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
- 	xfce_panel_plugin_unblock_menu(plugin);
-@@ -160,6 +161,7 @@
- 	GtkWidget *about;
- 	const gchar* authors[2] = {"Bountykiller <masse_nicolas@yahoo.fr>", NULL};
- 	about = gtk_about_dialog_new();
-+        gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin));
- 	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher"));
- 	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL);
- 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors);
-@@ -461,7 +463,7 @@
- 		if(launcher->quicklauncher->_last_zoomed_launcher == launcher)
- 		{
- 			g_return_val_if_fail(launcher->clicked_img, FALSE);
--			xfce_exec(launcher->command, FALSE, FALSE, NULL);
-+			xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL);
- 			gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
- 		}
- 		else
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
deleted file mode 100644
index 85dd21729..000000000
--- a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
-===================================================================
---- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3779)
-+++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3780)
-@@ -151,6 +151,7 @@
-         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
- 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
- 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
-+	quicklauncher_save(plugin, quicklauncher);
- 	xfce_panel_plugin_unblock_menu(plugin);
- }
- 
diff --git a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch b/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
deleted file mode 100644
index 8314d7a3c..000000000
--- a/testing/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- panel-plugin/main.c.orig	2009-09-09 21:15:01.000000000 +0200
-+++ panel-plugin/main.c	2009-09-09 21:23:12.000000000 +0200
-@@ -320,7 +320,7 @@
- 	launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM,
- 							NULL, quicklauncher);
- 	quicklauncher_add_element(quicklauncher, launcher);
--	launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS,
-+	launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS,
- 							NULL, quicklauncher);
- 	quicklauncher_add_element(quicklauncher, launcher);
- 	launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY,
diff --git a/testing/xfce4-sensors-plugin/PKGBUILD b/testing/xfce4-sensors-plugin/PKGBUILD
deleted file mode 100644
index f54632130..000000000
--- a/testing/xfce4-sensors-plugin/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 148357 2012-01-30 18:51:53Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Merk Matthias <macem@chello.at>
-
-pkgname=xfce4-sensors-plugin
-pkgver=1.2.3
-pkgrel=3
-pkgdesc="A lm_sensors plugin for the Xfce panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'lm_sensors' 'libnotify>=0.7.1' 'hicolor-icon-theme') #'libxfcegui4' 
-makedepends=('pkgconfig' 'intltool' 'hddtemp>=0.3.beta15.45-2' 'gnu-netcat' 'xfce4-dev-tools')
-optdepends=('gnu-netcat: for hddtemp access')
-options=(!libtool !makeflags)
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2edf376d140449ca42c4e4f591e626f8')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--datadir=/usr/share \
-	--datarootdir=/usr/share \
-	--disable-static \
-	--with-pathhddtemp=/usr/sbin/hddtemp \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/xfce4-sensors-plugin/xfce4-sensors-plugin.install b/testing/xfce4-sensors-plugin/xfce4-sensors-plugin.install
deleted file mode 100644
index 17ca8f78a..000000000
--- a/testing/xfce4-sensors-plugin/xfce4-sensors-plugin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/xfce4-verve-plugin/PKGBUILD b/testing/xfce4-verve-plugin/PKGBUILD
deleted file mode 100644
index 1828e79ce..000000000
--- a/testing/xfce4-verve-plugin/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 149693 2012-02-09 00:00:27Z allan $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-verve-plugin
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="command line plugin Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool')
-replaces=('verve-plugin')
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
-md5sums=('ed7039c40d6e560ed8bcf9a324d2ae86')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/xfig/LICENSE b/testing/xfig/LICENSE
deleted file mode 100644
index 5b38ccff8..000000000
--- a/testing/xfig/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Excerpt of the README from xfig/transfig - legal notice:
----------------------------------------------------------------------------
-
-THE LAWRENCE BERKELEY NATIONAL LABORATORY DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-***************************************************************************
-NEW COPYRIGHT/PERMISSION NOTICE:
-
-The xfig copyright and permission notice has changed (again) slightly in
-version 3.2.5.  It now states that:
-
-	FIG : Facility for Interactive Generation of figures
-	Copyright (c) 1985-1988 by Supoj Sutanthavibul
-	Parts Copyright (c) 1989-2002 by Brian V. Smith
-	Parts Copyright (c) 1991 by Paul King
-
-	Any party obtaining a copy of these files is granted, free of charge, a
-	full and unrestricted irrevocable, world-wide, paid up, royalty-free,
-	nonexclusive right and license to deal in this software and documentation 
-	files (the "Software"), including without limitation the rights to use, 
-	copy, modify, merge, publish distribute, sublicense and/or sell copies of
-	the Software, and to permit persons who receive copies from any such 
-	party to do so, with the only requirement being that the above copyright 
-	and this permission notice remain intact.
-
-The license for 3.2.4 didn't allow selling xfig unless it was simply included in a
-collection of programs (e.g. a CD) that one was selling.
diff --git a/testing/xfig/PKGBUILD b/testing/xfig/PKGBUILD
deleted file mode 100644
index b42d2b6ae..000000000
--- a/testing/xfig/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 148628 2012-02-04 13:38:12Z andyrtr $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xfig
-pkgver=3.2.5b
-pkgrel=7
-pkgdesc="An interactive drawing tool"
-arch=('i686' 'x86_64')
-url="http://www.xfig.org/userman/"
-license=('custom')
-depends=('libpng' 'libjpeg' 'xaw3d>=1.6' 'libxi' 'desktop-file-utils' 'gsfonts' 'libxpm')
-makedepends=('imake')
-optdepends=('transfig: to use the frontend to convert fig files')
-options=('!makeflags' '!emptydirs')
-install=xfig.install
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \
-	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \
-        xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \
-        xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \
-        xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \
-        xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop)
-sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542'
-          '926ad99c7221baa4aa9e9737722958860b2700fc'
-          'b7c03fb70066ff476a4039a8c0f8930c15edef68'
-          '33bff26b42ce164e79de11808b5b34b363f0d59f'
-          'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
-          '39bec6bac9746b643b05fd1286826113ede07ff6'
-          'bd76cd50be6a5789cfd6f182309cfd7056be04f3'
-          'a1285f4e61ad2eec040460ab03e8022098e7f78e'
-          '12a64ddaf65a73e23ef74f31483515a0e262768c'
-          '83032eb61c8dc96d5fc509a1ce632528457d4598'
-          '31edf4cfab708820ea3f114d095dfef5aa88e5aa'
-          '9011b8fa6143e37525b28cc9800a3bf2d6b008d2')
-
-build() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-  patch -p1 < ../xfig-3.2.4-redhat.patch
-  patch -p1 < ../xfig-3.2.5-fhs.patch
-  patch -p1 < ../xfig.3.2.5-modularX.patch
-  patch -p1 < ../xfig-3.2.5-enable-Xaw3d.patch
-  patch -p1 < ../xfig-3.2.5-color-resources.patch
-  patch -p1 < ../xfig-3.2.5-urwfonts.patch
-  patch -p1 < ../xfig-3.2.5-missing-protos.patch
-  patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch
-  patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch
-  chmod 755 Libraries
-
-  xmkmf
-  make DOCDIR=/usr/share/doc
-}
-
-package() {
-  cd "${srcdir}/${pkgname}.${pkgver}"
-  make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all
-  rm "${pkgdir}/usr/lib/X11/app-defaults"
-
-  find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \;
-  find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \;
-  find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \;
-  find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \;
-
-  install -D -m644 ../xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop"
-  install -D -m644 xfig.png  "${pkgdir}/usr/share/pixmaps/xfig.png"
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"	
-}
diff --git a/testing/xfig/xfig-3.2.4-redhat.patch b/testing/xfig/xfig-3.2.4-redhat.patch
deleted file mode 100644
index da6f150b3..000000000
--- a/testing/xfig/xfig-3.2.4-redhat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- xfig.3.2.4/Fig.ad.redhat	2002-12-19 01:05:41.000000000 +0100
-+++ xfig.3.2.4/Fig.ad	2003-05-06 11:45:15.000000000 +0200
-@@ -11,7 +11,7 @@
- Fig*AllowShellResize: false
- 
- ! Image editor - can edit imported image
--Fig.image_editor:		xv
-+Fig.image_editor:		xdg-open
- 
- ! name of ghostscript (not ghostview)
- Fig.ghostscript:		gs
-@@ -20,16 +20,16 @@
- ! 		This is for viewing the xfig html reference.
- ! For netscape, this command will open the help pages in a running netscape,
- !     or start a new netscape if one isn't already running
--Fig.browser:	firefox -remote 'openFile(%f)' || firefox %f
-+Fig.browser:	xdg-open %f
- 
- ! pdfviewer - put your favorite pdf viewer here.  
- !		This is for viewing the xfig how-to guide and man pages
--Fig.pdfviewer:			xpdf %f
-+Fig.pdfviewer:			xdg-open %f
- 
- ! Spell check program - put your favorite spelling check program here.
- !		It must write the misspelled words to standard output.
- 
--Fig.spellcheckcommand:	spell %f
-+Fig.spellcheckcommand:	aspell %f
- 
- ! delay before spinner automatically counts when pressed (milliseconds)
- Fig.spinner_delay:		1000
diff --git a/testing/xfig/xfig-3.2.5-color-resources.patch b/testing/xfig/xfig-3.2.5-color-resources.patch
deleted file mode 100644
index 6cf1af906..000000000
--- a/testing/xfig/xfig-3.2.5-color-resources.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad
---- xfig.3.2.5/Fig-color.bisque.ad~	2007-11-16 13:47:45.000000000 +0100
-+++ xfig.3.2.5/Fig-color.bisque.ad	2007-11-16 13:47:52.000000000 +0100
-@@ -93,7 +93,7 @@ Fig*sideruler.background: 		gray95
- Fig*topruler.background:	 		gray95
- Fig*sideruler.background:	 		gray95
- Fig*List*background:	 			gray95
--Fig*Scrollbar.background:	 		gray95
-+! Fig*Scrollbar.background:	 		gray95
-
- Fig*cancel.background:	 			navajowhite1
- Fig*dismiss.background:	 			navajowhite1
-@@ -104,8 +104,8 @@ Fig*menu_divider.foreground:			red
- Fig*menu_divider.foreground:			red
-
- !##### Shadows
--Fig*shadowWidth:				2
--Fig*Label.shadowWidth:				1
-+! Fig*shadowWidth:				2
-+! Fig*Label.shadowWidth:				1
- Fig*horizontal.shadowWidth:	 		2
- Fig*Scrollbar.shadowWidth:			2
- ! no shadows for update indicators
-@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel:		gray80
- 
- Fig*toggle*bottomShadowPixel:			gray80
- Fig*toggle*topShadowPixel:			gray50
-+
-+! repare damage done to scrollbar shadows non color resources file
-+
-+Fig*horizontal.topShadowPixel: gray95
-+Fig*horizontal.bottomShadowPixel: gray50
-+Fig*horizontal.topShadow: gray95
-+Fig*horizontal.bottomShadow: gray50
-+
-+Fig*Scrollbar.topShadow: gray95
-+Fig*Scrollbar.bottomShadow: gray50
-+Fig*Scrollbar.topShadowPixel: gray95
-+Fig*Scrollbar.bottomShadowPixel: gray50
diff --git a/testing/xfig/xfig-3.2.5-enable-Xaw3d.patch b/testing/xfig/xfig-3.2.5-enable-Xaw3d.patch
deleted file mode 100644
index f4d113808..000000000
--- a/testing/xfig/xfig-3.2.5-enable-Xaw3d.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up xfig.3.2.5/Imakefile.no-Xaw3d xfig.3.2.5/Imakefile
---- xfig.3.2.5/Imakefile.no-Xaw3d	2007-11-16 10:38:18.000000000 +0100
-+++ xfig.3.2.5/Imakefile	2007-11-16 10:38:49.000000000 +0100
-@@ -50,8 +50,8 @@ XAPPLOADDIR = /usr/share/X11/app-default
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
- XCOMM some new features, including "Tips", which replace xfig's "help balloons"
- XCOMM NOTE: This is the default for many X systems now.
-
--XCOMM #define XAW3D1_5E
-+#define XAW3D1_5E
- 
- #ifdef XAW3D1_5E
-     DUSEXAW3D = -DXAW3D -DXAW3D1_5E
--    XAWLIB = -lXaw3d15e
-+    XAWLIB = -lXaw3d
- #else
-     XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
-     XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
diff --git a/testing/xfig/xfig-3.2.5-fhs.patch b/testing/xfig/xfig-3.2.5-fhs.patch
deleted file mode 100644
index a17d908a7..000000000
--- a/testing/xfig/xfig-3.2.5-fhs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xfig.3.2.5/Imakefile.fhs	2006-10-11 01:19:22.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:04:45.000000000 +0200
-@@ -169,8 +169,7 @@
- XFIGLIBDIR = $(LIBDIR)/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
--XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = $(DOCDIR)/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
diff --git a/testing/xfig/xfig-3.2.5-missing-protos.patch b/testing/xfig/xfig-3.2.5-missing-protos.patch
deleted file mode 100644
index 181c52a69..000000000
--- a/testing/xfig/xfig-3.2.5-missing-protos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c
---- xfig.3.2.5/u_draw.c~	2008-04-03 15:58:23.000000000 +0200
-+++ xfig.3.2.5/u_draw.c	2008-04-03 15:58:23.000000000 +0200
-@@ -43,6 +43,7 @@
- #include "w_zoom.h"
- #include "u_redraw.h"
- #include "w_cursor.h"
-+#include <X11/ImUtil.h>
- 
- static Boolean add_point(int x, int y);
- static void init_point_array(void);
diff --git a/testing/xfig/xfig-3.2.5-urwfonts.patch b/testing/xfig/xfig-3.2.5-urwfonts.patch
deleted file mode 100644
index 7bc766bd9..000000000
--- a/testing/xfig/xfig-3.2.5-urwfonts.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- xfig.3.2.4/u_fonts.c	2002-09-09 13:36:58.000000000 -0400
-+++ new-xfig-3.2.4/u_fonts.c	2006-10-11 00:29:07.000000000 -0400
-@@ -22,41 +22,41 @@
- /* X11 font names */
- 
- struct _xfstruct x_fontinfo[NUM_FONTS] = {
--    {"-*-times-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-times-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-times-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-times-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
--    {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
--    {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
--    {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
--    {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
--    {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
--    {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-medium-r-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-bold-i-condensed--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
- };
- 
- /* Use the following font names for any font that doesn't exist in the table above.
diff --git a/testing/xfig/xfig-3.2.5b-fix-eps-reading.patch b/testing/xfig/xfig-3.2.5b-fix-eps-reading.patch
deleted file mode 100644
index 7601d20ea..000000000
--- a/testing/xfig/xfig-3.2.5b-fix-eps-reading.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c
---- xfig.3.2.5b/f_readeps.c	2009-03-30 17:52:18.000000000 +0200
-+++ xfig.3.2.5b.new/f_readeps.c	2010-11-25 16:53:54.328247928 +0100
-@@ -252,12 +252,13 @@
- {
-     char        buf[300];
-     FILE       *tmpfp, *pixfile, *gsfile;
--    char       *psnam, *driver;
-+    char       *driver;
-     int         status, wid, ht, nbitmap, fd;
-     char        tmpfile[PATH_MAX],
- 		pixnam[PATH_MAX],
- 		errnam[PATH_MAX],
--		gscom[2 * PATH_MAX];
-+		gscom[2 * PATH_MAX],
-+		psnam[PATH_MAX];
- 
-     wid = urx - llx;
-     ht = ury - lly;
-@@ -307,19 +308,14 @@
- 	/* for color, use pcx */
- 	driver = "pcx256";
-     }
--    /* avoid absolute paths (for Cygwin with gswin32) by changing directory */
--    if (tmpfile[0] == '/') {
--	psnam = strrchr(tmpfile, '/');
--	*psnam = 0;
--	sprintf(gscom, "cd \"%s/\";", tmpfile);
--	*psnam++ = '/';		/* Restore name for unlink() below */
--    } else {
--	psnam = tmpfile;
--	gscom[0] = '\0';
-+    /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */
-+    if (!realpath(tmpfile, psnam)) {
-+	file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno));
-+	return False;
-     }
--    sprintf(&gscom[strlen(gscom)],
--	    "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1",
--	    appres.ghostscript, driver, wid, ht, pixnam, errnam);
-+    sprintf(gscom,
-+	    "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1",
-+	    appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam);
-     if (appres.DEBUG)
- 	fprintf(stderr,"calling: %s\n",gscom);
-     if ((gsfile = popen(gscom, "w")) == 0) {
diff --git a/testing/xfig/xfig-3.2.5b-libpng-1.5.patch b/testing/xfig/xfig-3.2.5b-libpng-1.5.patch
deleted file mode 100644
index 7d9c3f15e..000000000
--- a/testing/xfig/xfig-3.2.5b-libpng-1.5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: xfig.3.2.5b/f_readpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_readpng.c
-+++ xfig.3.2.5b/f_readpng.c
-@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic
-     }
- 
-     /* set long jump recovery here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	close_picfile(file,filetype);
-@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    if (info_ptr->valid & PNG_INFO_gAMA)
--	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
--    else
--	png_set_gamma(png_ptr, 2.2, 0.45);
-+    png_fixed_point gamma = 0.45;
-+    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    png_set_gamma(png_ptr, 2.2, gamma);
- 
--    if (info_ptr->valid & PNG_INFO_bKGD)
-+    if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
- 	/* set the background to the one supplied */
--	png_set_background(png_ptr, &info_ptr->background,
-+	png_color_16p background;
-+	png_get_bKGD(png_ptr,info_ptr,&background);
-+	png_set_background(png_ptr, background,
- 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-+    }
-     else {
- 	/* blend the canvas background using the alpha channel */
- 	background.red   = x_bg_color.red >> 8;
-@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic
- 
- 	if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
- 	    png_get_hIST(png_ptr, info_ptr, &histogram);
-+#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5
- 	    png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
-+#else
-+	    png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
-+#endif
- 	}
-     }
-     if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
-Index: xfig.3.2.5b/f_wrpng.c
-===================================================================
---- xfig.3.2.5b.orig/f_wrpng.c
-+++ xfig.3.2.5b/f_wrpng.c
-@@ -20,6 +20,7 @@
- #include "w_msgpanel.h"
- #include "w_setup.h"
- #include <png.h>
-+#include <zlib.h>
- 
- /*
-  * Write PNG file from rgb data
-@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat
-     }
- 
-     /* set long jump recovery here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	return False;
diff --git a/testing/xfig/xfig.3.2.5-modularX.patch b/testing/xfig/xfig.3.2.5-modularX.patch
deleted file mode 100644
index 3b5ac5937..000000000
--- a/testing/xfig/xfig.3.2.5-modularX.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- xfig.3.2.5/Imakefile.modularX	2007-04-16 14:27:49.000000000 +0200
-+++ xfig.3.2.5/Imakefile	2007-04-16 14:29:18.000000000 +0200
-@@ -45,7 +45,7 @@
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
- 
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /usr/share/X11/app-defaults
- 
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -166,12 +166,12 @@
- XCOMM XFIGLIBDIR = $(LIBDIR)
- 
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = /usr/share/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XFIGDOCDIR = $(DOCDIR)/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
--MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-+MANDIR = /usr/share/man/man1
- XCOMM MANDIR = /usr/local/xfig/man
-
- XCOMM If your system doesn't have strstr undefine the following definition
diff --git a/testing/xfig/xfig.desktop b/testing/xfig/xfig.desktop
deleted file mode 100644
index c634a28e9..000000000
--- a/testing/xfig/xfig.desktop
+++ /dev/null
@@ -1,47 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Application;Graphics;
-MimeType=image/fig;image/x-xfig;
-Exec=xfig
-Icon=xfig
-Type=Application
-Name=Xfig
-Name[eo]=XDesegno
-Name[et]=Ffig
-Name[ja]=xfig
-Name[no]=X-figur
-Comment=Xfig drawing application
-Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå
-Comment[ca]=Aplicació de dibuix Xfig
-Comment[cs]=Aplikace pro kreslení vektorových obrázků
-Comment[da]=Xfig tegneprogram
-Comment[de]=Xfig-Zeichenprogramm
-Comment[el]=Xfig
-Comment[eo]=Desegnilo "Xfig"
-Comment[es]=Aplicación de diseño vectorial (objetos)
-Comment[et]=XFig joonistusprogramm
-Comment[fi]=Xfig vektoripiirto-ohjelma
-Comment[fr]=Programme de dessin objet Xfig
-Comment[gl]=Aplicación de debuxo (obxectos)
-Comment[he]=Xfig רויצה �ושיי
-Comment[hr]=Program za crtanje
-Comment[hu]=Rajzolóprogram
-Comment[is]=Hlutbundið teikniforrit
-Comment[it]=Applicazione di disegno Xfig
-Comment[lt]=Xfig braižymo programa
-Comment[mk]=Едно�тавна апликација за вектор�ко цртање
-Comment[nl]=Xfig-tekenprogramma
-Comment[no]=Xfig-tegneprogram
-Comment[no_NY]=Teikneprogrammet Xfig
-Comment[pl]=Aplikacja do kreślenia
-Comment[pt]=Aplicação de desenho
-Comment[ro]=Program de desenare vectorială
-Comment[ru]=Приложени� дл� ри�овани� векторной графики
-Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov
-Comment[sl]=Program za risanje Xfig
-Comment[sr]=Xfig prgram za vektorsko crtanje
-Comment[sv]=Xfig ritprogram
-Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
-Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Xfig
-Comment[zh_CN.GB2312]=Xfig 绘图应用程�
diff --git a/testing/xfig/xfig.install b/testing/xfig/xfig.install
deleted file mode 100644
index f01585f79..000000000
--- a/testing/xfig/xfig.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
- }
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/xine-ui/PKGBUILD b/testing/xine-ui/PKGBUILD
deleted file mode 100644
index 3e55a72f3..000000000
--- a/testing/xine-ui/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 148361 2012-01-30 18:52:07Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-ui
-pkgver=0.99.6
-pkgrel=5
-pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm'
-	 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
-	 'desktop-file-utils' 'lirc-utils')
-makedepends=('libxt')
-options=('!strip')
-install=xine-ui.install
-source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
-	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch 
-        fix_lirc.diff xine-ui-xdg.diff xine-ui-0.99.6-libpng15.patch)
-sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e'
-          'b2df43ede3a9d1a34b80139704a4cbbc7295c584'
-          '8bbd39f61de7b6991385457a4944b8ea104da88b'
-          '2361df9ddad59c426b0f863414c6d527b463a38a'
-          '9c70c6543dae6815710b239b4638ffe3843bac86'
-          'bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch"
-  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
-  patch -p1 < "${srcdir}/fix_lirc.diff"
-  patch -p1 < "${srcdir}/xine-ui-xdg.diff"
-  patch -p1 < "${srcdir}/xine-ui-0.99.6-libpng15.patch"
-  sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c
-  autoconf
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-x --enable-lirc --without-aalib --enable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install
-}
diff --git a/testing/xine-ui/fix_lirc.diff b/testing/xine-ui/fix_lirc.diff
deleted file mode 100644
index 93890cb5c..000000000
--- a/testing/xine-ui/fix_lirc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/m4/_xine.m4 b/m4/_xine.m4
---- a/m4/_xine.m4
-+++ b/m4/_xine.m4
-@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC],
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
-           AC_CHECK_FILE(["$llirc/liblirc_client.so"],
--             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             [LIRC_LIBS="$llirc/liblirc_client.so"
-+              found_lirc=yes]
-              AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-              AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-                 [LIRC_LIBS="$llirc/liblirc_client.a"
diff --git a/testing/xine-ui/lirc-check-a89347673097.patch b/testing/xine-ui/lirc-check-a89347673097.patch
deleted file mode 100644
index c1c8d2614..000000000
--- a/testing/xine-ui/lirc-check-a89347673097.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268754560 0
-# Node ID a89347673097053d89675e991ab403cda04d94cd
-# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11
-Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing.
-
---- a/m4/_xine.m4	Sun Mar 14 18:04:46 2010 +0000
-+++ b/m4/_xine.m4	Tue Mar 16 15:49:20 2010 +0000
-@@ -25,14 +25,14 @@
- dnl
- AC_DEFUN([AC_CHECK_LIRC],
-   [AC_ARG_ENABLE(lirc,
--     [  --disable-lirc          Turn off LIRC support.],
--     [], enable_lirc=yes)
-+     [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])],
-+     [given=Y], [given=N; enable_lirc=yes])
- 
-   found_lirc=no
-   if test x"$enable_lirc" = xyes; then
-     have_lirc=yes
--    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [])
--    if test "$LIRC_CFLAGS" != ''; then
-+    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:])
-+    if test "$found_lirc" = yes; then
-       LIRC_INCLUDE="$LIRC_CFLAGS"
-     else
-      AC_REQUIRE_CPP
-@@ -42,15 +42,20 @@
- 
-         if test x"$LIRC_PREFIX" != "x"; then
-            lirc_libprefix="$LIRC_PREFIX/lib"
--  	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-+	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
--          AC_CHECK_FILE(["$llirc/liblirc_client.a"],
--            [LIRC_LIBS="$llirc/liblirc_client.a"
--             found_lirc=yes],,)
-+          AC_CHECK_FILE(["$llirc/liblirc_client.so"],
-+             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-+             AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-+                [LIRC_LIBS="$llirc/liblirc_client.a"
-+                 found_lirc=yes],,)
-+          )
-         done
-      else
--         AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]);
-+	test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available])
-+	AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***])
-      fi
-     fi
-   fi
-@@ -59,7 +64,6 @@
-      fi
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
--     AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"])
- ])
- 
- dnl AC_C_ATTRIBUTE_ALIGNED
-
diff --git a/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch
deleted file mode 100644
index daad4f03a..000000000
--- a/testing/xine-ui/lirc-makefile-a68dd15ff7ae.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268758696 0
-# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514
-# Parent 882c464d4a650d09da37ade366face74452c1897
-Restore definition of HAVE_LIRC for use in makefiles.
-
---- a/m4/_xine.m4	Mon Mar 15 12:03:01 2010 -0700
-+++ b/m4/_xine.m4	Tue Mar 16 16:58:16 2010 +0000
-@@ -62,6 +62,7 @@
-      if test "$found_lirc" = yes; then
- 	AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed])
-      fi
-+     AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes])
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
- ])
-
diff --git a/testing/xine-ui/xine-ui-0.99.6-libpng15.patch b/testing/xine-ui/xine-ui-0.99.6-libpng15.patch
deleted file mode 100644
index 6a5fb5522..000000000
--- a/testing/xine-ui/xine-ui-0.99.6-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-===================================================================
---- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
-+++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id,
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/testing/xine-ui/xine-ui-xdg.diff b/testing/xine-ui/xine-ui-xdg.diff
deleted file mode 100644
index 959d674b2..000000000
--- a/testing/xine-ui/xine-ui-xdg.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- xine-ui-0.99.6.orig/src/xitk/common.h
-+++ xine-ui-0.99.6/src/xitk/common.h
-@@ -331,6 +331,5 @@ typedef struct {
-   int                       use_root_window;
- 
-   int                       ssaver_enabled;
--  int                       ssaver_timeout;
- 
-   int                       skip_by_chapter;
---- xine-ui-0.99.6.orig/src/xitk/main.c
-+++ xine-ui-0.99.6/src/xitk/main.c
-@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) {
-   if (sigprocmask (SIG_BLOCK,  &vo_mask, NULL))
-     fprintf (stderr, "sigprocmask() failed.\n");
- 
-+  signal(SIGCHLD, SIG_IGN);
-+
-   gGui = (gGui_t *) calloc(1, sizeof(gGui_t));
-   
-   gGui->stream                 = NULL;
---- xine-ui-0.99.6.orig/src/xitk/panel.c
-+++ xine-ui-0.99.6/src/xitk/panel.c
-@@ -356,7 +356,6 @@ void panel_update_runtime_display(void)
-  * Update slider thread.
-  */
- static void *slider_loop(void *dummy) {
--  int screensaver_timer = 0;
-   int status, speed;
-   int pos, secs;
-   int i = 0;
-@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) {
- 	else
- 	  video_window_set_mrl((char *)gGui->mmk.mrl);
- 	
--	if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) {
--	  
--	  if(gGui->ssaver_timeout) {
--	    
--	    if(!(i % 2))
--	      screensaver_timer++;
--	    
--	    if(screensaver_timer >= gGui->ssaver_timeout) {
--	      screensaver_timer = 0;
--	      video_window_reset_ssaver();
--	      
--	    }
--	  }  
--	}
-+       video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window));
- 
- 	if(gGui->logo_mode == 0) {
- 	  
-@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) {
- 	    stream_infos_update_infos();
- 
- 	}
-+      } else {
-+       video_window_suspend_ssaver(0);
-       }
-     }
-     
---- xine-ui-0.99.6.orig/src/xitk/videowin.c
-+++ xine-ui-0.99.6/src/xitk/videowin.c
-@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi
- 
-   /* The old window should be destroyed now */
-   if(old_video_window != None) {
-+    /* Screensaver control is tied to our window id */
-+    video_window_suspend_ssaver(0);
-+
-     XDestroyWindow(gGui->video_display, old_video_window);
-      
-     if(gGui->cursor_grabbed)
-@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X
- 
- }
- 
--void video_window_reset_ssaver(void) {
-+void video_window_suspend_ssaver(int do_suspend) {
-+  static int was_suspended;
- 
--  if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) {
-+  do_suspend = do_suspend && gGui->ssaver_enabled;
- 
--#ifdef HAVE_XTESTEXTENSION
--    if(gVw.have_xtest == True) {
--      
--      gVw.fake_key_cur++;
--      
--      if(gVw.fake_key_cur >= 2)
--	gVw.fake_key_cur = 0;
--
--      XLockDisplay(gGui->video_display);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime);
--      XSync(gGui->video_display, False);
--      XUnlockDisplay(gGui->video_display);
-+  if(was_suspended != do_suspend) {
-+    if(fork() == 0) {
-+      char window_id[30];
-+      char *args[] = { "xdg-screensaver", NULL, window_id, NULL };
-+      int fd;
-+
-+      for(fd = 3; fd < 256; fd++)
-+	close(fd);
-+
-+      args[1] = do_suspend ? "suspend" : "resume";
-+      sprintf(window_id, "%lu", (unsigned long)gGui->video_window);
-+      execvp(args[0], args);
-+      _exit(0);
-     }
--    else 
--#endif
--    {
--      /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */
--      /* assuming its location and permission will not change during run time of xine-ui. */
--      {
--	static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL };
--	static char *gssaver_path   = NULL;
--
--	if(!gssaver_path) {
--	  char *path = getenv("PATH");
--
--	  if(!path)
--	    path = "/usr/local/bin:/usr/bin";
--	  do {
--	    char *p, *pbuf;
--	    int   plen;
--
--	    for(p = path; *path && *path != ':'; path++)
--	      ;
--	    if(p == path)
--	      plen = 1, p = ".";
--	    else
--	      plen = path - p;
--	    asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]);
--	    if ( access(pbuf, X_OK) ) {
--	      free(pbuf);
--	      gssaver_path = "";
--	    } else
--	      gssaver_path = pbuf;
--	  } while(!gssaver_path[0] && *path++);
--	}
--	if(gssaver_path[0] && (fork() == 0)) {
--	  execv(gssaver_path, gssaver_args);
--	  exit(0);
--	}
--      }
- 
--      XLockDisplay(gGui->video_display);
--      XResetScreenSaver(gGui->video_display);
--      XUnlockDisplay(gGui->video_display);
--    }
-+    was_suspended = do_suspend;
-   }
- }
- 
-+void video_window_reset_ssaver(void) {
-+  video_window_suspend_ssaver(1);
-+}
-+
- void video_window_get_frame_size(int *w, int *h) {
-   if(w)
-     *w = gVw.frame_width;
---- xine-ui-0.99.6.orig/src/xitk/videowin.h
-+++ xine-ui-0.99.6/src/xitk/videowin.h
-@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag,
- void video_window_update_logo(void);
- void video_window_change_skins(int);
- 
-+void video_window_suspend_ssaver(int do_suspend);
- void video_window_reset_ssaver(void);
- 
- void video_window_get_frame_size(int *w, int *h);
---- xine-ui-0.99.6.orig/src/xitk/event.c
-+++ xine-ui-0.99.6/src/xitk/event.c
-@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat
-   gGui->skip_by_chapter = cfg->num_value;
-   panel_update_nextprev_tips();
- }
--static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) {
--  gGui->ssaver_timeout = cfg->num_value;
--}
- 
- static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) {
-   
-@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam
- 					 snapshot_loc_cb,
- 					 CONFIG_NO_DATA);
-   
--  gGui->ssaver_timeout =
--    xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10,
--			      _("Screensaver reset interval (s)"),
--			      _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."),
--			      CONFIG_LEVEL_ADV,
--			      ssaver_timeout_cb,
--			      CONFIG_NO_DATA);
--  
-   gGui->skip_by_chapter = 
-     xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1,
- 			       _("Chapter hopping"),
-
-
-
-
- 
diff --git a/testing/xine-ui/xine-ui.install b/testing/xine-ui/xine-ui.install
deleted file mode 100644
index 3b3aff7d9..000000000
--- a/testing/xine-ui/xine-ui.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/xmlto/PKGBUILD b/testing/xmlto/PKGBUILD
deleted file mode 100644
index 09664049a..000000000
--- a/testing/xmlto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 149751 2012-02-10 04:10:06Z allan $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: Robert Stoffers <rob1@ubuntu.com>
-
-pkgname=xmlto
-pkgver=0.0.25
-pkgrel=2
-pkgdesc="Convert xml to many other formats"
-arch=('i686' 'x86_64')
-url="http://cyberelk.net/tim/software/xmlto/"
-license=('GPL')
-depends=('libxslt' 'perl-yaml-syck' 'perl-test-pod')
-makedepends=('docbook-xsl')
-source=("https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('6b6267b1470f8571fe5f63a128970364')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/xorg-xcursorgen/PKGBUILD b/testing/xorg-xcursorgen/PKGBUILD
deleted file mode 100644
index b6abe5578..000000000
--- a/testing/xorg-xcursorgen/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 148363 2012-01-30 18:52:13Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-xcursorgen
-pkgver=1.0.4
-pkgrel=3
-pkgdesc="Create an X cursor file from PNG images"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libx11' 'libxcursor' 'libpng')
-makedepends=('xorg-util-macros')
-groups=('xorg-apps' 'xorg')
-source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2)
-sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a')
-
-build() {
-  cd "${srcdir}/xcursorgen-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/xcursorgen-${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/xorg-xinit/06_move_serverauthfile_into_tmp.diff b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
deleted file mode 100644
index 99e8a6754..000000000
--- a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Move startx auth files in /tmp so they are removed on reboot.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
-The trap patch didn't seem to work on reboot.
----
- startx.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp
-+++ xinit/startx.cpp
-@@ -273,7 +273,7 @@
-     dummy=0
- 
-     XCOMM create a file with auth information for the server. ':0' is a dummy.
--    xserverauthfile=$HOME/.serverauth.$$
-+    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
-     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
-     xauth -q -f "$xserverauthfile" << EOF
- add :$dummy . $mcookie
diff --git a/testing/xorg-xinit/PKGBUILD b/testing/xorg-xinit/PKGBUILD
deleted file mode 100644
index 957fd0570..000000000
--- a/testing/xorg-xinit/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 148559 2012-02-03 17:12:06Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth' 'inetutils')
-makedepends=('xorg-util-macros')
-optdepends=('xorg-twm' 'xterm')
-backup=('etc/skel/.xinitrc'
-        'etc/skel/.xsession'
-        'etc/X11/xinit/xserverrc'
-        'etc/X11/xinit/xinitrc')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
-        06_move_serverauthfile_into_tmp.diff
-        fs25361.patch
-        xinitrc
-        xsession
-        xserverrc)
-options=(!emptydirs)
-md5sums=('9c0943cbd83e489ad1b05221b97efd44'
-         'abd072ec435ce084cf4e89c58f83d45c'
-         '73a597d3fb7f5b9487318ac8cfd4bedf'
-         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
-         '7873d97db30d6c279ed37e3559e7c59d'
-         'c5baef10fdb7239594daee72a94ddab3')
-
-build() {
-  cd "${srcdir}/xinit-${pkgver}"
-  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
-  patch -Np1 -i "${srcdir}/fs25361.patch"
-  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
-  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
-  make
-}
-
-package() {
-  cd "${srcdir}/xinit-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/skel"
-  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
-  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
-  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xorg-xinit/fs25361.patch b/testing/xorg-xinit/fs25361.patch
deleted file mode 100644
index 4596122de..000000000
--- a/testing/xorg-xinit/fs25361.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
-diff -u xinit.orig/startx.cpp xinit/startx.cpp
---- xinit.orig/startx.cpp	2011-08-02 18:26:57.161711018 +0400
-+++ xinit/startx.cpp	2011-08-02 19:06:39.348816866 +0400
-@@ -290,9 +290,9 @@
-     XCOMM now add the same credentials to the client authority file
-     XCOMM if '$displayname' already exists do not overwrite it as another
-     XCOMM server man need it. Add them to the '$xserverauthfile' instead.
--    for displayname in $authdisplay $hostname$authdisplay; do
-+    for displayname in $authdisplay $hostname/unix$authdisplay; do
-         authcookie=`XAUTH list "$displayname" @@
--        | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
-+        | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
-         if [ "z${authcookie}" = "z" ] ; then
-             XAUTH -q << EOF 
- add $displayname . $mcookie
diff --git a/testing/xorg-xinit/xinitrc b/testing/xorg-xinit/xinitrc
deleted file mode 100644
index dbd080d00..000000000
--- a/testing/xorg-xinit/xinitrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
diff --git a/testing/xorg-xinit/xserverrc b/testing/xorg-xinit/xserverrc
deleted file mode 100644
index 6f746cdce..000000000
--- a/testing/xorg-xinit/xserverrc
+++ /dev/null
@@ -1 +0,0 @@
-exec /usr/bin/X -nolisten tcp "$@"
diff --git a/testing/xorg-xinit/xsession b/testing/xorg-xinit/xsession
deleted file mode 100644
index a16dc0b84..000000000
--- a/testing/xorg-xinit/xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
diff --git a/testing/xsane/PKGBUILD b/testing/xsane/PKGBUILD
deleted file mode 100644
index d03def0a0..000000000
--- a/testing/xsane/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 148365 2012-01-30 18:52:18Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgbase=xsane
-pkgname=('xsane' 'xsane-gimp')
-pkgver=0.998
-pkgrel=2
-arch=(i686 x86_64)
-url="http://www.xsane.org"
-license=('GPL2')
-makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp')
-source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz
-	xsane-0.995-xdg-open.patch)
-md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa'
-         '15541ff0ddc10acfa2059cf99d5478eb')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora
-  patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch"
-  sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp
-  make
-  mv src/xsane src/xsane-gimp
-
-  # build again with gimp enabled
-  make clean
-  ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp
-  make
-}
-
-package_xsane() {
-  pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp."
-  install=$pkgname.install
-  depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg')  
-  optdepends=('xsane-gimp: for gimp plugin support')
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-package_xsane-gimp() {
-  pkgdesc="XSane Gimp plugin"
-  depends=('xsane' 'gimp')
-  cd "$srcdir/$pkgbase-$pkgver"
-  install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp"
-
-  ## For making Gimp Plugin available 
-  /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins"
-  cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/"
-  /bin/ln -s ../../../../bin/xsane-gimp xsane
-
-# http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup
-# when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, 
-# gentoo has something similar
-#%post gimp
-#107 	if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
-#108 	%{_sbindir}/gimp-plugin-mgr --install xsane
-#109 	fi
-#110 	
-#111 	%preun gimp
-#112 	if [ $1 = 0 ]; then
-#113 	if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
-#114 	%{_sbindir}/gimp-plugin-mgr --uninstall xsane
-#115 	fi
-#116 	fi 
-}
diff --git a/testing/xsane/xsane-0.995-xdg-open.patch b/testing/xsane/xsane-0.995-xdg-open.patch
deleted file mode 100644
index db1f9bd68..000000000
--- a/testing/xsane/xsane-0.995-xdg-open.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h
---- xsane-0.995/src/xsane.h.xdg-open	2007-08-13 09:20:32.000000000 +0200
-+++ xsane-0.995/src/xsane.h	2007-11-23 11:50:49.000000000 +0100
-@@ -251,7 +251,7 @@
- # elif defined(HAVE_OS2_H)
- #  define DEFAULT_BROWSER "netscape"
- # else
--#  define DEFAULT_BROWSER "netscape"
-+#  define DEFAULT_BROWSER "xdg-open"
- # endif
- #endif
- 
diff --git a/testing/xsane/xsane.install b/testing/xsane/xsane.install
deleted file mode 100644
index aa3e3b8f8..000000000
--- a/testing/xsane/xsane.install
+++ /dev/null
@@ -1,16 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_install() {
-  echo "NOTE:"
-  echo "  If you experience any problems after installing xsane "
-  echo "  it may help to remove the setup and preferences files"
-  echo "  of xsane:"
-  echo ""
-  echo "    \$ rm -rf ~/.sane/xsane"
-  echo ""
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/xulrunner/PKGBUILD b/testing/xulrunner/PKGBUILD
deleted file mode 100644
index beff32fcf..000000000
--- a/testing/xulrunner/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 149133 2012-02-05 21:34:51Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=xulrunner
-pkgver=10.0
-pkgrel=2
-pkgdesc="Mozilla Runtime Environment"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-        mozconfig
-        mozilla-pkgconfig.patch
-        libvpx.patch)
-options=('!emptydirs')
-replaces=('xulrunner-oss')
-md5sums=('13c61203ccfa583e5a54b4dc22f41233'
-         '8dfb78c5bd0581c8cf4753813132bf0b'
-         '27271ce647a83906ef7a24605e840d61'
-         '5d418ecdbdb9f40597df6b978b0b5ee5')
-
-build() {
-  cd "$srcdir/mozilla-release"
-  cp "$srcdir/mozconfig" .mozconfig
-
-  #fix libdir/sdkdir - fedora
-  patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-  patch -Np1 -i "$srcdir/libvpx.patch"
-
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "$srcdir/mozilla-release"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation"
-
-  # add xulrunner library path to ld.so.conf
-  install -d $pkgdir/etc/ld.so.conf.d
-  echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
-
-  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py"
-}
diff --git a/testing/xulrunner/libvpx.patch b/testing/xulrunner/libvpx.patch
deleted file mode 100644
index f883b8e08..000000000
--- a/testing/xulrunner/libvpx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in
---- mozilla-release.orig/configure.in	2012-02-05 16:01:35.722024142 +0000
-+++ mozilla-release/configure.in	2012-02-05 16:03:34.871064547 +0000
-@@ -5629,7 +5629,7 @@
-             dnl v0.9.6 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],
diff --git a/testing/xulrunner/mozconfig b/testing/xulrunner/mozconfig
deleted file mode 100644
index 82a6ae512..000000000
--- a/testing/xulrunner/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/testing/xulrunner/mozilla-pkgconfig.patch b/testing/xulrunner/mozilla-pkgconfig.patch
deleted file mode 100644
index 037d4aee0..000000000
--- a/testing/xulrunner/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:11:38.100005674 +0000
-+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:14:35.095147521 +0000
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/libxul.pc.in	2011-12-19 22:14:04.375412141 +0000
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- 
-diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
---- mozilla-release.orig/xulrunner/installer/Makefile.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/Makefile.in	2011-12-19 22:18:28.743135321 +0000
-@@ -108,6 +108,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:18:55.569571004 +0000
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/testing/zsh/PKGBUILD b/testing/zsh/PKGBUILD
deleted file mode 100644
index 87e70797e..000000000
--- a/testing/zsh/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 149695 2012-02-09 00:00:30Z allan $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=zsh
-pkgver=4.3.15
-pkgrel=3
-pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
-arch=('i686' 'x86_64')
-url='http://www.zsh.org/'
-license=('custom')
-depends=('pcre' 'libcap' 'gdbm')
-install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
-        'zprofile' 'svn-1.7.patch')
-backup=('etc/zsh/zprofile')
-md5sums=('11766b0dd674a513810903cd33ffcac4'
-         '24a9335edf77252a7b5f52e079f7aef7'
-         '4fcbc119fdb624a8c483a278f3a82efd')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i "${srcdir}/svn-1.7.patch"
-	# FS#16360
-	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
-				 Doc/zsh.texi \
-				 Completion/Unix/Type/_services \
-				 Completion/Unix/Command/_init_d
-	./configure --prefix=/usr \
-		--bindir=/bin \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-maildir-support \
-		--with-term-lib='ncursesw' \
-		--enable-multibyte \
-		--enable-function-subdirs \
-		--enable-fndir=/usr/share/zsh/functions \
-		--enable-scriptdir=/usr/share/zsh/scripts \
-		--with-tcsetpgrp \
-		--enable-pcre \
-		--enable-cap \
-		--enable-zsh-secure-free
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	# This test wont work with the noatime mount option
-	rm Test/C02cond.ztst
-	HOME="${srcdir}" make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
-	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
-	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/zsh/svn-1.7.patch b/testing/zsh/svn-1.7.patch
deleted file mode 100644
index 5ef314cc9..000000000
--- a/testing/zsh/svn-1.7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-index b1cb730..41cc3e7 100644
---- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-@@ -6,12 +6,28 @@
- 
- setopt localoptions noksharrays extendedglob NO_shwordsplit
- local svnbase svnbranch a b rrn
-+local -i rc
- local -A svninfo parentinfo
- local -xA hook_com
- 
- svnbase=".";
- svninfo=()
--${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
-+# Unfortunately, `$pipestatus' is broken currently. Until that problem is
-+# resolved, here is a workaround that will get things done, without using it.
-+# Clumsily, but that's life.
-+local -a dat
-+dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} )
-+rc=$?
-+(( rc != 0 )) && return 1
-+# The following line is the real code, the following is the workaround.
-+#${vcs_comm[cmd]} info --non-interactive \
-+print -l "${dat[@]}" \
-+|& while IFS=: read a b; do
-+    svninfo[${a// /_}]="${b## #}"
-+done
-+#rc=${pipestatus[1]}
-+#(( rc != 0 )) && return 1
-+
- while [[ -d "${svnbase}/../.svn" ]]; do
-     parentinfo=()
-     ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done
diff --git a/testing/zsh/zprofile b/testing/zsh/zprofile
deleted file mode 100644
index 6bfcdf7cb..000000000
--- a/testing/zsh/zprofile
+++ /dev/null
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'
diff --git a/testing/zsh/zsh.install b/testing/zsh/zsh.install
deleted file mode 100644
index e2a53bea8..000000000
--- a/testing/zsh/zsh.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	sed -i '/^\/bin\/zsh/d' etc/shells
-}
diff --git a/testing/zvbi/PKGBUILD b/testing/zvbi/PKGBUILD
deleted file mode 100644
index ed33f6a26..000000000
--- a/testing/zvbi/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 148369 2012-01-30 18:52:25Z ibiru $
-# Maintainer: 
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=zvbi
-pkgver=0.2.33
-pkgrel=4
-pkgdesc="VBI capture and decoding library"
-url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
-arch=('i686' 'x86_64')
-depends=('libpng' 'libx11')
-license=('GPL')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
-        'fix-includes.patch'
-        'zvbi-0.2.33-libpng15.patch')
-md5sums=('1741a6045c3eedfb611d645f2da69ac8'
-         '38766bc59e1571133d0399f0102da653'
-         '4434de7addc438be8c5a33274146bd11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/fix-includes.patch"
-  patch -Np0 -i "${srcdir}/zvbi-0.2.33-libpng15.patch"
-
-  ./configure --prefix=/usr \
-              --disable-static \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/zvbi/fix-includes.patch b/testing/zvbi/fix-includes.patch
deleted file mode 100644
index 28252649e..000000000
--- a/testing/zvbi/fix-includes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Add proper #includes so that we do not get undef errors to S_ISCHR
-during linking.
-
-Signed-off-by: Alex Chiang <achiang@canonical.com>
----
---- zvbi-0.2.33.orig/src/io-dvb.c
-+++ zvbi-0.2.33/src/io-dvb.c
-@@ -29,6 +29,8 @@
- #include <errno.h>
- #include <sys/select.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #ifndef HAVE_S64_U64
-   /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
---- zvbi-0.2.33.orig/src/io-v4l.c
-+++ zvbi-0.2.33/src/io-v4l.c
-@@ -42,6 +42,7 @@ static const char rcsid [] =
- #include <assert.h>
- #include <sys/time.h>		/* timeval */
- #include <sys/types.h>		/* fd_set, uid_t */
-+#include <sys/stat.h>		/* S_ISCHR */
- #include <sys/ioctl.h>		/* for (_)videodev.h */
- #include <pthread.h>
- 
---- zvbi-0.2.33.orig/contrib/ntsc-cc.c
-+++ zvbi-0.2.33/contrib/ntsc-cc.c
-@@ -34,6 +34,7 @@
- #include <locale.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/time.h>
- #ifdef HAVE_GETOPT_LONG
- #  include <getopt.h>
diff --git a/testing/zvbi/zvbi-0.2.33-libpng15.patch b/testing/zvbi/zvbi-0.2.33-libpng15.patch
deleted file mode 100644
index 262677376..000000000
--- a/testing/zvbi/zvbi-0.2.33-libpng15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: src/exp-gfx.c
-===================================================================
-RCS file: /cvsroot/zapping/vbi/src/exp-gfx.c,v
-retrieving revision 1.16
-diff -u -B -r1.16 exp-gfx.c
---- src/exp-gfx.c	24 Feb 2008 14:17:47 -0000	1.16
-+++ src/exp-gfx.c	15 Feb 2011 20:03:58 -0000
-@@ -1672,11 +1672,11 @@
- 	char title[80];
- 	unsigned int i;
- 
--	if (setjmp (png_ptr->jmpbuf))
-+	if (setjmp (png_jmpbuf(png_ptr)))
- 		return FALSE;
- 
- 	png_set_write_fn (png_ptr,
--			  (voidp) gfx,
-+			  (png_voidp) gfx,
- 			  write_data,
- 			  flush_data);
- 
diff --git a/~mtjm/cups-usblp/cups-avahi.patch b/~mtjm/cups-usblp/cups-avahi.patch
deleted file mode 100644
index 7e9c8ecea..000000000
--- a/~mtjm/cups-usblp/cups-avahi.patch
+++ /dev/null
@@ -1,3156 +0,0 @@
-Description: Avahi support
-Bug: http://www.cups.org/str.php?L3066
-Author: Tim Waugh
-Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011)
-
---- a/backend/dnssd.c
-+++ b/backend/dnssd.c
-@@ -15,14 +15,21 @@
-  *
-  * Contents:
-  *
-+ *   next_txt_record()       - Get next TXT record from a cups_txt_records_t.
-+ *   parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
-  *   main()                  - Browse for printers.
-  *   browse_callback()       - Browse devices.
-  *   browse_local_callback() - Browse local devices.
-  *   compare_devices()       - Compare two devices.
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-+ *   device_type()           - Get DNS-SD type enumeration from string.
-  *   get_device()            - Create or update a device.
-  *   query_callback()        - Process query data.
-+ *   avahi_client_callback() - Avahi client callback function.
-+ *   avahi_query_callback()  - Avahi query callback function.
-+ *   avahi_browse_callback() - Avahi browse callback function.
-+ *   find_device()           - Find a device from its name and domain.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-  */
-@@ -33,7 +40,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -53,7 +71,12 @@
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -65,6 +88,20 @@
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -78,6 +115,7 @@
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -93,12 +131,6 @@
- 					      const char *regtype,
- 					      const char *replyDomain,
- 					      void *context);
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain);
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -107,9 +139,118 @@
- 				       uint16_t rrclass, uint16_t rdlen,
- 				       const void *rdata, uint32_t ttl,
- 				       void *context);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain);
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize);
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
-+ */
-+
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+
-+/*
-+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
-+ */
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) >= txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
-+
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -120,6 +261,13 @@
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -133,12 +281,11 @@
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -198,6 +345,49 @@
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("DEBUG: Unable to create avahi client");
-+    return (0);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -258,6 +448,7 @@
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -265,6 +456,9 @@
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -284,11 +478,35 @@
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -302,6 +520,7 @@
-         if (device->sent)
- 	  sent ++;
- 
-+#ifdef HAVE_DNSSD
-         if (device->ref)
- 	  count ++;
- 
-@@ -333,14 +552,23 @@
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -401,6 +629,7 @@
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'browse_callback()' - Browse devices.
-  */
-@@ -489,6 +718,7 @@
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -569,6 +799,41 @@
- 
- 
- /*
-+ * 'device_type()' - Get DNS-SD type enumeration from string.
-+ */
-+
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp.") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
-+
-+/*
-  * 'get_device()' - Create or update a device.
-  */
- 
-@@ -589,20 +854,7 @@
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_ipps._tcp.") ||
--	   !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPPS;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -622,8 +874,14 @@
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -643,6 +901,9 @@
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -650,13 +911,20 @@
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'query_callback()' - Process query data.
-  */
-@@ -680,7 +948,7 @@
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -714,94 +982,233 @@
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_ipps._tcp.") ||
--           strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPPS;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_client_callback()' - Avahi client callback function.
-+ */
-+
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_query_callback()' - Avahi query callback function.
-+ */
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-+
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+
-+/*
-+ * 'avahi_browse_callback()' - Avahi browse callback function.
-+ */
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
-+
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+/*
-+ * 'find_device()' - Find a device from its name and domain.
-+ */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (_cups_strcasecmp(device->name, dkey.name) ||
--        _cups_strcasecmp(device->domain, dkey.domain))
-+    if (_cups_strcasecmp(device->name, dkey->name) ||
-+        _cups_strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) >= dataend)
--	  break;
--
--        datanext = data + datalen;
--
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
-+	char *key;
-+	char *value;
- 
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
--	          key, value);
--	}
--	else
--	{
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
--	          key);
--	  continue;
--	}
--
--        if (!_cups_strncasecmp(key, "usb_", 4))
-+	key = txt->key;
-+	value = txt->value;
-+        if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
- 	  * Add USB device ID information...
-@@ -856,6 +1263,10 @@
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -905,11 +1316,9 @@
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
---- a/config-scripts/cups-dnssd.m4
-+++ b/config-scripts/cups-dnssd.m4
-@@ -23,6 +23,21 @@
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
---- a/config.h.in
-+++ b/config.h.in
-@@ -390,6 +390,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
---- a/cups/http-support.c
-+++ b/cups/http-support.c
-@@ -43,6 +43,10 @@
-  *   http_copy_decode()   - Copy and decode a URI.
-  *   http_copy_encode()   - Copy and encode a URI.
-  *   http_resolve_cb()    - Build a device URI for the given service name.
-+ *   avahi_resolve_uri_client_cb()
-+ *                        - Avahi client callback for resolving URI.
-+ *   avahi_resolve_uri_resolver_cb()
-+ *                        - Avahi resolver callback for resolving URI.
-  */
- 
- /*
-@@ -60,6 +64,11 @@
- #    include <sys/select.h>
- #  endif /* WIN32 */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -127,6 +136,24 @@
- 					void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1431,6 +1458,9 @@
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
- #  ifdef WIN32
- #    pragma comment(lib, "dnssd.lib")
-@@ -1449,6 +1479,17 @@
-     fd_set		input_set;	/* Input set for select() */
-     struct timeval	stimeout;	/* Timeout value for select() */
- #endif /* HAVE_POLL */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
-+
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-       fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1485,9 +1526,16 @@
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer   = resolved_uri;
-     uribuf.bufsize  = resolved_size;
-     uribuf.options  = options;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+    user_data.uribuf.options = options;
-+#endif
-+
-     resolved_uri[0] = '\0';
- 
-     DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1501,6 +1549,7 @@
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1608,6 +1657,36 @@
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-     {
-@@ -1619,13 +1698,13 @@
-       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if ((options & _HTTP_RESOLVE_STDERR) && !uri)
-       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1895,6 +1974,116 @@
- #endif /* HAVE_DNSSD */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
-+ *                                     URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
-  * End of "$Id: http-support.c 9820 2011-06-10 22:06:26Z mike $".
-  */
---- a/scheduler/Makefile
-+++ b/scheduler/Makefile
-@@ -17,6 +17,7 @@
- 
- CUPSDOBJS =	\
- 		auth.o \
-+		avahi.o \
- 		banners.o \
- 		cert.o \
- 		classes.o \
-@@ -39,7 +40,8 @@
- 		server.o \
- 		statbuf.o \
- 		subscriptions.o \
--		sysman.o
-+		sysman.o \
-+		timeout.o
- LIBOBJS =	\
- 		filter.o \
- 		mime.o \
---- /dev/null
-+++ b/scheduler/avahi.c
-@@ -0,0 +1,445 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Distribution and use rights are outlined in the file "LICENSE.txt"
-+ *   "LICENSE" which should have been included with this file.  If this
-+ *   file is missing or damaged, see the license at "http://www.cups.org/".
-+ *
-+ * Contents:
-+ *
-+ *   watch_read_cb         - Read callback for file descriptor
-+ *   watch_write_cb        - Write callback for file descriptor
-+ *   watched_fd_add_select() - Call cupsdAddSelect() as needed
-+ *   watch_new()           - Create a new file descriptor watch
-+ *   watch_free()          - Free a file descriptor watch
-+ *   watch_update()        - Update watched events for a file descriptor
-+ *   watch_get_events()    - Get events that happened for a file descriptor
-+ *   timeout_cb()          - Run a timed Avahi callback
-+ *   timeout_new()         - Set a wakeup time
-+ *   timeout_update()      - Update the expiration time for a timeout
-+ *   timeout_free()        - Free a timeout
-+ *   compare_watched_fds() - Compare watched file descriptors for array sorting
-+ *   compare_timeouts()    - Compare timeouts for array sorting
-+ *   avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
-+ *   avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
-+ *   avahi_cups_poll_get() - Get the abstract poll API structure
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+typedef struct
-+{
-+  AvahiCupsPoll *cups_poll;
-+
-+  int fd;
-+  AvahiWatchEvent occurred;
-+  cups_array_t *watches;
-+} cupsd_watched_fd_t;
-+
-+struct AvahiWatch
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  AvahiWatchEvent events;
-+  AvahiWatchCallback callback;
-+  void *userdata;
-+};
-+
-+struct AvahiTimeout
-+{
-+  AvahiCupsPoll *cups_poll;
-+  AvahiTimeoutCallback callback;
-+  void *userdata;
-+  cupsd_timeout_t *cupsd_timeout;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static AvahiWatch *	watch_new(const AvahiPoll *api,
-+				  int fd,
-+				  AvahiWatchEvent events,
-+				  AvahiWatchCallback callback,
-+				  void *userdata);
-+static void		watch_free(AvahiWatch *watch);
-+static void		watch_update(AvahiWatch *watch,
-+				     AvahiWatchEvent events);
-+static AvahiWatchEvent	watch_get_events(AvahiWatch *watch);
-+static int		compare_watches(AvahiWatch *p0,
-+					AvahiWatch *p1);
-+
-+
-+/*
-+ * 'watch_read_cb' - Read callback for file descriptor
-+ */
-+
-+static void
-+watch_read_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_IN;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+    if (watch->events & watched_fd->occurred) {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_IN, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_IN;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_write_cb' - Write callback for file descriptor
-+ */
-+
-+static void
-+watch_write_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_OUT;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+    if (watch->events & watched_fd->occurred) {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_OUT, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
-+ */
-+
-+static int						/* O - Watches? */
-+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
-+{
-+  AvahiWatch *watch;
-+  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
-+
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+    if (watch->events & (AVAHI_WATCH_IN |
-+			     AVAHI_WATCH_ERR |
-+			     AVAHI_WATCH_HUP)) {
-+      read_cb = (cupsd_selfunc_t)watch_read_cb;
-+      if (write_cb != NULL)
-+	break;
-+    }
-+
-+    if (watch->events & AVAHI_WATCH_OUT) {
-+      write_cb = (cupsd_selfunc_t)watch_write_cb;
-+      if (read_cb != NULL)
-+	break;
-+    }
-+  }
-+
-+  if (read_cb || write_cb)
-+    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
-+  else
-+    cupsdRemoveSelect (watched_fd->fd);
-+
-+  return (read_cb || write_cb);
-+}
-+
-+/*
-+ * 'watch_new' - Create a new file descriptor watch
-+ */
-+
-+static AvahiWatch *
-+watch_new (const AvahiPoll *api,
-+	   int fd,
-+	   AvahiWatchEvent events,
-+	   AvahiWatchCallback callback,
-+	   void *userdata)
-+{
-+  cupsd_watched_fd_t key, *watched_fd;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
-+  if (watch == NULL)
-+    return (NULL);
-+
-+  watch->events = events;
-+  watch->callback = callback;
-+  watch->userdata = userdata;
-+
-+  key.fd = fd;
-+  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
-+  if (watched_fd == NULL) {
-+    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
-+    if (watched_fd == NULL) {
-+      free (watch);
-+      return (NULL);
-+    }
-+
-+    watched_fd->fd = fd;
-+    watched_fd->occurred = 0;
-+    watched_fd->cups_poll = cups_poll;
-+    watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches,
-+					NULL);
-+  }
-+
-+  watch->watched_fd = watched_fd;
-+  cupsArrayAdd(watched_fd->watches, watch);
-+  watched_fd_add_select (watched_fd);
-+  return (watch);
-+}
-+
-+
-+/*
-+ * 'watch_free' - Free a file descriptor watch
-+ */
-+
-+static void
-+watch_free (AvahiWatch *watch)
-+{
-+  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
-+  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
-+
-+  cupsArrayRemove (watched_fd->watches, watch);
-+  free (watch);
-+
-+  if (!watched_fd_add_select (watched_fd)) {
-+    /* No more watches */
-+    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
-+    free (watched_fd);
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_update' - Update watched events for a file descriptor
-+ */
-+
-+static void
-+watch_update (AvahiWatch *watch,
-+	      AvahiWatchEvent events)
-+{
-+  watch->events = events;
-+  watched_fd_add_select (watch->watched_fd);
-+}
-+
-+
-+/*
-+ * 'watch_get_events' - Get events that happened for a file descriptor
-+ */
-+
-+static AvahiWatchEvent
-+watch_get_events (AvahiWatch *watch)
-+{
-+  return (watch->watched_fd->occurred);
-+}
-+
-+
-+/*
-+ * 'compare_watches' - Compare watches for array sorting
-+ */
-+
-+static int
-+compare_watches (AvahiWatch *p0,
-+		 AvahiWatch *p1)
-+{
-+  if (p0->watched_fd->fd < p1->watched_fd->fd)
-+    return (-1);
-+
-+  return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1);
-+}
-+
-+
-+/*
-+ * 'timeout_cb()' - Run a timed Avahi callback
-+ */
-+
-+static void
-+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
-+{
-+  AvahiTimeout *timeout = userdata;
-+  (timeout->callback) (timeout, timeout->userdata);
-+}
-+
-+
-+/*
-+ * 'timeout_new' - Set a wakeup time
-+ */
-+
-+static AvahiTimeout *
-+timeout_new (const AvahiPoll *api,
-+	     const struct timeval *tv,
-+	     AvahiTimeoutCallback callback,
-+	     void *userdata)
-+{
-+  AvahiTimeout *timeout;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+
-+  timeout = malloc(sizeof(AvahiTimeout));
-+  if (timeout == NULL)
-+    return (NULL);
-+
-+  timeout->cups_poll = cups_poll;
-+  timeout->callback = callback;
-+  timeout->userdata = userdata;
-+  timeout->cupsd_timeout = cupsdAddTimeout (tv,
-+					    (cupsd_timeoutfunc_t)timeout_cb,
-+					    timeout);
-+  cupsArrayAdd (cups_poll->timeouts, timeout);
-+  return (timeout);
-+}
-+
-+
-+/*
-+ * 'timeout_update' - Update the expiration time for a timeout
-+ */
-+
-+static void
-+timeout_update (AvahiTimeout *timeout,
-+		const struct timeval *tv)
-+{
-+  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
-+}
-+
-+
-+/*
-+ * ' timeout_free' - Free a timeout
-+ */
-+
-+static void
-+timeout_free (AvahiTimeout *timeout)
-+{
-+  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
-+  cupsdRemoveTimeout (timeout->cupsd_timeout);
-+  free (timeout);
-+}
-+
-+
-+/*
-+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
-+ */
-+static int
-+compare_watched_fds(cupsd_watched_fd_t *p0,
-+		    cupsd_watched_fd_t *p1)
-+{
-+  if (p0->fd != p1->fd)
-+    return (p0->fd < p1->fd ? -1 : 1);
-+
-+  if (p0 == p1)
-+    return (0);
-+
-+  return (p0 < p1 ? -1 : 1);
-+}
-+
-+
-+/*
-+ * 'compare_timeouts' - Compare timeouts for array sorting
-+ */
-+static int
-+compare_timeouts(AvahiTimeout *p0,
-+		 AvahiTimeout *p1)
-+{
-+ /*
-+  * Just compare pointers to make it a stable sort.
-+  */
-+
-+  if (p0->cupsd_timeout < p1->cupsd_timeout)
-+    return (-1);
-+  return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
-+ */
-+
-+AvahiCupsPoll *
-+avahi_cups_poll_new (void)
-+{
-+  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
-+  if (cups_poll == NULL)
-+    return (NULL);
-+
-+  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
-+					 NULL);
-+  cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts,
-+				      NULL);
-+
-+  cups_poll->api.userdata = cups_poll;
-+  cups_poll->api.watch_new = watch_new;
-+  cups_poll->api.watch_free = watch_free;
-+  cups_poll->api.watch_update = watch_update;
-+  cups_poll->api.watch_get_events = watch_get_events;
-+
-+  cups_poll->api.timeout_new = timeout_new;
-+  cups_poll->api.timeout_update = timeout_update;
-+  cups_poll->api.timeout_free = timeout_free;
-+
-+  return (cups_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
-+ */
-+void
-+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
-+       watched_fd;
-+       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){
-+    cupsArrayClear (watched_fd->watches);
-+  }
-+
-+  cupsArrayClear (cups_poll->watched_fds);
-+  cupsArrayClear (cups_poll->timeouts);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
-+ */
-+
-+const AvahiPoll *
-+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
-+{
-+  return (&cups_poll->api);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
---- /dev/null
-+++ b/scheduler/avahi.h
-@@ -0,0 +1,49 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Distribution and use rights are outlined in the file "LICENSE.txt"
-+ *   which should have been included with this file.  If this file is
-+ *   file is missing or damaged, see the license at "http://www.cups.org/".
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_AUTHORIZATION_H
-+#  include <Security/Authorization.h>
-+#endif /* HAVE_AUTHORIZATION_H */
-+
-+
-+#ifdef HAVE_AVAHI
-+typedef struct
-+{
-+    AvahiPoll api;
-+    cups_array_t *watched_fds;
-+    cups_array_t *timeouts;
-+} AvahiCupsPoll;
-+#endif /* HAVE_AVAHI */
-+
-+/*
-+ * Prototypes...
-+ */
-+
-+#ifdef HAVE_AVAHI
-+extern AvahiCupsPoll *	avahi_cups_poll_new(void);
-+extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
-+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * End of "$Id$".
-+ */
---- a/scheduler/cupsd.h
-+++ b/scheduler/cupsd.h
-@@ -140,6 +140,15 @@
- 
- typedef void (*cupsd_selfunc_t)(void *data);
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * Timeout callback function type...
-+ */
-+
-+typedef struct _cupsd_timeout_s cupsd_timeout_t;
-+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * Globals...
-@@ -173,6 +182,11 @@
- 					/* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_AVAHI
-+VAR cups_array_t *Timeouts;		/* Timed callbacks for main loop */
-+#endif /* HAVE_AVAHI */
-+
-+
- 
- /*
-  * Prototypes...
-@@ -242,6 +256,20 @@
- extern void		cupsdStartServer(void);
- extern void		cupsdStopServer(void);
- 
-+#ifdef HAVE_AVAHI
-+extern void     cupsdInitTimeouts(void);
-+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
-+					 cupsd_timeoutfunc_t cb,
-+					 void *data);
-+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
-+extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
-+extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
-+				    const struct timeval *tv);
-+extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
-+#endif /* HAVE_AVAHI */
-+
-+extern int	cupsdRemoveFile(const char *filename);
-+
- 
- /*
-  * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -122,6 +122,10 @@
-   cupsd_listener_t	*lis;		/* Current listener */
-   time_t		current_time,	/* Current time */
- 			activity,	/* Client activity timer */
-+#ifdef HAVE_AVAHI
-+			avahi_client_time, /* Time for next Avahi client
-+					      check */
-+#endif /* HAVE_AVAHI */
- 			browse_time,	/* Next browse send time */
- 			senddoc_time,	/* Send-Document time */
- 			expire_time,	/* Subscription expire time */
-@@ -148,6 +152,10 @@
-   int			launchd_idle_exit;
- 					/* Idle exit on select timeout? */
- #endif	/* HAVE_LAUNCHD */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Next scheduled timed callback */
-+  long			tmo_delay;	/* Time before it must be called */
-+#endif /* HAVE_AVAHI */
- 
- 
- #ifdef HAVE_GETEUID
-@@ -527,6 +535,14 @@
- 
-   httpInitialize();
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * Initialize timed callback structures.
-+  */
-+
-+  cupsdInitTimeouts();
-+#endif /* HAVE_AVAHI */
-+
-   cupsdStartServer();
- 
-  /*
-@@ -657,6 +673,9 @@
-   */
- 
-   current_time  = time(NULL);
-+#ifdef HAVE_AVAHI
-+  avahi_client_time = current_time;
-+#endif /* HAVE_AVAHI */
-   browse_time   = current_time;
-   event_time    = current_time;
-   expire_time   = current_time;
-@@ -871,6 +890,26 @@
-     }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+   /*
-+    * If a timed callback is due, run it.
-+    */
-+
-+    tmo = cupsdNextTimeout (&tmo_delay);
-+    if (tmo && tmo_delay == 0)
-+      cupsdRunTimeout (tmo);
-+
-+   /*
-+    * Try to restart the Avahi client every 10 seconds if needed...
-+    */
-+
-+    if ((current_time - avahi_client_time) >= 10)
-+    {
-+      avahi_client_time = current_time;
-+      cupsdStartAvahiClient();
-+    }
-+#endif /* HAVE_AVAHI */
-+
- #ifndef __APPLE__
-    /*
-     * Update the network interfaces once a minute...
-@@ -1815,6 +1854,10 @@
-   cupsd_job_t		*job;		/* Job information */
-   cupsd_subscription_t	*sub;		/* Subscription information */
-   const char		*why;		/* Debugging aid */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Timed callback */
-+  long			tmo_delay;	/* Seconds before calling it */
-+#endif /* HAVE_AVAHI */
- 
- 
-  /*
-@@ -1857,6 +1900,19 @@
-   }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * See if there are any scheduled timed callbacks to run.
-+  */
-+
-+  tmo = cupsdNextTimeout (&tmo_delay);
-+  if (tmo)
-+  {
-+    timeout = tmo_delay;
-+    why = "run a timed callback";
-+  }
-+#endif /* HAVE_AVAHI */
-+
-  /*
-   * Check whether we are accepting new connections...
-   */
---- /dev/null
-+++ b/scheduler/timeout.c
-@@ -0,0 +1,195 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Timeout functions for the Common UNIX Printing System (CUPS).
-+ *
-+ *   Copyright (C) 2010 Red Hat, Inc.
-+ *   Authors:
-+ *     Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Distribution and use rights are outlined in the file "LICENSE.txt"
-+ *   which should have been included with this file.  If this file is
-+ *   file is missing or damaged, see the license at "http://www.cups.org/".
-+ *
-+ * Contents:
-+ *
-+ *   cupsdInitTimeouts()  - Initialise timeout structure.
-+ *   cupsdAddTimeout()    - Add a timed callback.
-+ *   cupsdNextTimeout()   - Find the next enabled timed callback.
-+ *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
-+ *   cupsdRemoveTimeout() - Discard a timed callback.
-+ *   compare_timeouts()   - Compare timed callbacks for array sorting.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+struct _cupsd_timeout_s
-+{
-+  struct timeval when;
-+  int enabled;
-+  cupsd_timeoutfunc_t callback;
-+  void *data;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+/*
-+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
-+ */
-+
-+static int
-+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
-+{
-+  if (!p0->enabled || !p1->enabled)
-+  {
-+    if (!p0->enabled && !p1->enabled)
-+      return (0);
-+
-+    return (p0->enabled ? -1 : 1);
-+  }
-+
-+  return (avahi_timeval_compare (&p0->when, &p1->when));
-+}
-+
-+
-+/*
-+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
-+ */
-+
-+void
-+cupsdInitTimeouts(void)
-+{
-+  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
-+}
-+
-+
-+/*
-+ * 'cupsdAddTimeout()' - Add a timed callback.
-+ */
-+
-+cupsd_timeout_t *				/* O - Timeout handle */
-+cupsdAddTimeout(const struct timeval *tv,	/* I - Absolute time */
-+		cupsd_timeoutfunc_t cb,		/* I - Callback function */
-+		void *data)			/* I - User data */
-+{
-+  cupsd_timeout_t *timeout;
-+
-+  timeout = malloc (sizeof(cupsd_timeout_t));
-+  if (timeout != NULL)
-+  {
-+    timeout->enabled = (tv != NULL);
-+    if (tv)
-+    {
-+      timeout->when.tv_sec = tv->tv_sec;
-+      timeout->when.tv_usec = tv->tv_usec;
-+    }
-+
-+    timeout->callback = cb;
-+    timeout->data = data;
-+    cupsArrayAdd (Timeouts, timeout);
-+  }
-+
-+  return timeout;
-+}
-+
-+
-+/*
-+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
-+ */
-+
-+cupsd_timeout_t *		/* O - Next enabled timeout or NULL */
-+cupsdNextTimeout(long *delay)	/* O - Seconds before scheduled */
-+{
-+  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
-+  struct timeval curtime;
-+
-+  if (first && !first->enabled)
-+    first = NULL;
-+
-+  if (first && delay)
-+  {
-+    gettimeofday (&curtime, NULL);
-+    if (avahi_timeval_compare (&curtime, &first->when) > 0)
-+    {
-+      *delay = 0;
-+    } else {
-+      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
-+      if (first->when.tv_usec < curtime.tv_usec)
-+	(*delay)--;
-+    }
-+  }
-+
-+  return (first);
-+}
-+
-+
-+/*
-+ * 'cupsdRunTimeout()' - Run a timed callback.
-+ */
-+
-+void
-+cupsdRunTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  if (!timeout)
-+    return;
-+  timeout->enabled = 0;
-+  if (!timeout->callback)
-+    return;
-+  timeout->callback (timeout, timeout->data);
-+}
-+
-+/*
-+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
-+ */
-+
-+void
-+cupsdUpdateTimeout(cupsd_timeout_t *timeout,	/* I - Timeout */
-+		   const struct timeval *tv)	/* I - Absolute time or NULL */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  timeout->enabled = (tv != NULL);
-+  if (tv)
-+  {
-+    timeout->when.tv_sec = tv->tv_sec;
-+    timeout->when.tv_usec = tv->tv_usec;
-+  }
-+  cupsArrayAdd (Timeouts, timeout);
-+}
-+
-+
-+/*
-+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
-+ */
-+
-+void
-+cupsdRemoveTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  free (timeout);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
---- a/cgi-bin/admin.c
-+++ b/cgi-bin/admin.c
-@@ -1643,7 +1643,7 @@
-       else
- 	local_protocols[0] = '\0';
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
-       {
- 	if (local_protocols[0])
-@@ -1651,7 +1651,7 @@
- 	else
- 	  strcat(local_protocols, "dnssd");
-       }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@
- #endif /* HAVE_GSSAPI */
-   cgiSetVariable("KERBEROS", "");
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-   cgiSetVariable("HAVE_LDAP", "1");
---- a/scheduler/client.c
-+++ b/scheduler/client.c
-@@ -4987,7 +4987,7 @@
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4996,7 +4996,7 @@
-       (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
-        !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-  /*
-   * Check if the hostname is an IP address...
---- a/scheduler/dirsvc.c
-+++ b/scheduler/dirsvc.c
-@@ -27,6 +27,7 @@
-  *   ldap_connect()             - Start new LDAP connection
-  *   ldap_reconnect()           - Reconnect to LDAP Server
-  *   ldap_disconnect()          - Disconnect from LDAP Server
-+ *   cupsdStartAvahiClient()    - Start an Avahi client if needed
-  *   cupsdStartBrowsing()       - Start sending and receiving broadcast
-  *                                information.
-  *   cupsdStartPolling()        - Start polling servers as needed.
-@@ -45,6 +46,8 @@
-  *                                printer.
-  *   dnssdPackTxtRecord()       - Pack an array of key/value pairs into the TXT
-  *                                record format.
-+ *   avahiPackTxtRecord()       - Pack an array of key/value pairs into an
-+ *                                AvahiStringList.
-  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
-  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
-  *                                printer or update the broadcast contents.
-@@ -83,6 +86,7 @@
-  */
- 
- #include "cupsd.h"
-+#include <assert.h>
- #include <grp.h>
- 
- #ifdef HAVE_DNSSD
-@@ -97,6 +101,17 @@
- #    endif /* HAVE_SYSTEMCONFIGURATION */
- #  endif /* __APPLE__ */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/domain.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+#ifdef HAVE_DNSSD
-+typedef char *cupsd_txt_record_t;
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+typedef AvahiStringList *cupsd_txt_record_t;
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -159,27 +174,39 @@
- static void	update_smb(int onoff);
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-+					      int for_lpd);
-+static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
-+static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
-+static void	dnssdRegisterPrinter(cupsd_printer_t *p);
-+static void	dnssdStop(void);
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
- #ifdef HAVE_DNSSD
- #  ifdef HAVE_COREFOUNDATION
- static void	dnssdAddAlias(const void *key, const void *value,
- 		              void *context);
- #  endif /* HAVE_COREFOUNDATION */
--static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
--		                     int for_lpd);
--static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
--static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
--static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
--		                    int count);
- static void	dnssdRegisterCallback(DNSServiceRef sdRef,
- 		                      DNSServiceFlags flags,
- 				      DNSServiceErrorType errorCode,
- 				      const char *name, const char *regtype,
- 				      const char *domain, void *context);
--static void	dnssdRegisterPrinter(cupsd_printer_t *p);
--static void	dnssdStop(void);
- static void	dnssdUpdate(void);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
-+					   int count);
-+static void	avahi_entry_group_cb (AvahiEntryGroup *group,
-+				      AvahiEntryGroupState state,
-+				      void *userdata);
-+static void	avahi_client_cb (AvahiClient *client,
-+				 AvahiClientState state,
-+				 void *userdata);
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- 		{
-@@ -283,10 +310,10 @@
-     ldap_dereg_printer(p);
- #endif /* HAVE_LDAP */
- 
--#ifdef HAVE_DNSSD
--  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdDeregisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -702,10 +729,10 @@
-     slpRegisterPrinter(p); */
- #endif /* HAVE_LIBSLP */
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdRegisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -1419,6 +1446,27 @@
- #endif /* HAVE_LDAP */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
-+ */
-+
-+void
-+cupsdStartAvahiClient(void)
-+{
-+  if (!AvahiCupsClient && !AvahiCupsClientConnecting)
-+  {
-+    if (!AvahiCupsPollHandle)
-+      AvahiCupsPollHandle = avahi_cups_poll_new ();
-+
-+    if (AvahiCupsPollHandle)
-+      avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
-+			AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL);
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+  
- /*
-  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
-  */
-@@ -1542,13 +1590,16 @@
-   else
-     BrowseSocket = -1;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
-   {
-+#ifdef HAVE_DNSSD
-     DNSServiceErrorType error;		/* Error from service creation */
-+#endif /* HAVE_DNSSD */
-     cupsd_listener_t	*lis;		/* Current listening socket */
- 
- 
-+#ifdef HAVE_DNSSD
-    /*
-     * First create a "master" connection for all registrations...
-     */
-@@ -1573,6 +1624,7 @@
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
- 
-       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
-+#endif /* HAVE_DNSSD */
- 
-      /*
-       * Then get the port we use for registrations.  If we are not listening
-@@ -1606,9 +1658,16 @@
-       */
- 
-       cupsdUpdateDNSSDName();
-+
-+#ifdef HAVE_AVAHI
-+      cupsdStartAvahiClient ();
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_DNSSD
-     }
--  }
- #endif /* HAVE_DNSSD */
-+  }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-@@ -1834,10 +1893,10 @@
-     BrowseSocket = -1;
-   }
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdStop();
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-@@ -1902,7 +1961,7 @@
- }
- 
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
-  */
-@@ -1910,8 +1969,14 @@
- void
- cupsdUpdateDNSSDName(void)
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType error;		/* Error from service creation */
-   char		webif[1024];		/* Web interface share name */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		ret;			/* Error from service creation */
-+  char		webif[AVAHI_LABEL_MAX];	/* Web interface share name */
-+#endif /* HAVE_AVAHI */
- #  ifdef HAVE_SYSTEMCONFIGURATION
-   SCDynamicStoreRef sc;			/* Context for dynamic store */
-   CFDictionaryRef btmm;			/* Back-to-My-Mac domains */
-@@ -2042,6 +2107,7 @@
-     else
-       strlcpy(webif, "CUPS Web Interface", sizeof(webif));
- 
-+#ifdef HAVE_DNSSD
-     if (WebIFRef)
-       DNSServiceRefDeallocate(WebIFRef);
- 
-@@ -2054,9 +2120,45 @@
- 				    NULL)) != kDNSServiceErr_NoError)
-       cupsdLogMessage(CUPSD_LOG_ERROR,
- 		      "DNS-SD web interface registration failed: %d", error);
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+    if (!AvahiCupsClient)
-+     /*
-+      * Client not yet running.
-+      */
-+      return;
-+
-+    if (AvahiWebIFGroup)
-+      avahi_entry_group_reset (AvahiWebIFGroup);
-+    else
-+      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
-+					       avahi_entry_group_cb,
-+					       NULL);
-+
-+    if (AvahiWebIFGroup)
-+    {
-+      ret = avahi_entry_group_add_service (AvahiWebIFGroup,
-+					   AVAHI_IF_UNSPEC,
-+					   AVAHI_PROTO_UNSPEC,
-+					   0, /* flags */
-+					   webif, /* name */
-+					   "_http._tcp", /* type */
-+					   NULL, /* domain */
-+					   NULL, /* host */
-+					   DNSSDPort, /* port */
-+					   "path=/", NULL);
-+      if (ret == 0)
-+	ret = avahi_entry_group_commit (AvahiWebIFGroup);
-+
-+      if (ret != 0)
-+	cupsdLogMessage (CUPSD_LOG_ERROR,
-+			 "Avahi web interface registration failed: %d", ret);
-+    }
-+#endif /* HAVE_AVAHI */
-   }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
- #ifdef HAVE_LDAP
-@@ -2334,13 +2436,15 @@
-                     "Bad Back to My Mac domain in dynamic store!");
- }
- #  endif /* HAVE_COREFOUNDATION */
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
-  */
- 
--static char *				/* O - TXT record */
-+static cupsd_txt_record_t		/* O - TXT record */
- dnssdBuildTxtRecord(
-     int             *txt_len,		/* O - TXT record length */
-     cupsd_printer_t *p,			/* I - Printer information */
-@@ -2379,7 +2483,12 @@
-   keyvalue[i  ][0] = "ty";
-   keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
- 
--  snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
-+  snprintf(admin_hostname, sizeof(admin_hostname),
-+	   "%s.local"
-+#ifdef HAVE_DNSSD
-+	   "." /* terminating dot no good for Avahi */
-+#endif /* HAVE_DNSSD */
-+	   , DNSSDHostName);
-   httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
-                    "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
- 		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-@@ -2462,7 +2571,12 @@
-   * Then pack them into a proper txt record...
-   */
- 
-+#ifdef HAVE_DNSSD
-   return (dnssdPackTxtRecord(txt_len, keyvalue, i));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  return (avahiPackTxtRecord(keyvalue, i));
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2474,7 +2588,16 @@
- dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
-                      cupsd_printer_t *b)/* I - Second printer */
- {
--  return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+  if (!a->reg_name)
-+    if (!b->reg_name)
-+      return 0;
-+    else
-+      return -1;
-+  else
-+    if (!b->reg_name)
-+      return 1;
-+    else
-+      return (_cups_strcasecmp(a->reg_name, b->reg_name));
- }
- 
- 
-@@ -2489,6 +2612,10 @@
- {
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-  /*
-   * Closing the socket deregisters the service
-   */
-@@ -2524,6 +2651,24 @@
-     free(p->printer_txt);
-     p->printer_txt = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+  if (p->avahi_group)
-+    {
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+
-+      if (p->ipp_txt)
-+	avahi_string_list_free (p->ipp_txt);
-+
-+      if (p->printer_txt)
-+	avahi_string_list_free (p->printer_txt);
-+
-+      p->ipp_txt = p->printer_txt = NULL;
-+    }
-+#endif /* HAVE_AVAHI */
- 
-  /*
-   * Remove the printer from the array of DNS-SD printers, then clear the
-@@ -2533,8 +2678,10 @@
-   cupsArrayRemove(DNSSDPrinters, p);
-   cupsdClearString(&p->reg_name);
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
-  *                          TXT record format.
-@@ -2644,8 +2791,10 @@
-     LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
-   }
- }
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
-  *		              or update the broadcast contents.
-@@ -2654,20 +2803,40 @@
- static void
- dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType	se;		/* dnssd errors */
-   char			*ipp_txt,	/* IPP TXT record buffer */
- 			*printer_txt,	/* LPD TXT record buffer */
--			name[1024],	/* Service name */
--			*nameptr;	/* Pointer into name */
-+			name[1024];	/* Service name */
-   int			ipp_len,	/* IPP TXT record length */
- 			printer_len,	/* LPD TXT record length */
- 			printer_port;	/* LPD port number */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int			ret;		/* Error code */
-+  AvahiStringList	*ipp_txt,	/* IPP TXT record */
-+			*printer_txt;	/* LPD TXT record */
-+  char			name[AVAHI_LABEL_MAX],	/* Service name */
-+			fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
-+  char			*regtype_copy,	/* Writeable copy of reg type */
-+			*subtype,	/* Current service sub type */
-+			*nextsubtype;	/* Next service sub type */
-+#endif /* HAVE_AVAHI */
-+  char			*nameptr;	/* Pointer into name */
-   const char		*regtype;	/* Registration type */
- 
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-                   !p->ipp_ref ? "new" : "update");
--
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-+		  !p->avahi_group ? "new" : "update");
-+#endif /* HAVE_AVAHI */
-  /*
-   * If per-printer sharing was just disabled make sure we're not
-   * registered before returning.
-@@ -2686,12 +2855,36 @@
-   if (p->info && strlen(p->info) > 0)
-   {
-     if (DNSSDComputerName)
--      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
-+    {
-+     /*
-+      * Make sure there is room for at least 15 characters of
-+      * DNSSDComputerName.
-+      */
-+
-+      assert(sizeof(name) >= 15 + 4);
-+      nameptr = name + strlcpy(name, p->info,
-+			       sizeof(name) - 4 -
-+			       strnlen(DNSSDComputerName, 15));
-+      nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+      strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+    }
-     else
-       strlcpy(name, p->info, sizeof(name));
-   }
-   else if (DNSSDComputerName)
--    snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
-+  {
-+   /*
-+    * Make sure there is room for at least 15 characters of
-+    * DNSSDComputerName.
-+    */
-+
-+    assert(sizeof(name) >= 15 + 4);
-+    nameptr = name + strlcpy(name, p->info,
-+			     sizeof(name) - 4 -
-+			     strnlen(DNSSDComputerName, 15));
-+    nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+    strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+  }
-   else
-     strlcpy(name, p->name, sizeof(name));
- 
-@@ -2712,6 +2905,7 @@
-   * Register IPP and (optionally) LPD...
-   */
- 
-+#ifdef HAVE_DNSSD
-   ipp_len = 0;				/* anti-compiler-warning-code */
-   ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
- 
-@@ -2884,6 +3078,209 @@
- 
-   if (printer_txt)
-     free(printer_txt);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (!AvahiCupsClient)
-+   /*
-+    * Client not running yet.  The client callback will call us again later.
-+    */
-+    return;
-+
-+  ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
-+  printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
-+  regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
-+
-+  if (p->avahi_group && p->ipp_txt && ipp_txt &&
-+      !avahi_string_list_equal (p->ipp_txt, ipp_txt))
-+  {
-+   /*
-+    * Update the existing registration...
-+    */
-+
-+    avahi_string_list_free (p->ipp_txt);
-+
-+    if (p->printer_txt)
-+      avahi_string_list_free (p->printer_txt);
-+
-+   /*
-+    * Update the service group entry.
-+    */
-+
-+    regtype_copy = strdup (regtype);
-+    subtype = strchr (regtype_copy, ',');
-+    if (subtype)
-+      *subtype = '\0';
-+
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Updating TXT record for %s (%s)", name, regtype_copy);
-+    ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+						       AVAHI_IF_UNSPEC,
-+						       AVAHI_PROTO_UNSPEC,
-+						       0, name,
-+						       regtype_copy,
-+						       NULL, ipp_txt);
-+    free (regtype_copy);
-+
-+    if (ret < 0)
-+      goto update_failed;
-+
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+							 AVAHI_IF_UNSPEC,
-+							 AVAHI_PROTO_UNSPEC,
-+							 0, name,
-+							 "_printer._tcp", NULL,
-+							 printer_txt);
-+      if (ret < 0)
-+	goto update_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+    if (ret < 0)
-+    {
-+    update_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to update TXT record for %s: %d",
-+		       name, ret);
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (!p->avahi_group)
-+  {
-+   /*
-+    * Initial registration.  Use the _fax subtype for fax queues...
-+    */
-+
-+    p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
-+					    avahi_entry_group_cb,
-+					    p);
-+
-+    cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		    "Registering Avahi printer %s with name \"%s\" and "
-+		    "type \"%s\"", p->name, name, regtype);
-+
-+    if (!p->avahi_group)
-+    {
-+      ret = 0;
-+      goto add_failed;
-+    }
-+
-+   /*
-+    * Add each service type (DNSSDRegType may contain several,
-+    * separated by commas).
-+    */
-+
-+    subtype = regtype_copy = strdup (regtype);
-+    while (subtype && *subtype)
-+    {
-+      nextsubtype = strchr (subtype, ',');
-+      if (nextsubtype)
-+	*nextsubtype++ = '\0';
-+
-+      if (subtype == regtype_copy)
-+      {
-+       /*
-+	* Main type entry.
-+	*/
-+
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, regtype_copy);
-+	ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						    AVAHI_IF_UNSPEC,
-+						    AVAHI_PROTO_UNSPEC,
-+						    0, name, regtype_copy,
-+						    NULL, NULL,
-+						    DNSSDPort,
-+						    ipp_txt);
-+      }
-+      else
-+      {
-+       /*
-+	* Sub-type entry.
-+	*/
-+
-+	snprintf (fullsubtype, sizeof(fullsubtype),
-+		  "%s._sub.%s", subtype, regtype_copy);
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, fullsubtype);
-+	ret = avahi_entry_group_add_service_subtype (p->avahi_group,
-+						     AVAHI_IF_UNSPEC,
-+						     AVAHI_PROTO_UNSPEC,
-+						     0, name,
-+						     regtype_copy,
-+						     NULL, fullsubtype);
-+      }
-+
-+      if (ret < 0)
-+      {
-+	free (regtype_copy);
-+	goto add_failed;
-+      }
-+
-+      subtype = nextsubtype;
-+    }
-+
-+    free (regtype_copy);
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		      "Registering Avahi printer %s with name \"%s\" and "
-+		      "type \"_printer._tcp\"", p->name, name);
-+
-+      ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						  AVAHI_IF_UNSPEC,
-+						  AVAHI_PROTO_UNSPEC,
-+						  0, name,
-+						  "_printer._tcp", NULL, NULL,
-+						  515,
-+						  printer_txt);
-+      if (ret < 0)
-+	goto add_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+
-+    if (ret < 0)
-+    {
-+    add_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to add Avahi entry for %s: %d",
-+		       name, ret);
-+      if (p->avahi_group)
-+      {
-+	avahi_entry_group_reset (p->avahi_group);
-+	avahi_entry_group_free (p->avahi_group);
-+	p->avahi_group = NULL;
-+      }
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (ipp_txt)
-+    avahi_string_list_free (ipp_txt);
-+
-+  if (printer_txt)
-+    avahi_string_list_free (printer_txt);
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2896,6 +3293,10 @@
- {
-   cupsd_printer_t	*p;		/* Current printer */
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * De-register the individual printers
-@@ -2906,6 +3307,7 @@
-        p = (cupsd_printer_t *)cupsArrayNext(Printers))
-     dnssdDeregisterPrinter(p);
- 
-+#ifdef HAVE_DNSSD
-  /*
-   * Shutdown the rest of the service refs...
-   */
-@@ -2926,14 +3328,17 @@
- 
-   DNSServiceRefDeallocate(DNSSDRef);
-   DNSSDRef = NULL;
-+#endif /* HAVE_DNSSD */
- 
-   cupsArrayDelete(DNSSDPrinters);
-   DNSSDPrinters = NULL;
- 
-   DNSSDPort = 0;
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdUpdate()' - Handle DNS-SD queries.
-  */
-@@ -2955,6 +3360,147 @@
- #endif /* HAVE_DNSSD */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
-+ *                          AvahiStringList.
-+ */
-+
-+static AvahiStringList *		/* O - new string list */
-+avahiPackTxtRecord(char *keyvalue[][2],	/* I - Table of key value pairs */
-+		   int count)		/* I - Number of items in table */
-+{
-+  AvahiStringList *strlst = NULL;
-+  char **elements;
-+  size_t len;
-+  int i = 0;
-+
-+  elements = malloc ((1 + count) * sizeof (char *));
-+  if (!elements)
-+    goto cleanup;
-+
-+  for (i = 0; i < count; i++)
-+    {
-+      len = (1 + strlen (keyvalue[i][0]) +
-+	     (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
-+      elements[i] = malloc (len * sizeof (char));
-+      if (!elements[i])
-+	goto cleanup;
-+
-+      snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
-+    }
-+
-+  strlst = avahi_string_list_new_from_array ((const char **) elements, count);
-+
-+cleanup:
-+  while (--i >= 0)
-+    free (elements[i]);
-+
-+  free (elements);
-+  return (strlst);
-+}
-+
-+
-+/*
-+ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
-+ */
-+static void
-+avahi_entry_group_cb (AvahiEntryGroup *group,
-+		      AvahiEntryGroupState state,
-+		      void *userdata)
-+{
-+  char *name;
-+
-+  if (userdata)
-+    name = ((cupsd_printer_t *) userdata)->reg_name;
-+  else
-+    name = "CUPS web interface";
-+
-+  switch (state)
-+  {
-+  case AVAHI_ENTRY_GROUP_UNCOMMITED:
-+  case AVAHI_ENTRY_GROUP_REGISTERING:
-+    break;
-+
-+  case AVAHI_ENTRY_GROUP_ESTABLISHED:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group established for %s", name);
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group %s has state %d",
-+		     name, state);
-+    break;
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_client_cb()' - Avahi client callback function.
-+ */
-+static void
-+avahi_client_cb (AvahiClient *client,
-+		 AvahiClientState state,
-+		 void *userdata)
-+{
-+  cupsd_printer_t *printer;
-+  switch (state)
-+  {
-+  case AVAHI_CLIENT_S_RUNNING:
-+   /*
-+    * Avahi client started successfully.
-+    */
-+    AvahiCupsClient = client;
-+    AvahiCupsClientConnecting = 0;
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
-+
-+    cupsdUpdateDNSSDName ();
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
-+	  (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
-+			      CUPS_PRINTER_SCANNER))) && printer->shared)
-+	dnssdRegisterPrinter (printer);
-+
-+    break;
-+
-+  case AVAHI_CLIENT_CONNECTING:
-+   /*
-+    * No Avahi daemon, client is waiting.
-+    */
-+    AvahiCupsClientConnecting = 1;
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
-+    break;
-+
-+  case AVAHI_CLIENT_FAILURE:
-+   /*
-+    * Avahi client failed, close it to allow a clean restart.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_ERROR,
-+		     "Avahi client failed, "
-+		     "closing client to allow a clean restart");
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      dnssdDeregisterPrinter (printer);
-+
-+    avahi_client_free(client);
-+    AvahiCupsClientConnecting = 0;
-+    AvahiCupsClient = NULL;
-+
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
-  * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
-  */
---- a/scheduler/dirsvc.h
-+++ b/scheduler/dirsvc.h
-@@ -31,6 +31,10 @@
- #  endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
- 
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
- /*
-  * Browse protocols...
-  */
-@@ -131,19 +135,22 @@
- VAR cupsd_statbuf_t	*PollStatusBuffer VALUE(NULL);
- 					/* Status buffer for pollers */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- VAR char		*DNSSDComputerName VALUE(NULL),
- 					/* Computer/server name */
- 			*DNSSDHostName	VALUE(NULL),
- 					/* Hostname */
- 			*DNSSDRegType VALUE(NULL);
- 					/* Bonjour registration type */
--VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
--					/* List of dynamic ServerAlias's */
- VAR int			DNSSDPort	VALUE(0);
- 					/* Port number to register */
- VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
- 					/* Printers we have registered */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
-+#ifdef HAVE_DNSSD
-+VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
-+					/* List of dynamic ServerAlias's */
- VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Master DNS-SD service reference */
- 			WebIFRef	VALUE(NULL),
-@@ -152,6 +159,17 @@
- 					/* Remote printer browse reference */
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+VAR AvahiCupsPoll	*AvahiCupsPollHandle	VALUE(NULL);
-+					/* AvahiCupsPoll object */
-+VAR AvahiClient		*AvahiCupsClient	VALUE(NULL);
-+					/* AvahiClient object */
-+VAR int			AvahiCupsClientConnecting	VALUE(0);
-+					/* Is AvahiClient object connecting? */
-+VAR AvahiEntryGroup	*AvahiWebIFGroup	VALUE(NULL);
-+					/* Web interface entry group */
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle		BrowseSLPHandle	VALUE(NULL);
- 					/* SLP API handle */
-@@ -195,13 +213,14 @@
- extern void	cupsdRestartPolling(void);
- extern void	cupsdSaveRemoteCache(void);
- extern void	cupsdSendBrowseList(void);
-+extern void	cupsdStartAvahiClient(void);
- extern void	cupsdStartBrowsing(void);
- extern void	cupsdStartPolling(void);
- extern void	cupsdStopBrowsing(void);
- extern void	cupsdStopPolling(void);
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- extern void	cupsdUpdateDNSSDName(void);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void	cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
---- a/scheduler/ipp.c
-+++ b/scheduler/ipp.c
-@@ -6087,7 +6087,7 @@
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -6097,7 +6097,7 @@
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
---- a/scheduler/printers.c
-+++ b/scheduler/printers.c
-@@ -883,9 +883,9 @@
-   cupsdClearString(&p->alert);
-   cupsdClearString(&p->alert_description);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdClearString(&p->pdl);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   cupsArrayDelete(p->filetypes);
- 
-@@ -3765,7 +3765,7 @@
-     attr->values[i].string.text = _cupsStrAlloc(mimetype);
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   {
-     char		pdl[1024];	/* Buffer to build pdl list */
-     mime_filter_t	*filter;	/* MIME filter looping var */
-@@ -3821,7 +3821,7 @@
- 
-     cupsdSetString(&p->pdl, pdl);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
---- a/scheduler/printers.h
-+++ b/scheduler/printers.h
-@@ -16,6 +16,9 @@
- #ifdef HAVE_DNSSD
- #  include <dns_sd.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include "avahi.h"
-+#endif /* HAVE_AVAHI */
- #include <cups/pwg-private.h>
- 
- 
-@@ -95,16 +98,23 @@
-   time_t	marker_time;		/* Last time marker attributes were updated */
-   _ppd_cache_t	*pc;			/* PPD cache and mapping data */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   char		*reg_name,		/* Name used for service registration */
--		*pdl,			/* pdl value for TXT record */
--		*ipp_txt,		/* IPP TXT record contents */
-+		*pdl;			/* pdl value for TXT record */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+#ifdef HAVE_DNSSD
-+  char		*ipp_txt,		/* IPP TXT record contents */
- 		*printer_txt;		/* LPD TXT record contents */
-   int		ipp_len,		/* IPP TXT record length */
- 		printer_len;		/* LPD TXT record length */
-   DNSServiceRef	ipp_ref,		/* Reference for _ipp._tcp,_cups */
- 		printer_ref;		/* Reference for _printer._tcp */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiStringList *ipp_txt,		/* IPP TXT record */
-+		*printer_txt;		/* LPD TXT record */
-+  AvahiEntryGroup *avahi_group;		/* Avahi entry group */
-+#endif /* HAVE_AVAHI */
- };
- 
- 
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -650,7 +650,7 @@
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
- #endif /* HAVE_DNSSD */
-