Tue Apr 3 14:54:45 UTC 2012

1476 files changed, 0 insertions, 159414 deletions

diff --git a/community-staging/blender/PKGBUILD b/community-staging/blender/PKGBUILD
deleted file mode 100644
index d37cac0dd..000000000
--- a/community-staging/blender/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 66718 2012-02-27 19:17:34Z svenstaro $
-# 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.62
-pkgrel=2
-epoch=3
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' '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=('f2357584a5081b03f6e60ba3efe2a610')
-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 1458a7350..000000000
--- a/community-staging/cclive/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 66937 2012-03-01 19:27:11Z lfleischer $
-# 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=3
-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/deadbeef/PKGBUILD b/community-staging/deadbeef/PKGBUILD
deleted file mode 100644
index 2c470fcf7..000000000
--- a/community-staging/deadbeef/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 64836 2012-02-18 16:07:27Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.5.1
-pkgrel=5
-pkgdesc='An audio player for GNU/Linux based on GTK2.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
-             'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
-             'libsamplerate')
-optdepends=('libsamplerate: for Resampler plugin'
-            'libvorbis: for Ogg Vorbis playback'
-            'libmad: for MP1/MP2/MP3 playback'
-            'flac: for FLAC playback'
-            'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
-            'imlib2: for artwork plugin'
-            'wavpack: for WavPack playback'
-            'libsndfile: for Wave playback'
-            'libcdio: audio cd plugin'
-            'libcddb: audio cd plugin'
-            'ffmpeg: for WMA, AA, OMA, AC, etc.'
-            'faad2: for AAC/MP4 support'
-            'dbus: for OSD notifications support'
-            'pulseaudio: for PulseAudio output plugin'
-            'libx11: for global hotkeys plugin'
-            'zlib: for Audio Overload plugin'
-            'libzip: for vfs_zip plugin')
-options=('!libtool')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch'
-        'deadbeef-0.5.1-ffmpeg-version-check-fix.patch')
-md5sums=('be8359d1bd9cf7679cf2ca748996e726'
-         'd1c913c0ccefef33012732cf0ae49f7f'
-         '6d22855f61f4d2fea4b343dca76d5e85')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
-  patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-version-check-fix.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
deleted file mode 100644
index db1c79638..000000000
--- a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Mon, 4 Jul 2011 16:47:25 +0400
-Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT()
-
-For ffmpeg < 0.5.  Copied from libavutil 0.5.
-
-ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc
-
-fixes build with lavc 53.
-
-ffmpeg: fix erroneous version comparisons
-
-Comparing versions this way: (x.y < x1.y1) is obviously equivalent to
-(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1).
-
-ffmpeg: use av_register_protocol2() if available
-
-fixes usage with ffmpeg-0.8
----
- plugins/ffmpeg/ffmpeg.c |   37 ++++++++++++++++++++++++++++++-------
- 1 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index cd7edf4..0cb9955 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -44,6 +44,10 @@
- #define av_register_protocol register_protocol
- #endif
- 
-+#ifndef AV_VERSION_INT
-+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-+#endif
-+
- #endif
- 
- //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
-     for (i = 0; i < info->fctx->nb_streams; i++)
-     {
-         info->ctx = info->fctx->streams[i]->codec;
--        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (info->ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             info->codec = avcodec_find_decoder (info->ctx->codec_id);
-             if (info->codec != NULL) {
-@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
-             int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-             int len;
-             //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size);
--#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25)
--            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
--#else
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
-             len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt);
-+#else
-+            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
- #endif
-             trace ("out: out_size=%d, len=%d\n", out_size, len);
-             if (len <= 0) {
-@@ -418,7 +427,7 @@ static const char *map[] = {
- 
- static int
- ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
--#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0)
-     if (!strlen (fctx->title)) {
-         // title is empty, this call will set track title to filename without extension
-         deadbeef->pl_add_meta (it, "title", NULL);
-@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -704,7 +718,11 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+    av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
-+#else
-     av_register_protocol (&vfswrapper);
-+#endif
-     return 0;
- }
- 
-@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL)
--- 
-1.7.8.4
-
diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
deleted file mode 100644
index af8c282c0..000000000
--- a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Thu, 7 Jul 2011 22:31:44 +0400
-Subject: [PATCH 2/2] ffmpeg: version check fix
-
----
- plugins/ffmpeg/ffmpeg.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index 0cb9955..37c7e80 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -718,7 +718,7 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0)
-     av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
- #else
-     av_register_protocol (&vfswrapper);
--- 
-1.7.8.4
-
diff --git a/community-staging/deadbeef/deadbeef.install b/community-staging/deadbeef/deadbeef.install
deleted file mode 100644
index eaf1b9a69..000000000
--- a/community-staging/deadbeef/deadbeef.install
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgname=deadbeef
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD
deleted file mode 100644
index fe713cc2d..000000000
--- a/community-staging/encfs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 66952 2012-03-02 18:18:38Z lcarlier $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Sven Kauber, <celeon@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=encfs
-pkgver=1.7.4
-pkgrel=7
-pkgdesc='Encrypted filesystem in user-space'
-arch=('i686' 'x86_64')
-url='http://www.arg0.net/encfs'
-license=('GPL')
-depends=('rlog' 'openssl' 'fuse' 'boost-libs')
-makedepends=('boost')
-options=('!libtool')
-source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
-md5sums=('ac90cc10b2e9fc7e72765de88321d617')
-
-build(){
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD
deleted file mode 100644
index 041374e94..000000000
--- a/community-staging/glob2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 66954 2012-03-02 18:35:34Z lcarlier $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-
-pkgname=glob2
-pkgver=0.9.4.4
-pkgrel=11
-pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
-arch=('i686' 'x86_64')
-url="http://www.globulation2.org/"
-license=('GPL3')
-depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa'
-         'fribidi' 'desktop-file-utils')
-makedepends=('scons' 'boost')
-install=glob2.install
-source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz
-	glob2-0.9.4.1-gcc44.patch)
-md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e')
-sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
-  scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share"
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons install
-  find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
-  install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
-}
diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch
deleted file mode 100644
index b425b25ec..000000000
--- a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
---- libgag/include/StreamBackend.h.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/include/StreamBackend.h	2009-06-20 14:21:10.000000000 +0200
-@@ -43,7 +43,7 @@ namespace GAGCore
- 		virtual void flush(void) = 0;
- 		virtual void read(void *data, size_t size) = 0;
- 		virtual void putc(int c) = 0;
--		virtual int getc(void) = 0;
-+		virtual int get_c(void) = 0;
- 		virtual void seekFromStart(int displacement) = 0;
- 		virtual void seekFromEnd(int displacement) = 0;
- 		virtual void seekRelative(int displacement) = 0;
-@@ -67,7 +67,7 @@ namespace GAGCore
- 		virtual void flush(void) { assert(fp); fflush(fp); }
- 		virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
- 		virtual void putc(int c) { assert(fp); fputc(c, fp); }
--		virtual int getc(void) { assert(fp); return fgetc(fp); }
-+		virtual int get_c(void) { assert(fp); return fgetc(fp); }
- 		virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
- 		virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
- 		virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
-@@ -92,7 +92,7 @@ namespace GAGCore
- 		virtual void flush(void);
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-@@ -117,7 +117,7 @@ namespace GAGCore
- 		virtual void flush(void) { }
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
---- libgag/src/StreamBackend.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/StreamBackend.cpp	2009-06-20 14:21:53.000000000 +0200
-@@ -75,9 +75,9 @@ namespace GAGCore
- 		buffer->putc(c);
- 	}
- 	
--	int ZLibStreamBackend::getc(void)
-+	int ZLibStreamBackend::get_c(void)
- 	{
--		return buffer->getc();
-+		return buffer->get_c();
- 	}
- 	
- 	void ZLibStreamBackend::seekFromStart(int displacement)
-@@ -147,7 +147,7 @@ namespace GAGCore
- 		write(&ch, 1);
- 	}
- 	
--	int MemoryStreamBackend::getc(void)
-+	int MemoryStreamBackend::get_c(void)
- 	{
- 		Uint8 ch;
- 		read(&ch, 1);
-diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
---- libgag/src/Stream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/Stream.cpp	2009-06-20 14:21:35.000000000 +0200
-@@ -60,7 +60,7 @@ namespace GAGCore

- 		std::string s;

- 		while (1)

- 		{

--			int c = backend->getc();

-+			int c = backend->get_c();

- 			if(c=='\r')

- 				continue;

- 			if ((c >= 0) && (c != '\n'))

-diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
---- libgag/src/TextStream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/TextStream.cpp	2009-06-20 14:21:22.000000000 +0200
-@@ -150,7 +150,7 @@ namespace GAGCore
- 		
- 		int nextChar(void)
- 		{
--			next = stream->getc();
-+			next = stream->get_c();
- 			if 	(next == '\n')
- 			{
- 				column = 0;
diff --git a/community-staging/glob2/glob2.install b/community-staging/glob2/glob2.install
deleted file mode 100644
index 7463b6e76..000000000
--- a/community-staging/glob2/glob2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
-
diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD
deleted file mode 100644
index 4ad6510e2..000000000
--- a/community-staging/glom/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 66958 2012-03-02 19:47:35Z lcarlier $
-# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=glom
-pkgver=1.20.4
-pkgrel=1
-pkgdesc="An easy-to-use database designer and user interface"
-arch=('i686' 'x86_64')
-url="http://www.glom.org/"
-license=('GPL')
-depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
-makedepends=('intltool' 'gnome-doc-utils' 'python2-sphinx' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('038d106313774832c56c61312bb387a54cd2ffff50e6c7e56e47bc98b8b8531b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --with-postgres-utils=/usr/bin \
-    --disable-scrollkeeper \
-    --disable-update-mime-database \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/glom/glom.install b/community-staging/glom/glom.install
deleted file mode 100644
index 1ad77f9aa..000000000
--- a/community-staging/glom/glom.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
diff --git a/community-staging/gmerlin-avdecoder/PKGBUILD b/community-staging/gmerlin-avdecoder/PKGBUILD
deleted file mode 100644
index 937c26b95..000000000
--- a/community-staging/gmerlin-avdecoder/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 65331 2012-02-21 01:43:40Z stephane $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin-avdecoder
-pkgver=1.1.0
-pkgrel=5
-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-staging/gmerlin/PKGBUILD b/community-staging/gmerlin/PKGBUILD
deleted file mode 100644
index b22b4df13..000000000
--- a/community-staging/gmerlin/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 65037 2012-02-20 02:14:10Z allan $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin
-pkgver=1.0.0
-pkgrel=6
-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-staging/gmerlin/gmerlin.install b/community-staging/gmerlin/gmerlin.install
deleted file mode 100644
index c7625c2f1..000000000
--- a/community-staging/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-staging/gmerlin/libpng.patch b/community-staging/gmerlin/libpng.patch
deleted file mode 100644
index c01105e63..000000000
--- a/community-staging/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-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD
deleted file mode 100644
index d68fab52b..000000000
--- a/community-staging/gnash/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 66714 2012-02-27 19:15:41Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.10
-pkgrel=2
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnash/"
-license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
-             speex fontconfig ffmpeg
-             gstreamer0.10-base gstreamer0.10-ffmpeg
-             gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf
-             pkgconfig boost)
-options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        nodebug.patch)
-sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224'
-            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
-
-build() {
-  cd "$srcdir/gnash-$pkgver"
-
-  # Disable very, very verbose debugging (gigabytes of logs)
-  patch -Np1 -i "$srcdir/nodebug.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-plugins-install=system \
-    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
-    --enable-gui=sdl,gtk,dump \
-    --enable-media=gst,ffmpeg \
-    --enable-renderer=agg,cairo \
-    --enable-device=x11
-
-  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 sdl agg libjpeg libpng libltdl
-           speex fontconfig ffmpeg cairo
-           gstreamer0.10-base gstreamer0.10-ffmpeg
-           boost-libs)
-  backup=(etc/gnashrc etc/gnashthumbnailrc)
-
-  cd "$srcdir/gnash-$pkgver"
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  # Split gnash-gtk
-  mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}}
-  mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \
-    "$srcdir/gtk/usr/bin/"
-  mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \
-    "$srcdir/gtk/usr/share/man/man1/"
-  mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/"
-  mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/"
-}
-
-package_gnash-gtk() {
-  pkgdesc="A GNU Flash movie player"
-  depends=("gnash-common=$pkgver"
-            gtk2 libldap hicolor-icon-theme desktop-file-utils gconf)
-  install=gnash-gtk.install
-  backup=(etc/gnashpluginrc)
-
-  mv "$srcdir"/gtk/* "$pkgdir"
-  
-  cd "$srcdir/gnash-$pkgver"
-  make DESTDIR="$pkgdir" install-plugin
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \
-    "$pkgdir"/usr/share/applications/*.schemas
-  rm -f "$pkgdir"/usr/share/applications/*.schemas
-}
diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install
deleted file mode 100644
index 6678a7f8a..000000000
--- a/community-staging/gnash/gnash-gtk.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  gconfpkg --install gnash
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall gnash
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/gnash/nodebug.patch b/community-staging/gnash/nodebug.patch
deleted file mode 100644
index ca160b898..000000000
--- a/community-staging/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-staging/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD
deleted file mode 100644
index e48d1942b..000000000
--- a/community-staging/gpsdrive/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 66769 2012-02-28 13:30:36Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=gpsdrive
-pkgver=2.11
-pkgrel=12
-pkgdesc="A car (bike, ship, plane) navigation system"
-arch=("i686" "x86_64")
-url="http://www.gpsdrive.de/"
-license=('GPL2')
-depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn'
-         'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri'
-         'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer'
-        ) # already in core ('sqlite3')
-makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
-install="gpsdrive.install"
-source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz"
-	"gpsd-2.96.patch")
-md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c'
-         '5769e12c6d8932fb721212434c64f505')
-
-build() {
-  cd "$srcdir"
-
-  # python2 fix
-  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
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  # fix the mapnik default values
-  sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
-  sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
-
-  export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-  export LDFLAGS="`pkg-config --libs gtk+-2.0` -lboost_system -lboost_thread"
-
-  # see DefineOptions.cmake for a list of common options and defaults
-  # cmake -L for a more in-depth listing
-  cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DWITH_SCRIPTS=ON \
-    -DWITH_MAPNIK=ON \
-    -DWITH_POSTGIS=ON \
-    -DWITH_GDAL=ON \
-    -DWITH_BASEMAPS=ON \
-    -DWITH_FRIENDSD=ON \
-    -DWITH_KISMET=ON \
-    -DWITH_NAVIGATION=ON \
-    -DWITH_SPEECH=OFF \
-    -DWITH_DBUS=OFF \
-    -DLIBGPS_OLD=OFF \
-    "$srcdir/gpsdrive-$pkgver"
-  (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch)
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gpsdrive/gpsd-2.96.patch b/community-staging/gpsdrive/gpsd-2.96.patch
deleted file mode 100644
index bc6c7475f..000000000
--- a/community-staging/gpsdrive/gpsd-2.96.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c
---- gpsdrive-2.11/src/gps_handler.c	2010-06-24 19:53:32.000000000 +0000
-+++ gpsdrive-2.11.my/src/gps_handler.c	2011-04-18 13:21:33.000000000 +0000
-@@ -264,7 +264,8 @@
- #define GPS_TIMER 500
- 
- static gint gps_timeout_source = 0;
--static struct gps_data_t *gpsdata;
-+static struct gps_data_t __gd;
-+static struct gps_data_t *gpsdata = &__gd;
- 
- /* SYMBOLS USED IN LIBGPS:
-  * 
-@@ -410,9 +411,10 @@
- 	 */
- 	gps_query (gpsdata, "oys\n");
- #else
--	if (gps_waiting(gpsdata))
-+	if (gps_waiting(gpsdata, 1000000))
- 	{
--		gps_poll (gpsdata);
-+		gps_read (gpsdata);
-+		gps_hook_cb(gpsdata, NULL);
- 	}
- #endif
- 
-@@ -447,7 +449,7 @@
- 	}
- 
- 	/* try to open connection */
--	gpsdata =  gps_open (local_config.gpsd_server, local_config.gpsd_port);
-+	gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd;
- 	if (!gpsdata)
- 	{
- 		g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n",
-@@ -466,7 +468,7 @@
- 	gps_sats = g_new (gps_satellite_struct, MAXCHANNELS);
- 
- 	/* set hook function to handle gps data */
--	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
-+//	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
- 
- #ifndef LIBGPS_OLD
- 	/* enable watch mode to get data stream from gpsd */
diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install
deleted file mode 100644
index 8ea63912e..000000000
--- a/community-staging/gpsdrive/gpsdrive.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-  echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
-  echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive"
-}
diff --git a/community-staging/gtk2hs-buildtools/PKGBUILD b/community-staging/gtk2hs-buildtools/PKGBUILD
deleted file mode 100644
index 29a38e357..000000000
--- a/community-staging/gtk2hs-buildtools/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 66665 2012-02-27 02:28:35Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=gtk2hs-buildtools
-pkgver=0.12.1
-pkgrel=2
-pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
-url="http://hackage.haskell.org/package/gtk2hs-buildtools"
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('ghc' 'alex' 'happy' 'haskell-random')
-depends=('gmp')
-options=('strip')
-provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('225cbf3736b5ac3053f8c797687c7554')
-
-build() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-binary/PKGBUILD b/community-staging/haskell-binary/PKGBUILD
deleted file mode 100644
index 99a4677d7..000000000
--- a/community-staging/haskell-binary/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 66479 2012-02-25 14:56:03Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-binary
-pkgver=0.5.1.0
-pkgrel=1
-pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
-url="http://hackage.haskell.org/package/binary"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=(ghc=7.4.1 sh)
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz")
-install=haskell-binary.install
-sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3')
-
-build() {
-  cd "$srcdir/binary-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/binary-$pkgver"
-
-  install -Dm 744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/binary"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-binary/haskell-binary.install b/community-staging/haskell-binary/haskell-binary.install
deleted file mode 100644
index 844b8a67c..000000000
--- a/community-staging/haskell-binary/haskell-binary.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-binary
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  post_remove
-}
-
-post_install() {
-  post_upgrade
-}
-
-pre_remove() {
-  pre_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-bytestring-show/PKGBUILD b/community-staging/haskell-bytestring-show/PKGBUILD
deleted file mode 100644
index a97178852..000000000
--- a/community-staging/haskell-bytestring-show/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 66806 2012-02-28 19:28:49Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-bytestring-show
-pkgver=0.3.5.1
-pkgrel=2
-pkgdesc="Efficient conversion of values into readable byte strings."
-url="http://code.haskell.org/~dolio/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.4.1-2")
-install="${pkgname}.install"
-source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd')
-
-build() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-	--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-	--libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install b/community-staging/haskell-bytestring-show/haskell-bytestring-show.install
deleted file mode 100644
index 335fc37cd..000000000
--- a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=haskell-bytestring-show
-HS_DIR=usr/share/haskell/${pkgname}
-
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-cairo/PKGBUILD b/community-staging/haskell-cairo/PKGBUILD
deleted file mode 100644
index f99c3047e..000000000
--- a/community-staging/haskell-cairo/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 66743 2012-02-28 02:46:54Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-cairo
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the cairo library for Gtk2Hs."
-url="http://hackage.haskell.org/package/cairo"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'cairo' 'haskell-mtl')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-conflicts=('gtk2hs-cairo')
-provides=('gtk2hs-cairo')
-replaces=('gtk2hs-cairo')
-install=gtk2hs-cairo.install
-source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('b3583136fe84d25cd9d4f7bda3c3db0c')
-
-build() {
-    cd ${srcdir}/cairo-$pkgver
-    sed -i 's#cToBool :: Num a => a -> Bool#cToBool :: (Eq a, Num a) => a -> Bool#' Graphics/Rendering/Cairo/Types.chs
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0')
-
-    cd ${srcdir}/cairo-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-cairo/gtk2hs-cairo.install b/community-staging/haskell-cairo/gtk2hs-cairo.install
deleted file mode 100644
index 4ec5096b6..000000000
--- a/community-staging/haskell-cairo/gtk2hs-cairo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-cairo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-dataenc/PKGBUILD b/community-staging/haskell-dataenc/PKGBUILD
deleted file mode 100644
index fa552f137..000000000
--- a/community-staging/haskell-dataenc/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 66777 2012-02-28 14:59:59Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=dataenc
-pkgname=haskell-dataenc
-pkgver=0.14.0.3
-pkgrel=1
-pkgdesc="Data encoding library"
-url="http://hackage.haskell.org/package/dataenc"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('643a8c022b9c840f801faf9a661fe637')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-dataenc/haskell-dataenc.install b/community-staging/haskell-dataenc/haskell-dataenc.install
deleted file mode 100644
index 9c1bbff01..000000000
--- a/community-staging/haskell-dataenc/haskell-dataenc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-dataenc
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-ghc-paths/PKGBUILD b/community-staging/haskell-ghc-paths/PKGBUILD
deleted file mode 100644
index 46c267182..000000000
--- a/community-staging/haskell-ghc-paths/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 66483 2012-02-25 15:06:14Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-ghc-paths
-pkgver=0.1.0.8
-pkgrel=6
-pkgdesc="Knowledge of GHC's installation directories"
-url="http://hackage.haskell.org/package/ghc-paths"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-makedepends=()
-depends=(ghc=7.4.1)
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
-install=haskell-ghc-paths.install
-md5sums=('d2b23dc563888e380588501d2ce1d82b')
-
-build() {
-  cd "$srcdir/ghc-paths-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-     --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-     --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/ghc-paths-$pkgver"
-
-  install -Dm 744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-ghc-paths/haskell-ghc-paths.install b/community-staging/haskell-ghc-paths/haskell-ghc-paths.install
deleted file mode 100644
index 4fd2c6c56..000000000
--- a/community-staging/haskell-ghc-paths/haskell-ghc-paths.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-ghc-paths
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-glib/PKGBUILD b/community-staging/haskell-glib/PKGBUILD
deleted file mode 100644
index c4df94f81..000000000
--- a/community-staging/haskell-glib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 66673 2012-02-27 05:58:18Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-glib
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the GLIB library for Gtk2Hs."
-url="http://hackage.haskell.org/package/glib"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'glib2')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-install=gtk2hs-glib.install
-provides=('gtk2hs-glib')
-replaces=('gtk2hs-glib')
-conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('5d8a04be9a975fb70c6508f95aeb3265')
-
-build() {
-    cd ${srcdir}/glib-$pkgver
-    sed -i 's|cap=rts_evalIO|rts_evalIO|' System/Glib/hsgclosure.c
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" "glib2")
-
-    cd ${srcdir}/glib-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-glib/gtk2hs-glib.install b/community-staging/haskell-glib/gtk2hs-glib.install
deleted file mode 100644
index 24025f5d8..000000000
--- a/community-staging/haskell-glib/gtk2hs-glib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-glib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-gtk/PKGBUILD b/community-staging/haskell-gtk/PKGBUILD
deleted file mode 100644
index 793786cd7..000000000
--- a/community-staging/haskell-gtk/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 66747 2012-02-28 07:03:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-gtk
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the gtk library for Gtk2Hs."
-url="http://hackage.haskell.org/package/gtk"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-gtk')
-replaces=('gtk2hs-gtk')
-conflicts=('gtk2hs-gtk')
-options=('strip')
-install=gtk2hs-gtk.install
-source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz)
-md5sums=('a80d6f2ab90c673059270f2dd83c4686')
-
-build() {
-    cd ${srcdir}/gtk-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0')
-
-    cd ${srcdir}/gtk-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-gtk/gtk2hs-gtk.install b/community-staging/haskell-gtk/gtk2hs-gtk.install
deleted file mode 100644
index 7ed674b78..000000000
--- a/community-staging/haskell-gtk/gtk2hs-gtk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-gtk
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-haskeline/PKGBUILD b/community-staging/haskell-haskeline/PKGBUILD
deleted file mode 100644
index b8be99618..000000000
--- a/community-staging/haskell-haskeline/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 66779 2012-02-28 15:18:59Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=haskeline
-pkgname=haskell-haskeline
-pkgver=0.6.4.6
-pkgrel=1
-pkgdesc="A command-line interface for user input, written in Haskell."
-url="http://hackage.haskell.org/package/haskeline"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-utf8-string=0.3.7-1' 'haskell-mtl=2.0.1.0-4' 'haskell-terminfo=0.3.2.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('c43d01e3ea23eed266060391ca680a76')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure \
-      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-haskeline/haskell-haskeline.install b/community-staging/haskell-haskeline/haskell-haskeline.install
deleted file mode 100644
index 27cb4a093..000000000
--- a/community-staging/haskell-haskeline/haskell-haskeline.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskeline
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-hslogger/PKGBUILD b/community-staging/haskell-hslogger/PKGBUILD
deleted file mode 100644
index 5d91621f2..000000000
--- a/community-staging/haskell-hslogger/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 66809 2012-02-28 20:25:44Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-hslogger
-pkgver=1.1.5
-pkgrel=6
-pkgdesc="Versatile logging framework"
-url="http://hackage.haskell.org/package/hslogger"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
-md5sums=('cd3dfd6f88176bd53b333ea29130a857')
-
-build() {
-  cd ${srcdir}/hslogger-${pkgver}
-  runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
-	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
-	--enable-library-profiling
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/hslogger-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-hslogger/haskell-hslogger.install b/community-staging/haskell-hslogger/haskell-hslogger.install
deleted file mode 100644
index 2a0d98ae7..000000000
--- a/community-staging/haskell-hslogger/haskell-hslogger.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hslogger
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-pango/PKGBUILD b/community-staging/haskell-pango/PKGBUILD
deleted file mode 100644
index b08b885b9..000000000
--- a/community-staging/haskell-pango/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 66745 2012-02-28 03:58:29Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-pango
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the pango library for Gtk2Hs."
-url="http://hackage.haskell.org/package/pango"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-pango')
-replaces=('gtk2hs-pango')
-conflicts=('gtk2hs-pango')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
-install=gtk2hs-pango.install
-md5sums=('301efd2d2348698ce8d586ee14c36e2b')
-
-build() {
-    cd ${srcdir}/pango-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo')
-
-    cd ${srcdir}/pango-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-pango/gtk2hs-pango.install b/community-staging/haskell-pango/gtk2hs-pango.install
deleted file mode 100644
index f2be2100f..000000000
--- a/community-staging/haskell-pango/gtk2hs-pango.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-pango
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-stm/PKGBUILD b/community-staging/haskell-stm/PKGBUILD
deleted file mode 100644
index fa9819d51..000000000
--- a/community-staging/haskell-stm/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=stm
-pkgname=haskell-stm
-pkgver=2.2.0.1
-pkgrel=3
-pkgdesc="A modular composable concurrency abstraction."
-url="http://hackage.haskell.org/package/stm"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('b1cf03ed315e00c33160746feeee8682')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-stm/haskell-stm.install b/community-staging/haskell-stm/haskell-stm.install
deleted file mode 100644
index 0283c2fc5..000000000
--- a/community-staging/haskell-stm/haskell-stm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stm
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-syb/PKGBUILD b/community-staging/haskell-syb/PKGBUILD
deleted file mode 100644
index 9223379b2..000000000
--- a/community-staging/haskell-syb/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=syb
-pkgname=haskell-syb
-pkgver=0.3.6
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('0d807bb244fdeb95fa546b4311fcd8df')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/community-staging/haskell-syb/haskell-syb.install b/community-staging/haskell-syb/haskell-syb.install
deleted file mode 100644
index 080055165..000000000
--- a/community-staging/haskell-syb/haskell-syb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-syb
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-tar/PKGBUILD b/community-staging/haskell-tar/PKGBUILD
deleted file mode 100644
index 7b98d8a82..000000000
--- a/community-staging/haskell-tar/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 66489 2012-02-25 15:51:44Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-tar
-pkgver=0.4.0.0
-pkgrel=1
-pkgdesc="Reading, writing and manipulating \".tar\" archive files."
-url="http://hackage.haskell.org/package/tar"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.4.1')
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
-install=haskell-tar.install
-sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113')
-
-build() {
-  cd "$srcdir/tar-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/tar-$pkgver"
-
-  install -Dm 744 register.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-	  "$pkgdir/usr/share/doc/ghc/html/libraries/tar"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-tar/haskell-tar.install b/community-staging/haskell-tar/haskell-tar.install
deleted file mode 100644
index 7e0383621..000000000
--- a/community-staging/haskell-tar/haskell-tar.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-tar
-
-post_install() {
-  ${HS_DIR}/register.sh
-	post_remove
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	pre_upgrade
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-terminfo/PKGBUILD b/community-staging/haskell-terminfo/PKGBUILD
deleted file mode 100644
index a0bd2d3dc..000000000
--- a/community-staging/haskell-terminfo/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 66654 2012-02-26 22:15:49Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=terminfo
-pkgname=haskell-terminfo
-pkgver=0.3.2.3
-pkgrel=1
-pkgdesc="Haskell bindings to the terminfo library."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('706f546c629ac100a402c9c2629c25fa')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-terminfo/haskell-terminfo.install b/community-staging/haskell-terminfo/haskell-terminfo.install
deleted file mode 100644
index 40d39f42b..000000000
--- a/community-staging/haskell-terminfo/haskell-terminfo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-terminfo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-utf8-string/PKGBUILD b/community-staging/haskell-utf8-string/PKGBUILD
deleted file mode 100644
index 40d1f5c2d..000000000
--- a/community-staging/haskell-utf8-string/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 66456 2012-02-25 02:35:26Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=utf8-string
-pkgname=haskell-utf8-string
-pkgver=0.3.7
-pkgrel=1
-pkgdesc="Support for reading and writing UTF8 Strings"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('50e5c395713e716e0e4a56da73f87ccd')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-utf8-string/haskell-utf8-string.install b/community-staging/haskell-utf8-string/haskell-utf8-string.install
deleted file mode 100644
index 0f64366b2..000000000
--- a/community-staging/haskell-utf8-string/haskell-utf8-string.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-utf8-string
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-x11-xft/PKGBUILD b/community-staging/haskell-x11-xft/PKGBUILD
deleted file mode 100644
index 93dd4ab28..000000000
--- a/community-staging/haskell-x11-xft/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 66502 2012-02-25 19:03:17Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=X11-xft
-pkgname=haskell-x11-xft
-pkgver=0.3.1
-pkgrel=3
-pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.7' 'libxft')
-options=('strip')
-install=haskell-x11-xft.install
-source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
-md5sums=('ad885150a59f63de328e73abe5ffc79e')
-
-build() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-x11-xft/haskell-x11-xft.install b/community-staging/haskell-x11-xft/haskell-x11-xft.install
deleted file mode 100644
index a0ff8dac8..000000000
--- a/community-staging/haskell-x11-xft/haskell-x11-xft.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=/usr/share/haskell/haskell-x11-xft
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-x11/PKGBUILD b/community-staging/haskell-x11/PKGBUILD
deleted file mode 100644
index c867814e4..000000000
--- a/community-staging/haskell-x11/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 66493 2012-02-25 17:16:46Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: shild <sxp@bk.ru>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-
-_hkgname=X11
-pkgname=haskell-x11
-pkgver=1.5.0.1
-pkgrel=2
-pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
-license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama')
-conflicts=(haskell-x11-extras)
-install=hsmod.install
-source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('7d69b204f773a0335828ced0e1e069f2')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-x11/hsmod.install b/community-staging/haskell-x11/hsmod.install
deleted file mode 100644
index 45c23b979..000000000
--- a/community-staging/haskell-x11/hsmod.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/hedgewars/PKGBUILD b/community-staging/hedgewars/PKGBUILD
deleted file mode 100644
index 6f522b2b6..000000000
--- a/community-staging/hedgewars/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 66811 2012-02-28 21:33:38Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=hedgewars
-pkgver=0.9.17
-pkgrel=2
-pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
-url="http://hedgewars.org"
-license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
-makedepends=('fpc' 'cmake'
-             # haskell specific
-             'ghc=7.4.1-2'
-	     'haskell-network=2.3.0.11-1' 'haskell-bytestring-show=0.3.5.1-2'
-	     'haskell-utf8-string=0.3.7-1' 'haskell-dataenc=0.14.0.3-1' 
-	     'haskell-hslogger=1.1.5-6')
-source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.desktop
-	hedgewars.png)
-md5sums=('77c0bc4bc664604adbba67fab606d8f1'
-         '48c66a3204d4fa0a69e9aa46f7c31e0c'
-         'eeb14d50df39063549ac5eca9dbc65d1')
-
-build() {
-  cd $pkgname-src-$pkgver
-
-#  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATA_INSTALL_DIR=/usr/share \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
-	-DWITH_SERVER=1 .
-
-  make
-}
-
-package() {
-  cd $pkgname-src-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
-  install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
-  install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
-}
diff --git a/community-staging/hedgewars/hedgewars.desktop b/community-staging/hedgewars/hedgewars.desktop
deleted file mode 100644
index 9d74ed3f1..000000000
--- a/community-staging/hedgewars/hedgewars.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
\ No newline at end of file
diff --git a/community-staging/hedgewars/hedgewars.png b/community-staging/hedgewars/hedgewars.png
deleted file mode 100644
index 60ae66199..000000000
--- a/community-staging/hedgewars/hedgewars.png
+++ /dev/null
diff --git a/community-staging/lomoco/PKGBUILD b/community-staging/lomoco/PKGBUILD
deleted file mode 100644
index f3a8ddb44..000000000
--- a/community-staging/lomoco/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 68707 2012-03-31 22:57:51Z heftig $
-# Maintainer: Jeff Mickey <j@codemac.net>
-# Contributor: Shadowhand <woody.gilk@gmail.com>
-
-pkgname=lomoco
-pkgver=1.0
-pkgrel=8
-url="http://www.lomoco.org/"
-pkgdesc="Logitech USB mouse configuration program"
-license=('GPL')
-depends=('libusb-compat')
-replaces=('lmctl')
-arch=('i686' 'x86_64')
-options=(!libtool)
-backup=(etc/udev/lomoco_mouse.conf)
-source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz
-	"lomoco_mx518.patch::https://bugs.archlinux.org/task/28180?getfile=8163"
-	lomoco_mouse.conf
-	lomoco.sh)
-md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d'
-         '87aeccb99413faf9e49453215c3d0b8a'
-         '182b10a7e4a1828a93c1d55ef7f81b97'
-         'bc92f661641265b33b27895ef24028fd')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 <$srcdir/lomoco_mx518.patch
-  ./autogen.sh --prefix=/usr --mandir=/usr/share/man
-  make
-  make udev-rules
-  make DESTDIR=${pkgdir} install
-
-  # Fix and install udev rules and helpers
-  sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco
-  sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules
-  sed -i 's|SYSFS|ATTR|' udev/lomoco.rules
-  install -D -m 644 udev/lomoco.rules ${pkgdir}/usr/lib/udev/rules.d/80-lomoco.rules
-  install -D -m 755 ../lomoco.sh ${pkgdir}/usr/lib/udev/lomoco.sh
-  install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/lomoco_mouse.conf
-}
diff --git a/community-staging/lomoco/lomoco.sh b/community-staging/lomoco/lomoco.sh
deleted file mode 100644
index 76e2392da..000000000
--- a/community-staging/lomoco/lomoco.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-if [ -n "$BUSNUM" -a -n "$DEVNUM" ]; then
-	. /etc/udev/lomoco_mouse.conf
-
-	options=
-
-	if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then
-		options="--$LOGITECH_MOUSE_RESOLUTION"
-	fi
-
-	case "$LOGITECH_MOUSE_SMS" in
-		yes) options="$options --sms" ;;
-		no) options="$options --no-sms" ;;
-	esac
-
-	if [ -n "$options" ]; then
-		/usr/bin/lomoco -b $BUSNUM -d $DEVNUM $options
-	fi
-
-fi 2>&1 | /usr/bin/logger -t lomoco
diff --git a/community-staging/lomoco/lomoco_mouse.conf b/community-staging/lomoco/lomoco_mouse.conf
deleted file mode 100644
index b8c534ec2..000000000
--- a/community-staging/lomoco/lomoco_mouse.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Possible Resolutions Are: 400 800 1200 1600 2000
-#LOGITECH_MOUSE_RESOLUTION="800"
-
-# SmartScroll/Cruise Control (SMS command set): yes or no
-#LOGITECH_MOUSE_SMS="no"
diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD
deleted file mode 100644
index bef98d81e..000000000
--- a/community-staging/luxrender/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 66803 2012-02-28 19:00:17Z stativ $
-# 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=13
-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-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD
deleted file mode 100644
index 5f6eb28b2..000000000
--- a/community-staging/mapnik/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 66749 2012-02-28 07:04:10Z spupykin $
-# 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=14
-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-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install
deleted file mode 100644
index 46f265d5b..000000000
--- a/community-staging/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-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD
deleted file mode 100644
index d730cc7c3..000000000
--- a/community-staging/mongodb/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 66828 2012-02-29 01:06:29Z tdziedzic $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Mathias Stearn <mathias@10gen.com>
-# Contributor: Alec Thomas
-
-pkgname=mongodb
-pkgver=2.0.3
-pkgrel=2
-pkgdesc='A high-performance, open source, schema-free document-oriented database.'
-arch=('i686' 'x86_64')
-url='http://www.mongodb.org'
-license=('AGPL3')
-depends=('boost-libs')
-makedepends=('scons' 'boost')
-#checkdepends=('python2-pymongo')
-optdepends=('libpcap: needed for mongosniff')
-backup=('etc/mongodb.conf')
-install="mongodb.install"
-source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.rc'
-        'mongodb.conf')
-md5sums=('f588cae93196b94599ec50e3c4956592'
-         '9c67e00f4626ad761a8f7d4e037a54d7'
-         '4839fe1d638187ca3226e8267b947318')
-
-build() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  # fix python name for smoke tests
-  sed \
-    -e 's/python/&2/' \
-    -i SConstruct
-
-  scons \
-    all \
-    --full
-}
-
-<<COMMENT
-check() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    smokeAll \
-    --smokedbprefix=${srcdir}
-}
-COMMENT
-
-package() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    install \
-    --full \
-    --prefix=${pkgdir}/usr
-
-  install -D -m755 ${srcdir}/mongodb.rc \
-    ${pkgdir}/etc/rc.d/mongodb
-  install -D -m644 ${srcdir}/mongodb.conf \
-    ${pkgdir}/etc/mongodb.conf
-  install -d -m700 ${pkgdir}/var/lib/mongodb
-  install -d -m755 ${pkgdir}/var/log/mongodb
-
-  if [ -d ${pkgdir}/usr/lib64 ]; then
-    mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
-  fi
-}
diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf
deleted file mode 100644
index c5272b7f2..000000000
--- a/community-staging/mongodb/mongodb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/lib/mongodb
-logpath = /var/log/mongodb/mongod.log
-logappend = true
diff --git a/community-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install
deleted file mode 100644
index 3922c12ef..000000000
--- a/community-staging/mongodb/mongodb.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# vim: syntax=sh
-
-post_install() {
-  useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(arch)" != "x86_64" ]
-  then
-    echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.'
-    echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations'
-  fi
-}
-
-post_upgrade() {
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(vercmp $2 1.8.2-3)" -lt 0 ]
-  then
-    # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
-    # added july 5th, 2011
-    usermod -s /bin/bash mongodb >& /dev/null
-    echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
-    echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
-    echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
-  fi
-}
-
-pre_remove() {
-  userdel mongodb
-}
diff --git a/community-staging/mongodb/mongodb.rc b/community-staging/mongodb/mongodb.rc
deleted file mode 100644
index 30f2bbf79..000000000
--- a/community-staging/mongodb/mongodb.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: syntax=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof /usr/bin/mongod)
-case "$1" in
-  start)
-    stat_busy "Starting mongodb"
-    [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mongodb
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mongodb"
-    [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mongodb
-      while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
-        sleep 1;
-      done
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/multipath-tools/PKGBUILD b/community-staging/multipath-tools/PKGBUILD
deleted file mode 100644
index 15530097b..000000000
--- a/community-staging/multipath-tools/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 68708 2012-03-31 22:59:24Z heftig $
-# Maintainer:
-# Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
-# Contributor: Michael P <ptchinster@archlinux.us>
-# Contributor: Matt Heagney <matt@heagney.com>
-
-pkgname=multipath-tools
-pkgver=0.4.9
-pkgrel=6
-pkgdesc="Multipath Tools For Linux"
-arch=('i686' 'x86_64')
-url="http://christophe.varoqui.free.fr/"
-license=('GPL')
-depends=('libaio' 'device-mapper')
-backup=('etc/multipath.conf' 'etc/multipath.conf.annotated')
-install=multipath-tools.install
-options=('!emptydirs')
-source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2"
-        "multipath.conf" "multipath.conf.annotated" "multipathd.rc" 'fix-build.patch')
-md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765'
-         '9324ff0ba8330dcb21b2fcf64988026f'
-         'be11462922eeeb9fcd2ba5f3f137b7d9'
-         '7c04ef96441363b0d43a2ebb13a87659'
-         '2576fc535d7fa767837b1c7827013e52')
-
-build() {
-  patch -p1 -i fix-build.patch
-
-  sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile
-  sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules
-  
-  # Needs to be fixed upstream. Refer to
-  # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814
-  export LDFLAGS=${LDFLAGS/-Wl,--as-needed}
-  
-  make
-}
-
-package() {
-  make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install
-  install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf
-  install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
-  install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd
-}
diff --git a/community-staging/multipath-tools/fix-build.patch b/community-staging/multipath-tools/fix-build.patch
deleted file mode 100644
index c6196f73b..000000000
--- a/community-staging/multipath-tools/fix-build.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- multipath-tools-0.4.9.orig/kpartx/Makefile	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/kpartx/Makefile	2010-11-28 12:14:25.763531104 -0800
-@@ -6,7 +6,7 @@
- 
- CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
--LDFLAGS = -ldevmapper
-+LIBS = -ldevmapper
- OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
-        gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o
- EXEC = kpartx
-@@ -14,8 +14,7 @@
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 	
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -23,13 +22,14 @@
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.4.9.orig/Makefile.inc	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/Makefile.inc	2010-11-28 12:14:25.763531104 -0800
-@@ -32,11 +32,10 @@
- syslibdir   = $(prefix)/$(LIB)
- libdir	    = $(prefix)/$(LIB)/multipath
- 
--GZIP        = /bin/gzip -9 -c
- INSTALL_PROGRAM = install
- 
--OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
--CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
-+OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
-+CFLAGS	     += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
- SHARED_FLAGS = -shared
- 
- %.o:	%.c
---- multipath-tools-0.4.9.orig/multipath/Makefile	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/multipath/Makefile	2010-11-28 12:14:46.718697048 -0800
-@@ -7,32 +7,30 @@
- OBJS = main.o
- 
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath
- 
- EXEC = multipath
- 
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
--	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
--	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
--	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
-+	rm -f $(DESTDIR)$(bindir)/$(EXEC)
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.4.9.orig/multipathd/Makefile	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/multipathd/Makefile	2010-11-28 12:15:46.624171566 -0800
-@@ -6,8 +6,8 @@
- # basic flags setting
- #
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
--	   -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \
-+	   -L$(multipathdir) -lmultipath
- 
- #
- # debuging stuff
-@@ -28,21 +28,20 @@
- all : $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
- 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
- 
diff --git a/community-staging/multipath-tools/multipath-tools.install b/community-staging/multipath-tools/multipath-tools.install
deleted file mode 100644
index fa58bbc35..000000000
--- a/community-staging/multipath-tools/multipath-tools.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-
-    echo " * For full functonality ensure that the dm_multipath kernel module is loaded"
-}
diff --git a/community-staging/multipath-tools/multipath.conf b/community-staging/multipath-tools/multipath.conf
deleted file mode 100644
index 6dacf093d..000000000
--- a/community-staging/multipath-tools/multipath.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Very Basic Multipath Configuration File
-#
-
-defaults {
-	getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n"
-}
-
diff --git a/community-staging/multipath-tools/multipath.conf.annotated b/community-staging/multipath-tools/multipath.conf.annotated
deleted file mode 100644
index b79488413..000000000
--- a/community-staging/multipath-tools/multipath.conf.annotated
+++ /dev/null
@@ -1,362 +0,0 @@
-##
-## This is a template multipath-tools configuration file
-## Uncomment the lines relevent to your environment
-##
-#
-##
-## name  : defaults
-## desc  : multipath-tools default settings
-##
-#defaults {
-#	#
-#	# name    : udev_dir
-#	# desc    : directory where udev creates its device nodes
-#	# default : /dev
-#	#
-#	udev_dir	/dev
-#
-#	#
-#	# name    : polling_interval
-#	# scope   : multipathd
-#	# desc    : interval between two path checks in seconds
-#	# default : 5
-#	#
-#	polling_interval 10
-#
-#	#
-#	# name    : selector
-#	# scope   : multipath
-#	# desc    : the default path selector algorithm to use
-#	#           these algorithms are offered by the kernel multipath target
-#	# values  : "round-robin 0"
-#	# default : "round-robin 0"
-#	#
-#	selector	"round-robin 0"
-#
-#	#
-#	# name    : path_grouping_policy
-#	# scope   : multipath
-#	# desc    : the default path grouping policy to apply to unspecified
-#	#           multipaths
-#	# default : multibus
-#	#
-#	path_grouping_policy	multibus
-#
-#	#
-#	# name    : getuid_callout
-#	# scope   : multipath
-#	# desc    : the default program and args to callout to obtain a unique 
-#	#           path identifier. Absolute path required
-#	# default : /usr/lib/udev/scsi_id -g -u -s
-#	#
-#	getuid_callout	"/usr/lib/udev/scsi_id -g -u -s /block/%n"
-#
-#	#
-#	# name    : prio_callout
-#	# scope   : multipath
-#	# desc    : the default program and args to callout to obtain a path 
-#	#           priority value. The ALUA bits in SPC-3 provide an
-#	#           exploitable prio value for example. "none" is a valid value
-#	# default : (null)
-#	#
-#	#prio_callout	"/bin/true"
-#
-#	#
-#	# name    : path_checker
-#	# scope   : multipath & multipathd
-#	# desc    : the default method used to determine the paths' state
-#	# values  : readsector0|tur|emc_clariion|hp_sw|directio
-#	# default : directio
-#	#
-#	#path_checker	directio
-#
-#	#
-#	# name    : rr_min_io
-#	# scope   : multipath
-#	# desc    : the number of IO to route to a path before switching
-#	#           to the next in the same path group
-#	# default : 1000
-#	#
-#	rr_min_io	100
-#
-#	#
-#	# name    : rr_weight
-#	# scope   : multipath
-#	# desc    : if set to priorities the multipath configurator will assign
-#	#	    path weights as "path prio * rr_min_io"
-#	# values  : priorities|uniform
-#	# default : uniform
-#	#
-#	rr_weight	priorities
-#
-#	#
-#	# name    : failback
-#	# scope   : multipathd
-#	# desc    : tell the daemon to manage path group failback, or not to.
-#	#	    0 means immediate failback, values >0 means deffered failback
-#	#	    expressed in seconds.
-#	# values  : manual|immediate|n > 0
-#	# default : immediate
-#	#
-#	failback	manual
-#
-#	#
-#	# name    : no_path_retry
-#	# scope   : multipath & multipathd
-#	# desc    : tell the number of retries until disable queueing, or
-#	#           "fail" means immediate failure (no queueing),
-#	#           "queue" means never stop queueing
-#	# values  : queue|fail|n (>0)
-#	# default : (null)
-#	#
-#	#no_path_retry  queue
-#
-#	#
-#	# name    : user_friendly_names
-#	# scope   : multipath
-#	# desc    : If set to "yes", using the bindings file
-#	#           /var/lib/multipath/bindings to assign a persistent and
-#	#           unique alias to the multipath, in the form of mpath<n>.
-#	#           If set to "no" use the WWID as the alias. In either case
-#	#           this be will be overriden by any specific aliases in this
-#	#           file.
-#	# values  : yes|no
-#	# default : no
-#	user_friendly_names no
-#
-#}
-#	
-##
-## name    : blacklist
-## scope   : multipath & multipathd
-## desc    : list of device names to discard as not multipath candidates
-## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop
-##
-#blacklist {
-#       wwid 26353900f02796769
-#	devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
-#	devnode "^hd[a-z][[0-9]*]"
-#	devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-#       device {
-#               vendor DEC.*
-#               product MSA[15]00
-#       }
-#}
-##
-## name    : blacklist_exceptions
-## scope   : multipath & multipathd
-## desc    : list of device names to be treated as multipath candidates
-##           even if they are on the blacklist.
-##           Note: blacklist exceptions are only valid in the same class.
-##           It is not possible to blacklist devices using the devnode keyword
-##           and to exclude some devices of them using the wwid keyword.
-## default : -
-##
-#blacklist_exceptions {
-#       devnode "^dasd[c-d]+[0-9]*"
-#       wwid    "IBM.75000000092461.4d00.34"
-#       wwid    "IBM.75000000092461.4d00.35"
-#       wwid    "IBM.75000000092461.4d00.36"
-#}
-#
-##
-## name    : multipaths
-## scope   : multipath & multipathd
-## desc    : list of multipaths finest-grained settings
-##
-#multipaths {
-#	#
-#	# name  : multipath
-#	# scope : multipath & multipathd
-#	# desc  : container for settings that apply to one specific multipath
-#	#
-#	multipath {
-#		#
-#		# name  : wwid
-#		# scope : multipath & multipathd
-#		# desc  : index of the container
-#		#
-#		wwid			3600508b4000156d700012000000b0000
-#
-#		#
-#		# name    : alias
-#		# scope   : multipath
-#		# desc    : symbolic name for the multipath
-#		#
-#		alias			yellow
-#
-#		#
-#		# name    : path_grouping_policy
-#		# scope   : multipath
-#		# desc    : path grouping policy to apply to this multipath
-#		# values  : failover, multibus, group_by_serial
-#		# default : failover
-#		#
-#		path_grouping_policy	multibus
-#
-#		#
-#		# name    : path_checker
-#		# scope   : multipathd
-#		# desc    : path checking alorithm to use to check path state
-#		# values  : readsector0|tur|emc_clariion|hp_sw|directio
-#		# default : directio
-#		#
-#		# path_checker		directio
-#		
-#		#
-#		# name    : path_selector
-#		# desc    : the path selector algorithm to use for this mpath
-#		#           these algo are offered by the kernel mpath target
-#		# values  : "round-robin 0"
-#		# default : "round-robin 0"
-#		#
-#		path_selector		"round-robin 0"
-#
-#		#
-#		# name    : failback
-#		# scope   : multipathd
-#		# desc    : tell the daemon to manage path group failback, or not to.
-#		#	    0 means immediate failback, values >0 means deffered failback
-#		#	    expressed in seconds.
-#		# values  : manual|immediate|n > 0
-#		# default : immediate
-#		#
-#		failback		manual
-#
-#		#
-#		# name    : no_path_retry
-#		# scope   : multipath & multipathd
-#		# desc    : tell the number of retries until disable queueing, or
-#		#           "fail" means immediate failure (no queueing),
-#		#           "queue" means never stop queueing
-#		# values  : queue|fail|n (>0)
-#		# default : (null)
-#		#
-#		#no_path_retry  queue
-#
-#		#
-#		# name    : rr_min_io
-#		# scope   : multipath
-#		# desc    : the number of IO to route to a path before switching
-#		#           to the next in the same path group
-#		# default : 1000
-#		#
-#		rr_min_io	100
-#	}
-#	multipath {
-#		wwid	1DEC_____321816758474
-#		alias	red
-#		rr_weight		priorities
-#	}
-#}
-#
-##
-## name  : devices
-## scope : multipath & multipathd
-## desc  : list of per storage controller settings
-##	  overrides default settings (device_maps block)
-##         overriden by per multipath settings (multipaths block)
-##
-#devices {
-#	#
-#	# name  : device
-#	# scope : multipath & multipathd
-#	# desc  : settings for this specific storage controller
-#	#
-#	device {
-#		#
-#		# name  : vendor, product
-#		# scope : multipath & multipathd
-#		# desc  : index for the block
-#		#
-#		vendor			"COMPAQ  "
-#		product			"HSV110 (C)COMPAQ"
-#
-#		#
-#		# name    : path_grouping_policy
-#		# scope   : multipath
-#		# desc    : path grouping policy to apply to multipath hosted
-#		#           by this storage controller
-#		# values  : failover        = 1 path per priority group
-#		#           multibus        = all valid paths in 1 priority
-#		#                             group
-#		#           group_by_serial = 1 priority group per detected
-#		#                             serial number
-#		# default : failover
-#		#
-#		path_grouping_policy	multibus
-#
-#		#
-#		# name    : getuid_callout
-#		# scope   : multipath
-#		# desc    : the program and args to callout to obtain a unique 
-#		#           path identifier. Absolute path required
-#		# default : /usr/lib/udev/scsi_id -g -u -s
-#		#
-#		getuid_callout          "/usr/lib/udev/scsi_id -g -u -s /block/%n"
-#
-#		#
-#		# name    : prio_callout
-#		# scope   : multipath
-#		# desc    : the program and args to callout to obtain a path 
-#		#           weight. Weights are summed for each path group to
-#		#	    determine the next PG to use case of failure.
-#		#	    "none" is a valid value.
-#		# default : no callout, all paths equals
-#		#
-#		prio_callout          "/sbin/mpath_prio_balance_units %d"
-#
-#		#
-#		# name    : path_checker
-#		# scope   : multipathd
-#		# desc    : path checking alorithm to use to check path state
-#		# values  : readsector0|tur|emc_clariion|hp_sw|directio
-#		# default : directio
-#		#
-#		path_checker		directio
-#
-#		#
-#		# name    : path_selector
-#		# desc    : the path selector algorithm to use for this mpath
-#		#           these algo are offered by the kernel mpath target
-#		# values  : "round-robin 0"
-#		# default : "round-robin 0"
-#		#
-#		path_selector		"round-robin 0"
-#
-#		#
-#		# name    : failback
-#		# scope   : multipathd
-#		# desc    : tell the daemon to manage path group failback, or not to.
-#		#	    0 means immediate failback, values >0 means deffered failback
-#		#	    expressed in seconds.
-#		# values  : manual|immediate|n > 0
-#		# default : immediate
-#		#
-#		failback		30
-#
-#		#
-#		# name    : rr_min_io
-#		# scope   : multipath
-#		# desc    : the number of IO to route to a path before switching
-#		#           to the next in the same path group
-#		# default : 1000
-#		#
-#		rr_min_io	100
-#
-#		#
-#		# name    : product_blacklist
-#		# scope   : multipath & multipathd
-#		# desc    : product strings to blacklist for this vendor
-#		# default : none
-#		#
-#		product_blacklist	LUN_Z
-#	}
-#	device {
-#		vendor			"COMPAQ  "
-#		product			"MSA1000         "
-#		path_grouping_policy	multibus
-#		path_checker		tur
-#		rr_weight		priorities
-#	}
-#}
diff --git a/community-staging/multipath-tools/multipathd.rc b/community-staging/multipath-tools/multipathd.rc
deleted file mode 100644
index 7f5ef5d6a..000000000
--- a/community-staging/multipath-tools/multipathd.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting multipathd"
-    /usr/bin/multipathd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon multipathd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping multipathd"
-    [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon multipathd
-        stat_done
-      fi 
-      ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/openimageio/PKGBUILD b/community-staging/openimageio/PKGBUILD
deleted file mode 100644
index 2825485c5..000000000
--- a/community-staging/openimageio/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 66736 2012-02-27 21:25:22Z svenstaro $
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-_pkg=OpenImageIO
-pkgname=openimageio
-pkgver=0.10.4
-pkgrel=6
-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-staging/openimageio/openimageio-0.10.2-libpng15.patch b/community-staging/openimageio/openimageio-0.10.2-libpng15.patch
deleted file mode 100644
index 97375d5fb..000000000
--- a/community-staging/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-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD
deleted file mode 100644
index a0d17e939..000000000
--- a/community-staging/performous/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 66935 2012-03-01 19:04:05Z lcarlier $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=performous
-pkgver=0.6.1
-pkgrel=13
-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-staging/performous/boost-filesystem-v3.patch b/community-staging/performous/boost-filesystem-v3.patch
deleted file mode 100644
index 22dd07213..000000000
--- a/community-staging/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-staging/performous/png15.patch b/community-staging/performous/png15.patch
deleted file mode 100644
index b6fb8fb14..000000000
--- a/community-staging/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-staging/pingus/ChangeLog b/community-staging/pingus/ChangeLog
deleted file mode 100644
index c182f92eb..000000000
--- a/community-staging/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-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD
deleted file mode 100644
index 7b00ee6f6..000000000
--- a/community-staging/pingus/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 66931 2012-03-01 18:55:02Z lcarlier $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=pingus
-pkgver=0.7.6
-pkgrel=3
-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.49')
-makedepends=('scons' 'boost>=1.49' '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-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop
deleted file mode 100644
index 276db36a4..000000000
--- a/community-staging/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-staging/pion-net/pion-net-4.0.5-build.patch b/community-staging/pion-net/pion-net-4.0.5-build.patch
deleted file mode 100644
index 25fdca20b..000000000
--- a/community-staging/pion-net/pion-net-4.0.5-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp
---- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp	2010-12-21 03:07:13.000000000 +0100
-+++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp	2011-07-31 09:01:38.445559768 +0200
-@@ -639,7 +639,7 @@
- 	
- 	/// returns reference to the io_service used for async operations
- 	inline boost::asio::io_service& getIOService(void) {
--		return m_ssl_socket.lowest_layer().io_service();
-+		return m_ssl_socket.lowest_layer().get_io_service();
- 	}
- 
- 	/// returns non-const reference to underlying TCP socket object
diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD
deleted file mode 100644
index 5f57fc3b4..000000000
--- a/community-staging/pokerth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 66724 2012-02-27 19:46:51Z svenstaro $
-# Maintainer:  Mateusz Herych <heniekk@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Vasco Costa <vasco.costa@meiodigital.com>
-
-pkgname=pokerth
-_realname=PokerTH
-pkgver=0.9.3
-pkgrel=2
-pkgdesc="Poker game written in C++/QT4"
-arch=('i686' 'x86_64')
-url="http://www.pokerth.net/"
-license=('GPL' 'custom')
-depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls'
-         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
-makedepends=('boost')
-source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('09d173512f723441f288b2844e3c68cb')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro
-
-  sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp
-
-  # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms'
-  sed \
-    -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \
-    -i zlib_compress.pro pokerth_game.pro pokerth_server.pro
-
-  qmake $pkgname.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
-  install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
-  rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt"
-}
diff --git a/community-staging/pragha/PKGBUILD b/community-staging/pragha/PKGBUILD
deleted file mode 100644
index ae31a38d3..000000000
--- a/community-staging/pragha/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 65302 2012-02-20 20:09:04Z ttopper $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Contributor: Alois Nespor <alois.nespor@gmail.com>
-# Contributor:  JerichoKru   <jerichokru(AT)htomail.com>
-
-pkgname=pragha
-pkgver=1.0
-pkgrel=2
-pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
-arch=('i686' 'x86_64')
-url="http://pragha.wikispaces.com/"
-license=('GPL3')
-depends=('libnotify' 'libcdio' 'gstreamer0.10-base'
-         'taglib' 'hicolor-icon-theme'  'gtk2'
-         'dbus-glib' 'sqlite3' 'desktop-file-utils')
-optdepends=('notification-daemon: OSD notification')
-replaces=('dissonance')
-install=pragha.install
-source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('b4d2780b065e3141489dcc27c121f01b1d47227c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  LIBS+="-ldbus-glib-1"  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-	
-  install -m 644 "data/$pkgname.desktop" "$pkgdir/usr/share/applications"
-  install -d "$pkgdir/usr/share/pixmaps"
-  install -m 644 "data/$pkgname.png" "$pkgdir/usr/share/pixmaps/"
-  install -m 644 "data/$pkgname.1" "$pkgdir/usr/share/man/man1/"
-
-}
-
-# vim:ts=2:sw=2:expandtab
-
diff --git a/community-staging/pragha/pragha.install b/community-staging/pragha/pragha.install
deleted file mode 100644
index ff5a644bd..000000000
--- a/community-staging/pragha/pragha.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_remove() {
- gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
- update-desktop-database -q
-}
- 
diff --git a/community-staging/schroot/PKGBUILD b/community-staging/schroot/PKGBUILD
deleted file mode 100644
index ff55948d0..000000000
--- a/community-staging/schroot/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 66753 2012-02-28 08:00:12Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
-
-pkgname=schroot
-pkgver=1.4.25
-pkgrel=1
-pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
-url="http://packages.qa.debian.org/s/schroot.html"
-license=('GPL3')
-depends=('pam' 'lockdev' 'boost' 'e2fsprogs')
-optdepends=('btrfs-progs-unstable' 'lvm2')
-arch=('i686' 'x86_64')
-conflicts=('dchroot')
-replaces=('dchroot')
-provides=('schroot' 'sbuild' 'dchroot')
-backup=('etc/schroot/schroot.conf'
-	'etc/schroot/arch32/config'
-	'etc/schroot/arch32/copyfiles'
-	'etc/schroot/arch32/mount'
-	'etc/schroot/arch32/nssdatabases')
-options=(!libtool)
-source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2"
-	'pam.d.schroot.patch'
-	'arch32-example'
-	'arch32-config'
-	'arch32-copyfiles'
-	'arch32-mount'
-	'arch32-nssdatabases')
-md5sums=('c9e5056becd82b6330ac4502f59260f1'
-         'a8d77cac806a0a9adef3f93cdbeb280a'
-         '1e34db5387c4e5de911e15d8a9208bdb'
-         '5a3f7b839c7e0b8933748da7c5b6385b'
-         '06db41d42f9fce5449a28feb76ded556'
-         'f0d5d5b5e34a860f6f90b5628c680f46'
-         'af1da6edd8c8c0dafeeb2c2c4e0c840b')
-
-build() {
-	cd ${pkgname}-${pkgver}
-	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-dchroot \
-		--enable-lvm-snapshot \
-		--enable-btrfs-snapshot \
-		BTRFS=/sbin/btrfs \
-		BTRFSCTL=/sbin/btrfsctl \
-		LVCREATE=/sbin/lvcreate \
-		LVREMOVE=/sbin/lvremove
-		# --enable-csbuild
-	make
-}
-
-check() {
-	cd ${pkgname}-${pkgver}
-	make -k check
-}
-
-package() {
-	cd ${pkgname}-${pkgver}
-	make DESTDIR=$pkgdir install
-	install -dm 755 ${pkgdir}/etc/schroot/arch32
-	install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32
-	rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/*
-	install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example
-	patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot
-}
diff --git a/community-staging/schroot/arch32-config b/community-staging/schroot/arch32-config
deleted file mode 100644
index 0ee72d522..000000000
--- a/community-staging/schroot/arch32-config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default settings for chroot setup and exec scripts.
-# See schroot-script-config(5) for further details.
-
-# Filesystems to mount inside the chroot.
-FSTAB="/etc/schroot/arch32/mount"
-
-# Files to copy from the host system into the chroot.
-COPYFILES="/etc/schroot/arch32/copyfiles"
-
-# System databases to copy into the chroot
-NSSDATABASES="/etc/schroot/arch32/nssdatabases"
diff --git a/community-staging/schroot/arch32-copyfiles b/community-staging/schroot/arch32-copyfiles
deleted file mode 100644
index 88f093ceb..000000000
--- a/community-staging/schroot/arch32-copyfiles
+++ /dev/null
@@ -1,7 +0,0 @@
-/etc/group
-/etc/hosts
-/etc/passwd
-/etc/resolv.conf
-/etc/rc.conf
-/etc/localtime
-/etc/locale.gen
diff --git a/community-staging/schroot/arch32-example b/community-staging/schroot/arch32-example
deleted file mode 100644
index 3f059e3c0..000000000
--- a/community-staging/schroot/arch32-example
+++ /dev/null
@@ -1,10 +0,0 @@
-[arch32]
-description=Arch32
-type=directory
-directory=/opt/arch32
-#users=username
-groups=users
-root-groups=root
-script-config=arch32/config
-personality=linux32
-#aliases=32,i686
diff --git a/community-staging/schroot/arch32-mount b/community-staging/schroot/arch32-mount
deleted file mode 100644
index 075d6e451..000000000
--- a/community-staging/schroot/arch32-mount
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount.defaults: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
-proc		/proc		proc	defaults	0	0
-/dev		/dev		none	rw,bind		0	0
-#/dev/pts	/dev/pts	none	rw,bind		0	0
-tmpfs		/dev/shm	tmpfs	defaults	0	0
-/sys		/sys		none	rw,bind		0	0
-/tmp		/tmp		none	rw,bind		0	0
-/home		/home		none	rw,bind		0	0
diff --git a/community-staging/schroot/arch32-nssdatabases b/community-staging/schroot/arch32-nssdatabases
deleted file mode 100644
index 815ddce3f..000000000
--- a/community-staging/schroot/arch32-nssdatabases
+++ /dev/null
@@ -1,6 +0,0 @@
-# System databases to copy into the chroot from the host system.
-#
-# <database name>
-passwd
-shadow
-group
diff --git a/community-staging/schroot/pam.d.schroot.patch b/community-staging/schroot/pam.d.schroot.patch
deleted file mode 100644
index 528acb5f7..000000000
--- a/community-staging/schroot/pam.d.schroot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-@@ -23,13 +23,6 @@
- # time restrainst on schroot usage.
- # account    requisite  pam_time.so
- 
--# The standard Unix authentication modules, used with
--# NIS (man nsswitch) as well as normal /etc/passwd and
--# /etc/shadow entries.
--@include common-auth
--@include common-account
--@include common-session
--
- # Sets up user limits, please uncomment and read /etc/security/limits.conf
- # to enable this functionality.
- # session    required   pam_limits.so
-
diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD
deleted file mode 100644
index 93fd45dc0..000000000
--- a/community-staging/smc/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 66950 2012-03-02 18:13:57Z lcarlier $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=15
-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-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff
deleted file mode 100644
index a99cbce6c..000000000
--- a/community-staging/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-staging/smc/smc.desktop b/community-staging/smc/smc.desktop
deleted file mode 100644
index 6cfe5b018..000000000
--- a/community-staging/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-staging/smc/smc.png b/community-staging/smc/smc.png
deleted file mode 100644
index f02af1bfc..000000000
--- a/community-staging/smc/smc.png
+++ /dev/null
diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD
deleted file mode 100644
index 5294f7b74..000000000
--- a/community-staging/spring/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 66726 2012-02-27 20:26:04Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=0.86.0
-_pkgver=86.0
-pkgrel=2
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
-         'libxcursor')
-makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environment')
-optdepends=('python2: python-based bots'
-            'java-runtime: java-based bots')
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('047511adf2e4cd711df61d556367e7af')
-
-build() {
-  bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
-  
-  cd spring_${_pkgver}
- 
-  cmake	. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring
-  make
-}
-
-package() {
-  cd spring_${_pkgver}
-
-  make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/etc/spring
-  echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
-}
-
-# vim sw=2:ts=2 et:
diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD
deleted file mode 100644
index 59c68d9d0..000000000
--- a/community-staging/springlobby/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 66722 2012-02-27 19:40:00Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: DuGi <dugi@irc.pl>
-
-pkgname=springlobby
-pkgver=0.141
-pkgrel=2
-pkgdesc="A free cross-platform lobby client for the Spring RTS project."
-arch=('i686' 'x86_64')
-url="http://springlobby.info/"
-license=('GPL2')
-depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs')
-optdepends=('sdl' 'sdl_sound' 'sdl_mixer') 
-makedepends=('boost' 'asio' 'cmake')
-install=springlobby.install
-source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 
-        springlobby.desktop
-        springlobby.png)
-md5sums=('a7e5a9b031a1e72a1df59575289fed3f'
-         '45f8b59d033931d02e734fe3bd7777dd'
-         '1f388187539aeb0358b51995e26ed890')
-
-build() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt
-
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOPTION_SOUND=false
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  make DESTDIR=$pkgdir install
-  
-  install -m755 -d $pkgdir/usr/share/applications
-  install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
-
-  install -m755 -d -p $pkgdir/usr/share/pixmaps
-  install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop
deleted file mode 100644
index 1dce96b90..000000000
--- a/community-staging/springlobby/springlobby.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=SpringLobby
-Comment=Lobby for Spring. An open source RTS with similar gameplay to TA
-Exec=springlobby
-Icon=springlobby.png
-Terminal=false
-Type=Application
-Categories=Application;Game;StrategyGame;
diff --git a/community-staging/springlobby/springlobby.install b/community-staging/springlobby/springlobby.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-staging/springlobby/springlobby.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-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png
deleted file mode 100644
index 89c7ab0ac..000000000
--- a/community-staging/springlobby/springlobby.png
+++ /dev/null
diff --git a/community-staging/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD
deleted file mode 100644
index 9be52e571..000000000
--- a/community-staging/tagpy/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 66791 2012-02-28 18:40:56Z jelle $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Scott Horowitz <stonecrest@gmail.com>
-
-pkgname=tagpy
-pkgver=0.94.8
-pkgrel=7
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/tagpy"
-license=('MIT')
-depends=('python2' 'taglib' 'boost-libs')
-makedepends=('python2-distribute' 'boost')
-source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6baff63318cf90b9bc5a2497a0597802')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py') 
- 
-  ./configure.py --taglib-lib-dir=/usr/lib/ \
-  	--taglib-inc-dir=/usr/include/taglib/ \
-	--boost-inc-dir=/usr/include/boost/ \
-	--boost-lib-dir=/usr/lib/ \
-	--boost-python-libname=boost_python
-  python2 setup.py build
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-staging/twinkle/PKGBUILD b/community-staging/twinkle/PKGBUILD
deleted file mode 100644
index 13818687c..000000000
--- a/community-staging/twinkle/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 66771 2012-02-28 13:31:18Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-
-pkgname=twinkle
-pkgver=1.4.2
-pkgrel=15
-pkgdesc="Softphone for voice over IP and IM communication using SIP"
-arch=('x86_64' 'i686')
-url="http://www.twinklephone.com/"
-license=('GPL')
-depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp')
-makedepends=('pkg-config' 'boost')
-source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz"
-        "twinkle.desktop")
-sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
-            '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
-sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
-            '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  . /etc/profile.d/qt3.sh
-  ./configure --prefix=/usr \
-	--without-kde \
-	--with-speex \
-	--without-ilbc \
-	--mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \
-    "$pkgdir/usr/share/pixmaps/twinkle.png"
-  install -Dm644 twinkle.desktop \
-    "$pkgdir/usr/share/applications/twinkle.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/twinkle/twinkle.desktop b/community-staging/twinkle/twinkle.desktop
deleted file mode 100644
index 60688b5fe..000000000
--- a/community-staging/twinkle/twinkle.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Twinkle
-Comment=SIP softphone for Qt
-Icon=twinkle.png
-Exec=twinkle
-Terminal=false
-Type=Application
-Categories=Network;
-StartupNotify=false
diff --git a/community-staging/usb_modeswitch/PKGBUILD b/community-staging/usb_modeswitch/PKGBUILD
deleted file mode 100644
index c5934fc42..000000000
--- a/community-staging/usb_modeswitch/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 68705 2012-03-31 22:56:03Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=usb_modeswitch
-pkgver=1.2.2
-pkgrel=2
-_pkgdata=20120120
-pkgdesc="Activating switchable USB devices on Linux."
-arch=('i686' 'x86_64')
-url="http://www.draisberghof.de/usb_modeswitch/"
-license=('GPL')
-depends=('libusb-compat' 'tcl')
-makedepends=('gcc' 'make')
-backup=("etc/$pkgname.conf")
-source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
-	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
-	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('4f3d3b9342b59b488089a8a81abda3ae'
-         'c899cc9c71bb35f3ec600b7cd1455c65'
-         'c12e19e3992b5beac9b6c48555cff660')
-
-build() {
-  cd $srcdir/usb-modeswitch-$pkgver/
-  make clean
-  make
-}
-
-package() {
-  cd $srcdir/usb-modeswitch-$pkgver/
-
-  mkdir -p $pkgdir/usr/lib/udev
-  mkdir -p $pkgdir/etc
-  mkdir -p $pkgdir/usr/share/man/man1
-
-  make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install
-  
-  cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup
-
-  cd $srcdir/usb-modeswitch-data-${_pkgdata}
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/wesnoth/PKGBUILD b/community-staging/wesnoth/PKGBUILD
deleted file mode 100644
index 5c8742717..000000000
--- a/community-staging/wesnoth/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 66717 2012-02-27 19:17:20Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: 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.10.1
-pkgrel=2
-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" 'dbus-core' 'python2')
-makedepends=('boost' 'cmake')
-install=wesnoth.install
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        wesnoth.tmpfiles.conf
-        wesnothd.rc.d)
-md5sums=('a2ac2d629d4e3e5fc7e7e48f935d9960'
-         'b8122f5054e3895c9c054e87460869dc'
-         '85659b47d22dfdf4e4d046556973fc3e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir build && cd build
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DENABLE_OMP=ON \
-      -DENABLE_TOOLS=ON \
-      -DMANDIR=share/man \
-      -DFIFO_DIR=/var/run/wesnothd
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm -r $pkgdir/usr/share/applications
-  rm -r $pkgdir/usr/share/doc
-  rm -r $pkgdir/usr/share/pixmaps
-  rm -r $pkgdir/usr/share/wesnoth
-
-  install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
-  install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd"
-}
diff --git a/community-staging/wesnoth/wesnoth.install b/community-staging/wesnoth/wesnoth.install
deleted file mode 100644
index 4f1e419ae..000000000
--- a/community-staging/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/community-staging/wesnoth/wesnoth.tmpfiles.conf b/community-staging/wesnoth/wesnoth.tmpfiles.conf
deleted file mode 100644
index 3ec0f6013..000000000
--- a/community-staging/wesnoth/wesnoth.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/wesnothd 0700 root root -
diff --git a/community-staging/wesnoth/wesnothd.rc.d b/community-staging/wesnoth/wesnothd.rc.d
deleted file mode 100755
index 95e312b7b..000000000
--- a/community-staging/wesnoth/wesnothd.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/wesnothd)
-
-case "$1" in
-  start)
-    stat_busy "Starting Wesnoth Server Daemon"
-    [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd
-    [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/wesnothd)
-      echo $PID > /var/run/wesnotd/pid
-      add_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Wesnoth Server Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/wt/PKGBUILD b/community-staging/wt/PKGBUILD
deleted file mode 100644
index e9659b6f4..000000000
--- a/community-staging/wt/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 66751 2012-02-28 07:46:59Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Denis Martinez <deuns.martinez@gmail.com>
-
-pkgname=wt
-pkgver=3.2.0
-pkgrel=3
-pkgdesc="a C++ library and application server for developing and deploying web applications"
-arch=('i686' 'x86_64')
-url="http://www.webtoolkit.eu/"
-license=('GPL')
-depends=('boost-libs>=1.36')
-makedepends=('boost>=1.36' 'cmake>=2.8'
-	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite3' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
-optdepends=('openssl: for SSL support in built-in webserver'
-	    'zlib: for compression in HTTP protocol'
-	    'fcgi: for FastCGI support'
-	    'postgresql-libs: for PostgreSQL Dbo support'
-	    'sqlite3: for Sqlite3 Dbo support'
-	    'libharu: for PDF generation (WPdfImage)'
-	    'graphicsmagick: for raster image support (WRasterImage)'
-	    'pango: for advanced font rendering (WRasterImage)'
-	    'mysql++: for the hangman example'
-	    'qt: for the Wt/Qt interopability example (wtwithqt)')
-backup=('etc/wt/wt_config.xml')
-source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz)
-md5sums=('82ff039bccf7a941b37142c9d3fc7f32')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  mkdir -p build
-  cd build
-  cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \
-    -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
-    -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" ..
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/build
-  make DESTDIR=${pkgdir} install
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/wt/wt-boost-1.47.patch b/community-staging/wt/wt-boost-1.47.patch
deleted file mode 100644
index 919e1371f..000000000
--- a/community-staging/wt/wt-boost-1.47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt
---- wt-3.1.10.q/src/CMakeLists.txt	2011-07-26 00:58:19.000000000 +0400
-+++ wt-3.1.10/src/CMakeLists.txt	2011-06-24 18:51:54.000000000 +0400
-@@ -236,6 +236,7 @@
- web/TimeUtil.C
- web/XSSFilter.C
- web/XSSUtils.C
-+web/random_device.cpp
- web/base64.cpp
- Plain_html.C
- Boot_html.C
diff --git a/community-staging/xmobar/PKGBUILD b/community-staging/xmobar/PKGBUILD
deleted file mode 100644
index ebe3e2563..000000000
--- a/community-staging/xmobar/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 66667 2012-02-27 02:46:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.4
-
-pkgname=xmobar
-pkgver=0.14
-pkgrel=2
-pkgdesc="A Minimalistic Text Based Status Bar"
-url="http://hackage.haskell.org/package/xmobar"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc>=7.0.2' 'haskell-x11>=1.3.0' 'haskell-x11-xft>=0.2' 'haskell-utf8-string'
-	     'haskell-stm' 'haskell-parsec>=3' 'haskell-mtl>=2')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
-md5sums=('b965e2db0555c741db96945210995777')
-
-build() {
-    cd ${srcdir}/xmobar-$pkgver
-#    runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_alsa with_inotify with_iwlib"
-    runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib"
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/xmobar-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-staging/xmonad-contrib/PKGBUILD b/community-staging/xmonad-contrib/PKGBUILD
deleted file mode 100644
index e2092750a..000000000
--- a/community-staging/xmonad-contrib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 66781 2012-02-28 15:56:19Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: orbisvicis <gmail.com>
-
-pkgname=xmonad-contrib
-pkgver=0.10
-pkgrel=2
-pkgdesc="Add-ons for xmonad"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-2' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
-install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
-}
diff --git a/community-staging/xmonad-contrib/xmonad-contrib.install b/community-staging/xmonad-contrib/xmonad-contrib.install
deleted file mode 100644
index e9208c833..000000000
--- a/community-staging/xmonad-contrib/xmonad-contrib.install
+++ /dev/null
@@ -1,17 +0,0 @@
-HS_DIR=usr/share/haskell/xmonad-contrib
-
-post_install() {
-  ${HS_DIR}/register.sh
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-staging/xmonad/PKGBUILD b/community-staging/xmonad/PKGBUILD
deleted file mode 100644
index fa3779df6..000000000
--- a/community-staging/xmonad/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 66511 2012-02-25 22:21:22Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: shild <shildv@gmail.com>
-
-pkgname=xmonad
-pkgver=0.10
-pkgrel=3
-pkgdesc="A lightweight X11 tiled window manager written in Haskell"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.4.1' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.7')
-optdepends=('xorg-xmessage: for displaying visual error messages')
-install='xmonad.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-	xmonad.desktop
-	xmonad.session
-	xmonad.svg)
-md5sums=('f8381e1ec15137863558a454d4466467'
-         'f8e3d84a9f154d1b5d7fcffbc0a058c9'
-         '9d1bc84a7f32897d32f3fc71ef76228e'
-         '72bfa5e62e4e44fe7fa59b6a7593d993')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-#  runhaskell util/GenerateManpage.hs
-
-  install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
-
-  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
-  install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session
-  install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
-}
diff --git a/community-staging/xmonad/xmonad.desktop b/community-staging/xmonad/xmonad.desktop
deleted file mode 100644
index 0af0f2d9b..000000000
--- a/community-staging/xmonad/xmonad.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Xmonad GNOME
-Comment=Tiling window manager
-TryExec=/usr/bin/gnome-session
-Exec=gnome-session --session=xmonad
-Type=XSession
-Icon=/usr/share/pixmaps/xmonad.svg
diff --git a/community-staging/xmonad/xmonad.install b/community-staging/xmonad/xmonad.install
deleted file mode 100644
index 6659247db..000000000
--- a/community-staging/xmonad/xmonad.install
+++ /dev/null
@@ -1,22 +0,0 @@
-HS_DIR=/usr/share/haskell/xmonad
-
-post_install() {
-    ${HS_DIR}/register.sh
-    echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
-    echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
-    echo 
-    echo "If you would like to run xmonad as a window manager inside GNOME, please see"
-    echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-staging/xmonad/xmonad.png b/community-staging/xmonad/xmonad.png
deleted file mode 100644
index d957f62f8..000000000
--- a/community-staging/xmonad/xmonad.png
+++ /dev/null
diff --git a/community-staging/xmonad/xmonad.session b/community-staging/xmonad/xmonad.session
deleted file mode 100644
index c0bd16781..000000000
--- a/community-staging/xmonad/xmonad.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Xmonad session
-RequiredComponents=gnome-panel;gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=xmonad
-DefaultProvider-notifications=notification-daemon
diff --git a/community-staging/xmonad/xmonad.svg b/community-staging/xmonad/xmonad.svg
deleted file mode 100644
index 5fc884213..000000000
--- a/community-staging/xmonad/xmonad.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2211"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   width="47"
-   height="73"
-   version="1.0"
-   sodipodi:docbase="/home/sjanssen/xmonad-web/images"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata2216">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2214" />
-  <sodipodi:namedview
-     inkscape:window-height="778"
-     inkscape:window-width="1278"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="4"
-     inkscape:cx="23.5"
-     inkscape:cy="22.689137"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:current-layer="g3208" />
-  <g
-     id="g3208"
-     transform="translate(-44.517797,4.0967298)">
-    <g
-       id="g3212"
-       transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)">
-      <path
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462"
-         id="text2220"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path3206"
-         d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349"
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         sodipodi:nodetypes="ccccccccc" />
-    </g>
-    <path
-       style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z "
-       id="text3216"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
-  </g>
-</svg>
diff --git a/community-testing/blender/PKGBUILD b/community-testing/blender/PKGBUILD
deleted file mode 100644
index 20169f8cb..000000000
--- a/community-testing/blender/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 66980 2012-03-03 08:10:57Z ibiru $
-# 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.62
-pkgrel=2
-epoch=3
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' '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=('f2357584a5081b03f6e60ba3efe2a610')
-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/cclive/PKGBUILD b/community-testing/cclive/PKGBUILD
deleted file mode 100644
index 77f2561c6..000000000
--- a/community-testing/cclive/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 66982 2012-03-03 08:11:02Z ibiru $
-# 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=3
-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/cdemu-daemon/60-vhba.rules b/community-testing/cdemu-daemon/60-vhba.rules
deleted file mode 100644
index 91de6f86a..000000000
--- a/community-testing/cdemu-daemon/60-vhba.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
diff --git a/community-testing/cdemu-daemon/PKGBUILD b/community-testing/cdemu-daemon/PKGBUILD
deleted file mode 100644
index 87eb6bd8e..000000000
--- a/community-testing/cdemu-daemon/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 68476 2012-03-25 14:38:03Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Charles Lindsay <charles@chaoslizard.org>
-
-pkgname=cdemu-daemon
-pkgver=1.5.0
-pkgrel=4
-pkgdesc="CD/DVD-ROM device emulator daemon"
-arch=('i686' 'x86_64')
-url="http://cdemu.sourceforge.net/"
-license=('GPL')
-depends=('dbus' 'vhba-module>=20110915-5' 'libao' "libmirage=$pkgver")
-optdepends=('alsa-lib: to enable the ALSA audio driver'
-            'pulseaudio: to enable the PA audio driver')
-backup=('etc/conf.d/cdemud'
-        'etc/dbus-1/system.d/cdemud-dbus.conf')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
-        'cdemud.conf'
-        'cdemud.rc'
-        'system.patch')
-md5sums=('5ba780caa26d855942512b5b3c22405a'
-         '5d9e08255e45ca3c0987329b7920e206'
-         '4bbf42b69133e4e91c1be2c6825fa392'
-         '90a2516639c05737fa10a110a1cba467')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # make things Arch-friendly
-  patch -Np1 -i "$srcdir/system.patch"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --libexecdir=/usr/lib/$pkgname
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # the init stuff
-  install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud"
-  install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud"
-
-  # should we really be doing this? (for systemd)
-  #install -d "$pkgdir/usr/lib/modules-load.d"
-  #echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cdemu-daemon/cdemu-daemon-system.patch b/community-testing/cdemu-daemon/cdemu-daemon-system.patch
deleted file mode 100644
index ce4dab7d9..000000000
--- a/community-testing/cdemu-daemon/cdemu-daemon-system.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- system/cdemu-daemon-system.sh.orig	2012-02-27 21:38:05.000000000 +0100
-+++ system/cdemu-daemon-system.sh	2012-03-10 20:53:06.787503891 +0100
-@@ -6,10 +6,10 @@
- # Default settings
- NUM_DEVICES=2
- AUDIO_DRIVER=null
--LOG_FILE=/tmp/cdemu-daemon.log
-+LOG_FILE=/var/log/cdemu-daemon.log
- 
- # Read the settings
--CONFIG_FILE=/etc/sysconfig/cdemu-daemon
-+CONFIG_FILE=/etc/conf.d/cdemud
- 
- if [ -f ${CONFIG_FILE} ]; then
-     . ${CONFIG_FILE};
diff --git a/community-testing/cdemu-daemon/cdemu-daemon.install b/community-testing/cdemu-daemon/cdemu-daemon.install
deleted file mode 100644
index 7a3e8a9f5..000000000
--- a/community-testing/cdemu-daemon/cdemu-daemon.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_upgrade() {
-  echo "  > The 'cdemu' group is now created by vhba-module"
-  echo "  >> you may have to re-add yourself to the group and relogin"
-  echo
-  echo "  > Daemon can be used in session mode as user, simply run 'cdemud'"
-  echo "    >> you do not need to use the init script in this case"
-  echo "    >> put your configuration in ~/.cdemud instead"
-}
-
-post_install () {
-  echo "  > Add yourself to the 'cdemu' group for non-root access"
-  echo "  > Start the daemon as root with /etc/rc.d/cdemud"
-  echo "  > See /etc/conf.d/cdemud for further configuration"
-  echo
-  echo "  > Daemon can be used in session mode as user, simply run 'cdemud'"
-  echo "    >> you do not need to use the init script in this case"
-  echo "    >> put your configuration in ~/.cdemud instead"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cdemu-daemon/cdemud.conf b/community-testing/cdemu-daemon/cdemud.conf
deleted file mode 100644
index 6f14947a6..000000000
--- a/community-testing/cdemu-daemon/cdemud.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# how many optical drives to emulate
-NUM_DEVICES=2
-
-# audio backend (null, alsa or pulse)
-AUDIO_DRIVER=null
-
-# log file
-LOG_FILE=/var/log/cdemud.log
-
-# bus to use (system or session)
-BUS="system"
diff --git a/community-testing/cdemu-daemon/cdemud.install b/community-testing/cdemu-daemon/cdemud.install
deleted file mode 100644
index 3550a5e59..000000000
--- a/community-testing/cdemu-daemon/cdemud.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-  groupadd cdemu
-  echo "  > Add yourself to the 'cdemu' group for non-root access"
-  echo "  > See /etc/conf.d/cdemud for further configuration"
-}
-
-post_remove() {
-  groupdel cdemu
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cdemu-daemon/cdemud.rc b/community-testing/cdemu-daemon/cdemud.rc
deleted file mode 100644
index e8dab1f08..000000000
--- a/community-testing/cdemu-daemon/cdemud.rc
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/cdemud
-
-case "$1" in
-  start)
-    stat_busy "Loading vhba and loop modules"
-    modprobe vhba
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    stat_busy "Waiting for /dev/vhba_ctl"
-    i=0
-    until [ -c /dev/vhba_ctl -o $i -ge 10 ]; do
-      i=`expr $i + 1`
-      sleep 1
-    done
-    if [ -c /dev/vhba_ctl ]; then
-      stat_done
-    else
-      stat_fail
-    fi
-
-    stat_busy "Starting cdemud"
-    cdemud --ctl-device=/dev/vhba_ctl --bus=$BUS --num-devices=$NUM_DEVICES --audio-driver=$AUDIO_DRIVER --logfile=$LOG_FILE &
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon cdemud
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping cdemud"
-    kill -9 `pidof cdemud` &>/dev/null && sleep 1 && rmmod vhba
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      rm_daemon cdemud
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community-testing/cdemu-daemon/system.patch b/community-testing/cdemu-daemon/system.patch
deleted file mode 100644
index 3c3d4b221..000000000
--- a/community-testing/cdemu-daemon/system.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aur cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh
---- cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh	2012-03-25 16:35:40.577837996 +0800
-+++ cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh	2012-03-25 16:39:12.180024983 +0800
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *session* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from ~/.cdemu-daemon
-+# from ~/.cdemud
- 
- # Default settings
- NUM_DEVICES=2
--AUDIO_DRIVER=pulse
--LOG_FILE=~/.cdemu-daemon.log
-+AUDIO_DRIVER=null
-+LOG_FILE=~/.cdemud.log
- 
- # Read the settings
--CONFIG_FILE=~/.cdemu-daemon
-+CONFIG_FILE=~/.cdemud
- 
- if [ -f ${CONFIG_FILE} ]; then
-     . ${CONFIG_FILE};
-diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh
---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh	2012-03-25 16:35:40.581171312 +0800
-+++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh	2012-03-25 16:36:48.810801678 +0800
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemud
- 
- # Default settings
- NUM_DEVICES=2
- AUDIO_DRIVER=null
--LOG_FILE=/tmp/cdemu-daemon.log
-+LOG_FILE=/var/log/cdemud.log
- 
- # Read the settings
--CONFIG_FILE=/etc/sysconfig/cdemu-daemon
-+CONFIG_FILE=/etc/conf.d/cdemud
- 
- if [ -f ${CONFIG_FILE} ]; then
-     . ${CONFIG_FILE};
diff --git a/community-testing/courier-authlib/PKGBUILD b/community-testing/courier-authlib/PKGBUILD
deleted file mode 100644
index 1e80603f7..000000000
--- a/community-testing/courier-authlib/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 64621 2012-02-17 12:32:40Z spupykin $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=courier-authlib
-pkgver=0.63.0
-pkgrel=8
-pkgdesc="Authentification library for the courier mailserver(s)"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://courier-mta.org/authlib/"
-backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \
-        'etc/authlib/authmysqlrc' 'etc/authlib/authpgsqlrc')
-depends=('openssl' 'gdbm' 'perl' 'libtool' 'expect')
-makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0')
-optdepends=('libmysqlclient' 'libldap' 'postgresql-libs')
-conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap')
-provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap')
-options=(!libtool)
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        authdaemond.rc.d)
-md5sums=('411a927d178f783a1e8fab9964ce0dd2'
-         '7de75a9a74796f4fd2e81fd3ca16ed8d')
-
-build() {
-  #export MAKEFLAGS="-j1"
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libdir=/usr/lib \
-    --libexecdir=/usr/lib \
-    --with-db=gdbm \
-    --with-mailuser=courier --with-mailgroup=courier \
-    --with-authpam --with-authpwd --with-authshadow \
-    --with-authldap --with-authmysql --with-authpgsql \
-    --with-authuserdb --with-authcram --with-authdaemon \
-    --with-authdaemonvar=/var/run/authdaemon
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  ###############################################################################
-  # post_installation ---- rename the config file and change ownerschip
-  for distfile in ${pkgdir}/etc/authlib/*.dist; do
-    chown 72:72 ${distfile}
-    mv ${distfile} ${pkgdir}/etc/authlib/`basename ${distfile} .dist`
-  done
-   # copy the .schema; mostly refered to as courier.schema -> rename it
-  install -Dm 444 authldap.schema \
-    ${pkgdir}/etc/openldap/schema/courier.schema
-  ###############################################################################
-  # Install daemon, that wraps couriers bashscript
-  install -Dm 755 ${srcdir}/authdaemond.rc.d ${pkgdir}/etc/rc.d/authdaemond
-  #mkdir -p ${pkgdir}/var/spool/authdaemon
-  #chown -R 72:72 ${pkgdir}/var/spool/authdaemon
-  mkdir -p ${pkgdir}/var/spool/courier
-  chown -R 72:72 ${pkgdir}/var/spool/courier
-  chown -R 72:72 ${pkgdir}/var/run/authdaemon
-  # docs say we can remove .a files after make
-  find ${pkgdir} -name '*\.a' -exec rm -f {} \;
-  # Make libs available to /usr/lib
-  cd $pkgdir/usr/lib
-  for lib in courier-authlib/*.so; do
-      ln -s $lib .
-  done
-}
diff --git a/community-testing/courier-authlib/authdaemond.rc.d b/community-testing/courier-authlib/authdaemond.rc.d
deleted file mode 100644
index 791c3d122..000000000
--- a/community-testing/courier-authlib/authdaemond.rc.d
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start() {
-  [ -d /var/run/authdaemon ] || mkdir -p /var/run/authdaemon
-  chown courier:courier /var/run/authdaemon
-
-  stat_busy "Starting Authdaemond"
-  /usr/sbin/authdaemond start &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon authdaemond
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Authdaemond"
-  /usr/sbin/authdaemond stop &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm -f /var/run/authdaemon/{pid.lock,pid,socket} &> /dev/null
-
-    # TODO: Take these out at some point, they're only cleanup for old way
-    rm -f /var/run/authdaemond.pid &> /dev/null
-    rm -f /var/spool/authdaemon/{pid.lock,pid,socket} &> /dev/null
-
-    rm_daemon authdaemond
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    # calling 'stop' and 'start' without the $0 fails...
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/courier-authlib/courier-authlib.install b/community-testing/courier-authlib/courier-authlib.install
deleted file mode 100644
index cbccc636b..000000000
--- a/community-testing/courier-authlib/courier-authlib.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-   # creates group and user on virgin systems
-  if [ -z "`grep '^courier::' /etc/group`" ]; then
-    groupadd -g 72 courier >& /dev/null
-  fi
-  if [ -z "`grep '^courier:' /etc/passwd`" ]; then
-    useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier &>/dev/null
-  fi
-}
-
-# 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() {
-    userdel courier &> /dev/null
-    groupdel courier &> /dev/null
-}
-
-
-post_remove() {
- /bin/true
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/community-testing/dbmail/PKGBUILD b/community-testing/dbmail/PKGBUILD
deleted file mode 100644
index e7fd4b3ad..000000000
--- a/community-testing/dbmail/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 62080 2012-01-15 19:14:39Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
-
-pkgname=dbmail
-pkgver=3.0.0_rc3
-pkgrel=1
-pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
-depends=('gmime' 'libzdb' 'mhash' 'libevent')
-makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
-	     'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve')
-optdepends=('postgresql-libs: for PostgreSQL storage backend'
-	    'sqlite3: for SQLite storage backend'
-	    'libmysqlclient: for MySQL storage backend'
-	    'libldap: for LDAP authentication'
-	    'libsieve: for dbmail-sieve')
-url="http://www.dbmail.org"
-license=('GPL')
-options=('!libtool' 'zipman')
-backup=(etc/conf.d/dbmail)
-conflicts=('dbmail')
-provides=('dbmail')
-source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
-	dbmail.conf.d
-	dbmail.rc.d)
-md5sums=('52c3b9aad310efc90a6a2fff0552f73e'
-         'e7f72bc360decdb2475266391ad12329'
-         '099225611da20ec194c092ac9befc33c')
-
-build() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
-
-  [ -f Makefile ] || ./configure --prefix=/usr \
-	--with-mysql --with-pgsql --with-sqlite --with-ldap --with-sieve
-  make
-}
-
-package() {
-  cd $srcdir/dbmail-${pkgver/_/-}/
-  make DESTDIR=$pkgdir install
-  (cd man && make && make install DESTDIR=$pkgdir)
-
-  mkdir $pkgdir/etc
-  install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample
-  install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail
-  install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail
-  mkdir $pkgdir/usr/share/dbmail
-  cp -r sql/* $pkgdir/usr/share/dbmail/
-  cp dbmail.schema $pkgdir/usr/share/dbmail/
-}
diff --git a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch b/community-testing/dbmail/dbmail-2.2.10-pam-support.patch
deleted file mode 100644
index 805a7f609..000000000
--- a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-diff -wbBur dbmail-2.2.10/configure.in dbmail-2.2.10.pam/configure.in
---- dbmail-2.2.10/configure.in	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/configure.in	2008-09-18 16:43:04.000000000 +0400
-@@ -78,6 +78,13 @@
- 
- AC_SUBST(CRYPTLIB)
- 
-+dnl Check for PAM
-+AC_SUBST(PAMLIBS,"")
-+AC_CHECK_HEADERS(security/pam_appl.h,
-+    [AC_CHECK_LIB(pam,pam_start,
-+	[AC_DEFINE(HAVE_PAM,1,[Define if you have PAN including devel headers])
-+	 PAMLIBS="-lpam"],,)])
-+
- AC_SUBST(MYSQLLIB)
- AC_SUBST(MYSQLALIB)
- AC_SUBST(MYSQLLTLIB)
-diff -wbBur dbmail-2.2.10/dbmail-user.c dbmail-2.2.10.pam/dbmail-user.c
---- dbmail-2.2.10/dbmail-user.c	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/dbmail-user.c	2008-09-18 16:43:04.000000000 +0400
-@@ -157,7 +157,7 @@
- 		"md5", 		"md5-raw",		"md5sum",	"md5sum-raw", 
- 		"md5-hash",	"md5-hash-raw",		"md5-digest",	"md5-digest-raw",
- 		"md5-base64",	"md5-base64-raw",	"md5base64",	"md5base64-raw",
--		"shadow", 	"", 	NULL
-+		"shadow", 	"pam",	"", 	NULL
- 	};
- 
- 	/* These must correspond to the easy text names. */
-@@ -166,7 +166,7 @@
- 		MD5_HASH, 	MD5_HASH_RAW,		MD5_DIGEST,	MD5_DIGEST_RAW,
- 		MD5_HASH,	MD5_HASH_RAW,		MD5_DIGEST,	MD5_DIGEST_RAW,
- 		MD5_BASE64,	MD5_BASE64_RAW,		MD5_BASE64,	MD5_BASE64_RAW,
--		SHADOW,		PLAINTEXT,	PWTYPE_NULL
-+		SHADOW,		PWTYPE_PAM,		PLAINTEXT,	PWTYPE_NULL
- 	};
- 
- 	memset(pw, 0, 50);
-@@ -251,6 +251,12 @@
- 				*enctype = "crypt";
- 			}
- 			break;
-+#ifdef HAVE_PAM
-+		case PWTYPE_PAM:
-+			null_strncpy(pw, passwd, 49);
-+			*enctype = "pam";
-+			break;
-+#endif			
- 		default:
- 			qerrorf("Error: password type not supported [%s].\n",
- 				passwdtype);
-diff -wbBur dbmail-2.2.10/dbmail-user.h dbmail-2.2.10.pam/dbmail-user.h
---- dbmail-2.2.10/dbmail-user.h	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/dbmail-user.h	2008-09-18 16:43:04.000000000 +0400
-@@ -34,7 +34,7 @@
- typedef enum {
- 	PLAINTEXT = 0, PLAINTEXT_RAW, CRYPT, CRYPT_RAW,
- 	MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW,
--	MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_NULL
-+	MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_PAM, PWTYPE_NULL
- } pwtype_t;
- 
- int mkpassword(const char * const user, const char * const passwd,
-diff -wbBur dbmail-2.2.10/modules/authsql.c dbmail-2.2.10.pam/modules/authsql.c
---- dbmail-2.2.10/modules/authsql.c	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/modules/authsql.c	2008-09-18 16:43:04.000000000 +0400
-@@ -27,6 +27,19 @@
- #include "dbmail.h"
- #define THIS_MODULE "auth"
- 
-+#ifdef HAVE_PAM
-+#include <security/pam_appl.h>
-+
-+#ifndef DEFAULT_DBMAIL_PAM_SERVICE
-+#define DEFAULT_DBMAIL_PAM_SERVICE "dbmail"
-+#endif
-+
-+#ifndef DEFAULT_DBMAIL_PAM_TTL
-+#define DEFAULT_DBMAIL_PAM_TTL 60
-+#endif
-+
-+#endif
-+
- extern db_param_t _db_params;
- #define DBPFX _db_params.pfx
- 
-@@ -49,17 +62,80 @@
-  */
- static int __auth_query(const char *thequery);
- 
-+#ifdef HAVE_PAM
-+
-+static char *pam_password = NULL;	/* Workaround for Solaris 2.6 brokenness */
-+static pam_handle_t *pamh = NULL;
-+static int pam_ttl = DEFAULT_DBMAIL_PAM_TTL;
-+static char *pam_service = DEFAULT_DBMAIL_PAM_SERVICE;
-+static time_t pamh_created = 0;
-+/*
-+ * A simple "conversation" function returning the supplied password.
-+ * Has a bit to much error control, but this is my first PAM application
-+ * so I'd rather check everything than make any mistakes. The function
-+ * expects a single converstation message of type PAM_PROMPT_ECHO_OFF.
-+ */
-+static int
-+password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
-+{
-+    if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) {
-+    	TRACE(TRACE_ERROR, "Unexpected PAM converstaion '%d/%s'", msg[0]->msg_style, msg[0]->msg);
-+		return PAM_CONV_ERR;
-+    }
-+    if (!appdata_ptr) {
-+	/* Workaround for Solaris 2.6 where the PAM library is broken
-+	 * and does not pass appdata_ptr to the conversation routine
-+	 */
-+		appdata_ptr = pam_password;
-+    }
-+    if (!appdata_ptr) {
-+		TRACE(TRACE_ERROR, "ERROR: No password available to password_converstation!");
-+		return PAM_CONV_ERR;
-+    }
-+    *resp = calloc(num_msg, sizeof(struct pam_response));
-+    if (!*resp) {
-+		TRACE(TRACE_ERROR, "Out of memory!");
-+		return PAM_CONV_ERR;
-+    }
-+    (*resp)[0].resp = strdup((char *) appdata_ptr);
-+    (*resp)[0].resp_retcode = 0;
-+
-+    return ((*resp)[0].resp ? PAM_SUCCESS : PAM_CONV_ERR);
-+}
-+
-+static struct pam_conv conv =
-+{
-+    &password_conversation,
-+    NULL
-+};
-+
-+#endif
-+
-+
- int auth_connect()
- {
- 	/* this function is only called after a connection has been made
- 	 * if, in the future this is not the case, db.h should export a 
- 	 * function that enables checking for the database connection
- 	 */
-+#ifdef HAVE_PAM
-+
-+#endif
- 	return 0;
- }
- 
- int auth_disconnect()
- {
-+#ifdef HAVE_PAM
-+	int retval=PAM_SUCCESS;
-+	if (pamh) {
-+		retval = pam_end(pamh, retval);
-+		if (retval != PAM_SUCCESS) {
-+	    	pamh = NULL;
-+	    TRACE(TRACE_ERROR, "failed to release PAM authenticator");
-+		}
-+    }
-+#endif
- 	return 0;
- }
- 
-@@ -458,7 +534,71 @@
- 		is_validated = (strncmp(md5str, query_result, 32) == 0) ? 1 : 0;
- 		g_free(md5str);
- 	}
-+#ifdef HAVE_PAM
-+	else if (strcasecmp(query_result, "pam") == 0) {
-+		int retval=0;
-+		TRACE(TRACE_DEBUG, "validating using pam for user [%s] pass:[%s]",real_username,password);
-+		conv.appdata_ptr = (char *) password;
-+		pam_password= password;
-+		if (pam_ttl == 0) {
-+	    	/* Create PAM connection */
-+	    	retval = pam_start(pam_service, real_username, &conv, &pamh);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_ERROR, "failed to create PAM authenticator");
-+				goto pam_error;
-+	    	}
-+		} else if (!pamh || (time(NULL) - pamh_created) >= pam_ttl || pamh_created > time(NULL)) {
-+	    	/* Close previous PAM connection */
-+	    	if (pamh) {
-+				retval = pam_end(pamh, retval);
-+				if (retval != PAM_SUCCESS) {
-+		    		TRACE(TRACE_WARNING, "failed to release PAM authenticator");
-+				}
-+				pamh = NULL;
-+	    	}
-+	    	/* Initialize persistent PAM connection */
-+	    	retval = pam_start(pam_service, "dbmail@", &conv, &pamh);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_ERROR, "failed to create PAM authenticator");
-+				goto pam_error;
-+	    	}
-+	    	pamh_created = time(NULL);
-+		}
-+		retval = PAM_SUCCESS;
-+		if (pam_ttl != 0) {
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_USER, real_username);
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_CONV, &conv);
-+		}
-+		if (retval == PAM_SUCCESS)
-+	    	retval = pam_authenticate(pamh, 0);
-+		if (retval == PAM_SUCCESS ) //&& !no_acct_mgmt
-+	    	retval = pam_acct_mgmt(pamh, 0);
-+		if (retval == PAM_SUCCESS) {
-+	    	is_validated=1;
-+		} else {
-+pam_error:
-+		    is_validated=0;
-+		}
-+		/* cleanup */
-+		retval = PAM_SUCCESS;
-+#ifdef PAM_AUTHTOK
-+		if (pam_ttl != 0) {
-+	    	if (retval == PAM_SUCCESS)
-+				retval = pam_set_item(pamh, PAM_AUTHTOK, NULL);
-+		}
-+#endif
-+		if (pam_ttl == 0 || retval != PAM_SUCCESS) {
-+	    	retval = pam_end(pamh, retval);
-+	    	if (retval != PAM_SUCCESS) {
-+				TRACE(TRACE_WARNING, "failed to release PAM authenticator\n");
-+	    	}
-+	    	pamh = NULL;
-+		}
- 
-+	}
-+#endif
- 	if (is_validated) {
- 		db_user_log_login(*user_idnr);
- 	} else {
-diff -wbBur dbmail-2.2.10/modules/Makefile.am dbmail-2.2.10.pam/modules/Makefile.am
---- dbmail-2.2.10/modules/Makefile.am	2008-03-24 17:49:33.000000000 +0300
-+++ dbmail-2.2.10.pam/modules/Makefile.am	2008-09-18 16:44:53.000000000 +0400
-@@ -60,7 +60,7 @@
- 
- # This one is always built.
- libauth_sql_la_SOURCES = authsql.c
--libauth_sql_la_LIBADD = @CRYPTLIB@
-+libauth_sql_la_LIBADD = @CRYPTLIB@ @PAMLIBS@
- 
- if LDAP
- libauth_ldap_la_SOURCES = authldap.c
diff --git a/community-testing/dbmail/dbmail.conf.d b/community-testing/dbmail/dbmail.conf.d
deleted file mode 100644
index 73309a4a2..000000000
--- a/community-testing/dbmail/dbmail.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Parameters to be passed to dbmail
-#
-#
-# Select the service you want started with dbmail
-#
-# Available options :
-# dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved
-#
-DBMAIL_DAEMONS="dbmail-imapd"
diff --git a/community-testing/dbmail/dbmail.rc.d b/community-testing/dbmail/dbmail.rc.d
deleted file mode 100644
index 92c34e5d2..000000000
--- a/community-testing/dbmail/dbmail.rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/dbmail ] && . /etc/conf.d/dbmail
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-	for daemon in $DBMAIL_DAEMONS; do
-	    stat_busy "Starting DbMail ${daemon}"
-	    /usr/sbin/${daemon}
-	    if [ $? -gt 0 ]; then
-		stat_fail
-	    else
-		stat_done
-	    fi
-	done
-	add_daemon dbmail
-	;;
-    stop)
-	for daemon in $DBMAIL_DAEMONS; do
-	    stat_busy "Stopping DbMail ${daemon}"
-	    pid=$(cat /var/run/${daemon}.pid)
-	    kill $pid
-	    sleep 4
-	    stat_done
-	done
-	rm_daemon dbmail
-	;;
-    restart)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-    *)
-	echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-
-exit 0
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 65470ea8f..000000000
--- a/community-testing/directfb/DirectFB-1.4.9-libpng-1.5.patch
+++ /dev/null
@@ -1,252 +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;
-
--- 
-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
-
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 19:04:52.000000000 -0500
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 19:07:18.000000000 -0500
-@@ -710,10 +709,15 @@
- 
-      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;
---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c.old	2012-02-14 22:40:30.000000000 -0500
-+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	2012-02-14 23:37:19.000000000 -0500
-@@ -638,12 +638,10 @@
-                data->color_key = key;
-           }
-           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));
-           }
-      }
- 
diff --git a/community-testing/directfb/PKGBUILD b/community-testing/directfb/PKGBUILD
deleted file mode 100644
index 779bc141c..000000000
--- a/community-testing/directfb/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 67846 2012-03-15 01:59:34Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=directfb
-pkgver=1.5.3
-pkgrel=1
-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')
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz \
-        DirectFB-1.4.9-libpng-1.5.patch directfb-missing_include.patch)
-md5sums=('54a9ec931c8e3c82adb924194e65120e'
-         '82f552ae306871382a6a8e05cffee723'
-         '6b7ceca416c28a3791a145c15bf6f462')
-
-build() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch
-  patch -p1 -i ../directfb-missing_include.patch
-  CFLAGS+="-fno-inline" ./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-missing_include.patch b/community-testing/directfb/directfb-missing_include.patch
deleted file mode 100644
index 4b1af5a30..000000000
--- a/community-testing/directfb/directfb-missing_include.patch
+++ /dev/null
@@ -1,376 +0,0 @@
---- /dev/null	2012-02-14 14:47:01.028967126 -0500
-+++ b/lib/voodoo/link.h	2012-02-14 21:19:05.000000000 -0500
-@@ -0,0 +1,85 @@
-+/*
-+   (c) Copyright 2001-2009  The world wide DirectFB Open Source Community (directfb.org)
-+   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
-+
-+   All rights reserved.
-+
-+   Written by Denis Oliver Kropp <dok@directfb.org>,
-+              Andreas Hundt <andi@fischlustig.de>,
-+              Sven Neumann <neo@directfb.org>,
-+              Ville Syrjälä <syrjala@sci.fi> and
-+              Claudio Ciccani <klan@users.sf.net>.
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with this library; if not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __VOODOO__LINK_H__
-+#define __VOODOO__LINK_H__
-+
-+#include <voodoo/types.h>
-+
-+
-+typedef struct {
-+     void   *ptr;
-+     size_t  length;
-+     size_t  done;
-+} VoodooChunk;
-+
-+
-+struct __V_VoodooLink {
-+     void *priv;
-+     u32   code;
-+
-+     void    (*Close)( VoodooLink *link );
-+
-+     /* See 'read(2)', blocking */
-+     ssize_t (*Read) ( VoodooLink *link,
-+                       void       *buffer,
-+                       size_t      count );
-+
-+     /* See 'write(2)', blocking */
-+     ssize_t (*Write)( VoodooLink *link,
-+                       const void *buffer,
-+                       size_t      count );
-+
-+
-+     /* For later... */
-+     DirectResult (*SendReceive)( VoodooLink  *link,
-+                                  VoodooChunk *send,
-+                                  size_t       num_send,
-+                                  VoodooChunk *recv,
-+                                  size_t       num_recv );
-+
-+     DirectResult (*WakeUp)     ( VoodooLink  *link );
-+
-+     DirectResult (*WaitForData)( VoodooLink  *link,
-+                                  int          timeout_ms );
-+};
-+
-+
-+DirectResult VOODOO_API voodoo_link_init_connect( VoodooLink *link,
-+                                                  const char *hostname,
-+                                                  int         port,
-+                                                  bool        raw );
-+
-+DirectResult VOODOO_API voodoo_link_init_local  ( VoodooLink *link,
-+                                                  const char *path,
-+                                                  bool        raw );
-+
-+DirectResult VOODOO_API voodoo_link_init_fd     ( VoodooLink *link,
-+                                                  int         fd[2] );
-+
-+#endif
---- /dev/null	2012-02-14 14:47:01.028967126 -0500
-+++ b/lib/voodoo/packet.h	2012-02-14 21:37:45.000000000 -0500
-@@ -0,0 +1,285 @@
-+/*
-+   (c) Copyright 2001-2011  The world wide DirectFB Open Source Community (directfb.org)
-+   (c) Copyright 2000-2004  Convergence (integrated media) GmbH
-+
-+   All rights reserved.
-+
-+   Written by Denis Oliver Kropp <dok@directfb.org>,
-+              Andreas Hundt <andi@fischlustig.de>,
-+              Sven Neumann <neo@directfb.org>,
-+              Ville Syrjälä <syrjala@sci.fi> and
-+              Claudio Ciccani <klan@users.sf.net>.
-+
-+   This library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with this library; if not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __VOODOO__PACKET_H__
-+#define __VOODOO__PACKET_H__
-+
-+extern "C" {
-+#include <direct/fastlz.h>
-+#include <direct/list.h>
-+#include <direct/mem.h>
-+#include <direct/memcpy.h>
-+
-+
-+#include <voodoo/types.h>
-+}
-+
-+
-+typedef enum {
-+     VPHF_NONE       = 0x00000000,
-+
-+     VPHF_COMPRESSED = 0x00000001,
-+
-+     VPHF_ALL        = 0x00000001
-+} VoodooPacketHeaderFlags;
-+
-+
-+typedef struct {
-+     u32  size;
-+     u32  flags;
-+     u32  uncompressed;
-+     u32  align;
-+} VoodooPacketHeader;
-+
-+
-+class VoodooPacket {
-+public:
-+     DirectLink          link;
-+     bool                sending;
-+
-+private:
-+     void               *data;
-+     void               *current;
-+     VoodooPacketHeader  header;
-+
-+     VoodooPacket( u32   size,
-+                   void *data )
-+          :
-+          sending(false),
-+          data(data),
-+          current(data)
-+     {
-+          memset( &link, 0, sizeof(link) );
-+
-+          header.size         = size;
-+          header.flags        = VPHF_NONE;
-+          header.uncompressed = size;
-+     }
-+
-+     VoodooPacket( u32   size,
-+                   u32   flags,
-+                   u32   uncompressed,
-+                   void *data )
-+          :
-+          sending(false),
-+          data(data),
-+          current(data)
-+     {
-+          memset( &link, 0, sizeof(link) );
-+
-+          header.size         = size;
-+          header.flags        = VPHF_COMPRESSED;
-+          header.uncompressed = uncompressed;
-+     }
-+
-+     ~VoodooPacket() {};
-+
-+public:
-+/*
-+     static VoodooPacket *
-+     New( u32 size )
-+     {
-+          VoodooPacket *packet = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size );
-+
-+          if (!packet) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          return new (packet) VoodooPacket( size, packet + 1 );
-+
-+
-+          if (data)
-+               this->data = data;
-+          else
-+               this->data = header + 1;
-+     }
-+*/
-+     static VoodooPacket *
-+     New( u32   size,
-+          void *data )
-+     {
-+          return new VoodooPacket( size, data );
-+     }
-+
-+     static VoodooPacket *
-+     Reset( VoodooPacket *packet,
-+            u32           size,
-+            void         *data )
-+     {
-+          return new (packet) VoodooPacket( size, data );
-+     }
-+
-+     static VoodooPacket *
-+     New( void *header,
-+          u32   size )
-+     {
-+          VoodooPacketHeader *h = (VoodooPacketHeader*) header;
-+
-+          h->size         = size;
-+          h->flags        = VPHF_NONE;
-+          h->uncompressed = size;
-+
-+          return new VoodooPacket( size, (char*) header + sizeof(VoodooPacketHeader) );
-+     }
-+
-+     static VoodooPacket *
-+     New( u32 size )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + VOODOO_PACKET_MAX );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          return new (p) VoodooPacket( size, p + 1 );
-+     }
-+
-+     static VoodooPacket *
-+     Compressed( VoodooPacket *packet )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size * 4 / 3 );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          int compressed = direct_fastlz_compress( packet->data, packet->header.uncompressed, p + 1 );
-+
-+          if ((size_t) compressed < packet->header.uncompressed)
-+               return new (p) VoodooPacket( compressed, VPHF_COMPRESSED, packet->header.uncompressed, p + 1 );
-+
-+          D_FREE( p );
-+
-+          return packet;
-+     }
-+
-+     static VoodooPacket *
-+     Copy( VoodooPacket *packet )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          direct_memcpy( p + 1, packet->data_start(), packet->header.size );
-+
-+          return new (p) VoodooPacket( packet->header.size, packet->header.flags, packet->header.uncompressed, p + 1 );
-+     }
-+
-+     static VoodooPacket *
-+     Copy( u32   size,
-+           u32   flags,
-+           u32   uncompressed,
-+           void *data )
-+     {
-+          VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size );
-+
-+          if (!p) {
-+               D_OOM();
-+               return NULL;
-+          }
-+
-+          direct_memcpy( p + 1, data, size );
-+
-+          return new (p) VoodooPacket( size, flags, uncompressed, p + 1 );
-+     }
-+
-+     inline u32
-+     size() const
-+     {
-+          return header.size;
-+     }
-+
-+     inline u32
-+     flags() const
-+     {
-+          return header.flags;
-+     }
-+
-+     inline u32
-+     uncompressed() const
-+     {
-+          return header.uncompressed;
-+     }
-+
-+     inline const void *
-+     data_header() const
-+     {
-+          D_ASSERT( data == this + 1 );
-+
-+          return &header;
-+     }
-+
-+     inline const void *
-+     data_start() const
-+     {
-+          return data;
-+     }
-+
-+     inline void *
-+     data_raw() const
-+     {
-+          return current;
-+     }
-+
-+
-+     inline bool
-+     append( size_t size )
-+     {
-+          D_ASSERT( data == this + 1 );
-+
-+          if (header.size + size > VOODOO_PACKET_MAX)
-+               return false;
-+
-+          current = (char*) data + header.size;
-+
-+          header.size         += size;
-+          header.uncompressed += size;
-+
-+          return true;
-+     }
-+
-+     inline void
-+     reset( size_t size )
-+     {
-+          D_ASSERT( data == this + 1 );
-+
-+          current = (char*) data;
-+
-+          header.size         = size;
-+          header.uncompressed = size;
-+     }
-+};
-+
-+
-+#endif
diff --git a/community-testing/encfs/PKGBUILD b/community-testing/encfs/PKGBUILD
deleted file mode 100644
index 56fb64ce2..000000000
--- a/community-testing/encfs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 66984 2012-03-03 08:11:07Z ibiru $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Sven Kauber, <celeon@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=encfs
-pkgver=1.7.4
-pkgrel=7
-pkgdesc='Encrypted filesystem in user-space'
-arch=('i686' 'x86_64')
-url='http://www.arg0.net/encfs'
-license=('GPL')
-depends=('rlog' 'openssl' 'fuse' 'boost-libs')
-makedepends=('boost')
-options=('!libtool')
-source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
-md5sums=('ac90cc10b2e9fc7e72765de88321d617')
-
-build(){
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/ext4magic/PKGBUILD b/community-testing/ext4magic/PKGBUILD
deleted file mode 100644
index a17da046f..000000000
--- a/community-testing/ext4magic/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 66083 2012-02-23 00:12:41Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgname=ext4magic
-pkgver=0.3.0
-pkgrel=1
-pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems'
-arch=('i686' 'x86_64')
-url='http://developer.berlios.de/projects/ext4magic/'
-license=('GPL2')
-depends=('bzip2' 'file' 'util-linux' 'e2fsprogs')
-source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") 
-md5sums=('54ed503730b7e279c5cddc99a8821de3')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD
deleted file mode 100644
index 8a1b86ca7..000000000
--- a/community-testing/fatrat/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 66986 2012-03-03 08:11:16Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=fatrat
-pkgver=1.2.0_beta1
-pkgrel=4
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
-md5sums=('7ce4d5e6318361f36ba5ac86a5755da9')
-
-build() {
-  cd $pkgname-$pkgver
-
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-
-  cmake \
-    -DWITH_EVERYTHING=ON \
-    -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS="-lpthread" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    .
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/freeradius/PKGBUILD b/community-testing/freeradius/PKGBUILD
deleted file mode 100644
index 205bd828b..000000000
--- a/community-testing/freeradius/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 64623 2012-02-17 12:33:33Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jason R Begley (jayray@digitalgoat.com>
-
-pkgname=freeradius
-pkgver=2.1.12
-pkgrel=4
-pkgdesc="The premier open source RADIUS server"
-arch=('i686' 'x86_64')
-url="http://www.freeradius.org/"
-license=("GPL")
-depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam'
-	 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow')
-makedepends=('libpcap' 'unixodbc' 'python2')
-optdepends=('libpcap' 'unixodbc' 'python2')
-options=('!libtool' 'emptydirs' '!makeflags')
-install=$pkgname.install
-source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2
-	radiusd
-	krb5-build-fix.patch)
-md5sums=('862d3a2c11011e61890ba84fa636ed8c'
-         'f1a6530b1b69d2fa793aa45b2de379bb'
-         'c6a61de7576933f59154a53bfc12a2d2')
-
-build() {
-  cd $srcdir/freeradius-server-$pkgver
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in
-  patch -p1 <$srcdir/krb5-build-fix.patch
-  ./configure --with-system-libtool --with-system-libltdl \
-	      --prefix=/usr --enable-heimdal-krb5 \
-	      --localstatedir=/var \
-	      --sysconfdir=/etc \
-	      --libdir=/usr/lib/freeradius
-  make
-}
-
-package() {
-  cd $srcdir/freeradius-server-$pkgver
-  make install R=$pkgdir
-  install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd
-  chmod o+r $pkgdir/etc/raddb/*
-  mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/freeradius/freeradius.install b/community-testing/freeradius/freeradius.install
deleted file mode 100644
index c3b9f9415..000000000
--- a/community-testing/freeradius/freeradius.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-    groupadd -r radiusd
-    useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd
-
-    touch /var/log/radius/radius.log
-    chown -R radiusd.radiusd /var/log/radius/radius.log
-
-    [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb
-
-    /bin/true
-}
-
-pre_remove() {
-    /etc/rc.d/radiusd stop
-    /bin/true
-}
-
-post_remove() {
-    userdel radiusd
-    groupdel radiusd
-    /bin/true
-}
diff --git a/community-testing/freeradius/krb5-build-fix.patch b/community-testing/freeradius/krb5-build-fix.patch
deleted file mode 100644
index 11dae7090..000000000
--- a/community-testing/freeradius/krb5-build-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c
---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c	2010-09-28 11:03:56.000000000 +0000
-+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c	2011-04-29 09:26:10.000000000 +0000
-@@ -375,7 +375,7 @@
- 	 * Heimdal krb5 verification
- 	 */
- 	radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n",
--	       *userP->name.name_string.val,
-+	       "-" /* *userP->name.name_string.val*/,
- 	       userP->realm);
- 
- 	krb5_cc_default(context, &id);
-@@ -390,7 +390,7 @@
- 
-        radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )",
- 	      error_message(ret),
--	      *userP->name.name_string.val,
-+	      "-" /* *userP->name.name_string.val */,
- 	      userP->realm);
- 
-        return RLM_MODULE_REJECT;
diff --git a/community-testing/freeradius/radiusd b/community-testing/freeradius/radiusd
deleted file mode 100644
index bf872b6f2..000000000
--- a/community-testing/freeradius/radiusd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/radiusd`
-case "$1" in
-  start)
-    stat_busy "Starting radiusd Server"
-
-    [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd
-    [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid
-    chown -R radiusd.radiusd /var/run/radiusd
-
-    [ -z "$PID" ] && /usr/sbin/radiusd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/radiusd.pid
-      add_daemon radiusd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping radiusd Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/radiusd.pid
-      rm_daemon radiusd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/glob2/PKGBUILD b/community-testing/glob2/PKGBUILD
deleted file mode 100644
index 4840313d5..000000000
--- a/community-testing/glob2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 66990 2012-03-03 08:11:35Z ibiru $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-
-pkgname=glob2
-pkgver=0.9.4.4
-pkgrel=11
-pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
-arch=('i686' 'x86_64')
-url="http://www.globulation2.org/"
-license=('GPL3')
-depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa'
-         'fribidi' 'desktop-file-utils')
-makedepends=('scons' 'boost')
-install=glob2.install
-source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz
-	glob2-0.9.4.1-gcc44.patch)
-md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e')
-sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
-  scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share"
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons install
-  find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
-  install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
-}
diff --git a/community-testing/glob2/glob2-0.9.4.1-gcc44.patch b/community-testing/glob2/glob2-0.9.4.1-gcc44.patch
deleted file mode 100644
index b425b25ec..000000000
--- a/community-testing/glob2/glob2-0.9.4.1-gcc44.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
---- libgag/include/StreamBackend.h.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/include/StreamBackend.h	2009-06-20 14:21:10.000000000 +0200
-@@ -43,7 +43,7 @@ namespace GAGCore
- 		virtual void flush(void) = 0;
- 		virtual void read(void *data, size_t size) = 0;
- 		virtual void putc(int c) = 0;
--		virtual int getc(void) = 0;
-+		virtual int get_c(void) = 0;
- 		virtual void seekFromStart(int displacement) = 0;
- 		virtual void seekFromEnd(int displacement) = 0;
- 		virtual void seekRelative(int displacement) = 0;
-@@ -67,7 +67,7 @@ namespace GAGCore
- 		virtual void flush(void) { assert(fp); fflush(fp); }
- 		virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
- 		virtual void putc(int c) { assert(fp); fputc(c, fp); }
--		virtual int getc(void) { assert(fp); return fgetc(fp); }
-+		virtual int get_c(void) { assert(fp); return fgetc(fp); }
- 		virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
- 		virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
- 		virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
-@@ -92,7 +92,7 @@ namespace GAGCore
- 		virtual void flush(void);
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-@@ -117,7 +117,7 @@ namespace GAGCore
- 		virtual void flush(void) { }
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
---- libgag/src/StreamBackend.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/StreamBackend.cpp	2009-06-20 14:21:53.000000000 +0200
-@@ -75,9 +75,9 @@ namespace GAGCore
- 		buffer->putc(c);
- 	}
- 	
--	int ZLibStreamBackend::getc(void)
-+	int ZLibStreamBackend::get_c(void)
- 	{
--		return buffer->getc();
-+		return buffer->get_c();
- 	}
- 	
- 	void ZLibStreamBackend::seekFromStart(int displacement)
-@@ -147,7 +147,7 @@ namespace GAGCore
- 		write(&ch, 1);
- 	}
- 	
--	int MemoryStreamBackend::getc(void)
-+	int MemoryStreamBackend::get_c(void)
- 	{
- 		Uint8 ch;
- 		read(&ch, 1);
-diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
---- libgag/src/Stream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/Stream.cpp	2009-06-20 14:21:35.000000000 +0200
-@@ -60,7 +60,7 @@ namespace GAGCore

- 		std::string s;

- 		while (1)

- 		{

--			int c = backend->getc();

-+			int c = backend->get_c();

- 			if(c=='\r')

- 				continue;

- 			if ((c >= 0) && (c != '\n'))

-diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
---- libgag/src/TextStream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/TextStream.cpp	2009-06-20 14:21:22.000000000 +0200
-@@ -150,7 +150,7 @@ namespace GAGCore
- 		
- 		int nextChar(void)
- 		{
--			next = stream->getc();
-+			next = stream->get_c();
- 			if 	(next == '\n')
- 			{
- 				column = 0;
diff --git a/community-testing/glob2/glob2.install b/community-testing/glob2/glob2.install
deleted file mode 100644
index 7463b6e76..000000000
--- a/community-testing/glob2/glob2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
-
diff --git a/community-testing/glom/PKGBUILD b/community-testing/glom/PKGBUILD
deleted file mode 100644
index f90bc5f8e..000000000
--- a/community-testing/glom/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 66992 2012-03-03 08:11:43Z ibiru $
-# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=glom
-pkgver=1.20.4
-pkgrel=1
-pkgdesc="An easy-to-use database designer and user interface"
-arch=('i686' 'x86_64')
-url="http://www.glom.org/"
-license=('GPL')
-depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
-makedepends=('intltool' 'gnome-doc-utils' 'python2-sphinx' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('038d106313774832c56c61312bb387a54cd2ffff50e6c7e56e47bc98b8b8531b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --with-postgres-utils=/usr/bin \
-    --disable-scrollkeeper \
-    --disable-update-mime-database \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/glom/glom.install b/community-testing/glom/glom.install
deleted file mode 100644
index 1ad77f9aa..000000000
--- a/community-testing/glom/glom.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD
deleted file mode 100644
index 251a9f65b..000000000
--- a/community-testing/gnash/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 66994 2012-03-03 08:11:56Z ibiru $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.10
-pkgrel=2
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnash/"
-license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
-             speex fontconfig ffmpeg
-             gstreamer0.10-base gstreamer0.10-ffmpeg
-             gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf
-             pkgconfig boost)
-options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        nodebug.patch)
-sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224'
-            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
-
-build() {
-  cd "$srcdir/gnash-$pkgver"
-
-  # Disable very, very verbose debugging (gigabytes of logs)
-  patch -Np1 -i "$srcdir/nodebug.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-plugins-install=system \
-    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
-    --enable-gui=sdl,gtk,dump \
-    --enable-media=gst,ffmpeg \
-    --enable-renderer=agg,cairo \
-    --enable-device=x11
-
-  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 sdl agg libjpeg libpng libltdl
-           speex fontconfig ffmpeg cairo
-           gstreamer0.10-base gstreamer0.10-ffmpeg
-           boost-libs)
-  backup=(etc/gnashrc etc/gnashthumbnailrc)
-
-  cd "$srcdir/gnash-$pkgver"
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  # Split gnash-gtk
-  mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}}
-  mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \
-    "$srcdir/gtk/usr/bin/"
-  mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \
-    "$srcdir/gtk/usr/share/man/man1/"
-  mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/"
-  mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/"
-}
-
-package_gnash-gtk() {
-  pkgdesc="A GNU Flash movie player"
-  depends=("gnash-common=$pkgver"
-            gtk2 libldap hicolor-icon-theme desktop-file-utils gconf)
-  install=gnash-gtk.install
-  backup=(etc/gnashpluginrc)
-
-  mv "$srcdir"/gtk/* "$pkgdir"
-  
-  cd "$srcdir/gnash-$pkgver"
-  make DESTDIR="$pkgdir" install-plugin
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \
-    "$pkgdir"/usr/share/applications/*.schemas
-  rm -f "$pkgdir"/usr/share/applications/*.schemas
-}
diff --git a/community-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install
deleted file mode 100644
index 6678a7f8a..000000000
--- a/community-testing/gnash/gnash-gtk.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  gconfpkg --install gnash
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall gnash
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
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/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD
deleted file mode 100644
index 6b42fa2ff..000000000
--- a/community-testing/gpsdrive/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 66996 2012-03-03 08:12:16Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=gpsdrive
-pkgver=2.11
-pkgrel=12
-pkgdesc="A car (bike, ship, plane) navigation system"
-arch=("i686" "x86_64")
-url="http://www.gpsdrive.de/"
-license=('GPL2')
-depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn'
-         'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri'
-         'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer'
-        ) # already in core ('sqlite3')
-makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
-install="gpsdrive.install"
-source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz"
-	"gpsd-2.96.patch")
-md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c'
-         '5769e12c6d8932fb721212434c64f505')
-
-build() {
-  cd "$srcdir"
-
-  # python2 fix
-  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
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  # fix the mapnik default values
-  sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
-  sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c"
-
-  export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-  export LDFLAGS="`pkg-config --libs gtk+-2.0` -lboost_system -lboost_thread"
-
-  # see DefineOptions.cmake for a list of common options and defaults
-  # cmake -L for a more in-depth listing
-  cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DWITH_SCRIPTS=ON \
-    -DWITH_MAPNIK=ON \
-    -DWITH_POSTGIS=ON \
-    -DWITH_GDAL=ON \
-    -DWITH_BASEMAPS=ON \
-    -DWITH_FRIENDSD=ON \
-    -DWITH_KISMET=ON \
-    -DWITH_NAVIGATION=ON \
-    -DWITH_SPEECH=OFF \
-    -DWITH_DBUS=OFF \
-    -DLIBGPS_OLD=OFF \
-    "$srcdir/gpsdrive-$pkgver"
-  (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch)
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gpsdrive/gpsd-2.96.patch b/community-testing/gpsdrive/gpsd-2.96.patch
deleted file mode 100644
index bc6c7475f..000000000
--- a/community-testing/gpsdrive/gpsd-2.96.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c
---- gpsdrive-2.11/src/gps_handler.c	2010-06-24 19:53:32.000000000 +0000
-+++ gpsdrive-2.11.my/src/gps_handler.c	2011-04-18 13:21:33.000000000 +0000
-@@ -264,7 +264,8 @@
- #define GPS_TIMER 500
- 
- static gint gps_timeout_source = 0;
--static struct gps_data_t *gpsdata;
-+static struct gps_data_t __gd;
-+static struct gps_data_t *gpsdata = &__gd;
- 
- /* SYMBOLS USED IN LIBGPS:
-  * 
-@@ -410,9 +411,10 @@
- 	 */
- 	gps_query (gpsdata, "oys\n");
- #else
--	if (gps_waiting(gpsdata))
-+	if (gps_waiting(gpsdata, 1000000))
- 	{
--		gps_poll (gpsdata);
-+		gps_read (gpsdata);
-+		gps_hook_cb(gpsdata, NULL);
- 	}
- #endif
- 
-@@ -447,7 +449,7 @@
- 	}
- 
- 	/* try to open connection */
--	gpsdata =  gps_open (local_config.gpsd_server, local_config.gpsd_port);
-+	gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd;
- 	if (!gpsdata)
- 	{
- 		g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n",
-@@ -466,7 +468,7 @@
- 	gps_sats = g_new (gps_satellite_struct, MAXCHANNELS);
- 
- 	/* set hook function to handle gps data */
--	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
-+//	gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb);
- 
- #ifndef LIBGPS_OLD
- 	/* enable watch mode to get data stream from gpsd */
diff --git a/community-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install
deleted file mode 100644
index 8ea63912e..000000000
--- a/community-testing/gpsdrive/gpsdrive.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-  echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
-  echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive"
-}
diff --git a/community-testing/gtk2hs-buildtools/PKGBUILD b/community-testing/gtk2hs-buildtools/PKGBUILD
deleted file mode 100644
index e0b47c4e7..000000000
--- a/community-testing/gtk2hs-buildtools/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 66851 2012-02-29 21:17:04Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=gtk2hs-buildtools
-pkgver=0.12.1
-pkgrel=2
-pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
-url="http://hackage.haskell.org/package/gtk2hs-buildtools"
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('ghc' 'alex' 'happy' 'haskell-random')
-depends=('gmp')
-options=('strip')
-provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('225cbf3736b5ac3053f8c797687c7554')
-
-build() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-binary/PKGBUILD b/community-testing/haskell-binary/PKGBUILD
deleted file mode 100644
index 17de0af8f..000000000
--- a/community-testing/haskell-binary/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 66853 2012-02-29 21:17:10Z tdziedzic $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-binary
-pkgver=0.5.1.0
-pkgrel=1
-pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
-url="http://hackage.haskell.org/package/binary"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=(ghc=7.4.1 sh)
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz")
-install=haskell-binary.install
-sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3')
-
-build() {
-  cd "$srcdir/binary-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/binary-$pkgver"
-
-  install -Dm 744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/binary"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-binary/haskell-binary.install b/community-testing/haskell-binary/haskell-binary.install
deleted file mode 100644
index 844b8a67c..000000000
--- a/community-testing/haskell-binary/haskell-binary.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-binary
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  post_remove
-}
-
-post_install() {
-  post_upgrade
-}
-
-pre_remove() {
-  pre_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-bytestring-show/PKGBUILD b/community-testing/haskell-bytestring-show/PKGBUILD
deleted file mode 100644
index 69fd57fe1..000000000
--- a/community-testing/haskell-bytestring-show/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 66855 2012-02-29 21:17:17Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-bytestring-show
-pkgver=0.3.5.1
-pkgrel=2
-pkgdesc="Efficient conversion of values into readable byte strings."
-url="http://code.haskell.org/~dolio/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.4.1-2")
-install="${pkgname}.install"
-source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd')
-
-build() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-	--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-	--libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-bytestring-show/haskell-bytestring-show.install b/community-testing/haskell-bytestring-show/haskell-bytestring-show.install
deleted file mode 100644
index 335fc37cd..000000000
--- a/community-testing/haskell-bytestring-show/haskell-bytestring-show.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=haskell-bytestring-show
-HS_DIR=usr/share/haskell/${pkgname}
-
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-cairo/PKGBUILD b/community-testing/haskell-cairo/PKGBUILD
deleted file mode 100644
index 1055e078f..000000000
--- a/community-testing/haskell-cairo/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 66857 2012-02-29 21:17:24Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-cairo
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the cairo library for Gtk2Hs."
-url="http://hackage.haskell.org/package/cairo"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'cairo' 'haskell-mtl')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-conflicts=('gtk2hs-cairo')
-provides=('gtk2hs-cairo')
-replaces=('gtk2hs-cairo')
-install=gtk2hs-cairo.install
-source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('b3583136fe84d25cd9d4f7bda3c3db0c')
-
-build() {
-    cd ${srcdir}/cairo-$pkgver
-    sed -i 's#cToBool :: Num a => a -> Bool#cToBool :: (Eq a, Num a) => a -> Bool#' Graphics/Rendering/Cairo/Types.chs
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0')
-
-    cd ${srcdir}/cairo-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-cairo/gtk2hs-cairo.install b/community-testing/haskell-cairo/gtk2hs-cairo.install
deleted file mode 100644
index 4ec5096b6..000000000
--- a/community-testing/haskell-cairo/gtk2hs-cairo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-cairo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-dataenc/PKGBUILD b/community-testing/haskell-dataenc/PKGBUILD
deleted file mode 100644
index 2ae380580..000000000
--- a/community-testing/haskell-dataenc/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 66859 2012-02-29 21:17:31Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=dataenc
-pkgname=haskell-dataenc
-pkgver=0.14.0.3
-pkgrel=1
-pkgdesc="Data encoding library"
-url="http://hackage.haskell.org/package/dataenc"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('643a8c022b9c840f801faf9a661fe637')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-dataenc/haskell-dataenc.install b/community-testing/haskell-dataenc/haskell-dataenc.install
deleted file mode 100644
index 9c1bbff01..000000000
--- a/community-testing/haskell-dataenc/haskell-dataenc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-dataenc
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-glib/PKGBUILD b/community-testing/haskell-glib/PKGBUILD
deleted file mode 100644
index be82acf95..000000000
--- a/community-testing/haskell-glib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 66861 2012-02-29 21:17:39Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-glib
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the GLIB library for Gtk2Hs."
-url="http://hackage.haskell.org/package/glib"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'glib2')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-install=gtk2hs-glib.install
-provides=('gtk2hs-glib')
-replaces=('gtk2hs-glib')
-conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('5d8a04be9a975fb70c6508f95aeb3265')
-
-build() {
-    cd ${srcdir}/glib-$pkgver
-    sed -i 's|cap=rts_evalIO|rts_evalIO|' System/Glib/hsgclosure.c
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" "glib2")
-
-    cd ${srcdir}/glib-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-glib/gtk2hs-glib.install b/community-testing/haskell-glib/gtk2hs-glib.install
deleted file mode 100644
index 24025f5d8..000000000
--- a/community-testing/haskell-glib/gtk2hs-glib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-glib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-gtk/PKGBUILD b/community-testing/haskell-gtk/PKGBUILD
deleted file mode 100644
index 770d62ab2..000000000
--- a/community-testing/haskell-gtk/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 66863 2012-02-29 21:17:45Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-gtk
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the gtk library for Gtk2Hs."
-url="http://hackage.haskell.org/package/gtk"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-gtk')
-replaces=('gtk2hs-gtk')
-conflicts=('gtk2hs-gtk')
-options=('strip')
-install=gtk2hs-gtk.install
-source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz)
-md5sums=('a80d6f2ab90c673059270f2dd83c4686')
-
-build() {
-    cd ${srcdir}/gtk-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0')
-
-    cd ${srcdir}/gtk-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-gtk/gtk2hs-gtk.install b/community-testing/haskell-gtk/gtk2hs-gtk.install
deleted file mode 100644
index 7ed674b78..000000000
--- a/community-testing/haskell-gtk/gtk2hs-gtk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-gtk
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-haskeline/PKGBUILD b/community-testing/haskell-haskeline/PKGBUILD
deleted file mode 100644
index 20d6909cf..000000000
--- a/community-testing/haskell-haskeline/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 66865 2012-02-29 21:17:53Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=haskeline
-pkgname=haskell-haskeline
-pkgver=0.6.4.6
-pkgrel=1
-pkgdesc="A command-line interface for user input, written in Haskell."
-url="http://hackage.haskell.org/package/haskeline"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-utf8-string=0.3.7-1' 'haskell-mtl=2.0.1.0-4' 'haskell-terminfo=0.3.2.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('c43d01e3ea23eed266060391ca680a76')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure \
-      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-haskeline/haskell-haskeline.install b/community-testing/haskell-haskeline/haskell-haskeline.install
deleted file mode 100644
index 27cb4a093..000000000
--- a/community-testing/haskell-haskeline/haskell-haskeline.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskeline
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-hslogger/PKGBUILD b/community-testing/haskell-hslogger/PKGBUILD
deleted file mode 100644
index acf96d487..000000000
--- a/community-testing/haskell-hslogger/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 66867 2012-02-29 21:18:01Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-hslogger
-pkgver=1.1.5
-pkgrel=6
-pkgdesc="Versatile logging framework"
-url="http://hackage.haskell.org/package/hslogger"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
-md5sums=('cd3dfd6f88176bd53b333ea29130a857')
-
-build() {
-  cd ${srcdir}/hslogger-${pkgver}
-  runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
-	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
-	--enable-library-profiling
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/hslogger-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-hslogger/haskell-hslogger.install b/community-testing/haskell-hslogger/haskell-hslogger.install
deleted file mode 100644
index 2a0d98ae7..000000000
--- a/community-testing/haskell-hslogger/haskell-hslogger.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hslogger
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-pango/PKGBUILD b/community-testing/haskell-pango/PKGBUILD
deleted file mode 100644
index e7300d2cc..000000000
--- a/community-testing/haskell-pango/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 66869 2012-02-29 21:18:07Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-pango
-pkgver=0.12.2
-pkgrel=2
-pkgdesc="Binding to the pango library for Gtk2Hs."
-url="http://hackage.haskell.org/package/pango"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-pango')
-replaces=('gtk2hs-pango')
-conflicts=('gtk2hs-pango')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
-install=gtk2hs-pango.install
-md5sums=('301efd2d2348698ce8d586ee14c36e2b')
-
-build() {
-    cd ${srcdir}/pango-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo')
-
-    cd ${srcdir}/pango-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-pango/gtk2hs-pango.install b/community-testing/haskell-pango/gtk2hs-pango.install
deleted file mode 100644
index f2be2100f..000000000
--- a/community-testing/haskell-pango/gtk2hs-pango.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-pango
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-stm/PKGBUILD b/community-testing/haskell-stm/PKGBUILD
deleted file mode 100644
index fa9819d51..000000000
--- a/community-testing/haskell-stm/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=stm
-pkgname=haskell-stm
-pkgver=2.2.0.1
-pkgrel=3
-pkgdesc="A modular composable concurrency abstraction."
-url="http://hackage.haskell.org/package/stm"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('b1cf03ed315e00c33160746feeee8682')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-stm/haskell-stm.install b/community-testing/haskell-stm/haskell-stm.install
deleted file mode 100644
index 0283c2fc5..000000000
--- a/community-testing/haskell-stm/haskell-stm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stm
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-syb/PKGBUILD b/community-testing/haskell-syb/PKGBUILD
deleted file mode 100644
index 9223379b2..000000000
--- a/community-testing/haskell-syb/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=syb
-pkgname=haskell-syb
-pkgver=0.3.6
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('0d807bb244fdeb95fa546b4311fcd8df')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/community-testing/haskell-syb/haskell-syb.install b/community-testing/haskell-syb/haskell-syb.install
deleted file mode 100644
index 080055165..000000000
--- a/community-testing/haskell-syb/haskell-syb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-syb
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-tar/PKGBUILD b/community-testing/haskell-tar/PKGBUILD
deleted file mode 100644
index d22136233..000000000
--- a/community-testing/haskell-tar/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 66875 2012-02-29 21:18:30Z tdziedzic $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-tar
-pkgver=0.4.0.0
-pkgrel=1
-pkgdesc="Reading, writing and manipulating \".tar\" archive files."
-url="http://hackage.haskell.org/package/tar"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.4.1')
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
-install=haskell-tar.install
-sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113')
-
-build() {
-  cd "$srcdir/tar-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/tar-$pkgver"
-
-  install -Dm 744 register.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-	  "$pkgdir/usr/share/doc/ghc/html/libraries/tar"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-tar/haskell-tar.install b/community-testing/haskell-tar/haskell-tar.install
deleted file mode 100644
index 7e0383621..000000000
--- a/community-testing/haskell-tar/haskell-tar.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-tar
-
-post_install() {
-  ${HS_DIR}/register.sh
-	post_remove
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	pre_upgrade
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-terminfo/PKGBUILD b/community-testing/haskell-terminfo/PKGBUILD
deleted file mode 100644
index 4ed18587a..000000000
--- a/community-testing/haskell-terminfo/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 66877 2012-02-29 21:18:36Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=terminfo
-pkgname=haskell-terminfo
-pkgver=0.3.2.3
-pkgrel=1
-pkgdesc="Haskell bindings to the terminfo library."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('706f546c629ac100a402c9c2629c25fa')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-terminfo/haskell-terminfo.install b/community-testing/haskell-terminfo/haskell-terminfo.install
deleted file mode 100644
index 40d39f42b..000000000
--- a/community-testing/haskell-terminfo/haskell-terminfo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-terminfo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-utf8-string/PKGBUILD b/community-testing/haskell-utf8-string/PKGBUILD
deleted file mode 100644
index 7bc733f00..000000000
--- a/community-testing/haskell-utf8-string/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 66879 2012-02-29 21:18:44Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=utf8-string
-pkgname=haskell-utf8-string
-pkgver=0.3.7
-pkgrel=1
-pkgdesc="Support for reading and writing UTF8 Strings"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('50e5c395713e716e0e4a56da73f87ccd')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-utf8-string/haskell-utf8-string.install b/community-testing/haskell-utf8-string/haskell-utf8-string.install
deleted file mode 100644
index 0f64366b2..000000000
--- a/community-testing/haskell-utf8-string/haskell-utf8-string.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-utf8-string
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-x11-xft/PKGBUILD b/community-testing/haskell-x11-xft/PKGBUILD
deleted file mode 100644
index ccfb63fd5..000000000
--- a/community-testing/haskell-x11-xft/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 66883 2012-02-29 21:19:00Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=X11-xft
-pkgname=haskell-x11-xft
-pkgver=0.3.1
-pkgrel=3
-pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.7' 'libxft')
-options=('strip')
-install=haskell-x11-xft.install
-source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
-md5sums=('ad885150a59f63de328e73abe5ffc79e')
-
-build() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-x11-xft/haskell-x11-xft.install b/community-testing/haskell-x11-xft/haskell-x11-xft.install
deleted file mode 100644
index a0ff8dac8..000000000
--- a/community-testing/haskell-x11-xft/haskell-x11-xft.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=/usr/share/haskell/haskell-x11-xft
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-x11/PKGBUILD b/community-testing/haskell-x11/PKGBUILD
deleted file mode 100644
index 3de0124d3..000000000
--- a/community-testing/haskell-x11/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 66881 2012-02-29 21:18:52Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: shild <sxp@bk.ru>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-
-_hkgname=X11
-pkgname=haskell-x11
-pkgver=1.5.0.1
-pkgrel=2
-pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
-license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.4.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama')
-conflicts=(haskell-x11-extras)
-install=hsmod.install
-source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('7d69b204f773a0335828ced0e1e069f2')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-x11/hsmod.install b/community-testing/haskell-x11/hsmod.install
deleted file mode 100644
index 45c23b979..000000000
--- a/community-testing/haskell-x11/hsmod.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/hedgewars/PKGBUILD b/community-testing/hedgewars/PKGBUILD
deleted file mode 100644
index c9d8befeb..000000000
--- a/community-testing/hedgewars/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 66885 2012-02-29 21:19:09Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=hedgewars
-pkgver=0.9.17
-pkgrel=2
-pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
-url="http://hedgewars.org"
-license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
-makedepends=('fpc' 'cmake'
-             # haskell specific
-             'ghc=7.4.1-2'
-	     'haskell-network=2.3.0.11-1' 'haskell-bytestring-show=0.3.5.1-2'
-	     'haskell-utf8-string=0.3.7-1' 'haskell-dataenc=0.14.0.3-1' 
-	     'haskell-hslogger=1.1.5-6')
-source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.desktop
-	hedgewars.png)
-md5sums=('77c0bc4bc664604adbba67fab606d8f1'
-         '48c66a3204d4fa0a69e9aa46f7c31e0c'
-         'eeb14d50df39063549ac5eca9dbc65d1')
-
-build() {
-  cd $pkgname-src-$pkgver
-
-#  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATA_INSTALL_DIR=/usr/share \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
-	-DWITH_SERVER=1 .
-
-  make
-}
-
-package() {
-  cd $pkgname-src-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
-  install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
-  install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
-}
diff --git a/community-testing/hedgewars/hedgewars.desktop b/community-testing/hedgewars/hedgewars.desktop
deleted file mode 100644
index 9d74ed3f1..000000000
--- a/community-testing/hedgewars/hedgewars.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
\ No newline at end of file
diff --git a/community-testing/hedgewars/hedgewars.png b/community-testing/hedgewars/hedgewars.png
deleted file mode 100644
index 60ae66199..000000000
--- a/community-testing/hedgewars/hedgewars.png
+++ /dev/null
diff --git a/community-testing/hostapd/PKGBUILD b/community-testing/hostapd/PKGBUILD
deleted file mode 100644
index 651e39976..000000000
--- a/community-testing/hostapd/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 65319 2012-02-21 00:00:16Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_madwifiver=0.9.4.4133
-pkgname=hostapd
-pkgver=0.7.3
-pkgrel=7
-pkgdesc="daemon for wireless software access points"
-arch=('i686' 'x86_64')
-url="http://hostap.epitest.fi/hostapd/"
-license=('custom')
-depends=('openssl' 'libnl')
-makedepends=()
-provides=('hostapd')
-conflicts=('hostapd')
-backup=('etc/hostapd/hostapd.conf'
-	'etc/conf.d/hostapd'
-	'etc/hostapd/hlr_auc_gw.milenage_db'
-	'etc/hostapd/hostapd.accept'
-	'etc/hostapd/hostapd.deny'
-	'etc/hostapd/hostapd.eap_user'
-	'etc/hostapd/hostapd.radius_clients'
-	'etc/hostapd/hostapd.sim_db'
-	'etc/hostapd/hostapd.vlan'
-	'etc/hostapd/hostapd.wpa_psk'
-	'etc/hostapd/wired.conf')
-install=hostapd.install
-source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
-	ftp://ftp.archlinux.org/other/madwifi/madwifi-${_madwifiver}.tar.bz2
-	hostap_allow-linking-with-libnl-3.2.patch
-	config
-	hostapd
-	hostapd.conf.d)
-md5sums=('91a7c8d0f090b7104152d3455a84c112'
-         'ca3c3504d000e7b3d7063af46271c932'
-         'e904e62b12c5d64132dd9441e8b45dce'
-         'bfe5701bc93d5d091e6f1a93f1a32dd6'
-         'd570327c385f34a4af24d3a0d61cea19'
-         'f169534b0f59b341f6df1a21e0344511')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
-  cd hostapd
-  cp "$srcdir/config" ./.config
-
-  sed -i "s|@@madwifi@@|$srcdir/madwifi|" .config
-  sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/hostapd"
-  
-  install -D hostapd "$pkgdir/usr/bin/hostapd"
-  install hostapd_cli "$pkgdir/usr/bin/hostapd_cli"
-
-  install -Dm644 hlr_auc_gw.milenage_db "$pkgdir/etc/hostapd/hlr_auc_gw.milenage_db"
-  install -m644 -t "$pkgdir/etc/hostapd" \
-    hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \
-    wired.conf
-  
-  install -Dm644 hostapd.8 "$pkgdir/usr/share/man/man8/hostapd.8"
-  install -Dm644 hostapd_cli.1 "$pkgdir/usr/share/man/man1/hostapd_cli.1"
-
-  install -D "$srcdir/hostapd" "$pkgdir/etc/rc.d/hostapd"
-  install -Dm644 "$srcdir/hostapd.conf.d" "$pkgdir/etc/conf.d/hostapd"
-
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/community-testing/hostapd/config b/community-testing/hostapd/config
deleted file mode 100644
index d77e77461..000000000
--- a/community-testing/hostapd/config
+++ /dev/null
@@ -1,96 +0,0 @@
-# Example hostapd build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cass, these lines should use += in order not
-# to override previous values of the variables.
-
-# Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for wired authenticator
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for madwifi driver
-CONFIG_DRIVER_MADWIFI=y
-CFLAGS += -I@@madwifi@@  # change to reflect local setup; directory for madwifi src
-
-# Driver interface for Prism54 driver
-CONFIG_DRIVER_PRISM54=y
-
-# IEEE 802.11F/IAPP
-CONFIG_IAPP=y
-
-# WPA2/IEEE 802.11i RSN pre-authentication
-CONFIG_RSN_PREAUTH=y
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-CONFIG_IEEE80211W=y
-
-# Integrated EAP server
-CONFIG_EAP=y
-
-# EAP-MD5 for the integrated EAP server
-CONFIG_EAP_MD5=y
-
-# EAP-TLS for the integrated EAP server
-CONFIG_EAP_TLS=y
-
-# EAP-MSCHAPv2 for the integrated EAP server
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-PEAP for the integrated EAP server
-CONFIG_EAP_PEAP=y
-
-# EAP-GTC for the integrated EAP server
-CONFIG_EAP_GTC=y
-
-# EAP-TTLS for the integrated EAP server
-CONFIG_EAP_TTLS=y
-
-# EAP-SIM for the integrated EAP server
-CONFIG_EAP_SIM=y
-
-# EAP-AKA for the integrated EAP server
-CONFIG_EAP_AKA=y
-
-# EAP-PAX for the integrated EAP server
-CONFIG_EAP_PAX=y
-
-# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
-CONFIG_EAP_PSK=y
-
-# EAP-SAKE for the integrated EAP server
-CONFIG_EAP_SAKE=y
-
-# EAP-GPSK for the integrated EAP server
-CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-CONFIG_EAP_GPSK_SHA256=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# RADIUS authentication server. This provides access to the integrated EAP
-# server from external hosts using RADIUS.
-CONFIG_RADIUS_SERVER=y
-
-# Build IPv6 support for RADIUS operations
-CONFIG_IPV6=y
-
-CONFIG_DRIVER_NL80211=y
-
-CONFIG_IEEE80211N=y
-
-CONFIG_LIBNL32=y
diff --git a/community-testing/hostapd/config.bz2 b/community-testing/hostapd/config.bz2
deleted file mode 100644
index d11df0bd5..000000000
--- a/community-testing/hostapd/config.bz2
+++ /dev/null
diff --git a/community-testing/hostapd/hostap_allow-linking-with-libnl-3.2.patch b/community-testing/hostapd/hostap_allow-linking-with-libnl-3.2.patch
deleted file mode 100644
index 8e7cd9a97..000000000
--- a/community-testing/hostapd/hostap_allow-linking-with-libnl-3.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: [RFC] hostap: Allow linking with libnl-3.
-Date: Tue, 15 Nov 2011 14:30:04 -0000
-From: Ben Greear <greearb@candelatech.com>
-
-I needed this patch to compile against the latest
-libnl code.  I added this to my config file:
-
-CONFIG_LIBNL32=y
-
-Signed-hostap: Ben Greear <greearb@candelatech.com>
-rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de>
-
----
-:100644 100644 5caeec5... 0cc81f9... M  src/drivers/drivers.mak
- src/drivers/drivers.mak |   21 ++++++++++++++-------
- 2 files changed, 29 insertions(+), 14 deletions(-)
-
---- a/src/drivers/drivers.mak
-+++ b/src/drivers/drivers.mak
-@@ -31,11 +31,18 @@ NEED_SME=y
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
--DRV_LIBS += -lnl
-+ifdef CONFIG_LIBNL32
-+  DRV_LIBS += -lnl-3
-+  DRV_LIBS += -lnl-genl-3
-+  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -I/usr/include/libnl3/
-+else
-+  DRV_LIBS += -lnl
- 
--ifdef CONFIG_LIBNL20
--DRV_LIBS += -lnl-genl
--DRV_CFLAGS += -DCONFIG_LIBNL20
-+  ifdef CONFIG_LIBNL20
-+    DRV_LIBS += -lnl-genl
-+    DRV_CFLAGS += -DCONFIG_LIBNL20
-+  endif
- endif
- endif
- 
diff --git a/community-testing/hostapd/hostapd b/community-testing/hostapd/hostapd
deleted file mode 100644
index b4709d7bf..000000000
--- a/community-testing/hostapd/hostapd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/hostapd
-
-case "$1" in
-  start)
-    stat_busy "Starting hostapd"
-    /usr/bin/hostapd -B -P ${HOSTAPD_PID} ${HOSTAPD_CONF} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon hostapd
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping hostapd"
-    [ -f ${HOSTAPD_PID} ] && kill `cat ${HOSTAPD_PID}` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon hostapd
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community-testing/hostapd/hostapd.conf.d b/community-testing/hostapd/hostapd.conf.d
deleted file mode 100644
index 7a7bbc806..000000000
--- a/community-testing/hostapd/hostapd.conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-HOSTAPD_PID="/var/run/hostapd.pid"
-HOSTAPD_CONF="/etc/hostapd/hostapd.conf"
diff --git a/community-testing/hostapd/hostapd.install b/community-testing/hostapd/hostapd.install
deleted file mode 100644
index 801187e71..000000000
--- a/community-testing/hostapd/hostapd.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-	echo "> Note: You will find some config examples in"
-	echo "> /etc/hostapd. The default location of several"
-	echo "> key configuration files for hostapd are in"
-	echo "> /etc/hostapd as well. They are:"
-	echo "> hostapd.conf --> primary configuration file"
-	echo "> hostapd.allow --> MAC allow list"
-	echo "> hostapd.deny --> MAC deny list"
-	echo "> Also, note that there are some self-explanatory"
-	echo "> examples in the directory. Feel free to change the mac" 
-	echo "> list location by defining it differently in your hostapd.conf"
-	echo "> file. Please, note, however. The daemon start/stop" 
-	echo "> script assumes you have a working config file at"
-	echo "> /etc/hostapd/hostapd.conf. One final thing to remember."
-	echo "> You need to install madwifi if you want support for it."
-}
-
-post_upgrade() {
-	post_install
-}
diff --git a/community-testing/ipvsadm/01-fix-not-showing-all-server.patch b/community-testing/ipvsadm/01-fix-not-showing-all-server.patch
deleted file mode 100644
index dea23bf76..000000000
--- a/community-testing/ipvsadm/01-fix-not-showing-all-server.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs.h ipvsadm-1.26/libipvs/ip_vs.h
---- ipvsadm-1.26.vanilla/libipvs/ip_vs.h	2011-02-06 18:38:57.000000000 -0800
-+++ ipvsadm-1.26/libipvs/ip_vs.h	2011-08-23 15:03:59.000000000 -0700
-@@ -413,7 +413,7 @@
- 	__IPVS_CMD_ATTR_MAX,
- };
-
--#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1)
-+#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1)
-
- /*
-  * Attributes used to describe a service
-diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c
-ipvsadm-1.26/libipvs/ip_vs_nl_policy.c
---- ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c	2008-09-18
-08:57:37.000000000 -0700
-+++ ipvsadm-1.26/libipvs/ip_vs_nl_policy.c	2011-08-23 14:45:34.000000000 -0700
-@@ -26,6 +26,8 @@
- 	[IPVS_SVC_ATTR_TIMEOUT]		= { .type = NLA_U32 },
- 	[IPVS_SVC_ATTR_NETMASK]		= { .type = NLA_U32 },
- 	[IPVS_SVC_ATTR_STATS]		= { .type = NLA_NESTED },
-+	[IPVS_SVC_ATTR_PE_NAME]		= { .type = NLA_STRING,
-+					    .maxlen = IP_VS_PENAME_MAXLEN},
- };
diff --git a/community-testing/ipvsadm/PKGBUILD b/community-testing/ipvsadm/PKGBUILD
deleted file mode 100644
index a72b397b2..000000000
--- a/community-testing/ipvsadm/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 64696 2012-02-17 18:49:11Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=ipvsadm
-pkgver=1.26
-pkgrel=3
-pkgdesc='The IP Virtual Server administration utility'
-arch=('i686' 'x86_64')
-url='http://www.linuxvirtualserver.org/software/ipvs.html'
-license=('GPL2')
-depends=('libnl1' 'popt')
-backup=('etc/conf.d/ipvsadm')
-#options=('!makeflags')
-source=("http://www.linuxvirtualserver.org/software/kernel-2.6/$pkgname-$pkgver.tar.gz"
-        'ipvsadm.rc'
-        'ipvsadm.conf'
-        'ipvsadm.rules'
-        '01-fix-not-showing-all-server.patch')
-md5sums=('eac3ba3f62cd4dea2da353aeddd353a8'
-         '0e106fce0675e014bea0f9355b947bd6'
-         'cd358130967a9cc0d31fc61282df43e7'
-         'cd6649c647e495d4d6f981542ce5a93b'
-         'e9fb77d2fbe2d3f41d60257316338543')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ../01-fix-not-showing-all-server.patch
-  make INCLUDE="-I/usr/src/linux-`uname -r`/include -I.. -I." || return 1
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make BUILD_ROOT=${pkgdir} MANDIR=usr/share/man INIT="$pkgdir/etc/rc.d" install
-  cd "$srcdir"
-  # add initscripts
-  install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
-  install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
-  # add ipvsadm rules
-  install -D -m 644 $pkgname.rules "${pkgdir}/etc/$pkgname.rules"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/ipvsadm/ipvsadm.conf b/community-testing/ipvsadm/ipvsadm.conf
deleted file mode 100644
index aac7ba729..000000000
--- a/community-testing/ipvsadm/ipvsadm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh et:
-
-IPVSADM_CONF='/etc/ipvsadm.rules'
diff --git a/community-testing/ipvsadm/ipvsadm.rc b/community-testing/ipvsadm/ipvsadm.rc
deleted file mode 100644
index 91ed32e3b..000000000
--- a/community-testing/ipvsadm/ipvsadm.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ipvsadm
-
-case "$1" in
-	start)
-    stat_busy 'Loading IPVS table'
-		if [[ -f $IPVSADM_CONF ]] && /sbin/ipvsadm-restore < "$IPVSADM_CONF"; then
-			add_daemon ipvsadm
-			stat_done
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		status 'Clearing IPVS table' /sbin/ipvsadm -C
-		rm_daemon ipvsadm
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	save)
-		stat_busy 'Saving IPVS table'
-		if /sbin/ipvsadm-save -n > "$IPVSADM_CONF" 2>/dev/null; then
-			stat_done
-    else
-			stat_fail
-		fi
-		;;
-	*)
-		echo "usage: ${0##*/} {start|stop|restart|save}"
-esac
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/ipvsadm/ipvsadm.rules b/community-testing/ipvsadm/ipvsadm.rules
deleted file mode 100644
index 6740463a1..000000000
--- a/community-testing/ipvsadm/ipvsadm.rules
+++ /dev/null
@@ -1 +0,0 @@
-# emtpy rules file for ipvsadm
diff --git a/community-testing/keepalived/PKGBUILD b/community-testing/keepalived/PKGBUILD
deleted file mode 100644
index ad7fa29f4..000000000
--- a/community-testing/keepalived/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Andrea Zucchelli <zukka77@gmail.com>
-
-pkgname=keepalived
-pkgver=1.2.2
-pkgrel=3
-pkgdesc='Failover and monitoring daemon for LVS clusters'
-arch=('i686' 'x86_64')
-url='http://www.keepalived.org/'
-license=('GPL2')
-backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived')
-depends=('openssl' 'popt' 'libnl1')
-source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
-        'keepalived.rc'
-        'keepalived.conf'
-        'ip_vs_moved.patch')
-md5sums=('f68327ca142616a8463d2d105db122cd'
-         'baeb62a682c2b59d732cea84bf52cc87'
-         '9c8142da8730ad27a345587dea83ced7'
-         '87ee19c85adaedd3eb11bea8a5865d47')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../ip_vs_moved.patch
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  # clean pacakge init scripts
-  rm -r "$pkgdir/etc/rc.d/init.d" "$pkgdir/etc/sysconfig"
-  # move examples to /usr/share
-  install -d -m 755 "$pkgdir/usr/share/$pkgname"
-  mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples"
-
-  # add initscripts
-  install -D -m 755 ../$pkgname.rc "${pkgdir}/etc/rc.d/$pkgname"
-  install -D -m 644 ../$pkgname.conf "${pkgdir}/etc/conf.d/$pkgname"
-
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/keepalived/ip_vs_moved.patch b/community-testing/keepalived/ip_vs_moved.patch
deleted file mode 100644
index e27873810..000000000
--- a/community-testing/keepalived/ip_vs_moved.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- keepalived-1.2.2/configure	2011-01-06 01:51:33.000000000 +0100
-+++ keepalived-1.2.2.orig/configure	2011-11-24 19:36:32.051486626 +0100
-@@ -3973,7 +3973,7 @@
- 
- IPVS_SUPPORT="_WITHOUT_LVS_"
- if test "$enable_lvs" != "no"; then
--  ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
-+  ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
- if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then :
-   IPVS_SUPPORT="_WITH_LVS_"
- else
-diff -ru keepalived-1.2.2/configure.in keepalived-1.2.2.orig/configure.in
---- keepalived-1.2.2/configure.in	2011-01-06 01:51:30.000000000 +0100
-+++ keepalived-1.2.2.orig/configure.in	2011-11-24 19:36:11.797860077 +0100
-@@ -124,7 +124,7 @@
- dnl ----[ Checks for LVS and VRRP support ]----
- IPVS_SUPPORT="_WITHOUT_LVS_"
- if test "$enable_lvs" != "no"; then
--  AC_CHECK_HEADER([net/ip_vs.h],
-+  AC_CHECK_HEADER([linux/ip_vs.h],
-     [IPVS_SUPPORT="_WITH_LVS_"],
-     [
-       IPVS_SUPPORT="_WITHOUT_LVS_"
diff --git a/community-testing/keepalived/keepalived.conf b/community-testing/keepalived/keepalived.conf
deleted file mode 100644
index 225f02bf9..000000000
--- a/community-testing/keepalived/keepalived.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh et:
-# Options for keepalived. See `keepalived --help' output and keepalived(8) and
-# keepalived.conf(5) man pages for a list of all options. Here are the most
-# common ones :
-#
-# --vrrp               -P    Only run with VRRP subsystem.
-# --check              -C    Only run with Health-checker subsystem.
-# --dont-release-vrrp  -V    Dont remove VRRP VIPs & VROUTEs on daemon stop.
-# --dont-release-ipvs  -I    Dont remove IPVS topology on daemon stop.
-# --dump-conf          -d    Dump the configuration data.
-# --log-detail         -D    Detailed log messages.
-# --log-facility       -S    0-7 Set local syslog facility (default=LOG_DAEMON)
-#
-
-DAEMON_OPTS='-D'
-
diff --git a/community-testing/keepalived/keepalived.rc b/community-testing/keepalived/keepalived.rc
deleted file mode 100644
index 88bb90724..000000000
--- a/community-testing/keepalived/keepalived.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-NAME=keepalived
-DAEMON=/usr/sbin/keepalived
-PID=$(pidof -o %PPID $DAEMON)
-
-case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
-  stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
-  restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  reload)
-		stat_busy "Reloading $NAME daemon"
-		[[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0
-		stat_fail
-	;;
-  *) 
-		echo "usage: ${0##*/} {start|stop|restart|reload}" >&2
-	;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh noet:
diff --git a/community-testing/knemo/PKGBUILD b/community-testing/knemo/PKGBUILD
deleted file mode 100644
index 48224bb73..000000000
--- a/community-testing/knemo/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 64583 2012-02-16 20:41:18Z heftig $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
-
-pkgname=knemo
-pkgver=0.7.3
-pkgrel=2
-pkgdesc="The KDE Network Monitor"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php?content=12956"
-license=('GPL')
-depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl1'
-         'gtk-update-icon-cache')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-options=('libtool')
-source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2")
-md5sums=('24b5ec27b862ed7026ff643193952b78')
-
-build() {
-  cd ${srcdir}
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr    
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-
-  make DESTDIR=${pkgdir} install
-
-  # remove knemo autostart
-  rm -rf ${pkgdir}/usr/share/autostart
-}
diff --git a/community-testing/knemo/knemo.install b/community-testing/knemo/knemo.install
deleted file mode 100644
index 0fbb3047a..000000000
--- a/community-testing/knemo/knemo.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() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD
deleted file mode 100644
index c537ce978..000000000
--- a/community-testing/libvirt/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 64585 2012-02-16 20:41:38Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jonathan Wiersma <archaur at jonw dot org>
-
-pkgname=libvirt
-pkgver=0.9.10
-pkgrel=1
-pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
-arch=('i686' 'x86_64')
-url="http://libvirt.org/"
-license=('LGPL')
-depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
-	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
-	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
-	 'iproute2' 'netcf' 'libnl1')
-makedepends=('pkgconfig' 'lvm2')
-optdepends=('bridge-utils: for briged networking (default)'
-	    'dnsmasq: for NAT/DHCP for guests'
-	    'kvm'
-	    'openbsd-netcat: for remote management over ssh'
-	    'qemu'
-	    'radvd'
-	    'dmidecode')
-options=('emptydirs' '!libtool')
-backup=('etc/conf.d/libvirtd'
-	'etc/conf.d/libvirtd-guests'
-	'etc/libvirt/libvirtd.conf'
-	'etc/libvirt/libvirt.conf'
-	'etc/libvirt/qemu.conf'
-	'etc/sasl2/libvirt.conf')
-install="libvirt.install"
-source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
-	libvirtd.rc.d
-	libvirtd.conf.d
-	libvirtd-guests.rc.d
-	libvirtd-guests.conf.d
-	openbsd-netcat-default.patch
-	unixperms.patch
-	yajl-2.x.patch)
-md5sums=('a424bb793521e637349da47e93dd5fff'
-         'c43244c40a0437038c82089618e7beaa'
-         '3ed0e24f5b5e25bf553f5427d64915e6'
-         '737ec24aa56871fbabfa892789457db4'
-         'bc2971dacdbac967fc3474e50affc345'
-         'b0be50eb9dfe4d133decf23b60880f7d'
-         'db95aecdf2ccf3693fef5821cdcb7eba'
-         '5745bb8d0b254abb7a3528c66e03b0f9')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  export PYTHON=`which python2`
-  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
-
-#  for more information on authentication see http://libvirt.org/auth.html
-#  If you wish to have unix-permissions based access rather than only polkit
-#  access, create a group called libvirt and uncomment the line below:
-#  patch -Np1 -i "$srcdir"/unixperms.patch
-
-  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
-
-  # fixes for yajl 2.0 API changes
-#  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch"
-
-  export LDFLAGS=-lX11
-  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
-	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static
-  find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \;
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd
-  install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
-
-  install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests
-  install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests
-
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/libvirt/libvirt.install b/community-testing/libvirt/libvirt.install
deleted file mode 100644
index 3881386d2..000000000
--- a/community-testing/libvirt/libvirt.install
+++ /dev/null
@@ -1,38 +0,0 @@
-_libvirt_setup() {
-  rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
-  echo ">>> To use libvirt as a non-root user:"
-  echo ">>>  Use polkit to grant access."
-  echo ">>>  ...or change the access model in /etc/libvirt/libvirtd.conf."
-  echo ">>>     (see unixperms.patch in PKGBUILD for help)"
-  echo ""
-}
-
-post_install() {
-  _libvirt_setup || return 1
-  echo ">>> Be sure to see optdepends as you may find some of them helpfull."
-  echo ">>>  Especially: bridge-utils, dnsmasq, and hal."
-  echo ""
-  echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root."
-  echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
-  echo ">>>  booting."
-  echo ""
-  /bin/true
-}
-
-post_upgrade() {
-  _libvirt_setup || return 1
-  echo ">>> To finish the upgrade, restart libvirtd by running the command:"
-  echo ">>>  '/etc/rc.d/libvirtd restart' as root or rebooting."
-  echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
-  echo ""
-  /bin/true
-}
-
-post_remove() {
-   rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
-   echo ">>> You may wish to delete the group 'libvirt' if it still exists."
-   echo ">>>  It can be removed by running 'groupdel libvirt' as root."
-   echo ""
-   depmod -a
-   /bin/true
-}
diff --git a/community-testing/libvirt/libvirtd-guests.conf.d b/community-testing/libvirt/libvirtd-guests.conf.d
deleted file mode 100644
index 02a933715..000000000
--- a/community-testing/libvirt/libvirtd-guests.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBVIRTD_STOP_ACTION=suspend
-
-#LIBVIRTD_URI="-c qemu+ssh://user@host/system"
-LIBVIRTD_URI=""
-
-#LIBVIRTD_BYPASS_CACHE="--bypass-cache"
-LIBVIRTD_BYPASS_CACHE=""
-
-LIBVIRTD_START_DELAY=0
-
-LIBVIRTD_SHUTDOWN_TIMEOUT=3
diff --git a/community-testing/libvirt/libvirtd-guests.rc.d b/community-testing/libvirt/libvirtd-guests.rc.d
deleted file mode 100644
index b4331964a..000000000
--- a/community-testing/libvirt/libvirtd-guests.rc.d
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/libvirtd-guests
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list"
-
-# get guest state by name
-libvirt_get_guest_state()
-{
-	virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}'
-}
-
-# list IDs of running guests
-libvirt_list()
-{
-	virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}'
-}
-
-# suspend guest by name
-libvirt_suspend()
-{
-	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null
-	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
-	while [ "$timeout" -gt 0 ]; do
-		sleep 1
-		timeout=$((timeout - 1))
-		state=`libvirt_get_guest_state "$1"`
-		[ "x$state" == "xshut" ] && return 0
-	done
-	return 1
-}
-
-# shutdown guest by name
-libvirt_shutdown()
-{
-	virsh $LIBVIRTD_URI shutdown "$1" >/dev/null
-	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
-	while [ "$timeout" -gt 0 ]; do
-		sleep 1
-		timeout=$((timeout - 1))
-		state=`libvirt_get_guest_state "$1"`
-		[ "x$state" != "xshut" ] && return 0
-	done
-	return 1
-}
-
-# start guest by name
-libvirt_start()
-{
-	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null
-}
-
-# stop all guests
-libvirt_stop_all()
-{
-	mkdir -p `dirname $LIBVIRTD_LISTFILE`
-	echo -n >$LIBVIRTD_LISTFILE
-	for i in `libvirt_list`; do
-		if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then
-			stat_busy "Suspending libvirtd/$i guest"
-			libvirt_suspend "$i"
-		else
-			stat_busy "Shutting libvirtd/$i guest down"
-			libvirt_shutdown "$i"
-		fi
-		[ $? -eq 0 ] && stat_done || stat_fail
-		echo $i >>$LIBVIRTD_LISTFILE
-	done
-}
-
-# start all guests
-libvirt_start_all()
-{
-	if [ -f $LIBVIRTD_LISTFILE ]; then
-		for i in `cat $LIBVIRTD_LISTFILE`; do
-			stat_busy "Starting/resuming libvirtd/$i guest"
-			libvirt_start "$i"
-			[ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail
-		done
-	fi
-	rm -f $LIBVIRTD_LISTFILE
-}
-
-# main
-LC_ALL=C
-LANG=C
-case "$1" in
-    start)
-		libvirt_start_all
-		add_daemon libvirtd-guests
-	;;
-    stop)
-		libvirt_stop_all
-		rm_daemon libvirtd-guests
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|restart}"
-        ;;
-esac
-exit 0
diff --git a/community-testing/libvirt/libvirtd.conf.d b/community-testing/libvirt/libvirtd.conf.d
deleted file mode 100644
index d4d25b47a..000000000
--- a/community-testing/libvirt/libvirtd.conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf"
-LIBVIRTD_ARGS="-p /var/run/libvirtd.pid"
-KRB5_KTNAME="/etc/libvirt/krb5.tab"
diff --git a/community-testing/libvirt/libvirtd.rc.d b/community-testing/libvirt/libvirtd.rc.d
deleted file mode 100644
index 193bffa9c..000000000
--- a/community-testing/libvirt/libvirtd.rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/libvirtd
-. /etc/rc.d/functions
-
-LIBVIRTD_CONFIG_ARGS=
-if [ -n "$LIBVIRTD_CONFIG" ]
-then
-	LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
-fi
-
-PID=`pidof -o %PPID /usr/sbin/libvirtd`
-case "$1" in
-    start)
-	stat_busy "Starting libvirtd"
-	export RADVD=/usr/sbin/radvd
-	for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do
-		[ -d $i ] || mkdir -p $i
-	done
-	[ -z "$PID" ] && (
-		mkdir -p /var/{cache,run}/libvirt
-		rm -rf /var/cache/libvirt/*
-		KRB5_KTNAME=$KRB5_KTNAME \
-			/usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon libvirtd
-		stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping libvirtd"
-	[ ! -z "$PID" ]  && (
-		kill $PID &> /dev/null
-		rm -rf /var/cache/libvirt/*
-		rm -f /var/run/libvirtd.pid
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		rm_daemon libvirtd
-		stat_done
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    reload)
-	stat_busy "Reloading libvirtd configuration"
-	[ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		stat_done
-	fi
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|restart|reload}"
-        ;;
-esac
-exit 0
diff --git a/community-testing/libvirt/openbsd-netcat-default.patch b/community-testing/libvirt/openbsd-netcat-default.patch
deleted file mode 100644
index a01b4f14e..000000000
--- a/community-testing/libvirt/openbsd-netcat-default.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
---- libvirt-0.9.7/src/qemu/qemu_migration.c	2011-10-31 07:46:04.000000000 +0400
-+++ libvirt-0.9.7.my/src/qemu/qemu_migration.c	2011-11-08 15:46:10.000000000 +0400
-@@ -1589,7 +1589,7 @@
-                                            spec->dest.unix_socket.file);
-         } else {
-             const char *args[] = {
--                "nc", "-U", spec->dest.unix_socket.file, NULL
-+                "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL
-             };
-             ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
-         }
-diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
---- libvirt-0.9.7/src/remote/remote_driver.c	2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/remote/remote_driver.c	2011-11-08 15:46:10.000000000 +0400
-@@ -614,7 +614,7 @@
-                                                 username,
-                                                 !tty,
-                                                 !verify,
--                                                netcat ? netcat : "nc",
-+                                                netcat ? netcat : "nc.openbsd",
-                                                 keyfile,
-                                                 sockname)))
-             goto failed;
-diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
---- libvirt-0.9.7/src/rpc/virnetsocket.c	2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/rpc/virnetsocket.c	2011-11-08 15:46:31.000000000 +0400
-@@ -642,7 +642,7 @@
-         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
- 
-     if (!netcat)
--        netcat = "nc";
-+        netcat = "nc.openbsd";
- 
-     virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
- 
diff --git a/community-testing/libvirt/unixperms.patch b/community-testing/libvirt/unixperms.patch
deleted file mode 100644
index b3fb86cf5..000000000
--- a/community-testing/libvirt/unixperms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf
---- libvirt-0.7.4-orig/daemon/libvirtd.conf	2009-11-23 03:10:33.398655655 -0800
-+++ libvirt-0.7.4-patched/daemon/libvirtd.conf	2009-11-23 03:09:37.831189671 -0800
-@@ -78,14 +78,14 @@
- # without becoming root.
- #
- # This is restricted to 'root' by default.
--#unix_sock_group = "libvirt"
-+unix_sock_group = "libvirt"
- 
- # Set the UNIX socket permissions for the R/O socket. This is used
- # for monitoring VM status only
- #
- # Default allows any user. If setting group ownership may want to
- # restrict this to:
--#unix_sock_ro_perms = "0777"
-+unix_sock_ro_perms = "0770"
- 
- # Set the UNIX socket permissions for the R/W socket. This is used
- # for full management of VMs
-@@ -95,7 +95,7 @@
- #
- # If not using PolicyKit and setting group ownership for access
- # control then you may want to relax this to:
--#unix_sock_rw_perms = "0770"
-+unix_sock_rw_perms = "0770"
- 
- # Set the name of the directory in which sockets will be found/created.
- #unix_sock_dir = "/var/run/libvirt"
-@@ -126,7 +126,7 @@
- #
- # To restrict monitoring of domains you may wish to enable
- # an authentication mechanism here
--#auth_unix_ro = "none"
-+auth_unix_ro = "none"
- 
- # Set an authentication scheme for UNIX read-write sockets
- # By default socket permissions only allow root. If PolicyKit
-@@ -135,7 +135,7 @@
- #
- # If the unix_sock_rw_perms are changed you may wish to enable
- # an authentication mechanism here
--#auth_unix_rw = "none"
-+auth_unix_rw = "none"
- 
- # Change the authentication scheme for TCP sockets.
- #
diff --git a/community-testing/libvirt/yajl-2.x.patch b/community-testing/libvirt/yajl-2.x.patch
deleted file mode 100644
index 80d3edce0..000000000
--- a/community-testing/libvirt/yajl-2.x.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/util/json.c	2011-03-24 03:10:26.000000000 -0400
-+++ b/src/util/json.c	2011-04-25 20:01:29.354939116 -0400
-@@ -709,7 +709,7 @@
- 
- static int virJSONParserHandleNumber(void * ctx,
-                                      const char * s,
--                                     unsigned int l)
-+                                     size_t l)
- {
-     virJSONParserPtr parser = ctx;
-     char *str = strndup(s, l);
-@@ -735,7 +735,7 @@
- 
- static int virJSONParserHandleString(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal,
-@@ -756,7 +756,7 @@
- 
- static int virJSONParserHandleMapKey(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONParserStatePtr state;
-@@ -894,14 +894,14 @@
- /* XXX add an incremental streaming parser - yajl trivially supports it */
- virJSONValuePtr virJSONValueFromString(const char *jsonstring)
- {
--    yajl_parser_config cfg = { 1, 1 };
-     yajl_handle hand;
-     virJSONParser parser = { NULL, NULL, 0 };
-     virJSONValuePtr ret = NULL;
- 
-     VIR_DEBUG("string=%s", jsonstring);
- 
--    hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser);
-+    hand = yajl_alloc(&parserCallbacks, NULL, &parser);
-+    yajl_config(hand, yajl_allow_comments, 1);
- 
-     if (yajl_parse(hand,
-                    (const unsigned char *)jsonstring,
-@@ -1002,15 +1002,16 @@
- 
- char *virJSONValueToString(virJSONValuePtr object)
- {
--    yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */
-     yajl_gen g;
-     const unsigned char *str;
-     char *ret = NULL;
--    unsigned int len;
-+    size_t len;
- 
-     VIR_DEBUG("object=%p", object);
- 
--    g = yajl_gen_alloc(&conf, NULL);
-+    g = yajl_gen_alloc(NULL);
-+    yajl_gen_config(g, yajl_gen_beautify, 0);
-+    yajl_gen_config(g, yajl_gen_indent_string, " ");
- 
-     if (virJSONValueToStringOne(object, g) < 0) {
-         virReportOOMError();
diff --git a/community-testing/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD
deleted file mode 100644
index 647c6c052..000000000
--- a/community-testing/luxrender/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 66998 2012-03-03 08:12:24Z 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=13
-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 45a0e5dc4..000000000
--- a/community-testing/mapnik/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 67000 2012-03-03 08:12:30Z 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=14
-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/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD
deleted file mode 100644
index e8867af8e..000000000
--- a/community-testing/mongodb/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 67002 2012-03-03 08:12:49Z ibiru $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Mathias Stearn <mathias@10gen.com>
-# Contributor: Alec Thomas
-
-pkgname=mongodb
-pkgver=2.0.3
-pkgrel=2
-pkgdesc='A high-performance, open source, schema-free document-oriented database.'
-arch=('i686' 'x86_64')
-url='http://www.mongodb.org'
-license=('AGPL3')
-depends=('boost-libs')
-makedepends=('scons' 'boost')
-#checkdepends=('python2-pymongo')
-optdepends=('libpcap: needed for mongosniff')
-backup=('etc/mongodb.conf')
-install="mongodb.install"
-source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.rc'
-        'mongodb.conf')
-md5sums=('f588cae93196b94599ec50e3c4956592'
-         '9c67e00f4626ad761a8f7d4e037a54d7'
-         '4839fe1d638187ca3226e8267b947318')
-
-build() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  # fix python name for smoke tests
-  sed \
-    -e 's/python/&2/' \
-    -i SConstruct
-
-  scons \
-    all \
-    --full
-}
-
-<<COMMENT
-check() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    smokeAll \
-    --smokedbprefix=${srcdir}
-}
-COMMENT
-
-package() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    install \
-    --full \
-    --prefix=${pkgdir}/usr
-
-  install -D -m755 ${srcdir}/mongodb.rc \
-    ${pkgdir}/etc/rc.d/mongodb
-  install -D -m644 ${srcdir}/mongodb.conf \
-    ${pkgdir}/etc/mongodb.conf
-  install -d -m700 ${pkgdir}/var/lib/mongodb
-  install -d -m755 ${pkgdir}/var/log/mongodb
-
-  if [ -d ${pkgdir}/usr/lib64 ]; then
-    mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
-  fi
-}
diff --git a/community-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf
deleted file mode 100644
index c5272b7f2..000000000
--- a/community-testing/mongodb/mongodb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/lib/mongodb
-logpath = /var/log/mongodb/mongod.log
-logappend = true
diff --git a/community-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install
deleted file mode 100644
index 3922c12ef..000000000
--- a/community-testing/mongodb/mongodb.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# vim: syntax=sh
-
-post_install() {
-  useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(arch)" != "x86_64" ]
-  then
-    echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.'
-    echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations'
-  fi
-}
-
-post_upgrade() {
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(vercmp $2 1.8.2-3)" -lt 0 ]
-  then
-    # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
-    # added july 5th, 2011
-    usermod -s /bin/bash mongodb >& /dev/null
-    echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
-    echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
-    echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
-  fi
-}
-
-pre_remove() {
-  userdel mongodb
-}
diff --git a/community-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc
deleted file mode 100644
index 30f2bbf79..000000000
--- a/community-testing/mongodb/mongodb.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: syntax=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof /usr/bin/mongod)
-case "$1" in
-  start)
-    stat_busy "Starting mongodb"
-    [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mongodb
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mongodb"
-    [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mongodb
-      while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
-        sleep 1;
-      done
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/netcf/PKGBUILD b/community-testing/netcf/PKGBUILD
deleted file mode 100644
index 1498f4623..000000000
--- a/community-testing/netcf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 64587 2012-02-16 20:41:45Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
-
-pkgname=netcf
-pkgver=0.1.7
-pkgrel=3
-pkgdesc="A library for configuring network interfaces"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="https://fedorahosted.org/netcf/"
-depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl1')
-makedepends=('gcc')
-options=(!libtool)
-source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz"
-        netcf-0.1.7.patch)
-md5sums=('8e313b623c907eb035cf3948b71fecc2'
-         '0e88ee6813219e9e75a943444fe439f5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/netcf-0.1.7.patch
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/netcf/netcf-0.1.7.patch b/community-testing/netcf/netcf-0.1.7.patch
deleted file mode 100644
index d4a4d31b7..000000000
--- a/community-testing/netcf/netcf-0.1.7.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-diff -ur netcf-0.1.7.ori//data/xml/initscripts-get.xsl netcf-0.1.7/data/xml/initscripts-get.xsl
---- netcf-0.1.7.ori//data/xml/initscripts-get.xsl	2009-10-04 08:18:41.000000000 +0200
-+++ netcf-0.1.7/data/xml/initscripts-get.xsl	2010-12-08 14:54:28.891813397 +0100
-@@ -47,9 +47,12 @@
-   <xsl:template name="vlan-interface-common">
-     <xsl:variable name="iface" select="concat(vlan/interface/@name, '.', vlan/@tag)"/>
- 
--    <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute>
--    <node label="DEVICE" value="{$iface}"/>
--    <node label="VLAN" value="yes"/>
-+    <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute>
-+    <node label="INTERFACE" value="{$iface}"/>
-+    <node label="PHYS_INTERFACE" value="{vlan/interface/@name}"/>
-+    <node label="VLAN" value="{vlan/@tag}"/>
-+    <node label="CONNECTION" value="ethernet-iproute-vlan"/>
-+    <node label="FLAG" value="false"/>
-   </xsl:template>
- 
-   <xsl:template name='bare-vlan-interface'>
-@@ -68,6 +71,7 @@
-       <xsl:call-template name="startmode"/>
-       <xsl:call-template name="mtu"/>
-       <node label="TYPE" value="Bridge"/>
-+      <node label="CONNECTION" value="bridge"/>
-       <xsl:call-template name="interface-addressing"/>
-       <xsl:if test="bridge/@stp">
-         <node label="STP" value="{bridge/@stp}"/>
-@@ -75,7 +79,11 @@
-       <xsl:if test="bridge/@delay">
-         <node label="DELAY" value="{bridge/@delay}"/>
-       </xsl:if>
-+      <node label="DHCP_TIMEOUT" value="0"/>
-+    <!--
-+    We don't have to define interfaces separately
-     </tree>
-+    
-     <xsl:for-each select='bridge/interface'>
-       <tree>
-         <xsl:if test="@type = 'ethernet'">
-@@ -87,12 +95,29 @@
-         <xsl:if test="@type = 'bond'">
-           <xsl:call-template name="bare-bond-interface"/>
-         </xsl:if>
-+
-+        BRIDGE_INTERFACES= is defined with all interfaces
-         <node label="BRIDGE" value="{../../@name}"/>
-+
-+        <xsl:variable name="bridgeifaces" select="concat($bridgeifaces, '.', @name)"/>
-       </tree>
-       <xsl:if test="@type = 'bond'">
-         <xsl:call-template name="bond-slaves"/>
-       </xsl:if>
-     </xsl:for-each>
-+    -->
-+    <!-- <xsl:if test="count(ip) > 1"> -->
-+    <node label="BRIDGE_INTERFACES">
-+    <xsl:attribute name="value">
-+      <xsl:text></xsl:text>
-+      <xsl:for-each select="bridge/interface">
-+        <xsl:value-of select="@name"/><xsl:value-of select="string(' ')"/>
-+      </xsl:for-each>
-+      <xsl:text></xsl:text>
-+    </xsl:attribute>
-+    </node>
-+    <!-- </xsl:if> -->
-+    </tree>
-   </xsl:template>
- 
-   <!--
-@@ -138,8 +163,8 @@
-        Named templates, following the Relax NG syntax
-   -->
-   <xsl:template name="name-attr">
--    <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="@name"/></xsl:attribute>
--    <node label="DEVICE" value="{@name}"/>
-+    <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="@name"/></xsl:attribute>
-+    <node label="INTERFACE" value="{@name}"/>
-   </xsl:template>
- 
-   <xsl:template name="mtu">
-@@ -153,6 +178,7 @@
-     <xsl:if test="mac">
-       <node label="HWADDR" value="{mac/@address}"/>
-     </xsl:if>
-+    <node label="CONNECTION" value="{@type}"/>
-     <xsl:call-template name="startmode"/>
-     <xsl:call-template name="mtu"/>
-   </xsl:template>
-@@ -184,14 +210,14 @@
-   <xsl:template name="protocol-ipv4">
-     <xsl:choose>
-       <xsl:when test="dhcp">
--        <node label="BOOTPROTO" value="dhcp"/>
-+        <node label="IP" value="dhcp"/>
-         <xsl:if test="dhcp/@peerdns">
-           <node label="PEERDNS" value="{dhcp/@peerdns}"/>
-         </xsl:if>
-       </xsl:when>
-       <xsl:when test="ip">
--        <node label="BOOTPROTO" value="none"/>
--        <node label="IPADDR" value="{ip/@address}"/>
-+        <node label="IP" value="static"/>
-+        <node label="ADDR" value="{ip/@address}"/>
-         <xsl:if test="ip/@prefix">
-           <node label="NETMASK" value="{ipcalc:netmask(ip/@prefix)}"/>
-         </xsl:if>
-diff -ur netcf-0.1.7.ori//data/xml/initscripts-put.xsl netcf-0.1.7/data/xml/initscripts-put.xsl
---- netcf-0.1.7.ori//data/xml/initscripts-put.xsl	2009-10-04 08:18:41.000000000 +0200
-+++ netcf-0.1.7/data/xml/initscripts-put.xsl	2010-11-26 10:44:46.133757628 +0100
-@@ -47,7 +47,7 @@
-   </xsl:template>
- 
-   <xsl:template name="bare-vlan-interface">
--    <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/>
-+    <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/>
-     <interface type="vlan">
-       <xsl:call-template name="name-attr"/>
-       <xsl:call-template name="vlan-device"/>
-@@ -55,7 +55,7 @@
-   </xsl:template>
- 
-   <xsl:template name="vlan-device">
--    <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/>
-+    <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/>
-     <xsl:variable name="device" select="substring-before($name, '.')"/>
-     <xsl:variable name="tag" select="substring-after($name, '.')"/>
-     <vlan tag="{$tag}">
-@@ -70,7 +70,7 @@
-                 match="tree[node[@label = 'TYPE' and @value = 'Bridge']]">
-     <interface type="bridge">
-       <!-- the bridge node itself -->
--      <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/>
-+      <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/>
-       <xsl:call-template name="name-attr"/>
-       <xsl:call-template name="startmode"/>
-       <xsl:call-template name="mtu"/>
-@@ -101,17 +101,17 @@
-       Bond
-   -->
-   <xsl:template name="bond-element">
--    <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/>
-+    <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/>
-     <bond>
-       <xsl:variable name="opts" select="node[@label = 'BONDING_OPTS']/@value"/>
-       <xsl:call-template name="bonding-opts">
-         <xsl:with-param name="opts" select="$opts"/>
-       </xsl:call-template>
-       <xsl:variable name="primary" select="bond:option($opts, 'primary')"/>
--      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value = $primary]]">
-+      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value = $primary]]">
-         <xsl:call-template name='bare-ethernet-interface'/>
-       </xsl:for-each>
--      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value != $primary]]">
-+      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value != $primary]]">
-         <xsl:call-template name='bare-ethernet-interface'/>
-       </xsl:for-each>
-     </bond>
-@@ -125,7 +125,7 @@
-   </xsl:template>
- 
-   <xsl:template name="bond-interface"
--                match="tree[node[@label = 'DEVICE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]">
-+                match="tree[node[@label = 'INTERFACE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]">
-     <interface type="bond">
-       <xsl:call-template name="name-attr"/>
-       <xsl:call-template name="startmode"/>
-@@ -154,7 +154,7 @@
- 
-   <xsl:template name="name-attr">
-     <xsl:attribute name="name">
--      <xsl:value-of select="node[@label= 'DEVICE']/@value"/>
-+      <xsl:value-of select="node[@label= 'INTERFACE']/@value"/>
-     </xsl:attribute>
-   </xsl:template>
- 
-@@ -173,7 +173,7 @@
-     <xsl:variable name="uses_dhcp"
-                   select="node[@label = 'BOOTPROTO']/@value = 'dhcp'"/>
-     <xsl:variable name="uses_static"
--                  select="count(node[@label = 'IPADDR']) > 0"/>
-+                  select="count(node[@label = 'ADDR']) > 0"/>
-     <xsl:variable name="uses_ipv4" select="$uses_dhcp or $uses_static"/>
-     <xsl:if test="$uses_ipv4">
-     <protocol family="ipv4">
-@@ -186,7 +186,7 @@
-           </dhcp>
-         </xsl:when>
-         <xsl:when test="$uses_static">
--          <ip address="{node[@label = 'IPADDR']/@value}">
-+          <ip address="{node[@label = 'ADDR']/@value}">
-             <xsl:choose>
-               <xsl:when test="node[@label = 'PREFIX']">
-                 <xsl:attribute name="prefix"><xsl:value-of select="node[@label = 'PREFIX']/@value"/></xsl:attribute>
-diff -ur netcf-0.1.7.ori//src/drv_initscripts.c netcf-0.1.7/src/drv_initscripts.c
---- netcf-0.1.7.ori//src/drv_initscripts.c	2010-09-23 14:13:13.000000000 +0200
-+++ netcf-0.1.7/src/drv_initscripts.c	2010-12-08 13:57:02.027361706 +0100
-@@ -49,17 +49,20 @@
- #include <libexslt/exslt.h>
- 
- static const char *const network_scripts_path =
--    "/files/etc/sysconfig/network-scripts";
-+    //"/files/etc/sysconfig/network-scripts";
-+    "/files/etc/network.d/*";
- 
- static const char *const ifcfg_path =
--    "/files/etc/sysconfig/network-scripts/*";
-+    //"/files/etc/sysconfig/network-scripts/*";
-+    "/files/etc/network.d/*";
- 
- /* Augeas should only load the files we are interested in */
- static const struct augeas_pv augeas_xfm_common_pv[] = {
-     /* Ifcfg files */
-     { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" },
-     { "/augeas/load/Ifcfg/incl",
--      "/etc/sysconfig/network-scripts/ifcfg-*" },
-+      "/etc/network.d/ifcfg-*" },
-+      //"/etc/sysconfig/network-scripts/ifcfg-*" },
-     { "/augeas/load/Ifcfg/excl[1]", "*~" },
-     { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
-     { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
-@@ -107,10 +110,10 @@
-     int nmatches;
- 
-     nmatches = aug_fmt_match(ncf, NULL,
--                             "%s[ DEVICE = '%s'"
-+                             "%s[ INTERFACE = '%s'"
-                              "    or BRIDGE = '%s'"
-                              "    or MASTER = '%s'"
--                             "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
-+                             "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE",
-                              ifcfg_path, name, name, name, name);
-     return nmatches > 0;
- }
-@@ -173,7 +176,7 @@
-     aug = get_augeas(ncf);
-     ERR_BAIL(ncf);
- 
--    ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']",
-+    ndevs = aug_fmt_match(ncf, &devs, "%s[INTERFACE = '%s']",
-                           ifcfg_path, name);
-     ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
- 
-@@ -296,7 +299,8 @@
-     int result = 0, ndevs;
-     char **devs = NULL;
- 
--    ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path);
-+    ndevs = aug_fmt_match(ncf, &devs, "%s/INTERFACE", ifcfg_path);
-+    printf("%i\n", ndevs);
-     ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
- 
-     result = uniq_ifcfg_paths(ncf, ndevs, devs, intf);
-@@ -453,11 +457,11 @@
- 
- int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names,
-         unsigned int flags) {
--    return list_interface_ids(ncf, maxnames, names, flags, "DEVICE");
-+    return list_interface_ids(ncf, maxnames, names, flags, "INTERFACE");
- }
- 
- int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) {
--    return list_interface_ids(ncf, 0, NULL, flags, "DEVICE");
-+    return list_interface_ids(ncf, 0, NULL, flags, "INTERFACE");
- }
- 
- struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) {
-@@ -599,8 +603,8 @@
- 
-     ncf = nif->ncf;
-     ndevs = aug_fmt_match(ncf, &devs,
--              "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s'"
--              "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
-+              "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s'"
-+              "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE",
-               ifcfg_path, nif->name, nif->name, nif->name, nif->name);
-     ERR_BAIL(ncf);
- 
-@@ -745,7 +749,7 @@
-     int nmatches = 0;
- 
-     nmatches = aug_fmt_match(ncf, NULL,
--                             "%s[ DEVICE = '%s' and TYPE = 'Bridge']",
-+                             "%s[ INTERFACE = '%s' and TYPE = 'Bridge']",
-                              ifcfg_path, name);
-     return nmatches > 0;
- }
-@@ -758,7 +762,7 @@
-     ERR_BAIL(ncf);
- 
-     nslaves = aug_fmt_match(ncf, slaves,
--                            "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path, name);
-+                            "%s[ BRIDGE = '%s' ]/INTERFACE", ifcfg_path, name);
-     ERR_BAIL(ncf);
-     for (int i=0; i < nslaves; i++) {
-         char *p = (*slaves)[i];
-@@ -790,8 +794,8 @@
-     /* The last or clause catches slaves of a bond that are enslaved to
-      * a bridge NAME */
-     r = xasprintf(&path,
--          "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s' "
--          "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]",
-+          "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s' "
-+          "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]",
-                   ifcfg_path, name, name, name, name);
-     ERR_NOMEM(r < 0, ncf);
- 
-@@ -967,7 +971,7 @@
-     for (int i = 0; i < nmatches; i++) {
-         if (!has_ifcfg_file(ncf, matches[i]))
-             continue;
--        r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path, matches[i]);
-+        r = xasprintf(&ifcfg, "%s[INTERFACE = '%s']", ifcfg_path, matches[i]);
-         ERR_NOMEM(r < 0, ncf);
- 
-         if (! is_slave(ncf, ifcfg))
-@@ -1023,7 +1027,10 @@
-  */
- 
- int drv_if_up(struct netcf_if *nif) {
--    static const char *const ifup = "ifup";
-+    //static const char *const ifup = "ifup";
-+    static const char *const ifup = "netcfg";
-+    static const char *const ifprefix = "ifcfg-";
-+    char ifname[strlen(nif->name) + sizeof(ifprefix)];
-     struct netcf *ncf = nif->ncf;
-     char **slaves = NULL;
-     int nslaves = 0;
-@@ -1035,11 +1042,24 @@
-         ERR_BAIL(ncf);
- 
-         for (int i=0; i < nslaves; i++) {
--            run1(ncf, ifup, slaves[i]);
-+            //run1(ncf, ifup, slaves[i]);
-+            const char *const argv[] = {
-+                ifup, "-u", slaves[i], NULL
-+            };
-+
-+            run_program(ncf, argv);
-             ERR_BAIL(ncf);
-         }
-     }
--    run1(ncf, ifup, nif->name);
-+    //run1(ncf, ifup, nif->name);
-+    /* Interfaces name have to be equal to script under /etc/network.d */
-+    strcpy(ifname, ifprefix);
-+    strcat(ifname, nif->name);
-+    const char *const argv[] = {
-+                ifup, "-u", ifname, NULL
-+            };
-+
-+    run_program(ncf, argv);
-     ERR_BAIL(ncf);
-     result = 0;
-  error:
-@@ -1048,13 +1068,23 @@
- }
- 
- int drv_if_down(struct netcf_if *nif) {
--    static const char *const ifdown = "ifdown";
-+    //static const char *const ifdown = "ifdown";
-+    static const char *const ifdown = "netcfg";
-+    static const char *const ifprefix = "ifcfg-";
-+    char ifname[strlen(nif->name) + sizeof(ifprefix)];
-     struct netcf *ncf = nif->ncf;
-     char **slaves = NULL;
-     int nslaves = 0;
-     int result = -1;
- 
--    run1(ncf, ifdown, nif->name);
-+    //run1(ncf, ifdown, nif->name);
-+    strcpy(ifname, ifprefix);
-+    strcat(ifname, nif->name);
-+    const char *const argv[] = {
-+        ifdown, "-d", ifname, NULL
-+    };
-+
-+    run_program(ncf, argv);
-     ERR_BAIL(ncf);
-     if (is_bridge(ncf, nif->name)) {
-         /* Bring up bridge slaves after the bridge */
-@@ -1062,7 +1092,12 @@
-         ERR_BAIL(ncf);
- 
-         for (int i=0; i < nslaves; i++) {
--            run1(ncf, ifdown, slaves[i]);
-+            //run1(ncf, ifdown, slaves[i]);
-+            const char *const argvs[] = {
-+                ifdown, "-d", slaves[i], NULL
-+            };
-+
-+            run_program(ncf, argvs);
-             ERR_BAIL(ncf);
-         }
-     }
-diff -ur netcf-0.1.7.ori//tests/interface/bridge.xml~ netcf-0.1.7/tests/interface/bridge.xml~
---- netcf-0.1.7.ori//tests/interface/bridge.xml~	2009-10-13 19:14:53.000000000 +0200
-+++ netcf-0.1.7/tests/interface/bridge.xml~	2009-10-14 05:09:05.000000000 +0200
-@@ -2,10 +2,12 @@
-   <start mode="onboot"/>
-   <mtu size="1500"/>
-   <protocol family="ipv4">
--    <ip address="192.168.80.5" prefix="24"/>
-+    <dhcp/>
-   </protocol>
-   <bridge stp="off" delay="0.01">
-     <interface type="ethernet" name="eth0">
-+      <mac address="ab:bb:cc:dd:ee:ff"/>
-     </interface>
-+    <interface type="ethernet" name="eth1"/>
-   </bridge>
- </interface>
-diff -ur netcf-0.1.7.ori//tests/interface/vlan.xml~ netcf-0.1.7/tests/interface/vlan.xml~
---- netcf-0.1.7.ori//tests/interface/vlan.xml~	2010-07-30 06:02:39.000000000 +0200
-+++ netcf-0.1.7/tests/interface/vlan.xml~	2010-09-07 18:26:22.000000000 +0200
-@@ -1,9 +1,9 @@
--<interface type="vlan" name="eth1.42">
-+<interface type="vlan" name="eth0.42">
-   <start mode="onboot"/>
-   <protocol family="ipv4">
-     <dhcp peerdns="no"/>
-   </protocol>
-   <vlan tag="42">
--    <interface name="eth1"/>
-+    <interface name="eth0"/>
-   </vlan>
- </interface>
diff --git a/community-testing/openimageio/PKGBUILD b/community-testing/openimageio/PKGBUILD
deleted file mode 100644
index 0f4bb0102..000000000
--- a/community-testing/openimageio/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 67006 2012-03-03 08:13:05Z ibiru $
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-_pkg=OpenImageIO
-pkgname=openimageio
-pkgver=0.10.4
-pkgrel=6
-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/performous/PKGBUILD b/community-testing/performous/PKGBUILD
deleted file mode 100644
index af0874e3f..000000000
--- a/community-testing/performous/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 67008 2012-03-03 08:13:15Z ibiru $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=performous
-pkgver=0.6.1
-pkgrel=13
-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/pigeonhole/PKGBUILD b/community-testing/pigeonhole/PKGBUILD
deleted file mode 100644
index afc922926..000000000
--- a/community-testing/pigeonhole/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
-# Contributor: Sebastian Köhler <sebkoehler@whoami.org.uk>
-
-# This must be built against the version of dovecot being used,
-# else mail delivery will fail.
-# Specify the version of dovecot to be used here:
-_dcpkgver=2.1.1
-# Make sure to bump pkgrel if changing this.
-
-pkgname=pigeonhole
-pkgver=0.3.0
-pkgrel=2
-pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
-arch=('i686' 'x86_64')
-url="http://pigeonhole.dovecot.org/"
-license=('LGPL')
-depends=('dovecot='$_dcpkgver)
-conflicts=('dovecot-sieve' 'pigeonhole-hg')
-source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig}
-        "dovecot.conf")
-options=('!libtool')
-sha256sums=('2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada'
-            '181213cd4af854966ff5bb6b5052b49b0b40c0c21999939b8451658053fa396d'
-            'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
-
-build() {
-  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --with-dovecot=/usr/lib/dovecot
-  make
-}
-
-package() {
-  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf"
-}
-
diff --git a/community-testing/pigeonhole/dovecot.conf b/community-testing/pigeonhole/dovecot.conf
deleted file mode 100644
index 061a50c90..000000000
--- a/community-testing/pigeonhole/dovecot.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/dovecot
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 8f8619de5..000000000
--- a/community-testing/pingus/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 67010 2012-03-03 08:13:23Z ibiru $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=pingus
-pkgver=0.7.6
-pkgrel=3
-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.49')
-makedepends=('scons' 'boost>=1.49' '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/pion-net/PKGBUILD b/community-testing/pion-net/PKGBUILD
deleted file mode 100644
index 714f38b37..000000000
--- a/community-testing/pion-net/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 67012 2012-03-03 08:13:30Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: David Watzke <david@watzke.cz>
-
-pkgname=pion-net
-pkgver=4.0.7
-pkgrel=3
-pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
-url="http://www.pion.org/projects/pion-network-library"
-arch=('i686' 'x86_64')
-license=('custom:Boost')
-depends=('boost-libs' 'openssl' 'log4cpp')
-makedepends=('boost')
-source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2"
-        "$pkgname-4.0.5-build.patch")
-md5sums=('761c8af8dc54102b637f8d91d162f987'
-         'd75ea2af90163a81d2bc71fda00f0c00')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch"
-
-	# override configure bug (forces debug even when nobody asked for it)
-	sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure
-
-	./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp
-
-	find -name Makefile -print0 | xargs -0 \
-	sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile
-
-	# override Makefile bug
-	sed -i "/docs:/ s/doxygen-doc//" Makefile
-
-	make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-
-	# install license
-	install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost"
-}
diff --git a/community-testing/pion-net/pion-net-4.0.5-build.patch b/community-testing/pion-net/pion-net-4.0.5-build.patch
deleted file mode 100644
index 25fdca20b..000000000
--- a/community-testing/pion-net/pion-net-4.0.5-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp
---- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp	2010-12-21 03:07:13.000000000 +0100
-+++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp	2011-07-31 09:01:38.445559768 +0200
-@@ -639,7 +639,7 @@
- 	
- 	/// returns reference to the io_service used for async operations
- 	inline boost::asio::io_service& getIOService(void) {
--		return m_ssl_socket.lowest_layer().io_service();
-+		return m_ssl_socket.lowest_layer().get_io_service();
- 	}
- 
- 	/// returns non-const reference to underlying TCP socket object
diff --git a/community-testing/pokerth/PKGBUILD b/community-testing/pokerth/PKGBUILD
deleted file mode 100644
index 6b0e9972c..000000000
--- a/community-testing/pokerth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 67014 2012-03-03 08:13:34Z ibiru $
-# Maintainer:  Mateusz Herych <heniekk@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Vasco Costa <vasco.costa@meiodigital.com>
-
-pkgname=pokerth
-_realname=PokerTH
-pkgver=0.9.3
-pkgrel=2
-pkgdesc="Poker game written in C++/QT4"
-arch=('i686' 'x86_64')
-url="http://www.pokerth.net/"
-license=('GPL' 'custom')
-depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls'
-         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
-makedepends=('boost')
-source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('09d173512f723441f288b2844e3c68cb')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro
-
-  sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp
-
-  # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms'
-  sed \
-    -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \
-    -i zlib_compress.pro pokerth_game.pro pokerth_server.pro
-
-  qmake $pkgname.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
-  install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
-  rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt"
-}
diff --git a/community-testing/qingy/PKGBUILD b/community-testing/qingy/PKGBUILD
deleted file mode 100644
index 280c38bdd..000000000
--- a/community-testing/qingy/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 67844 2012-03-15 01:20:15Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=qingy
-pkgver=1.0.0
-pkgrel=3
-pkgdesc="A DirectFB getty replacement"
-arch=('i686' 'x86_64')
-url="http://qingy.sourceforge.net/"
-license=('GPL')
-depends=('directfb' 'openssl' 'libxss')
-makedepends=('emacs')
-backup=('etc/qingy/settings' 'etc/qingy/welcomes')
-options=('!libtool')
-install=qingy.install
-source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \
-        qingy.logrotate)
-md5sums=('1e0912655e240adfd0ce5ced30bbc685'
-         'a9bdfd0ac9f29380eafa97a4a056789d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \
-    ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \
-    --disable-optimizations --enable-pam \
-    --disable-static-build --enable-gpm-lock --enable-emacs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy"
-}
diff --git a/community-testing/qingy/qingy.install b/community-testing/qingy/qingy.install
deleted file mode 100644
index 5cf234b72..000000000
--- a/community-testing/qingy/qingy.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=usr/share/info
-filelist=(qingy.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/community-testing/qingy/qingy.logrotate b/community-testing/qingy/qingy.logrotate
deleted file mode 100644
index e16fb8d2a..000000000
--- a/community-testing/qingy/qingy.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/qingy.log {
-    compress
-    rotate 1
-    size=+1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/community-testing/schroot/PKGBUILD b/community-testing/schroot/PKGBUILD
deleted file mode 100644
index cf8ed49e8..000000000
--- a/community-testing/schroot/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 67016 2012-03-03 08:13:50Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
-
-pkgname=schroot
-pkgver=1.4.25
-pkgrel=1
-pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
-url="http://packages.qa.debian.org/s/schroot.html"
-license=('GPL3')
-depends=('pam' 'lockdev' 'boost' 'e2fsprogs')
-optdepends=('btrfs-progs-unstable' 'lvm2')
-arch=('i686' 'x86_64')
-conflicts=('dchroot')
-replaces=('dchroot')
-provides=('schroot' 'sbuild' 'dchroot')
-backup=('etc/schroot/schroot.conf'
-	'etc/schroot/arch32/config'
-	'etc/schroot/arch32/copyfiles'
-	'etc/schroot/arch32/mount'
-	'etc/schroot/arch32/nssdatabases')
-options=(!libtool)
-source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2"
-	'pam.d.schroot.patch'
-	'arch32-example'
-	'arch32-config'
-	'arch32-copyfiles'
-	'arch32-mount'
-	'arch32-nssdatabases')
-md5sums=('c9e5056becd82b6330ac4502f59260f1'
-         'a8d77cac806a0a9adef3f93cdbeb280a'
-         '1e34db5387c4e5de911e15d8a9208bdb'
-         '5a3f7b839c7e0b8933748da7c5b6385b'
-         '06db41d42f9fce5449a28feb76ded556'
-         'f0d5d5b5e34a860f6f90b5628c680f46'
-         'af1da6edd8c8c0dafeeb2c2c4e0c840b')
-
-build() {
-	cd ${pkgname}-${pkgver}
-	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-dchroot \
-		--enable-lvm-snapshot \
-		--enable-btrfs-snapshot \
-		BTRFS=/sbin/btrfs \
-		BTRFSCTL=/sbin/btrfsctl \
-		LVCREATE=/sbin/lvcreate \
-		LVREMOVE=/sbin/lvremove
-		# --enable-csbuild
-	make
-}
-
-check() {
-	cd ${pkgname}-${pkgver}
-	make -k check
-}
-
-package() {
-	cd ${pkgname}-${pkgver}
-	make DESTDIR=$pkgdir install
-	install -dm 755 ${pkgdir}/etc/schroot/arch32
-	install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32
-	rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/*
-	install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example
-	patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot
-}
diff --git a/community-testing/schroot/arch32-config b/community-testing/schroot/arch32-config
deleted file mode 100644
index 0ee72d522..000000000
--- a/community-testing/schroot/arch32-config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default settings for chroot setup and exec scripts.
-# See schroot-script-config(5) for further details.
-
-# Filesystems to mount inside the chroot.
-FSTAB="/etc/schroot/arch32/mount"
-
-# Files to copy from the host system into the chroot.
-COPYFILES="/etc/schroot/arch32/copyfiles"
-
-# System databases to copy into the chroot
-NSSDATABASES="/etc/schroot/arch32/nssdatabases"
diff --git a/community-testing/schroot/arch32-copyfiles b/community-testing/schroot/arch32-copyfiles
deleted file mode 100644
index 88f093ceb..000000000
--- a/community-testing/schroot/arch32-copyfiles
+++ /dev/null
@@ -1,7 +0,0 @@
-/etc/group
-/etc/hosts
-/etc/passwd
-/etc/resolv.conf
-/etc/rc.conf
-/etc/localtime
-/etc/locale.gen
diff --git a/community-testing/schroot/arch32-example b/community-testing/schroot/arch32-example
deleted file mode 100644
index 3f059e3c0..000000000
--- a/community-testing/schroot/arch32-example
+++ /dev/null
@@ -1,10 +0,0 @@
-[arch32]
-description=Arch32
-type=directory
-directory=/opt/arch32
-#users=username
-groups=users
-root-groups=root
-script-config=arch32/config
-personality=linux32
-#aliases=32,i686
diff --git a/community-testing/schroot/arch32-mount b/community-testing/schroot/arch32-mount
deleted file mode 100644
index 075d6e451..000000000
--- a/community-testing/schroot/arch32-mount
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount.defaults: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
-proc		/proc		proc	defaults	0	0
-/dev		/dev		none	rw,bind		0	0
-#/dev/pts	/dev/pts	none	rw,bind		0	0
-tmpfs		/dev/shm	tmpfs	defaults	0	0
-/sys		/sys		none	rw,bind		0	0
-/tmp		/tmp		none	rw,bind		0	0
-/home		/home		none	rw,bind		0	0
diff --git a/community-testing/schroot/arch32-nssdatabases b/community-testing/schroot/arch32-nssdatabases
deleted file mode 100644
index 815ddce3f..000000000
--- a/community-testing/schroot/arch32-nssdatabases
+++ /dev/null
@@ -1,6 +0,0 @@
-# System databases to copy into the chroot from the host system.
-#
-# <database name>
-passwd
-shadow
-group
diff --git a/community-testing/schroot/pam.d.schroot.patch b/community-testing/schroot/pam.d.schroot.patch
deleted file mode 100644
index 528acb5f7..000000000
--- a/community-testing/schroot/pam.d.schroot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-@@ -23,13 +23,6 @@
- # time restrainst on schroot usage.
- # account    requisite  pam_time.so
- 
--# The standard Unix authentication modules, used with
--# NIS (man nsswitch) as well as normal /etc/passwd and
--# /etc/shadow entries.
--@include common-auth
--@include common-account
--@include common-session
--
- # Sets up user limits, please uncomment and read /etc/security/limits.conf
- # to enable this functionality.
- # session    required   pam_limits.so
-
diff --git a/community-testing/simh/LICENSE b/community-testing/simh/LICENSE
deleted file mode 100644
index 5b0273020..000000000
--- a/community-testing/simh/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-   Original code published in 1993-2005, written by Robert M Supnik
-   Copyright (c) 1993-2005, Robert M Supnik
-
-   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
-   ROBERT M SUPNIK 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 Robert M Supnik shall not be
-   used in advertising or otherwise to promote the sale, use or other dealings
-   in this Software without prior written authorization from Robert M Supnik.
-
diff --git a/community-testing/simh/PKGBUILD b/community-testing/simh/PKGBUILD
deleted file mode 100644
index 4ad116a82..000000000
--- a/community-testing/simh/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 64589 2012-02-16 20:41:53Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: waterbear <st92.at.freeshell.org>
-
-pkgname=simh
-pkgver=3.8.1
-_pkgver=38-1
-pkgrel=3
-pkgdesc="simulator for assorted historical computers, from Altair to VAX"
-arch=('i686' 'x86_64')
-url="http://simh.trailing-edge.com"
-license=("BSD")
-depends=("libpcap")
-makedepends=("unzip")
-install=simh.install
-source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip"
-	"LICENSE")
-md5sums=('e15f65a82e21ea49e14b438326d93d5c'
-         'd56eefa5d020ee2b77d21280fef80e3d')
-
-build() {
-  cd "$srcdir"
-  mkdir -p BIN
-  find VAX -type f -exec sed -i 's/SIM_INLINE//' {} +
-  make USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -isystem /usr/include -lpcap'
-}
-
-package() {
-  cd "$srcdir/BIN"
-  for i in *; do
-    install -D $i "$pkgdir/usr/bin/simh-$i"
-  done
-
-  cd "$srcdir/VAX"
-  mkdir -p "$pkgdir/usr/lib/simh"
-  cp *.bin "$pkgdir/usr/lib/simh"
-
-  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-testing/simh/simh.install b/community-testing/simh/simh.install
deleted file mode 100644
index 19779ad80..000000000
--- a/community-testing/simh/simh.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo -e "->  The VAX ROM images are located in /usr/lib/simh."
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
diff --git a/community-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD
deleted file mode 100644
index 9bbdc2211..000000000
--- a/community-testing/smc/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 67018 2012-03-03 08:14:00Z ibiru $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=15
-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/spring/PKGBUILD b/community-testing/spring/PKGBUILD
deleted file mode 100644
index 0fa8affa7..000000000
--- a/community-testing/spring/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 67020 2012-03-03 08:14:04Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=0.86.0
-_pkgver=86.0
-pkgrel=2
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
-         'libxcursor')
-makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environment')
-optdepends=('python2: python-based bots'
-            'java-runtime: java-based bots')
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('047511adf2e4cd711df61d556367e7af')
-
-build() {
-  bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
-  
-  cd spring_${_pkgver}
- 
-  cmake	. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring
-  make
-}
-
-package() {
-  cd spring_${_pkgver}
-
-  make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/etc/spring
-  echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
-}
-
-# vim sw=2:ts=2 et:
diff --git a/community-testing/springlobby/PKGBUILD b/community-testing/springlobby/PKGBUILD
deleted file mode 100644
index eb0575480..000000000
--- a/community-testing/springlobby/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 67022 2012-03-03 08:14:16Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: DuGi <dugi@irc.pl>
-
-pkgname=springlobby
-pkgver=0.141
-pkgrel=2
-pkgdesc="A free cross-platform lobby client for the Spring RTS project."
-arch=('i686' 'x86_64')
-url="http://springlobby.info/"
-license=('GPL2')
-depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs')
-optdepends=('sdl' 'sdl_sound' 'sdl_mixer') 
-makedepends=('boost' 'asio' 'cmake')
-install=springlobby.install
-source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 
-        springlobby.desktop
-        springlobby.png)
-md5sums=('a7e5a9b031a1e72a1df59575289fed3f'
-         '45f8b59d033931d02e734fe3bd7777dd'
-         '1f388187539aeb0358b51995e26ed890')
-
-build() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt
-
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOPTION_SOUND=false
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  make DESTDIR=$pkgdir install
-  
-  install -m755 -d $pkgdir/usr/share/applications
-  install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
-
-  install -m755 -d -p $pkgdir/usr/share/pixmaps
-  install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/springlobby/springlobby.desktop b/community-testing/springlobby/springlobby.desktop
deleted file mode 100644
index 1dce96b90..000000000
--- a/community-testing/springlobby/springlobby.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=SpringLobby
-Comment=Lobby for Spring. An open source RTS with similar gameplay to TA
-Exec=springlobby
-Icon=springlobby.png
-Terminal=false
-Type=Application
-Categories=Application;Game;StrategyGame;
diff --git a/community-testing/springlobby/springlobby.install b/community-testing/springlobby/springlobby.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-testing/springlobby/springlobby.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/springlobby/springlobby.png b/community-testing/springlobby/springlobby.png
deleted file mode 100644
index 89c7ab0ac..000000000
--- a/community-testing/springlobby/springlobby.png
+++ /dev/null
diff --git a/community-testing/tagpy/PKGBUILD b/community-testing/tagpy/PKGBUILD
deleted file mode 100644
index 99b9b60b7..000000000
--- a/community-testing/tagpy/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 67024 2012-03-03 08:14:22Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Scott Horowitz <stonecrest@gmail.com>
-
-pkgname=tagpy
-pkgver=0.94.8
-pkgrel=7
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/tagpy"
-license=('MIT')
-depends=('python2' 'taglib' 'boost-libs')
-makedepends=('python2-distribute' 'boost')
-source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6baff63318cf90b9bc5a2497a0597802')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py') 
- 
-  ./configure.py --taglib-lib-dir=/usr/lib/ \
-  	--taglib-inc-dir=/usr/include/taglib/ \
-	--boost-inc-dir=/usr/include/boost/ \
-	--boost-lib-dir=/usr/lib/ \
-	--boost-python-libname=boost_python
-  python2 setup.py build
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-testing/twinkle/PKGBUILD b/community-testing/twinkle/PKGBUILD
deleted file mode 100644
index fec2fb473..000000000
--- a/community-testing/twinkle/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 67026 2012-03-03 08:14:28Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-
-pkgname=twinkle
-pkgver=1.4.2
-pkgrel=15
-pkgdesc="Softphone for voice over IP and IM communication using SIP"
-arch=('x86_64' 'i686')
-url="http://www.twinklephone.com/"
-license=('GPL')
-depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp')
-makedepends=('pkg-config' 'boost')
-source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz"
-        "twinkle.desktop")
-sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
-            '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
-sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5'
-            '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  . /etc/profile.d/qt3.sh
-  ./configure --prefix=/usr \
-	--without-kde \
-	--with-speex \
-	--without-ilbc \
-	--mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \
-    "$pkgdir/usr/share/pixmaps/twinkle.png"
-  install -Dm644 twinkle.desktop \
-    "$pkgdir/usr/share/applications/twinkle.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/twinkle/twinkle.desktop b/community-testing/twinkle/twinkle.desktop
deleted file mode 100644
index 60688b5fe..000000000
--- a/community-testing/twinkle/twinkle.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Twinkle
-Comment=SIP softphone for Qt
-Icon=twinkle.png
-Exec=twinkle
-Terminal=false
-Type=Application
-Categories=Network;
-StartupNotify=false
diff --git a/community-testing/vhba-module/vhba-kernel2.6.37.patch b/community-testing/vhba-module/vhba-kernel2.6.37.patch
deleted file mode 100644
index e2b619c74..000000000
--- a/community-testing/vhba-module/vhba-kernel2.6.37.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9ad7ec7fae387f05249b9f4e6accb3bc3b0b8b0f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 6 Jan 2011 03:39:26 -0500
-Subject: [PATCH] Make vhba compatible with kernel 2.6.37 SCSI host API
-
-Due to the SCSI host lock push-down changes introduced in 2.6.37 (see
-http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f281233d3eba15fb225d21ae2e228fd4553d824a
-for more details), trying to use current vhba on 2.6.37 leads to oopses
-and kernel panics - e.g. see http://bugs.gentoo.org/show_bug.cgi?id=350753
-
-Add some #ifdefs to enable compatibility both with 2.6.37 and older API.
-Note that if future kernel versions remove the DEF_SCSI_QCMD macro, this
-issue will need to be revisited.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
- vhba-module/vhba.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
-index 059f6ce..9d13016 100644
---- a/vhba-module/vhba.c
-+++ b/vhba-module/vhba.c
-@@ -27,6 +27,7 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/slab.h>
-+#include <linux/version.h>
- #ifdef CONFIG_COMPAT
- #include <linux/compat.h>
- #endif
-@@ -363,7 +364,7 @@ static void vhba_free_command(struct vhba_command *vcmd)
-         spin_unlock_irqrestore(&vhost->cmd_lock, flags);
- }
- 
--static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
-+static int vhba_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
- {
-         struct vhba_device *vdev;
-         int retval;
-@@ -388,6 +389,12 @@ static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn
-         return retval;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+DEF_SCSI_QCMD(vhba_queuecommand)
-+#else
-+#define vhba_queuecommand vhba_queuecommand_lck
-+#endif
-+
- static int vhba_abort(struct scsi_cmnd *cmd)
- {
-         struct vhba_device *vdev;
--- 
-1.7.3.4
-
diff --git a/community-testing/virtualbox-modules/60-vboxguest.rules b/community-testing/virtualbox-modules/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/community-testing/virtualbox-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/community-testing/virtualbox-modules/LocalConfig.kmk b/community-testing/virtualbox-modules/LocalConfig.kmk
deleted file mode 100644
index af79f90cd..000000000
--- a/community-testing/virtualbox-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/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD
deleted file mode 100644
index e3c7f13e7..000000000
--- a/community-testing/virtualbox-modules/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 68222 2012-03-19 13:27:46Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
-pkgver=4.1.10
-pkgrel=2
-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')
-[[ $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=('263e495ef3a7ab75943af28d446ee702'
-         '4c88bd122677a35f68abd76eb01b378b'
-         'ed1341881437455d9735875ddf455fbe')
-
-_extramodules=extramodules-3.3-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
-
-export KERN_DIR=/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
-
-build() {
-    cd "$srcdir/VirtualBox-${pkgver}"
-
-    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}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-    make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-archlinux-modules(){
-    pkgdesc="Additions only for Arch Linux guests (kernel modules)"
-    license=('GPL')
-    install=virtualbox-archlinux-modules.install
-    depends=('linux>=3.3' 'linux<3.4')
-    replaces=('virtualbox-guest-modules')
-    conflicts=('virtualbox-guest-modules')
-
-    source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}/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-archlinux-modules.install"
-}
-
-package_virtualbox-modules(){
-    pkgdesc="Kernel modules for VirtualBox"
-    license=('GPL')
-    install=virtualbox-modules.install
-    depends=('linux>=3.3' 'linux<3.4')
-
-    source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
-
-    cd "$srcdir/VirtualBox-${pkgver}/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/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install b/community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
deleted file mode 100644
index e422dc770..000000000
--- a/community-testing/virtualbox-modules/virtualbox-archlinux-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.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/virtualbox-modules/virtualbox-modules.install b/community-testing/virtualbox-modules/virtualbox-modules.install
deleted file mode 100644
index 6426d6643..000000000
--- a/community-testing/virtualbox-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.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.3-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/wesnoth/PKGBUILD b/community-testing/wesnoth/PKGBUILD
deleted file mode 100644
index 35e8b4cd0..000000000
--- a/community-testing/wesnoth/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 67028 2012-03-03 08:14:39Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: 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.10.1
-pkgrel=2
-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" 'dbus-core' 'python2')
-makedepends=('boost' 'cmake')
-install=wesnoth.install
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        wesnoth.tmpfiles.conf
-        wesnothd.rc.d)
-md5sums=('a2ac2d629d4e3e5fc7e7e48f935d9960'
-         'b8122f5054e3895c9c054e87460869dc'
-         '85659b47d22dfdf4e4d046556973fc3e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir build && cd build
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DENABLE_OMP=ON \
-      -DENABLE_TOOLS=ON \
-      -DMANDIR=share/man \
-      -DFIFO_DIR=/var/run/wesnothd
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm -r $pkgdir/usr/share/applications
-  rm -r $pkgdir/usr/share/doc
-  rm -r $pkgdir/usr/share/pixmaps
-  rm -r $pkgdir/usr/share/wesnoth
-
-  install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
-  install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd"
-}
diff --git a/community-testing/wesnoth/wesnoth.install b/community-testing/wesnoth/wesnoth.install
deleted file mode 100644
index 4f1e419ae..000000000
--- a/community-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/community-testing/wesnoth/wesnoth.tmpfiles.conf b/community-testing/wesnoth/wesnoth.tmpfiles.conf
deleted file mode 100644
index 3ec0f6013..000000000
--- a/community-testing/wesnoth/wesnoth.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/wesnothd 0700 root root -
diff --git a/community-testing/wesnoth/wesnothd.rc.d b/community-testing/wesnoth/wesnothd.rc.d
deleted file mode 100755
index 95e312b7b..000000000
--- a/community-testing/wesnoth/wesnothd.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/wesnothd)
-
-case "$1" in
-  start)
-    stat_busy "Starting Wesnoth Server Daemon"
-    [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd
-    [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/wesnothd)
-      echo $PID > /var/run/wesnotd/pid
-      add_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Wesnoth Server Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/wt/PKGBUILD b/community-testing/wt/PKGBUILD
deleted file mode 100644
index f77371f96..000000000
--- a/community-testing/wt/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 67030 2012-03-03 08:14:45Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Denis Martinez <deuns.martinez@gmail.com>
-
-pkgname=wt
-pkgver=3.2.0
-pkgrel=3
-pkgdesc="a C++ library and application server for developing and deploying web applications"
-arch=('i686' 'x86_64')
-url="http://www.webtoolkit.eu/"
-license=('GPL')
-depends=('boost-libs>=1.36')
-makedepends=('boost>=1.36' 'cmake>=2.8'
-	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite3' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
-optdepends=('openssl: for SSL support in built-in webserver'
-	    'zlib: for compression in HTTP protocol'
-	    'fcgi: for FastCGI support'
-	    'postgresql-libs: for PostgreSQL Dbo support'
-	    'sqlite3: for Sqlite3 Dbo support'
-	    'libharu: for PDF generation (WPdfImage)'
-	    'graphicsmagick: for raster image support (WRasterImage)'
-	    'pango: for advanced font rendering (WRasterImage)'
-	    'mysql++: for the hangman example'
-	    'qt: for the Wt/Qt interopability example (wtwithqt)')
-backup=('etc/wt/wt_config.xml')
-source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz)
-md5sums=('82ff039bccf7a941b37142c9d3fc7f32')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  mkdir -p build
-  cd build
-  cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \
-    -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
-    -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" ..
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/build
-  make DESTDIR=${pkgdir} install
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/wt/wt-boost-1.47.patch b/community-testing/wt/wt-boost-1.47.patch
deleted file mode 100644
index 919e1371f..000000000
--- a/community-testing/wt/wt-boost-1.47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt
---- wt-3.1.10.q/src/CMakeLists.txt	2011-07-26 00:58:19.000000000 +0400
-+++ wt-3.1.10/src/CMakeLists.txt	2011-06-24 18:51:54.000000000 +0400
-@@ -236,6 +236,7 @@
- web/TimeUtil.C
- web/XSSFilter.C
- web/XSSUtils.C
-+web/random_device.cpp
- web/base64.cpp
- Plain_html.C
- Boot_html.C
diff --git a/community-testing/xmobar/PKGBUILD b/community-testing/xmobar/PKGBUILD
deleted file mode 100644
index 79473dbb6..000000000
--- a/community-testing/xmobar/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 66887 2012-02-29 21:19:14Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.4
-
-pkgname=xmobar
-pkgver=0.14
-pkgrel=2
-pkgdesc="A Minimalistic Text Based Status Bar"
-url="http://hackage.haskell.org/package/xmobar"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc>=7.0.2' 'haskell-x11>=1.3.0' 'haskell-x11-xft>=0.2' 'haskell-utf8-string'
-	     'haskell-stm' 'haskell-parsec>=3' 'haskell-mtl>=2')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
-md5sums=('b965e2db0555c741db96945210995777')
-
-build() {
-    cd ${srcdir}/xmobar-$pkgver
-#    runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_alsa with_inotify with_iwlib"
-    runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib"
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/xmobar-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-testing/xmonad-contrib/PKGBUILD b/community-testing/xmonad-contrib/PKGBUILD
deleted file mode 100644
index 818b767b8..000000000
--- a/community-testing/xmonad-contrib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 66891 2012-02-29 21:19:38Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: orbisvicis <gmail.com>
-
-pkgname=xmonad-contrib
-pkgver=0.10
-pkgrel=2
-pkgdesc="Add-ons for xmonad"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-2' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
-install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
-}
diff --git a/community-testing/xmonad-contrib/xmonad-contrib.install b/community-testing/xmonad-contrib/xmonad-contrib.install
deleted file mode 100644
index e9208c833..000000000
--- a/community-testing/xmonad-contrib/xmonad-contrib.install
+++ /dev/null
@@ -1,17 +0,0 @@
-HS_DIR=usr/share/haskell/xmonad-contrib
-
-post_install() {
-  ${HS_DIR}/register.sh
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD
deleted file mode 100644
index cbbfeab39..000000000
--- a/community-testing/xmonad/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 66889 2012-02-29 21:19:32Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: shild <shildv@gmail.com>
-
-pkgname=xmonad
-pkgver=0.10
-pkgrel=3
-pkgdesc="A lightweight X11 tiled window manager written in Haskell"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.4.1' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.7')
-optdepends=('xorg-xmessage: for displaying visual error messages')
-install='xmonad.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-	xmonad.desktop
-	xmonad.session
-	xmonad.svg)
-md5sums=('f8381e1ec15137863558a454d4466467'
-         'f8e3d84a9f154d1b5d7fcffbc0a058c9'
-         '9d1bc84a7f32897d32f3fc71ef76228e'
-         '72bfa5e62e4e44fe7fa59b6a7593d993')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-#  runhaskell util/GenerateManpage.hs
-
-  install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
-
-  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
-  install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session
-  install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
-}
diff --git a/community-testing/xmonad/xmonad.desktop b/community-testing/xmonad/xmonad.desktop
deleted file mode 100644
index 0af0f2d9b..000000000
--- a/community-testing/xmonad/xmonad.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Xmonad GNOME
-Comment=Tiling window manager
-TryExec=/usr/bin/gnome-session
-Exec=gnome-session --session=xmonad
-Type=XSession
-Icon=/usr/share/pixmaps/xmonad.svg
diff --git a/community-testing/xmonad/xmonad.install b/community-testing/xmonad/xmonad.install
deleted file mode 100644
index 6659247db..000000000
--- a/community-testing/xmonad/xmonad.install
+++ /dev/null
@@ -1,22 +0,0 @@
-HS_DIR=/usr/share/haskell/xmonad
-
-post_install() {
-    ${HS_DIR}/register.sh
-    echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
-    echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
-    echo 
-    echo "If you would like to run xmonad as a window manager inside GNOME, please see"
-    echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-testing/xmonad/xmonad.png b/community-testing/xmonad/xmonad.png
deleted file mode 100644
index d957f62f8..000000000
--- a/community-testing/xmonad/xmonad.png
+++ /dev/null
diff --git a/community-testing/xmonad/xmonad.session b/community-testing/xmonad/xmonad.session
deleted file mode 100644
index c0bd16781..000000000
--- a/community-testing/xmonad/xmonad.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Xmonad session
-RequiredComponents=gnome-panel;gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=xmonad
-DefaultProvider-notifications=notification-daemon
diff --git a/community-testing/xmonad/xmonad.svg b/community-testing/xmonad/xmonad.svg
deleted file mode 100644
index 5fc884213..000000000
--- a/community-testing/xmonad/xmonad.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2211"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   width="47"
-   height="73"
-   version="1.0"
-   sodipodi:docbase="/home/sjanssen/xmonad-web/images"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata2216">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2214" />
-  <sodipodi:namedview
-     inkscape:window-height="778"
-     inkscape:window-width="1278"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="4"
-     inkscape:cx="23.5"
-     inkscape:cy="22.689137"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:current-layer="g3208" />
-  <g
-     id="g3208"
-     transform="translate(-44.517797,4.0967298)">
-    <g
-       id="g3212"
-       transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)">
-      <path
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462"
-         id="text2220"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path3206"
-         d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349"
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         sodipodi:nodetypes="ccccccccc" />
-    </g>
-    <path
-       style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z "
-       id="text3216"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
-  </g>
-</svg>
diff --git a/community/asciijump/PKGBUILD b/community/asciijump/PKGBUILD
deleted file mode 100644
index 3be130f09..000000000
--- a/community/asciijump/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 21656 2010-07-16 21:29:57Z lcarlier $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=asciijump
-pkgver=1.0.2beta
-pkgrel=5
-pkgdesc="Ski jumping in ASCII"
-arch=('i686' 'x86_64')
-url="http://asciijump.prv.pl/"
-license=('GPL')
-depends=('slang' 'ctags')
-source=("http://otak.k-k.pl/asciijump/tgz/asciijump-1.0.2beta.tar.gz")
-md5sums=('199228bbfb4a16914913fe594b775a6d')
-
-build() {
-	cd ${srcdir}/asciijump-$pkgver
-
-	./configure --prefix=/usr --mandir=/usr/share/man
-	make
-}
-
-package() {
-	cd ${srcdir}/asciijump-$pkgver
-
-	make DESTDIR="$pkgdir" install
-	chmod -R 775 ${pkgdir}/usr/var/games
-	chown -R root:games ${pkgdir}/usr/var/games
-	rm -rf ${pkgdir}/usr/share/pixmaps
-	mv ${pkgdir}/usr/X11R6/share/pixmaps $startdir/pkg/usr/share/pixmaps
-	rm -rf ${pkgdir}/usr/X11R6
-}
-
diff --git a/community/bbpager/fix-shm-linking-ugly.diff b/community/bbpager/fix-shm-linking-ugly.diff
deleted file mode 100644
index 630218af7..000000000
--- a/community/bbpager/fix-shm-linking-ugly.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -d -r -N -- bbpager-0.4.7/configure.ac bbpager-0.4.7b/configure.ac
---- bbpager-0.4.7/configure.ac	2008-01-14 18:03:50.000000000 +0100
-+++ bbpager-0.4.7b/configure.ac	2010-07-17 10:36:04.042040059 +0200
-@@ -68,7 +68,7 @@
- dnl pkgconfig checks for blackbox library
- PKG_CHECK_MODULES(LIBBT, libbt)
- CXXFLAGS="$CXXFLAGS $LIBBT_CFLAGS"
--LIBS="$LIBS $LIBBT_LIBS"
-+LIBS="$LIBS $LIBBT_LIBS -lXext"
- 
- dnl generate the config header
- AM_CONFIG_HEADER(config.h) 
diff --git a/community/buoh/ChangeLog b/community/buoh/ChangeLog
deleted file mode 100644
index 12ed723c2..000000000
--- a/community/buoh/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-04-06  Eric Belanger  <eric@archlinux.org>
-
-	* buoh-0.8.2-3
-	* rebuilt against libsoup 2.4
-	* added ChangeLog
diff --git a/community/cairo-compmgr/PKGBUILD b/community/cairo-compmgr/PKGBUILD
deleted file mode 100644
index dde0b7713..000000000
--- a/community/cairo-compmgr/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 56292 2011-10-05 06:05:11Z bluewind $
-# Maintainer: Florian Pritz <flo@xinu.at>
-# Contributor: Adam Hani Schakaki (krzd) <krzd@krzd.net>
-# Contributor: Det <nimetonmaili at gmail a-dot com>
-# Contributor: catalyst <catalyst@xaker.ru>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: jackobw
-# Contributor: Gianni Vialetto <g dot vialetto at gmail dot com>
-
-pkgname=cairo-compmgr
-pkgver=git20111002
-_commit=348f149af30bc829c2100d0e622c5dcaf43925b7
-pkgrel=1
-epoch=1
-pkgdesc="A Cairo based composite manager"
-arch=(i686 x86_64)
-url="http://cairo-compmgr.tuxfamily.org/"
-license=(GPL)
-makedepends=(gettext gtk-doc "intltool>=0.41" git)
-depends=("gtk2>=2.16.0" "vala>=0.14" libsm gconf)
-install=cairo-compmgr.install
-options=(!libtool)
-#source=(http://download.tuxfamily.org/ccm/$pkgname/$pkgname-$pkgver.tar.gz)
-source=()
-md5sums=()
-
-__gitroot="git://git.tuxfamily.org/gitroot/ccm/cairocompmgr.git"
-__gitname="cairo-compmgr"
-
-
-build() {
-#  cd "$srcdir/$pkgname-$pkgver"
-  cd "$srcdir"
-
-  msg "Connecting to GIT server...."
-
-  if [ -d $__gitname ] ; then
-    cd $__gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $__gitroot $__gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-  git checkout "$_commit"
-
-#  sed -i 's!vala-0.10!libvala-0.12!' vapi/cairo-compmgr.deps configure.ac
-  ./autogen.sh --prefix=/usr
-  make -j1
-}
-
-package() {
-  #cd "$srcdir/$pkgname-$pkgver"
-  cd "$srcdir/$__gitname-build"
-
-  make DESTDIR="$pkgdir" install
-  mkdir -p "$pkgdir/usr/share/gconf/schemas/"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/cairo-compmgr.schemas" "$pkgdir/etc/gconf/schemas/*.schemas"
-  rm -rf "$pkgdir/etc/gconf/schemas/"
-}
diff --git a/community/cairo-compmgr/cairo-compmgr.install b/community/cairo-compmgr/cairo-compmgr.install
deleted file mode 100644
index 21c829413..000000000
--- a/community/cairo-compmgr/cairo-compmgr.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  gconfpkg --install cairo-compmgr
-}
-
-pre_upgrade() {
-  gconfpkg --uninstall cairo-compmgr
-}
-
-post_upgrade() {
-  gconfpkg --install cairo-compmgr
-}
-
-pre_remove() {
-  gconfpkg --uninstall cairo-compmgr
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
deleted file mode 100644
index c09c8a4ab..000000000
--- a/community/calibre/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 68373 2012-03-23 10:53:05Z 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.44
-pkgrel=1
-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' 'python2-lxml' 'libusb' 
-         'python-imaging' 'shared-mime-info' 'python-dnspython' 
-         'libunrar' 'python2-pyqt' 'icu')
-makedepends=('python2-pycountry')
-optdepends=('ipython2: to use calibre-debug')
-install=calibre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'desktop_integration.patch'
-        'calibre-mount-helper')
-md5sums=('7cb3983a0458d20df982300b310df3be'
-         'c7eaa8ed3d2b0a09345aecffa1402ff4'
-         '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/calibre/calibre-mount-helper b/community/calibre/calibre-mount-helper
deleted file mode 100755
index 00cac4270..000000000
--- a/community/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/calibre/calibre.install b/community/calibre/calibre.install
deleted file mode 100644
index 6210bd0ab..000000000
--- a/community/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/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch
deleted file mode 100644
index 73037b6a7..000000000
--- a/community/calibre/desktop_integration.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- a/src/calibre/linux.py	2012-03-16 03:42:45.000000000 +0100
-+++ b/src/calibre/linux.py	2012-03-21 08:06:35.000000000 +0100
-@@ -140,18 +140,6 @@
-         self.install_man_pages()
-         if islinux or isbsd:
-             self.setup_desktop_integration()
--        self.create_uninstaller()
--
--        from calibre.utils.config import config_dir
--        if os.path.exists(config_dir):
--            os.chdir(config_dir)
--            if islinux or isbsd:
--                for f in os.listdir('.'):
--                    if os.stat(f).st_uid == 0:
--                        import shutil
--                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
--                if os.stat(config_dir).st_uid == 0:
--                    os.rmdir(config_dir)
- 
-         if warn is None and self.warnings:
-             self.info('There were %d warnings'%len(self.warnings))
-@@ -198,7 +186,7 @@
-                 if isnetbsd:
-                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
-                 else:
--                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-+                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
-             if not os.path.exists(os.path.dirname(f)):
-                 os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -305,7 +293,7 @@
-             if isbsd:
-                 manpath = os.path.join(self.opts.staging_root, 'man/man1')
-             else:
--                manpath = os.path.join(self.opts.staging_sharedir, 'man/man1')
-+                manpath = os.path.join(self.opts.staging_root, 'usr/share/man/man1')
-             if not os.path.exists(manpath):
-                 os.makedirs(manpath)
-             self.info('Installing MAN pages...')
-@@ -321,7 +309,7 @@
-                 if isbsd:
-                     manfile = os.path.join(manpath, prog+'.1')
-                 else:
--                    manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-+                    manfile = os.path.join(manpath, prog+'.1'+'.bz2')
-                 self.info('\tInstalling MAN page for', prog)
-                 open(manfile, 'wb').write(raw)
-                 self.manifest.append(manfile)
-@@ -339,51 +327,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
-@@ -521,7 +497,7 @@
- [Desktop Entry]
- Version=1.0
- Type=Application
--Name=calibre
-+Name=Calibre
- GenericName=E-book library management
- Comment=E-book library management: Convert, view, share, catalogue all your e-books
- TryExec=calibre
diff --git a/community/cdemu-daemon/60-vhba.rules b/community/cdemu-daemon/60-vhba.rules
deleted file mode 100644
index 5ee03c807..000000000
--- a/community/cdemu-daemon/60-vhba.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
diff --git a/community/cdemu-daemon/cdemud.install b/community/cdemu-daemon/cdemud.install
deleted file mode 100644
index 699b3f0e5..000000000
--- a/community/cdemu-daemon/cdemud.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install () {
-  echo ">> Place 'cdemud' in DAEMONS= in /etc/rc.conf to enable cdemud on system boot."
-  echo ">> If the alsa-lib package is installed, cdemud can use the ALSA audio backend"
-  echo ">> (edit /etc/conf.d/cdemud to enable this)."
-  groupadd cdemu
-}
-post_remove() {
-  groupdel cdemu
-}
diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD
deleted file mode 100644
index ec59807bb..000000000
--- a/community/cwiid/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63522 2012-02-05 11:53:14Z 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/cwiid/bluez4.patch b/community/cwiid/bluez4.patch
deleted file mode 100644
index dbbc790c5..000000000
--- a/community/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/cwiid/cwiid.install b/community/cwiid/cwiid.install
deleted file mode 100644
index 05e698be7..000000000
--- a/community/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/darcs/PKGBUILD b/community/darcs/PKGBUILD
deleted file mode 100644
index d23e917a5..000000000
--- a/community/darcs/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 116991 2011-03-27 10:10:32Z remy $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Simo Leone <neotuli@gmail.com>
-
-pkgname=darcs
-pkgver=2.5.2
-pkgrel=1.1
-pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics"
-arch=(i686 x86_64)
-url="http://darcs.net/"
-license=('GPL')
-depends=('curl' 'gmp' 'ncurses>=5.6-7')
-makedepends=('ghc' 'haskell-tar<0.4' 'haskell-text<0.12'
-    'haskell-hashed-storage<0.6' 'haskell-haskeline<0.7'
-    'haskell-html<1.1' 'haskell-parsec<3.2' 'haskell-regex-compat<0.94')
-source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz")
-md5sums=('491b6ca01dec245a16112ad2c7e07dc1')
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-    runhaskell Setup.lhs configure --ghc -O --prefix=/usr \
-         --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup.lhs build
-}
-
-check() {
-    cd ${srcdir}/$pkgname-$pkgver
-    runhaskell Setup.lhs test
-}
-
-package() {
-    cd $srcdir/$pkgname-$pkgver
-    runhaskell Setup.lhs copy --destdir=$pkgdir
-    rm -r $pkgdir/usr/lib/ 
-    chmod 755 $pkgdir/usr/share/man/man1/$pkgname.1   
-}
-
diff --git a/community/directfb/directfb.changelog b/community/directfb/directfb.changelog
deleted file mode 100644
index 721fd1deb..000000000
--- a/community/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/flac123/ChangeLog b/community/flac123/ChangeLog
deleted file mode 100644
index 72fa008c4..000000000
--- a/community/flac123/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-11-09 Corrado Primier <bardo@aur.archlinux.org>
-
-	* Adopted and built for [community]
diff --git a/community/gadmin-samba/PKGBUILD b/community/gadmin-samba/PKGBUILD
deleted file mode 100644
index 316fb2624..000000000
--- a/community/gadmin-samba/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <flo@xinu.at>
-# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
-# Contributor: Marcin Kaczorek <kaczus@karek.pl>
-
-pkgname=gadmin-samba
-pkgver=0.3.2
-pkgrel=1
-pkgdesc="An easy to use GTK+ frontend for the SAMBA file and print server"
-url="http://gadmintools.flippedweb.com/index.php?option=com_content&task=view&id=16&Itemid=30"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2' 'samba')
-replaces=('gsambad')
-install=gadmin-samba.install
-source=("http://mange.dynalias.org/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-options=(!emptydirs)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --localstatedir=/var --sbindir=/usr/sbin
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 desktop/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
-md5sums=('14e2ca42b4826c3d87492965d310e631')
diff --git a/community/gadmin-samba/gadmin-samba.install b/community/gadmin-samba/gadmin-samba.install
deleted file mode 100644
index e8a5f5151..000000000
--- a/community/gadmin-samba/gadmin-samba.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	echo "See /usr/share/gadmin-samba/example.bat for an example of logon script"
-}
-
-op=$1
-shift
-$op $*
diff --git a/community/gadmin-samba/makefile.patch b/community/gadmin-samba/makefile.patch
deleted file mode 100644
index 54998fbb1..000000000
--- a/community/gadmin-samba/makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in	2008-05-25 17:44:34.000000000 +0200
-+++ Makefile.in.new	2008-08-10 15:12:37.000000000 +0200
-@@ -677,11 +677,11 @@
- 	   cp scripts/gadmin-samba-pdf $(bindir)/; \
- 	fi;
- 	@echo Installing example logon script to static /home/netlogon.
--	if test ! -d /home/netlogon; then \
--	   mkdir -p /home/netlogon; \
-+	if test ! -d $(DESTDIR)/usr/share/gadmin-samba; then \
-+	   mkdir -p $(DESTDIR)/usr/share/gadmin-samba; \
- 	fi;
--	if test -d /home/netlogon && test ! -f /home/netlogon/example.bat; then \
--	   cp scripts/example.bat /home/netlogon/; \
-+	if test -d $(DESTDIR)/usr/share/gadmin-samba && test ! -f $(DESTDIR)/usr/share/gadmin-samba/example.bat; then \
-+	   cp scripts/example.bat $(DESTDIR)/usr/share/gadmin-samba/; \
- 	fi;
- 	@echo ""
- 	@echo "Start GADMIN-SAMBA by typing gadmin-samba in a terminal"
diff --git a/community/gdmap/fix_deprecated_GTK_WIDGET_SENSITIVE.diff b/community/gdmap/fix_deprecated_GTK_WIDGET_SENSITIVE.diff
deleted file mode 100644
index 38122ed96..000000000
--- a/community/gdmap/fix_deprecated_GTK_WIDGET_SENSITIVE.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur ../gdmap-0.8.1/src/gui_support.c .//src/gui_support.c
---- ../gdmap-0.8.1/src/gui_support.c	2008-05-23 09:54:28.000000000 -0500
-+++ .//src/gui_support.c	2010-07-22 02:52:43.489842704 -0500
-@@ -85,7 +85,7 @@
-   const char* text;
- 
-   (void)event;
--  if (GTK_WIDGET_SENSITIVE(label)) {
-+  if (gtk_widget_get_sensitive(label)) {
-     char* temp;
- 
-     text = g_object_get_data(G_OBJECT(label), "label");
-@@ -106,7 +106,7 @@
- 
-   (void)event;
-   //  if (GTK_WIDGET_HAS_FOCUS(gtk_widget_get_parent(GTK_WIDGET(label)))) return TRUE;
--/*   if (GTK_WIDGET_SENSITIVE(label)) { */
-+/*   if (gtk_widget_get_sensitive(label)) { */
-     text = g_object_get_data(G_OBJECT(label), "label");
-     temp = g_strdup_printf(EVENT_FMT, text);
-     gtk_label_set_markup(label, temp);
-@@ -129,7 +129,7 @@
- void ui_event_label_set_sensitive(GtkWidget* ebox, gboolean set) {
-   gpointer callback = g_object_get_data(G_OBJECT(ebox), "callback");
-   GtkWidget* child = GTK_BIN(ebox)->child;
--  if (GTK_WIDGET_SENSITIVE(child) == set) return;
-+  if (gtk_widget_get_sensitive(child) == set) return;
- 
-   if (set && !callback) return;
-   gtk_widget_set_sensitive(child, set);
diff --git a/community/gnubiff-gtk/build.patch b/community/gnubiff-gtk/build.patch
deleted file mode 100644
index 523b0557e..000000000
--- a/community/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/gnunet-gtk/drop_gtk2.patch b/community/gnunet-gtk/drop_gtk2.patch
deleted file mode 100644
index 1ae4fda1f..000000000
--- a/community/gnunet-gtk/drop_gtk2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur gnunet-gtk-0.9.0pre3.orig/configure.ac gnunet-gtk-0.9.0pre3/configure.ac
---- gnunet-gtk-0.9.0pre3.orig/configure.ac	2011-10-12 06:30:21.001993062 +0000
-+++ gnunet-gtk-0.9.0pre3/configure.ac	2011-10-12 06:30:50.695578118 +0000
-@@ -169,7 +169,6 @@
- AC_MSG_CHECKING(for gtk)
- without_gtk=true
- AM_PATH_GTK_3_0(3.0.0,without_gtk=false,)
--AM_PATH_GTK_2_0(2.6.0,without_gtk=false,)
- AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
- if test $without_gtk != true
- then
diff --git a/community/go/go.install b/community/go/go.install
deleted file mode 100644
index 6d11cdbbc..000000000
--- a/community/go/go.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-  echo
-  echo "Source /etc/profile.d/go.sh or relogin"
-  echo
-}
diff --git a/community/gstm/PKGBUILD b/community/gstm/PKGBUILD
deleted file mode 100644
index 985683dbe..000000000
--- a/community/gstm/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 5679 2009-11-14 00:54:15Z ibiru $
-# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gstm
-pkgver=1.2
-pkgrel=2
-pkgdesc="Gnome front-end to ssh tunneling"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/gstm/"
-license=('GPL')
-depends=('libgnomeui')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/sourceforge/gstm/gstm-$pkgver.tar.gz)
-md5sums=('7fa71b86969d8d695c3b062780a5694e')
-
-build() {
-  cd $startdir/src/gstm-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/community/haskell-dbus/PKGBUILD b/community/haskell-dbus/PKGBUILD
deleted file mode 100644
index 316df37f3..000000000
--- a/community/haskell-dbus/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7
-# Maintainer: Jelle van der Waa <jelle vdwaa nl>
-#
-_hkgname=DBus
-pkgname=haskell-dbus
-pkgver=0.4
-pkgrel=1
-pkgdesc="DBus bindings"
-url="http://hackage.haskell.org/package/DBus"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3' 'sh')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/DBus/0.4/DBus-0.4.tar.gz
-	dbus-0.4.patch)
-install=haskell-dbus.install
-md5sums=('5658e4b2acfca27151222e8dc8adeed0'
-	 '964d3a42b4ffcfa741fc75be99d485b7')
-build() {
-    cd ${srcdir}/DBus-$pkgver
-    patch -p1 -i ${srcdir}/dbus-0.4.patch
-    runhaskell Setup configure -O -p \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid \
-        --enable-split-objs --enable-shared
-    runhaskell Setup build                   
-    runhaskell Setup haddock 
-    runhaskell Setup register   --gen-script 
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/$pkgname/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/$pkgname/unregister.sh
-    install -d -m755 $pkgdir/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/DBus
-    runhaskell Setup copy --destdir=${pkgdir} 
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE 
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community/haskell-dbus/dbus-0.4.patch b/community/haskell-dbus/dbus-0.4.patch
deleted file mode 100644
index b983801cf..000000000
--- a/community/haskell-dbus/dbus-0.4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aru DBus-0.4/DBus/Internal.hsc DBus-0.4.new/DBus/Internal.hsc
---- DBus-0.4/DBus/Internal.hsc	2008-09-08 01:28:20.000000000 +0200
-+++ DBus-0.4.new/DBus/Internal.hsc	2011-02-15 08:07:45.222787595 +0100
-@@ -9,7 +9,7 @@
- 
- module DBus.Internal where
- 
--import Control.Exception (throwDyn)
-+import Control.Exception (throwIO)
- import Control.Monad (when)
- import DBus (Error(..))
- import Foreign
-@@ -57,6 +57,6 @@
-       else do name <- #{peek DBusError, name} err >>= peekCString
-               msg  <- #{peek DBusError, message} err >>= peekCString
-               error_free err
--              throwDyn $ Error name msg
-+              throwIO $ Error name msg
- 
- -- vim: set ts=2 sw=2 tw=72 et ft=haskell :
-diff -aru DBus-0.4/DBus.cabal DBus-0.4.new/DBus.cabal
---- DBus-0.4/DBus.cabal	2008-09-08 01:28:20.000000000 +0200
-+++ DBus-0.4.new/DBus.cabal	2011-02-15 08:09:19.376168928 +0100
-@@ -11,7 +11,8 @@
- description:    Bindings for the D-Bus API.
-   For details on D-Bus, see the D-Bus wiki at:
-   <http://www.freedesktop.org/wiki/Software/dbus>
--build-depends:  base, bytestring
-+build-depends:  base >= 4, bytestring
-+pkgconfig-depends:  dbus-1
- build-type:     Configure
- extensions:     ForeignFunctionInterface, OverlappingInstances,
-                 ExistentialQuantification
-diff -aru DBus-0.4/DBus.hsc DBus-0.4.new/DBus.hsc
---- DBus-0.4/DBus.hsc	2008-09-08 01:28:20.000000000 +0200
-+++ DBus-0.4.new/DBus.hsc	2011-02-15 08:08:49.974771904 +0100
-@@ -2,7 +2,7 @@
- -- Copyright (C) 2006 Evan Martin <martine@danga.com>
- 
- #define DBUS_API_SUBJECT_TO_CHANGE
--#include "dbus/dbus.h"
-+#include <dbus/dbus.h>
- 
- module DBus (
-   module DBus.Shared,
-@@ -24,6 +24,7 @@
- 
- import DBus.Shared
- import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
-+import Control.Exception
- 
- -- |'Error's carry a name (like \"org.freedesktop.dbus.Foo\") and a
- -- message (like \"connection failed\").
-@@ -32,5 +33,6 @@
-   typeOf _ = mkTyConApp (mkTyCon "DBus.Error") []
- instance Show Error where
-   show (Error name message) = "D-Bus Error (" ++ name ++ "): " ++ message
-+instance Exception Error
- 
- -- vim: set ts=2 sw=2 tw=72 et ft=haskell :
diff --git a/community/haskell-dbus/haskell-dbus.install b/community/haskell-dbus/haskell-dbus.install
deleted file mode 100644
index 284164971..000000000
--- a/community/haskell-dbus/haskell-dbus.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-dbus
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/haskell-mmap/PKGBUILD b/community/haskell-mmap/PKGBUILD
deleted file mode 100644
index b1002be46..000000000
--- a/community/haskell-mmap/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=mmap
-pkgname=haskell-mmap
-pkgver=0.5.7
-pkgrel=3.2
-pkgdesc="Memory mapped files for POSIX and Windows"
-url="http://hackage.haskell.org/package/mmap"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1f74b3f59617332b06e277f5212423c1')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community/haskell-mmap/haskell-mmap.install b/community/haskell-mmap/haskell-mmap.install
deleted file mode 100644
index 68fe74f4e..000000000
--- a/community/haskell-mmap/haskell-mmap.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mmap
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog
deleted file mode 100644
index 1790b3400..000000000
--- a/community/homebank/homebank.changelog
+++ /dev/null
@@ -1,17 +0,0 @@
-2010-03-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* homebank 4.4-1
-
-2010-06-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 4.3
-
-2010-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 4.2.1
-
-2010-02-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 4.2
-
-2009-11-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 4.1
-
-2008-11-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 4.0
diff --git a/community/hostapd/config.bz2 b/community/hostapd/config.bz2
deleted file mode 100644
index 5c85415bb..000000000
--- a/community/hostapd/config.bz2
+++ /dev/null
diff --git a/community/jbig2dec/jbig2dec-0.11-libpng15.patch b/community/jbig2dec/jbig2dec-0.11-libpng15.patch
deleted file mode 100644
index c18ccb7af..000000000
--- a/community/jbig2dec/jbig2dec-0.11-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -45,7 +45,7 @@
-   fi
-   dnl libpng requires pow() which may be in libm
-   AC_SEARCH_LIBS([pow], [m])
--  AC_CHECK_LIB([png], [png_check_sig], [
-+  AC_CHECK_LIB([png], [png_sig_cmp], [
-     AC_CHECK_LIB([z], [deflate], [
-       AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
-       LIBS="-lpng -lz $LIBS"
---- jbig2_image_png.c
-+++ jbig2_image_png.c
-@@ -33,7 +33,7 @@
- {
-     png_size_t check;
- 
--    check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
-+    check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
-     if (check != length) {
-       png_error(png_ptr, "Write Error");
-     }
-@@ -43,7 +43,7 @@
- jbig2_png_flush(png_structp png_ptr)
- {
-     png_FILE_p io_ptr;
--    io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-+    io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
-     if (io_ptr != NULL)
-         fflush(io_ptr);
- }
diff --git a/community/kdesvn/kdesvn.changelog b/community/kdesvn/kdesvn.changelog
deleted file mode 100644
index c2309dab2..000000000
--- a/community/kdesvn/kdesvn.changelog
+++ /dev/null
@@ -1,54 +0,0 @@
-2010-09-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5.5
-
-2010-04-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5.3
-
-2010-01-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5.1
-
-2010-01-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.5.0
-
-2009-10-01 Biru Ionut <ionut@archlinux.ro>
-	* Update to major release 1.4.1
-
-2009-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.3.2
-
-2009-05-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.3.1
-
-2009-05-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#14602 fixed in 1.3.0-2
-
-2009-04-30 Biru Ionut <biru.ionut@gmail.com>
-	* rebuild for x86_64 #FS14506 
-
-2009-04-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.3.0
-
-2009-02-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.2.4
-
-2009-01-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.2.3
-
-2008-11-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.2.2
-
-2008-10-08  Eric Belanger  <eric@archlinux.org>
-	* Removed unneede file sourcing
-
-2008-10-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Removed conflicting files in 1.2.1-2
-	* The one provided with kdesdk are more complete.
-
-2008-10-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.2.1 - KDE4 version
-
-2008-09-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.0.2
-
-2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.0.1
diff --git a/community/lastfm-client/PKGBUILD b/community/lastfm-client/PKGBUILD
deleted file mode 100644
index 85f5530ac..000000000
--- a/community/lastfm-client/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 34579 2010-12-09 22:20:48Z mherych $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=lastfm-client
-pkgver=1.5.4.26862
-pkgrel=4
-pkgdesc="The Last.fm client"
-arch=('i686' 'x86_64')
-url="http://www.last.fm/tools/downloads/"
-license=('GPL')
-depends=('libpng' 'libjpeg' 'libxinerama' 'libxi' 'fontconfig' 'alsa-lib' 'libxcursor' 'libsm' 'libxrandr' 'qt' 'fftw' 'libsamplerate' 'libmad')
-optdepends=('libgpod: iPod support')
-source=(http://ftp.de.debian.org/debian/pool/main/l/lastfm/lastfm_$pkgver+dfsg.orig.tar.gz
-        lastfm.desktop
-        build-fixes.diff
-        set-firstrun-status.diff
-        set-locale.diff
-        makefile-qt45.patch
-        qt46.diff)
-md5sums=('c7991fd2636ca25e68ff476578b506a6'
-         '9c5e444704d49cff7b1dc916f290bad0'
-         'ae0e4a94af0d9e38172f064642a32e20'
-         '494d7c336b09c7d579dad3cc7d7bc627'
-         '1aeec4db77dc7cbc8e4660f127485599'
-         'bea1168abcacef30832bb1e88a25b5f3'
-         '8f9af912aa7eb84ef8d941bccdf6ee66')
-
-build() {
-   cd "$srcdir/lastfm-$pkgver+dfsg"
-   patch -Np1 -i ../build-fixes.diff
-   patch -Np1 -i ../set-locale.diff
-   patch -Np1 -i ../set-firstrun-status.diff 
-   patch -Np1 -i ../qt46.diff
-   ./configure
-   MAKEFLAGS=-j1 make src/Makefile
-   patch -Np1 -i ../makefile-qt45.patch
-   MAKEFLAGS=-j1 make
-   (   make || (mv build/fplib/libfplib_debug.a build/fplib/libfplib.a && make ) )
-}
-
-package() {
-        cd "$srcdir/lastfm-$pkgver+dfsg"
-	mkdir -p $pkgdir/opt $pkgdir/usr/bin
-	cp -rp bin/ $pkgdir/opt/last.fm
-	mkdir -p $pkgdir/opt $pkgdir/usr/bin
-	cp -rp  bin/ $pkgdir/opt/last.fm
-	printf "#!/bin/sh\nexec /opt/last.fm/last.fm.sh\n" > $pkgdir/usr/bin/lastfm
-	chmod +x $pkgdir/usr/bin/lastfm
-	install -D -m 644 $srcdir/lastfm.desktop $pkgdir/usr/share/applications/lastfm.desktop
-}
diff --git a/community/lastfm-client/build-fixes.diff b/community/lastfm-client/build-fixes.diff
deleted file mode 100644
index 5e7553434..000000000
--- a/community/lastfm-client/build-fixes.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/LastFM.pro
-+++ b/LastFM.pro
-@@ -41,8 +41,7 @@
-     SUBDIRS -= src/Twiddly \
-                src/Bootstrapper/ITunesDevice
- 
--    SUBDIRS += src/output/alsa-playback \
--               src/output/portAudio
-+    SUBDIRS += src/output/alsa-playback
- }
- 
- 
diff --git a/community/lastfm-client/lastfm.desktop b/community/lastfm-client/lastfm.desktop
deleted file mode 100644
index 1658c5997..000000000
--- a/community/lastfm-client/lastfm.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=Last.fm
-Name[de]=Last.fm
-GenericName=Client for the Last.fm Network
-GenericName[de]=Client f�r das Last.fm-Netzwerk
-GenericName[pl]=Klient sieci Last.fm
-Exec=lastfm
-Icon=lastfm
-Categories=AudioVideo;Player;
-Terminal=false
-Type=Application
-Encoding=UTF-8
-StartupNotify=false
-Icon=/opt/last.fm/data/icons/as.png
diff --git a/community/lastfm-client/makefile-qt45.patch b/community/lastfm-client/makefile-qt45.patch
deleted file mode 100644
index c7db8aca7..000000000
--- a/community/lastfm-client/makefile-qt45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lastfm-1.5.1.31879.dfsg/src/Makefile
-===================================================================
---- lastfm-1.5.1.31879.dfsg.orig/src/Makefile
-+++ lastfm-1.5.1.31879.dfsg/src/Makefile
-@@ -959,6 +959,7 @@ compiler_uic_clean:
- ../build/ui_playcontrols.h: playcontrols.ui \
- 		volumeslider.h
- 	/usr/bin/uic playcontrols.ui -o ../build/ui_playcontrols.h
-+	sed -i "s/phonon\/Phonon::VolumeSlider/volumeslider.h/" ../build/ui_playcontrols.h
- 
- ../build/ui_failedlogindialog.h: failedlogindialog.ui
- 	/usr/bin/uic failedlogindialog.ui -o ../build/ui_failedlogindialog.h
diff --git a/community/lastfm-client/qt46.diff b/community/lastfm-client/qt46.diff
deleted file mode 100644
index b2370abee..000000000
--- a/community/lastfm-client/qt46.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Fix some text/icon display issues with Qt 4.6
---- a/src/libUnicorn/draglabel.cpp
-+++ b/src/libUnicorn/draglabel.cpp
-@@ -324,6 +324,11 @@
-     {
-         rect.setHeight( fm.height() );
-     }
-+    // Qt 4.6 seems to have problems with the width too
-+    if ( fm.width( d.m_text ) > rect.width() )
-+    {
-+        rect.setWidth( fm.width( d.m_text ) );
-+    }
- 
-     // boundingRect sometimes returns negative values so make sure it's at 0, 0
-     rect.moveTo( 0, 0 );
---- a/src/settingsdialog.cpp
-+++ b/src/settingsdialog.cpp
-@@ -140,29 +140,29 @@
-         UnicornUtils::qtLanguageToLfmLangCode( QLocale::Japanese ) );
- 
-     // Add icons to sidebar
--    pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 0 )->setIcon( pixmap );
-+    ui.pageList->item( 0 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_account.png" ) ) );
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_radio.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_radio.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 1 )->setIcon( pixmap );
-+    ui.pageList->item( 1 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_radio.png" ) ) );
- 
-     #ifdef HIDE_RADIO
-         ui.pageList->setItemHidden( ui.pageList->item( 1 ), true );
-     #endif // HIDE_RADIO
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 2 )->setIcon( pixmap );
-+    ui.pageList->item( 2 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) ) );
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_connection.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_connection.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 3 )->setIcon( pixmap );
-+    ui.pageList->item( 3 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_connection.png" ) ) );
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 4 )->setIcon( pixmap );
-+    ui.pageList->item( 4 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) ) );
- 
-     #ifdef Q_WS_X11
-     ui.pageList->setRowHidden( 4, true );
diff --git a/community/lastfm-client/set-firstrun-status.diff b/community/lastfm-client/set-firstrun-status.diff
deleted file mode 100644
index 61457fed2..000000000
--- a/community/lastfm-client/set-firstrun-status.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/configwizard.cpp
-+++ b/src/configwizard.cpp
-@@ -750,7 +750,7 @@
- 
-             nextButtonClicked();
-         #else
--            m_pageOffset += 7;
-+            m_pageOffset += 8;
-             BaseWizard::nextButtonClicked();
-         #endif
- 
diff --git a/community/lastfm-client/set-locale.diff b/community/lastfm-client/set-locale.diff
deleted file mode 100644
index 3b81e6cbb..000000000
--- a/community/lastfm-client/set-locale.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libUnicorn/Settings.h
-+++ b/src/libUnicorn/Settings.h
-@@ -226,6 +226,17 @@
-         QString langCode = customAppLanguage();
-         if ( langCode.isEmpty() )
-         {
-+            #ifdef LINUX
-+            // Now check the environment including LC_MESSAGES
-+            // This fixes Debian bug #432232
-+            if ( langCode.isEmpty() )
-+                langCode = qgetenv( "LC_ALL" );
-+            if ( langCode.isEmpty() )
-+                langCode = qgetenv( "LC_MESSAGES" );
-+            if ( langCode.isEmpty() )
-+                langCode = qgetenv( "LANG" );
-+            #endif
-+
-             // If none found, use system locale
-             #ifdef Q_WS_MAC
-             QLocale::Language qtLang = UnicornUtils::osxLanguageCode();
diff --git a/community/lib32-libpng/PKGBUILD b/community/lib32-libpng/PKGBUILD
deleted file mode 100644
index 8d626ebc2..000000000
--- a/community/lib32-libpng/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 66846 2012-02-29 12:56:09Z bluewind $
-# 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.9
-_apngver=1.5.9
-_libversion=15
-pkgrel=2
-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=('05d9ab3705c34954c0032b71318b678a'
-         '268f7db97b292d5f14a24ea7940f6f1c')
-
-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 --program-suffix=-32
-  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}
-
-  rm "$pkgdir/usr/bin/libpng-config"
-  ln -s "libpng${_libversion}-config-32" "$pkgdir/usr/bin/libpng-config-32"
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/community/libkate/PKGBUILD b/community/libkate/PKGBUILD
deleted file mode 100644
index 3bd121d24..000000000
--- a/community/libkate/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 66073 2012-02-22 22:19:27Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: N30N <archlinux@alunamation.com>
-# Contributor: linkmauve <linkmauve@linkmauve.fr>
-# Contributor: mokkurkalve <xenofil@gmail.com>
-
-pkgname=libkate
-pkgver=0.4.1
-pkgrel=2
-pkgdesc="A karaoke and text codec for embedding in ogg"
-url="http://libkate.googlecode.com/"
-license=('BSD')
-arch=('i686' 'x86_64')
-depends=('libpng' 'libogg' 'python2')
-makedepends=('pkg-config')
-optdepends=('wxpython: for KateDJ'
-            'liboggz: for KateDJ')
-options=('!libtool')
-source=("http://libkate.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1dfdbdeb2fa5d07063cf5b8261111fca')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON="/usr/bin/python2"
-  sed "1s/python$/python2/" -i tools/KateDJ/KateDJ
-
-  ./configure --prefix=/usr \
-              --disable-static \
-              --disable-doc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  # install BSD license
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community/libtar/PKGBUILD b/community/libtar/PKGBUILD
deleted file mode 100644
index 62f5394b9..000000000
--- a/community/libtar/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer : Biru Ionut <ionut@archlinux.ro>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=libtar
-pkgver=1.2.11
-pkgrel=2
-pkgdesc="C library for manipulating POSIX tar files"
-arch=('i686' 'x86_64')
-url="http://www.feep.net/libtar/"
-license=('BSD')
-depends=('zlib')
-source=(ftp://ftp.feep.net/pub/software/$pkgname/$pkgname-$pkgver.tar.gz \
-        libtar-$pkgver.patch)
-md5sums=('604238e8734ce6e25347a58c4f1a1d7e' 'baef7da841c186e1830566296859c35b')
-sha1sums=('9611f23024b0e89aad1cfea301122186b3c160f8' '100c37378faea118c6664cd8958caa91f34633d0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export CFLAGS+=" -fPIC"
-  patch -Np1 -i ../libtar-$pkgver.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
-}
diff --git a/community/libtar/libtar-1.2.11.patch b/community/libtar/libtar-1.2.11.patch
deleted file mode 100644
index 347203dc3..000000000
--- a/community/libtar/libtar-1.2.11.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -Naur libtar-1.2.11-orig/lib/decode.c libtar-1.2.11/lib/decode.c
---- libtar-1.2.11-orig/lib/decode.c	2003-01-06 17:40:59.000000000 -0800
-+++ libtar-1.2.11/lib/decode.c	2004-08-13 12:26:34.000000000 -0700
-@@ -26,7 +26,7 @@
- char *
- th_get_pathname(TAR *t)
- {
--	char filename[MAXPATHLEN];
-+	static char filename[MAXPATHLEN];
- 
- 	if (t->th_buf.gnu_longname)
- 		return t->th_buf.gnu_longname;
-@@ -35,11 +35,11 @@
- 	{
- 		snprintf(filename, sizeof(filename), "%.155s/%.100s",
- 			 t->th_buf.prefix, t->th_buf.name);
--		return strdup(filename);
-+		return filename;
- 	}
- 
- 	snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name);
--	return strdup(filename);
-+	return filename;
- }
- 
- 
-diff -Naur libtar-1.2.11-orig/lib/extract.c libtar-1.2.11/lib/extract.c
---- libtar-1.2.11-orig/lib/extract.c	2003-03-02 15:58:07.000000000 -0800
-+++ libtar-1.2.11/lib/extract.c	2004-08-13 12:26:34.000000000 -0700
-@@ -28,14 +28,6 @@
- #endif
- 
- 
--struct linkname
--{
--	char ln_save[MAXPATHLEN];
--	char ln_real[MAXPATHLEN];
--};
--typedef struct linkname linkname_t;
--
--
- static int
- tar_set_file_perms(TAR *t, char *realname)
- {
-@@ -98,7 +90,9 @@
- tar_extract_file(TAR *t, char *realname)
- {
- 	int i;
--	linkname_t *lnp;
-+	char *lnp;
-+	int pathname_len;
-+	int realname_len;
- 
- 	if (t->options & TAR_NOOVERWRITE)
- 	{
-@@ -137,11 +131,13 @@
- 	if (i != 0)
- 		return i;
- 
--	lnp = (linkname_t *)calloc(1, sizeof(linkname_t));
-+	pathname_len = strlen(th_get_pathname(t)) + 1;
-+	realname_len = strlen(realname) + 1;
-+	lnp = (char *)calloc(1, pathname_len + realname_len);
- 	if (lnp == NULL)
- 		return -1;
--	strlcpy(lnp->ln_save, th_get_pathname(t), sizeof(lnp->ln_save));
--	strlcpy(lnp->ln_real, realname, sizeof(lnp->ln_real));
-+	strcpy(&lnp[0], th_get_pathname(t));
-+	strcpy(&lnp[pathname_len], realname);
- #ifdef DEBUG
- 	printf("tar_extract_file(): calling libtar_hash_add(): key=\"%s\", "
- 	       "value=\"%s\"\n", th_get_pathname(t), realname);
-@@ -288,7 +284,7 @@
- {
- 	char *filename;
- 	char *linktgt = NULL;
--	linkname_t *lnp;
-+	char *lnp;
- 	libtar_hashptr_t hp;
- 
- 	if (!TH_ISLNK(t))
-@@ -304,8 +300,8 @@
- 	if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t),
- 			       (libtar_matchfunc_t)libtar_str_match) != 0)
- 	{
--		lnp = (linkname_t *)libtar_hashptr_data(&hp);
--		linktgt = lnp->ln_real;
-+		lnp = (char *)libtar_hashptr_data(&hp);
-+		linktgt = &lnp[strlen(lnp) + 1];
- 	}
- 	else
- 		linktgt = th_get_linkname(t);
-diff -Naur libtar-1.2.11-orig/lib/libtar.h libtar-1.2.11/lib/libtar.h
---- libtar-1.2.11-orig/lib/libtar.h	2003-01-06 17:40:59.000000000 -0800
-+++ libtar-1.2.11/lib/libtar.h	2004-08-13 12:26:52.000000000 -0700
-@@ -63,9 +63,9 @@
- /***** handle.c ************************************************************/
- 
- typedef int (*openfunc_t)(const char *, int, ...);
--typedef int (*closefunc_t)(int);
--typedef ssize_t (*readfunc_t)(int, void *, size_t);
--typedef ssize_t (*writefunc_t)(int, const void *, size_t);
-+typedef int (*closefunc_t)(long);
-+typedef ssize_t (*readfunc_t)(long, void *, size_t);
-+typedef ssize_t (*writefunc_t)(long, const void *, size_t);
- 
- typedef struct
- {
diff --git a/community/libtiger/PKGBUILD b/community/libtiger/PKGBUILD
deleted file mode 100644
index 4fff8f708..000000000
--- a/community/libtiger/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 66081 2012-02-22 23:05:43Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-
-pkgname=libtiger
-pkgver=0.3.4
-pkgrel=2
-pkgdesc="A rendering library for Kate streams using Pango and Cairo"
-url="http://libtiger.googlecode.com/"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('pango' 'libkate')
-makedepends=('pkg-config')
-options=('!libtool')
-source=("http://libtiger.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=("dc1dbeb658c95485ba10b9b2897b4ae2")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --enable-static=no \
-              --disable-doc
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/lincity-ng/ChangeLog b/community/lincity-ng/ChangeLog
deleted file mode 100644
index 03303d1b6..000000000
--- a/community/lincity-ng/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2009-06-18  Eric Belanger  <eric@archlinux.org>
-
-	* lincity-ng 2.0-2
-	* Rebuild against sdl_gfx 2.0.19
-
-2009-01-29  Eric Belanger  <eric@archlinux.org>
-
-	* lincity-ng 2.0-1
-	* Upstream update
-
-2008-08-16  Eric Belanger  <eric@archlinux.org>
-
-	* lincity-ng 1.1.2-3
-	* Rebuilt against physfs 1.1.1
-	* Added ChangeLog
diff --git a/community/lxdm/lxdm-conf.patch b/community/lxdm/lxdm-conf.patch
deleted file mode 100644
index 1744e557e..000000000
--- a/community/lxdm/lxdm-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/lxdm.conf.orig	2011-11-01 17:57:59.208757577 +0100
-+++ data/lxdm.conf	2011-11-01 18:03:55.608741945 +0100
-@@ -27,7 +27,7 @@
- gtk_theme=Clearlooks
- 
- ## background of the greeter
--bg=/usr/share/backgrounds/default.png
-+# bg=/usr/share/backgrounds/default.png
- 
- ## if show bottom pane
- bottom_pane=1
diff --git a/community/lxdm/lxdm-pam.patch b/community/lxdm/lxdm-pam.patch
deleted file mode 100644
index 3f5df04a7..000000000
--- a/community/lxdm/lxdm-pam.patch
+++ /dev/null
@@ -1,8 +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
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
diff --git a/community/mget/PKGBUILD b/community/mget/PKGBUILD
deleted file mode 100644
index fb960d5cd..000000000
--- a/community/mget/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 4928 2009-11-02 21:45:22Z ibiru $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=mget
-pkgver=1.50
-pkgrel=2
-pkgdesc="Simple script allowing to download embedded movies from various video hosting services"
-arch=('i686' 'x86_64')
-url="http://movie-get.org/"
-license=('GPL2')
-depends=('ruby' 'wget')
-optdepends=('ffmpeg: for converting movies'
-            'mplayer: for downloading mms streams')
-source=(http://mget.googlecode.com/files/mget-$pkgver.tar.gz fix-warnings.patch)
-md5sums=('d29bbef2f4536f8697ccabe782563624'
-         '4dcb1eafc95a7893c9b0be0a4232b282')
-
-build() {
-  cd $srcdir/mget-$pkgver
-  patch -Np1 -i $srcdir/fix-warnings.patch || return 1
-
-  install -D -m755 mget.rb $pkgdir/usr/bin/mget
-  mkdir -p $pkgdir/usr/lib/ruby/1.9.1/mget
-  install -m644 lib/mget/*.rb $pkgdir/usr/lib/ruby/1.9.1/mget
-  install -D -m644 docs/mget.1 $pkgdir/usr/share/man/man1/mget.1
-}
diff --git a/community/mget/fix-warnings.patch b/community/mget/fix-warnings.patch
deleted file mode 100644
index 042f5e5b5..000000000
--- a/community/mget/fix-warnings.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mget-1.50.old/lib/mget/error_handling.rb mget-1.50/lib/mget/error_handling.rb
---- mget-1.50.old/lib/mget/error_handling.rb	2008-06-12 19:57:11.000000000 +0300
-+++ mget-1.50/lib/mget/error_handling.rb	2009-11-02 23:39:47.587497291 +0200
-@@ -48,7 +48,7 @@
-   def setTrace(string)
-     if trace?
-       @log.info(string)
--	end
-+    end
-   end
-   
-   def logDir()
-@@ -63,4 +63,4 @@
-     Dir.mkdir(path) unless File.exists?(path) && File.directory?(path)
-     return path
-   end
--end
-\ No newline at end of file
-+end
-diff -Nur mget-1.50.old/lib/mget/mget.rb mget-1.50/lib/mget/mget.rb
---- mget-1.50.old/lib/mget/mget.rb	2008-06-12 19:57:11.000000000 +0300
-+++ mget-1.50/lib/mget/mget.rb	2009-11-02 23:36:38.317512845 +0200
-@@ -111,7 +111,7 @@
-       else
-         @target = target
-       end
--	end
-+    end
-   end
- 
-   def download=(flag)
-@@ -158,7 +158,7 @@
- 		self.input=fileName   # force self check again, but without validation
- 	  end
- 	  return
--	end
-+    end
- 	setTrace("File.exists?="+fileName)
-     if File.exists? fileName
-       if File.zero? fileName
diff --git a/community/netsurf/PKGBUILD.wip b/community/netsurf/PKGBUILD.wip
deleted file mode 100644
index 592ca0268..000000000
--- a/community/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/newsbeuter/newsbeuter-archlinux.patch b/community/newsbeuter/newsbeuter-archlinux.patch
deleted file mode 100644
index 3fb26b39b..000000000
--- a/community/newsbeuter/newsbeuter-archlinux.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/view.cpp	2011-02-06 23:15:11.000000000 +0100
-+++ src/view.cpp	2011-02-06 23:15:11.000000000 +0100
-@@ -42,3 +42,3 @@
- #include <string.h>
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- 
---- src/controller.cpp	2011-02-06 23:14:53.000000000 +0100
-+++ src/controller.cpp	2011-02-06 23:14:53.000000000 +0100
-@@ -40,3 +40,3 @@
- 
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- 
diff --git a/community/nexuiz/PKGBUILD b/community/nexuiz/PKGBUILD
deleted file mode 100644
index 2471fe8ec..000000000
--- a/community/nexuiz/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Xyne
-# Contributor: Rick Chen (stuffcorpse)
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Camille Moncelier <pix@devlife.org>
-
-pkgname=nexuiz
-pkgver=2.5.2
-_zipver=252
-pkgrel=2
-arch=('i686' 'x86_64')
-pkgdesc="a free, open-source first person shooter"
-url="http://www.nexuiz.com/"
-license=("GPL")
-depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0')
-makedepends=('mesa')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_zipver}.zip \
-        nexuiz-dedicated nexuiz-glx nexuiz-sdl nexuiz-glx.desktop \
-        nexuiz-sdl.desktop nexuiz.png libpng14.patch)
-md5sums=('d750bc328e58df8492f8d88bdcf818cb'
-         '19bfaa6e891d3309783e8366db485474'
-         '4d0ee9282a6fe153f82f7797decfd585'
-         '3e5ea741e8d55df8e7691c797c81ffa7'
-         '310f0577c39391f2d2f17cea446ce269'
-         '4561d3c5be4801399af515faf82ebcba'
-         '442fb62670bbe0a1b5370461052051a3'
-	 '60964348924ff777a92dbb171a86a1ed')
-
-build() {
-  _nexdir="$pkgdir/opt/nexuiz"
-  _enginesource_date="20091001"
-  mkdir -p "$_nexdir" || return 1
-  
-  cd $srcdir/Nexuiz
-  bsdtar -x -f sources/enginesource${_enginesource_date}.zip || return 1
-  cd darkplaces
-  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
-  # patch -p1 < "$srcdir/nexuiz-libjpeg-fix.patch" || return 1
-  
-  # here's a working kludge to build all three binaries at once but don't use it ;)
-  # make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || return 1
-  
-  # build the binaries separately instead to avoid truncated files
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz || return 1
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz || return 1
-  make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz || return 1
-
-  # install the compiled binaries
-  install -Dm755 nexuiz-glx nexuiz-sdl nexuiz-dedicated -t $_nexdir || return 1
-
-  install -dm755 $pkgdir/usr/{bin,share/applications} || return 1
-  install -Dm755 $srcdir/nexuiz-{glx,sdl,dedicated} -t $pkgdir/usr/bin || return 1
-  install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications || return 1
-  install -Dm644 $srcdir/nexuiz.png $pkgdir/usr/share/pixmaps/nexuiz.png || return 1
-}
diff --git a/community/nexuiz/libpng14.patch b/community/nexuiz/libpng14.patch
deleted file mode 100644
index d6ce5ea76..000000000
--- a/community/nexuiz/libpng14.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur darkplaces.old/image_png.c darkplaces/image_png.c
---- darkplaces.old/image_png.c	2009-09-15 06:08:02.000000000 +0300
-+++ darkplaces/image_png.c	2010-01-28 01:23:24.000000000 +0200
-@@ -36,7 +36,7 @@
- static void*			(*qpng_create_info_struct)	(void*);
- static void				(*qpng_read_info)			(void*, void*);
- static void				(*qpng_set_expand)			(void*);
--static void				(*qpng_set_gray_1_2_4_to_8)	(void*);
-+static void				(*qpng_set_expand_gray_1_2_4_to_8)	(void*);
- static void				(*qpng_set_palette_to_rgb)	(void*);
- static void				(*qpng_set_tRNS_to_alpha)	(void*);
- static void				(*qpng_set_gray_to_rgb)		(void*);
-@@ -61,7 +61,7 @@
- 	{"png_create_info_struct",	(void **) &qpng_create_info_struct},
- 	{"png_read_info",			(void **) &qpng_read_info},
- 	{"png_set_expand",			(void **) &qpng_set_expand},
--	{"png_set_gray_1_2_4_to_8",	(void **) &qpng_set_gray_1_2_4_to_8},
-+	{"png_set_expand_gray_1_2_4_to_8",	(void **) &qpng_set_expand_gray_1_2_4_to_8},
- 	{"png_set_palette_to_rgb",	(void **) &qpng_set_palette_to_rgb},
- 	{"png_set_tRNS_to_alpha",	(void **) &qpng_set_tRNS_to_alpha},
- 	{"png_set_gray_to_rgb",		(void **) &qpng_set_gray_to_rgb},
-@@ -110,7 +110,7 @@
- #elif defined(MACOSX)
- 		"libpng12.0.dylib",
- #else
--		"libpng12.so.0",
-+		"libpng14.so.0",
- 		"libpng.so", // FreeBSD
- #endif
- 		NULL
-@@ -311,7 +311,7 @@
- 	{
- 		qpng_set_gray_to_rgb(png);
- 		if (my_png.BitDepth < 8)
--			qpng_set_gray_1_2_4_to_8(png);
-+			qpng_set_expand_gray_1_2_4_to_8(png);
- 	}
- 
- 	if (qpng_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/community/nexuiz/nexuiz-dedicated b/community/nexuiz/nexuiz-dedicated
deleted file mode 100644
index bf517cce7..000000000
--- a/community/nexuiz/nexuiz-dedicated
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-dedicated $@
diff --git a/community/nexuiz/nexuiz-glx b/community/nexuiz/nexuiz-glx
deleted file mode 100644
index 5fad4db07..000000000
--- a/community/nexuiz/nexuiz-glx
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-glx $@
diff --git a/community/nexuiz/nexuiz-glx.desktop b/community/nexuiz/nexuiz-glx.desktop
deleted file mode 100644
index 8808c16db..000000000
--- a/community/nexuiz/nexuiz-glx.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Nexuiz (GLX)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/nexuiz.png
-Exec=/usr/bin/nexuiz-glx
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/community/nexuiz/nexuiz-sdl b/community/nexuiz/nexuiz-sdl
deleted file mode 100644
index 36b6d5cc3..000000000
--- a/community/nexuiz/nexuiz-sdl
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/nexuiz
-./nexuiz-sdl $@
diff --git a/community/nexuiz/nexuiz-sdl.desktop b/community/nexuiz/nexuiz-sdl.desktop
deleted file mode 100644
index 019970e61..000000000
--- a/community/nexuiz/nexuiz-sdl.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Nexuiz (SDL)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/nexuiz.png
-Exec=/usr/bin/nexuiz-sdl
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/community/nexuiz/nexuiz.png b/community/nexuiz/nexuiz.png
deleted file mode 100644
index a0ec8b3d4..000000000
--- a/community/nexuiz/nexuiz.png
+++ /dev/null
diff --git a/community/ngrep/ngrep-fix-ipv6-support.patch b/community/ngrep/ngrep-fix-ipv6-support.patch
deleted file mode 100644
index 9a07d7d38..000000000
--- a/community/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/nzbget/ChangeLog b/community/nzbget/ChangeLog
deleted file mode 100644
index 74030cd3d..000000000
--- a/community/nzbget/ChangeLog
+++ /dev/null
@@ -1,18 +0,0 @@
-2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Fixed FS#19399 - missing postprocess-example.conf file
-
-2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.7.0
-
-2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Dependency added (gnutls) in v0.6.0-2 
-
-2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.6.0
-
-2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.5.1
-
-2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community]
-	* Update to major release 0.5.0
diff --git a/community/openimageio/openimageio-0.10.2-libpng15.patch b/community/openimageio/openimageio-0.10.2-libpng15.patch
deleted file mode 100644
index 97375d5fb..000000000
--- a/community/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/openntpd/sync_fix_with_adjtime.patch b/community/openntpd/sync_fix_with_adjtime.patch
deleted file mode 100644
index 4b9956b6d..000000000
--- a/community/openntpd/sync_fix_with_adjtime.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ntp.c
-===================================================================
-RCS file: /storage/1/mirror/openbsd/src/usr.sbin/ntpd/ntp.c,v
-retrieving revision 1.91
-diff -u -r1.91 ntp.c
---- ntp.c       1 Jul 2006 18:52:46 -0000       1.91
-+++ ntp.c       15 Jul 2006 07:50:05 -0000
-@@ -1,4 +1,4 @@
--/*     $OpenBSD: ntp.c,v 1.91 2006-07-01 18:52:46 otto Exp $ */
-+/*     $OpenBSD: ntp.c,v 1.91 2006/07/01 18:52:46 otto Exp $ */
-
- /*
-  * Copyright (c) 2003, 2004 Henning Brauer <[EMAIL PROTECTED]>
-@@ -315,8 +315,10 @@
-                for (s = TAILQ_FIRST(&conf->ntp_sensors); s != NULL;
-                    s = next_s) {
-                        next_s = TAILQ_NEXT(s, entry);
--                       if (s->next <= time(NULL))
-+                       if (s->next <= time(NULL)) {
-                                sensor_query(s);
-+                               priv_adjtime();
-+                       }
-                }
-        }
diff --git a/community/paraview/12859-VisItBrige-external-tiff-support.diff b/community/paraview/12859-VisItBrige-external-tiff-support.diff
deleted file mode 100644
index 1901d0146..000000000
--- a/community/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/paraview/fix-boost-graph-api-changes.diff b/community/paraview/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 37d78665b..000000000
--- a/community/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/proj/ChangeLog b/community/proj/ChangeLog
deleted file mode 100644
index 017763ec9..000000000
--- a/community/proj/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Fixed license dir | license -> licenses
diff --git a/community/pstreams/PKGBUILD b/community/pstreams/PKGBUILD
deleted file mode 100644
index 62b446587..000000000
--- a/community/pstreams/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname=pstreams
-pkgver=0.7.0
-pkgrel=1
-pkgdesc='C++ utility for simple IOStream-based Inter-Process Communication.'
-arch=('i686' 'x86_64')
-url='http://pstreams.sourceforge.net'
-license=('LGPL')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6154b8df98487bd28eb50ad85d5cdba0')
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  install -D -m644 pstream.h \
-    ${pkgdir}/usr/include/pstreams/pstream.h
-}
diff --git a/community/pyglet/PKGBUILD b/community/pyglet/PKGBUILD
deleted file mode 100644
index 2f795c66d..000000000
--- a/community/pyglet/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Ryan Coyner <rcoyner@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pyglet
-pkgver=1.1.4
-pkgrel=2
-pkgdesc="A cross-platform windowing and multimedia library for Python"
-arch=('i686' 'x86_64')
-url="http://pyglet.org/"
-license=('BSD')
-depends=('python2')
-optdepend=('avbin: provides audio&video support')
-source=(http://pyglet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b2363642dc3832e95dc4e63a6793467f')
-
-build() { 
-	cd ${srcdir}/${pkgname}-${pkgver}
-	python2 setup.py build
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	python2 setup.py install --root=${pkgdir}
-	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/python-html5lib/LICENSE b/community/python-html5lib/LICENSE
deleted file mode 100644
index 89de35479..000000000
--- a/community/python-html5lib/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/community/python-html5lib/PKGBUILD b/community/python-html5lib/PKGBUILD
deleted file mode 100644
index bcd2f73b6..000000000
--- a/community/python-html5lib/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Erol V. Aktay <e.aktay@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=python-html5lib
-pkgver=0.90
-pkgrel=1
-pkgdesc="A HTML parser/tokenizer based on the WHATWG HTML5 spec"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/html5lib/"
-license=('MIT')
-depends=('python2')
-makedepends=('unzip' 'setuptools')
-source=(http://html5lib.googlecode.com/files/html5lib-${pkgver}.zip
-    LICENSE)
-md5sums=('691e6b9ebe15b333a28280974b2ce432'
-         '838c366f69b72c5df05c96dff79b35f2')
-
-build() {
-    /bin/true
-}
-
-package() {
-    cd ${srcdir}/html5lib-${pkgver}
-
-    python2 setup.py install --root=${pkgdir}
-    install -dm755 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE  
-}
diff --git a/community/python-pychm/PKGBUILD b/community/python-pychm/PKGBUILD
deleted file mode 100644
index 77b8f05b8..000000000
--- a/community/python-pychm/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: iom <pizorn@gmail.com>
-
-pkgname=python-pychm
-pkgver=0.8.4
-pkgrel=5
-pkgdesc="Python bindings for CHMLIB"
-arch=('i686' 'x86_64')
-url="http://gnochm.sourceforge.net"
-license=('GPL')
-depends=('chmlib' 'python2')
-source=(http://downloads.sourceforge.net/sourceforge/gnochm/pychm-$pkgver.tar.gz)
-md5sums=('ff7f0baf94290c44263a1618e7e6a116')
-
-build() {
-  cd $srcdir/pychm-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community/python2-rst2pdf/LICENSE.txt b/community/python2-rst2pdf/LICENSE.txt
deleted file mode 100644
index 89b95f202..000000000
--- a/community/python2-rst2pdf/LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2007,2008,2009 Roberto Alsina
-Nicolas Laurance, Christoph Zwerschke, Yasushi Masuda, Josh VanderLinden.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/community/python2-rst2pdf/PKGBUILD b/community/python2-rst2pdf/PKGBUILD
deleted file mode 100644
index b81b90874..000000000
--- a/community/python2-rst2pdf/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 54721 2011-08-23 21:07:42Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Roberto Alsina <ralsina@kde.org>
-pkgname=python2-rst2pdf
-pkgver=0.16
-pkgrel=10
-pkgdesc="Create PDFs from simple text markup, no LaTeX required."
-arch=('i686' 'x86_64')
-url="http://rst2pdf.googlecode.com"
-license=('MIT')
-depends=('python2' 'setuptools' 'docutils' 'python-reportlab')
-source=(http://rst2pdf.googlecode.com/files/rst2pdf-$pkgver.tar.gz LICENSE.txt
-        rst2pdf-0.16_docutils-0.8.patch)
-optdepends=('uniconvertor: vector images support'
-            'python-svglib: some SVG support'
-            'inkscape: best SVG support'
-	        'python-wordaxe: hyphenation'
-            'python2-pygments: Syntax Highlighting' 
-            'pil: non-JPEG bitmap image formats'
-            'pythonmagick: more image formats')
-md5sums=('67b8bfac3ac55a85a09fc35ba98794d3'
-         '416f8046c66b9476cdbacda69a673afe'
-         'fcd21288b01b35f654579670dd8c7a02')
-
-build() {
-  cd $srcdir/rst2pdf-$pkgver
-  patch -p0 < ../rst2pdf-0.16_docutils-0.8.patch
-  python2 setup.py install --root=$pkgdir 
-}
-
-package() {
-  cd $srcdir/rst2pdf-$pkgver
-  install -D ../LICENSE.txt $pkgdir/usr/share/licenses/python-rst2pdf/COPYING
-  (cd doc && rst2man rst2pdf.txt rst2pdf.1)
-  install -D doc/rst2pdf.1 $pkgdir/usr/share/man/man1/rst2pdf.1
-  gzip $pkgdir/usr/share/man/man1/rst2pdf.1
-}
diff --git a/community/python2-rst2pdf/rst2pdf-0.16_docutils-0.8.patch b/community/python2-rst2pdf/rst2pdf-0.16_docutils-0.8.patch
deleted file mode 100644
index a7cc081ff..000000000
--- a/community/python2-rst2pdf/rst2pdf-0.16_docutils-0.8.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: rst2pdf/createpdf.py
-===================================================================
---- rst2pdf/createpdf.py	(revision 2441)
-+++ rst2pdf/createpdf.py	(working copy)
-@@ -56,6 +56,7 @@
- from optparse import OptionParser
- import logging
- 
-+import docutils
- from docutils.languages import get_language
- import docutils.readers.doctree
- import docutils.core
-@@ -97,6 +98,12 @@
- escape=tenjin.helpers.escape
- templateEngine=tenjin.Engine()
- 
-+# fix get_language for docutils>=0.8
-+if docutils.__version__ >= '0.8':
-+    orig_func = get_language
-+    def get_language(arg1):
-+        return orig_func(arg1, None)
-+
- def renderTemplate(tname, **context):
-   context['to_str']=to_str
-   context['escape']=escape
-Index: rst2pdf/pdfbuilder.py
-===================================================================
---- rst2pdf/pdfbuilder.py	(revision 2441)
-+++ rst2pdf/pdfbuilder.py	(working copy)
-@@ -27,6 +27,7 @@
- from rst2pdf import pygments_code_block_directive, oddeven_directive
- from pygments.lexers import get_lexer_by_name, guess_lexer
- 
-+import docutils
- from docutils import writers
- from docutils import nodes
- from docutils import languages
-@@ -56,7 +57,14 @@
- 
- from traceback import print_exc
- 
-+# fix get_language for docutils>=0.8
-+if docutils.__version__ >= '0.8':
-+    orig_func = get_language
-+    def get_language(arg1):
-+        return orig_func(arg1, None)
-+    languages.get_language = get_language
- 
-+
- class PDFBuilder(Builder):
-     name = 'pdf'
-     out_suffix = '.pdf'
diff --git a/community/qingy/README b/community/qingy/README
deleted file mode 100644
index aa5678475..000000000
--- a/community/qingy/README
+++ /dev/null
@@ -1,77 +0,0 @@
-Qingy README
-
-What is qingy?
---------------
-
-Qingy is a replacement for getty. It is using DirectFB to provide a
-fast, nice GUI without the overhead of the X Windows System. It allows
-the user to log in and start the session of his choice (text console,
-gnome, kde, wmaker, ...). Running several X sessions is also
-possible. 
-
-How to get qingy?
------------------
-
-A package is available in the [community] repo. To install:
-
-# pacman -S qingy 
-
-Several extra themes are also available. In [community] repo, there is
-an Arch specific theme:
-
-# pacman -S qingy-theme-arch
-
-A package of several various themes is available in AUR:
-
-    * qingy-themes
-
-How to setup qingy?
--------------------
-
-To use qingy, you'll need to edit /etc/inittab.
-
-Replace:
-
-c1:2345:respawn:/sbin/agetty 38400 vc/1 linux
-c2:2345:respawn:/sbin/agetty 38400 vc/2 linux
-c3:2345:respawn:/sbin/agetty 38400 vc/3 linux
-c4:2345:respawn:/sbin/agetty 38400 vc/4 linux
-c5:2345:respawn:/sbin/agetty 38400 vc/5 linux
-c6:2345:respawn:/sbin/agetty 38400 vc/6 linux 
-
-by:
-
-c1:2345:respawn:/sbin/qingy tty1
-c2:2345:respawn:/sbin/qingy tty2
-c3:2345:respawn:/sbin/qingy tty3
-c4:2345:respawn:/sbin/qingy tty4
-c5:2345:respawn:/sbin/qingy tty5
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-Qingy's author suggest to keep agetty on a console (here on console 6)
-as a safety measure as qingy is still beta software.
-
-When logging in an X session, qingy doesn't source your profile. The
-best solution is to add:
-[ -f /etc/profile ] && . /etc/profile
-to your ~/.xinitrc and create a .xsession symlink:
-ln -s  ~/.xinitrc ~/.xsession
-(or source the profiles in your ~/.xsession depending on your setup). Then
-login in the 'Your .xsession' session.
-Otherwise, add:
-[ -f /etc/profile ] && . /etc/profile
-to your ~/.bashrc so that the profile will be sourced for each
-terminal.
-
-
-Having problems with your Synaptics touchpad?
----------------------------------------------
-
-Qingy (and quite possibly other DirectFB applicationss) has some
-issues using Synaptics touchpad. This can be solved by adding: 
-
-disable-module=linux_input
-
-to /etc/directfbrc. If the file does not exist, create it. This will
-enable you to use your touchpad, however some extra functionality like
-tapping or tap-dragging might not work.
diff --git a/community/qoauth/PKGBUILD b/community/qoauth/PKGBUILD
deleted file mode 100644
index 0613ba44f..000000000
--- a/community/qoauth/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id $
-# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=qoauth
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="Support with OAuth-powered network services"
-url="http://github.com/ayoy/qoauth"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qca')
-makedepends=('cmake' 'automoc4')
-source=("http://files.ayoy.net/qoauth/release/current/src/${pkgname}-${pkgver}-src.tar.bz2")
-md5sums=('bcb6d01e6c9a6fb22099c9e0f5889578')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}-src
-  qmake
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}-src
-  make INSTALL_ROOT=${pkgdir} install
-
-  # Move libraries from /usr/lib64 to /usr/lib
-  if [ -d ${pkgdir}/usr/lib64 ]; then
-    mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
-  fi
-}
diff --git a/community/qsvn/ChangeLog b/community/qsvn/ChangeLog
deleted file mode 100644
index 5d2b6b37c..000000000
--- a/community/qsvn/ChangeLog
+++ /dev/null
@@ -1,27 +0,0 @@
-2009-05-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.8.2
-	* Release info: http://www.anrichter.net/projects/qsvn/wiki/Releases/ReleaseNotes-0.8.2
-
-2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.8.1
-	* Release info: http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.1
-
-2008-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.8.0
-	* Release info: http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.8.0
-
-2008-10-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.7.1
-
-2008-08-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 0.7.0
-	* Release info: http://www.anrichter.net/projects/qsvn/wiki/ReleaseNotes-0.7.0
-
-2008-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Fixed bug FS#10914
-
-2008-03-27 JJDaNiMoTh <jjdanimoth@gmail.com>
-	* Replaced qt4 with qt as depend
-
-2007-12-19 Georg Grabler (STiAT) <ggrabler@gmail.com>
-	* Updated to major release 0.6.0
diff --git a/community/qtmpc/qtmpc.changelog b/community/qtmpc/qtmpc.changelog
deleted file mode 100644
index f4271103c..000000000
--- a/community/qtmpc/qtmpc.changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-2011-05-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qtmpc 0.6.1-2
-	* moved to [community] with 109 votes
diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD
deleted file mode 100644
index f872009d6..000000000
--- a/community/quilt/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 63831 2012-02-06 00:30:28Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
-
-pkgname=quilt
-pkgver=0.51
-pkgrel=1
-pkgdesc='Manage a series of patches by keeping track of the changes each patch makes'
-arch=('i686' 'x86_64')
-url='http://savannah.nongnu.org/projects/quilt'
-license=('GPL2')
-depends=('diffstat' 'gawk' 'patch' 'diffutils' 'gettext')
-source=("http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d56d23d5212297d5777502e84dc0ee80')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/radvd/radvd.install b/community/radvd/radvd.install
deleted file mode 100644
index fc0b7f852..000000000
--- a/community/radvd/radvd.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-cat << EOF
-
-To use radvd you must create the configuration file
-
-  /etc/radvd.conf
-
-An example configuration file has been installed at
-
-  /usr/share/doc/radvd/radvd.conf.example
-
-radvd requires IPv6 forwarding be enabled.
-To enable IPv6 forwarding at boot time,
-add the following line to /etc/sysctl.conf:
-
-  # Enable IPv6 packet forwarding 
-  net.ipv6.conf.all.forwarding = 1
-
-or manually enable forwarding using:
-
-  echo 1 > /proc/sys/net/ipv6/conf/all/forwarding 
-
-EOF
-}
-
-op=$1
-shift
-$op $*
diff --git a/community/radvd/radvd.rc.d b/community/radvd/radvd.rc.d
deleted file mode 100644
index f8c9ea571..000000000
--- a/community/radvd/radvd.rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-### /etc/rc.d/radvd: Initscript for radvd Daemon
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/radvd`
-case "$1" in
-  start)
-    stat_busy "Starting radvd Daemon"
-    [ -z "$PID" ] && \
-      /usr/sbin/radvd &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else stat_done; add_daemon radvd
-      echo $PID > /var/run/radvd.pid
-    fi ;;
-  stop)
-    stat_busy "Stopping radvd Daemon"
-    [ ! -z "$PID" ] \
-      && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done; rm_daemon radvd
-    fi ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0
-
-### /etc/rc.d/radvd: Initscript for radvd Daemon
diff --git a/community/raul/raul.install b/community/raul/raul.install
deleted file mode 100644
index 46f265d5b..000000000
--- a/community/raul/raul.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/root/fix-mathcore-generation-r42566.diff b/community/root/fix-mathcore-generation-r42566.diff
deleted file mode 100644
index ae22c23c0..000000000
--- a/community/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/scantailor/build-fix.patch b/community/scantailor/build-fix.patch
deleted file mode 100644
index 85b620020..000000000
--- a/community/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/stormbaancoureur/PKGBUILD b/community/stormbaancoureur/PKGBUILD
deleted file mode 100644
index 484d4371f..000000000
--- a/community/stormbaancoureur/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 12391 2010-03-03 10:54:05Z mherych $
-# Maintainer: Callan Barrett <wizzomafizzo@gmail.com>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> 
-
-pkgname=stormbaancoureur
-pkgver=2.1.6
-pkgrel=1
-pkgdesc="Arcade-style car game based on physics"
-arch=('i686' 'x86_64')
-url="http://www.stolk.org/stormbaancoureur/"
-license=('GPL')
-depends=('freeglut' 'alsa-lib')
-makedepends=('ode' 'plib')
-source=(http://www.stolk.org/stormbaancoureur/download/$pkgname-$pkgver.tar.gz
-	$pkgname.desktop)
-md5sums=('c09adc441b60acd2bbf6eb6d8a994c1e'
-         '38a10794e85dd01eff09d06d0c647d97')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver/src-$pkgname
-  sed -i 's|/usr/share/games|/usr/share|g' Makefile main.cxx
-  sed -i 's|/usr/games|/usr/bin|g' Makefile
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  install -D -m644 $startdir/src/$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop
-}
-
diff --git a/community/stormbaancoureur/stormbaancoureur.desktop b/community/stormbaancoureur/stormbaancoureur.desktop
deleted file mode 100644
index 2453f1bc3..000000000
--- a/community/stormbaancoureur/stormbaancoureur.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Stormbaan Coureur
-GenericName=Car Game
-Exec=stormbaancoureur
-Terminal=false
-StartupNotify=false
-Type=Application
-Categories=Application;Game;ArcadeGame;
diff --git a/community/subtitleeditor/fix-taking-address-of-temporary-error.patch b/community/subtitleeditor/fix-taking-address-of-temporary-error.patch
deleted file mode 100644
index a35746d62..000000000
--- a/community/subtitleeditor/fix-taking-address-of-temporary-error.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- trunk/plugins/subtitleformats/sami/sami.cc	2011/06/18 08:06:45	772
-+++ trunk/plugins/subtitleformats/sami/sami.cc	2011/07/02 13:01:33	777
-@@ -155,7 +155,7 @@
- 		int state = 0;
- 		Glib::ustring line;
- 		Glib::ustring text;
--		Subtitle* curSt;
-+		Subtitle curSt;
- 		char tmptext[MAXBUF+1] = "";
- 		char *p = NULL, *q = NULL;
- 		if (!file.getline(line))
-@@ -174,8 +174,8 @@
- 					start_sync = utility::string_to_int(inptr + 6);
- 
- 					// Get a line from the current subtitle on memory
--					curSt = &subtitles.append();
--					curSt->set_start(start_sync);
-+					curSt = subtitles.append();
-+					curSt.set_start(start_sync);
- 
- 					state = SAMI_STATE_SYNC_START;
- 					continue;
-@@ -239,14 +239,14 @@
- 					// Now we are sure that this line is the end sync.
- 
- 					end_sync = utility::string_to_int(q + 6);
--					curSt->set_end(end_sync);
-+					curSt.set_end(end_sync);
- 
- 					*p = '\0';
- 					trail_space(tmptext);
- 
- 					// finalize the end sync of current line
- 					if (tmptext[0] != '\0')
--						curSt->set_text(tmptext);
-+						curSt.set_text(tmptext);
- 
- 					// an important check if this is end sync.
- 					// Is there any delimiter "&nbsp;" in this line?
-@@ -276,14 +276,14 @@
- 				else
- 				{
- 					end_sync = SAMISYNC_MAXVAL;
--					curSt->set_end(end_sync);
-+					curSt.set_end(end_sync);
- 
- 					*p = '\0';
- 					trail_space(tmptext);
- 
- 					// finalize the end sync of current line
- 					if (tmptext[0] != '\0')
--						curSt->set_text(tmptext);
-+						curSt.set_text(tmptext);
- 
- 					state = SAMI_STATE_FORCE_QUIT;
- 					break;
diff --git a/community/synce-rra/build-fix.diff b/community/synce-rra/build-fix.diff
deleted file mode 100644
index 848fe2d71..000000000
--- a/community/synce-rra/build-fix.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nruad -Nruad librra-0.11.1.orig/python/pyrra.pyx librra-0.11.1/python/pyrra.pyx
---- librra-0.11.1.orig/python/pyrra.pyx	2008-05-23 20:56:17.000000000 +0100
-+++ librra-0.11.1/python/pyrra.pyx	2008-05-23 20:56:30.000000000 +0100
-@@ -132,7 +132,7 @@
- cdef bool _CB_TypesCallback(RRA_SyncMgrTypeEvent event, uint32_t type, uint32_t count, uint32_t * ids, context):
- 	ida=[]
- 	cdef bool rc
--	for i from 0 <= i < count:
-+	for 0 <= i < count:
- 		ida.append(ids[i])
- 	rc=context.CB_TypeCallback(<RRA_SyncMgrTypeEvent> event,type,ida)
- 	return rc
-@@ -192,9 +192,9 @@
- 	# Event processing
- 	#
- 
--	def SubscribeObjectEvents(self,type):
-+	def SubscribeObjectEvents(self,type_id):
- 		if self.connected != 0:
--			rra_syncmgr_subscribe(self.instance, type, _CB_TypesCallback, self)
-+			rra_syncmgr_subscribe(self.instance, type_id, _CB_TypesCallback, self)
- 			return 0
- 		return -1
- 
-@@ -260,7 +260,7 @@
- 		c_oids = <uint32_t *>malloc(sizeof(uint32_t)*c_cnt)
- 		rc=0
- 		if c_oids != NULL:
--			for i from 0 <= i < c_cnt:
-+			for 0 <= i < c_cnt:
- 				c_oids[i] = oids[i]
- 			rc= rra_syncmgr_get_multiple_objects(self.instance,type_id, c_cnt, c_oids,_CB_WriterCallback, self)
- 			free(c_oids)
-@@ -291,7 +291,7 @@
- 				rc = rra_syncmgr_put_multiple_objects(self.instance,type_id,c_oidcount,
- 								      c_oids,c_newoids,flags,_CB_ReaderCallback,self)
- 				if rc == True:
--					for i from 0 <= i < c_oidcount:
-+					for 0 <= i < c_oidcount:
- 						newoid_array.append(c_newoids[i])
- 			free(c_oids)
- 		return rc
-@@ -312,7 +312,7 @@
- 	# (to be overloaded by user)
- 	#
- 
--	def CB_TypeCallback(self, event, type, idarray):
-+	def CB_TypeCallback(self, event, type_id, idarray):
- 		return False
- 		
- 	def CB_ObjectWriterCallback(self,type_id, obj_id, data):
diff --git a/community/tightvnc/tightvnc-fontpath-xcolors.patch b/community/tightvnc/tightvnc-fontpath-xcolors.patch
deleted file mode 100644
index 10bc4b596..000000000
--- a/community/tightvnc/tightvnc-fontpath-xcolors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver
---- vnc_unixsrc/vncserver	2009-02-11 23:27:18.000000000 -0500
-+++ vnc_unixsrc.fixed/vncserver	2009-04-23 21:46:46.000000000 -0400
-@@ -34,7 +34,8 @@
- $desktopName = "X";
- $vncClasses = "/usr/local/vnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
-+$colorPath = "/usr/share/X11/rgb";
- $authType = "-rfbauth $vncUserDir/passwd";
- 
- # Read configuration from the system-wide and user files if present.
diff --git a/community/tuxcards/ChangeLog b/community/tuxcards/ChangeLog
deleted file mode 100644
index 716e98541..000000000
--- a/community/tuxcards/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2010-09-24  Eric Belanger  <eric@archlinux.org>
-
-	* tuxcards 2.2.1-1
-	* Upstream update
-
-2010-02-20  Eric Belanger  <eric@archlinux.org>
-
-	* tuxcards 2.2-1
-	* Upstream update
-	* Updated depends to qt
-	* Added .desktop file
-	* Improved description
-	* Updated url
-	* Enabled SMP build
-	* Added ChangeLog
diff --git a/community/virtualbox-modules/60-vboxguest.rules b/community/virtualbox-modules/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/community/virtualbox-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/community/virtualbox-modules/LocalConfig.kmk b/community/virtualbox-modules/LocalConfig.kmk
deleted file mode 100644
index af79f90cd..000000000
--- a/community/virtualbox-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/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
deleted file mode 100644
index 2cfa18b6a..000000000
--- a/community/virtualbox-modules/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 67731 2012-03-14 09:59:00Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
-pkgver=4.1.10
-pkgrel=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')
-[[ $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=('263e495ef3a7ab75943af28d446ee702'
-         '4c88bd122677a35f68abd76eb01b378b'
-         'ed1341881437455d9735875ddf455fbe')
-
-_extramodules=extramodules-3.2-ARCH
-_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
-
-export KERN_DIR=/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
-
-build() {
-    cd "$srcdir/VirtualBox-${pkgver}"
-
-    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}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
-    make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-}
-
-package_virtualbox-archlinux-modules(){
-    pkgdesc="Additions only for Arch Linux guests (kernel modules)"
-    license=('GPL')
-    install=virtualbox-archlinux-modules.install
-    depends=('linux>=3.2' 'linux<3.3')
-    replaces=('virtualbox-guest-modules')
-    conflicts=('virtualbox-guest-modules')
-
-    source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
-    cd "$srcdir/VirtualBox-${pkgver}/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-archlinux-modules.install"
-}
-
-package_virtualbox-modules(){
-    pkgdesc="Kernel modules for VirtualBox"
-    license=('GPL')
-    install=virtualbox-modules.install
-    depends=('linux>=3.2' 'linux<3.3')
-
-    source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
-
-    cd "$srcdir/VirtualBox-${pkgver}/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/community/virtualbox-modules/virtualbox-archlinux-modules.install b/community/virtualbox-modules/virtualbox-archlinux-modules.install
deleted file mode 100644
index 74af049cc..000000000
--- a/community/virtualbox-modules/virtualbox-archlinux-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.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community/virtualbox-modules/virtualbox-modules.install b/community/virtualbox-modules/virtualbox-modules.install
deleted file mode 100644
index eeab16ca9..000000000
--- a/community/virtualbox-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.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.2-ARCH'
-    depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community/virtualbox/10-vboxdrv.rules b/community/virtualbox/10-vboxdrv.rules
deleted file mode 100644
index 37403ae2f..000000000
--- a/community/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/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk
deleted file mode 100644
index e5cbcebcd..000000000
--- a/community/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/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
deleted file mode 100644
index f28badfda..000000000
--- a/community/virtualbox/PKGBUILD
+++ /dev/null
@@ -1,189 +0,0 @@
-# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z 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/virtualbox/change_default_driver_dir.patch b/community/virtualbox/change_default_driver_dir.patch
deleted file mode 100644
index d8531499d..000000000
--- a/community/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/virtualbox/vbox-service.conf b/community/virtualbox/vbox-service.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/community/virtualbox/vbox-service.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/community/virtualbox/vbox-service.rc b/community/virtualbox/vbox-service.rc
deleted file mode 100755
index 6f1b8d892..000000000
--- a/community/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/virtualbox/vboxbuild b/community/virtualbox/vboxbuild
deleted file mode 100755
index e6fb94edd..000000000
--- a/community/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/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch
deleted file mode 100644
index 710e2e511..000000000
--- a/community/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/virtualbox/virtualbox-source.install b/community/virtualbox/virtualbox-source.install
deleted file mode 100644
index 24d90b1c2..000000000
--- a/community/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/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install
deleted file mode 100644
index c794b857d..000000000
--- a/community/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/vobcopy/ChangeLog b/community/vobcopy/ChangeLog
deleted file mode 100644
index b3f39517a..000000000
--- a/community/vobcopy/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-10-13 voidnull <giovanni@archlinux.org>
-* Updated to 1.1.2
-
-2008-03-13 voidnull <giovanni@archlinux.org>
-* Updated to 1.1.1
diff --git a/community/winegame/PKGBUILD b/community/winegame/PKGBUILD
deleted file mode 100644
index e38cd9255..000000000
--- a/community/winegame/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 25462 2010-09-05 08:42:22Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=winegame
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="An interface to install windows programs in Wine"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/winegame/"
-license=('GPL3')
-depends=('libnotify' 'winestuff')
-makedepends=('cmake')
-source=(http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('631dd218707c6efb2901ef1206092538')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/community/winestuff/PKGBUILD b/community/winestuff/PKGBUILD
deleted file mode 100644
index 0a1e18ea3..000000000
--- a/community/winestuff/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=winestuff
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="Library utility for winegame"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/winegame/"
-license=('LGPL2.1')
-depends=('qt' 'fuseiso' 'winetricks')
-makedepends=('cmake')
-source=(http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('a01f55d30bd0e1dcee3a44aa0fa5369d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make translations
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/community/xdg-user-dirs/PKGBUILD b/community/xdg-user-dirs/PKGBUILD
deleted file mode 100644
index f96ef4606..000000000
--- a/community/xdg-user-dirs/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor:  <mathieu.clabaut@gmail.com>
-
-pkgname=xdg-user-dirs
-pkgver=0.14
-pkgrel=2
-pkgdesc="Tool to help manage 'well known' user directories like the desktop folder and the music folder. It also handles localization (i.e. translation) of the filenames. "
-arch=('i686' 'x86_64')
-depends=('sh')
-makedepends=('gawk')
-url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-license=('GPL')
-source=(http://user-dirs.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('dc496ecde0e6a1e959bd8a38643f28fd')
-backup=('etc/xdg/user-dirs.conf' 'etc/xdg/user-dirs.defaults')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install 
-}
diff --git a/community/xiphos/xiphos.patch b/community/xiphos/xiphos.patch
deleted file mode 100644
index f1940375e..000000000
--- a/community/xiphos/xiphos.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/main/display.cc	2012/02/19 14:16:05	4372
-+++ src/main/display.cc	2012/02/20 10:56:39	4374
-@@ -29,9 +29,12 @@
- #include <thmlhtmlhref.h>
- #include <gbfhtmlhref.h>
- #include <teihtmlhref.h>
-+#ifndef NO_SWORD_SET_RENDER_NOTE_NUMBERS
-+/* these files are erroneously uninstalled as of previous release */
- #include <osisxhtml.h>
- #include <thmlxhtml.h>
- #include <gbfxhtml.h>
-+#endif
- 
- #include <osisvariants.h>
- #include <thmlvariants.h>
---- src/main/display.cc (revision 4374)
-+++ src/main/display.cc (revision 4375)
-@@ -762,7 +762,10 @@
-       }
- }
-
--#ifndef NO_SWORD_SET_RENDER_NOTE_NUMBERS
-+#ifdef NO_SWORD_SET_RENDER_NOTE_NUMBERS
-+// placeholder for older Sword.
-+#define        set_render_numbers(x,y) /* nothing */
-+#else
- void
- set_render_numbers(SWModule& imodule, GLOBAL_OPS *ops)
- { 
diff --git a/community/yaws/ChangeLog b/community/yaws/ChangeLog
deleted file mode 100644
index 887b62a4f..000000000
--- a/community/yaws/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2007-06-29 Dragonlord <dragonlord@aur.archlinux.org>
-	* updated to major version 1.77
-	* added backup of /etc/yaws.conf
-
-2007-06-29 tardo <tardo@nagi-fanboi.net>
-	* Built for x86_64
-	* Moved to /usr, removed profile
diff --git a/core/curl/0001-include-headers-for-tcp-keepalives.patch b/core/curl/0001-include-headers-for-tcp-keepalives.patch
deleted file mode 100644
index 780fb5b82..000000000
--- a/core/curl/0001-include-headers-for-tcp-keepalives.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d906981b20d41466d040e6cc2570099c8d665f7f Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Sat, 28 Jan 2012 08:05:02 -0500
-Subject: [PATCH] include headers for tcp-keepalives
-
----
- src/tool_cb_skt.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/src/tool_cb_skt.c b/src/tool_cb_skt.c
-index 156c110..e74d5e4 100644
---- a/src/tool_cb_skt.c
-+++ b/src/tool_cb_skt.c
-@@ -27,6 +27,14 @@
- #  include <sys/socket.h>
- #endif
- 
-+#ifdef HAVE_NETINET_TCP_H
-+#  include <netinet/tcp.h>
-+#endif
-+
-+#ifdef HAVE_NETINET_IN_H
-+#  include <netinet/in.h>
-+#endif
-+
- #define ENABLE_CURLX_PRINTF
- /* use our own printf() functions */
- #include "curlx.h"
--- 
-1.7.8.4
-
diff --git a/core/glibc/glibc-2.10-bz4781.patch b/core/glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/core/glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/core/glibc/glibc-2.14-revert-4768ae77.patch b/core/glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/core/glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/core/gnupg/gnupg.install b/core/gnupg/gnupg.install
deleted file mode 100644
index 0a6f3d518..000000000
--- a/core/gnupg/gnupg.install
+++ /dev/null
@@ -1,21 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f ${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 ${info_dir}/dir 2> /dev/null
-  done
-}
-# vim:set ts=2 sw=2 et:
diff --git a/core/gnupg2/PKGBUILD b/core/gnupg2/PKGBUILD
deleted file mode 100644
index 367ce13b8..000000000
--- a/core/gnupg2/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 146741 2012-01-16 22:52:47Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=gnupg2
-pkgver=2.0.18
-pkgrel=1
-pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
-arch=('i686' 'x86_64')
-depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt'
-	'pth' 'libusb-compat' 'libassuan' 'texinfo' 'readline' 'pinentry' 'dirmngr')
-license=('GPL')
-url="http://www.gnupg.org/"
-install=${pkgname}.install
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2)
-
-build() {
-  cd ${srcdir}/gnupg-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 #$EXTRAOPTS
-  make
-}
-
-package() {
-  cd ${srcdir}/gnupg-$pkgver
-  make DESTDIR=${pkgdir} install
-  # move conflicting files
-  mv ${pkgdir}/usr/share/gnupg{,2}
-  rm -f ${pkgdir}/usr/share/info/dir
-}
-md5sums=('2f37e0722666a0fedbe4d9f9227ac4d7')
diff --git a/core/gnupg2/gnupg2-2.0.16-security.patch b/core/gnupg2/gnupg2-2.0.16-security.patch
deleted file mode 100644
index b265c1532..000000000
--- a/core/gnupg2/gnupg2-2.0.16-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbx/keybox-blob.c   (revision 5367)
-+++ kbx/keybox-blob.c   (working copy)
-@@ -898,6 +898,7 @@
-               rc = gpg_error_from_syserror ();
-               goto leave;
-             }
-+          names = tmp;
-         }
-       names[blob->nuids++] = p;
-       if (!i && (p=x509_email_kludge (p)))
-
diff --git a/core/gnupg2/gnupg2.install b/core/gnupg2/gnupg2.install
deleted file mode 100644
index 27c121ffd..000000000
--- a/core/gnupg2/gnupg2.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(gnupg.info gnupg.info-1 gnupg.info-2)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
deleted file mode 100644
index 4ffc3e53b..000000000
--- a/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Tue, 7 Feb 2012 09:48:59 -0200
-Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being
- applied
-
----
- TODO                     |    3 +++
- libkmod/libkmod-module.c |    3 ++-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 0af3e2e..b5eb7c9 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
- 	if (mod == NULL)
- 		return -ENOENT;
- 
--	if (module_is_inkernel(mod)) {
-+	if (!(flags & KMOD_PROBE_IGNORE_LOADED)
-+					&& module_is_inkernel(mod)) {
- 		if (flags & KMOD_PROBE_FAIL_ON_LOADED)
- 			return -EEXIST;
- 		else
--- 
-1.7.9
-
diff --git a/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch b/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
deleted file mode 100644
index 95e7f859a..000000000
--- a/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Sat, 11 Feb 2012 19:45:29 -0200
-Subject: [PATCH] libkmod-module: probe: fix infinite loop with softdeps
-
-If a softdep depends on a module in the dependency list of the module
-being inserted, we would enter and infinite loop.
-
-Move the "mod->visited = true" assignment to the proper place, hoping it
-didn't break other use cases. This is a bug that comes and goes every
-now and then. Since we have a testsuite now, a test for this should be
-written.
----
- libkmod/libkmod-module.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index b5eb7c9..835896f 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -1013,7 +1013,6 @@ static int __kmod_module_fill_softdep(struct kmod_module *mod,
- 		goto fail;
- 	}
- 	*list = l;
--	mod->visited = true;
- 	mod->ignorecmd = (pre != NULL || post != NULL);
- 
- 	kmod_list_foreach(l, post) {
-@@ -1043,6 +1042,7 @@ static int __kmod_module_get_probe_list(struct kmod_module *mod,
- 								mod->name);
- 		return 0;
- 	}
-+	mod->visited = true;
- 
- 	dep = kmod_module_get_dependencies(mod);
- 	kmod_list_foreach(l, dep) {
--- 
-1.7.9
-
diff --git a/core/krb5/krb5-1.9.1-2011-007.patch b/core/krb5/krb5-1.9.1-2011-007.patch
deleted file mode 100644
index 336a4ad31..000000000
--- a/core/krb5/krb5-1.9.1-2011-007.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
-index f46cad3..102fbaa 100644
---- a/src/kdc/Makefile.in
-+++ b/src/kdc/Makefile.in
-@@ -67,6 +67,7 @@ check-unix:: rtest
- 
- check-pytests::
- 	$(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
-+	$(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
- 
- install::
- 	$(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index c169c54..840a2ef 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -243,7 +243,8 @@ tgt_again:
-                     if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
-                         errcode = find_alternate_tgs(request, &server);
-                         firstpass = 0;
--                        goto tgt_again;
-+                        if (errcode == 0)
-+                            goto tgt_again;
-                     }
-                 }
-                 status = "UNKNOWN_SERVER";
-diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py
-new file mode 100644
-index 0000000..1760bcd
---- /dev/null
-+++ b/src/kdc/t_emptytgt.py
-@@ -0,0 +1,8 @@
-+#!/usr/bin/python
-+from k5test import *
-+
-+realm = K5Realm(start_kadmind=False, create_host=False)
-+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
-+if 'not found in Kerberos database' not in output:
-+    fail('TGT lookup for empty realm failed in unexpected way')
-+success('Empty tgt lookup.')
diff --git a/core/krb5/krb5-1.9.1-canonicalize-fallback.patch b/core/krb5/krb5-1.9.1-canonicalize-fallback.patch
deleted file mode 100644
index e5a38498f..000000000
--- a/core/krb5/krb5-1.9.1-canonicalize-fallback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
---- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c	2011-02-09 16:55:36.000000000 -0500
-+++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c	2011-09-26 18:42:01.465190278 -0400
-@@ -470,13 +470,10 @@
- 
- /***** STATE_REFERRALS *****/
- 
--/*
-- * Possibly retry a request in the fallback realm after a referral request
-- * failure in the local realm.  Expects ctx->reply_code to be set to the error
-- * from a referral request.
-- */
-+/* Possibly try a non-referral request after a referral request failure.
-+ * Expects ctx->reply_code to be set to the error from a referral request. */
- static krb5_error_code
--try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
-+try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
- {
-     krb5_error_code code;
-     char **hrealms;
-@@ -485,9 +482,10 @@
-     if (ctx->referral_count > 1)
-         return ctx->reply_code;
- 
--    /* Only fall back if the original request used the referral realm. */
-+    /* If the request used a specified realm, make a non-referral request to
-+     * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
-     if (!krb5_is_referral_realm(&ctx->req_server->realm))
--        return ctx->reply_code;
-+        return begin_non_referral(context, ctx);
- 
-     if (ctx->server->length < 2) {
-         /* We need a type/host format principal to find a fallback realm. */
-@@ -500,10 +498,10 @@
-     if (code != 0)
-         return code;
- 
--    /* Give up if the fallback realm isn't any different. */
-+    /* If the fallback realm isn't any different, use the existing TGT. */
-     if (data_eq_string(ctx->server->realm, hrealms[0])) {
-         krb5_free_host_realm(context, hrealms);
--        return ctx->reply_code;
-+        return begin_non_referral(context, ctx);
-     }
- 
-     /* Rewrite server->realm to be the fallback realm. */
-@@ -540,9 +538,9 @@
-     krb5_error_code code;
-     const krb5_data *referral_realm;
- 
--    /* Possibly retry with the fallback realm on error. */
-+    /* Possibly try a non-referral fallback request on error. */
-     if (ctx->reply_code != 0)
--        return try_fallback_realm(context, ctx);
-+        return try_fallback(context, ctx);
- 
-     if (krb5_principal_compare(context, ctx->reply_creds->server,
-                                ctx->server)) {
diff --git a/core/krb5/krb5-1.9.1-config-script.patch b/core/krb5/krb5-1.9.1-config-script.patch
deleted file mode 100644
index a72a75edf..000000000
--- a/core/krb5/krb5-1.9.1-config-script.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
---- krb5-1.9.1.ori/src/krb5-config.in	2010-01-19 13:44:57.000000000 -0500
-+++ krb5-1.9.1/src/krb5-config.in	2011-09-26 18:27:09.018487087 -0400
-@@ -186,7 +186,7 @@
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
--	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+	    -e 's#\$(CFLAGS)##'`
- 
-     if test $library = 'kdb'; then
- 	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-@@ -214,9 +214,13 @@
-     fi
- 
-     if test $library = 'krb5'; then
--	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
-     fi
- 
-+    # If we ever support a flag to generate output suitable for static
-+    # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
-+    # here.
-+
-     echo $lib_flags
- fi
- 
diff --git a/core/libfetch/Makefile b/core/libfetch/Makefile
deleted file mode 100644
index 34f3b1d99..000000000
--- a/core/libfetch/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-prefix = /usr
-DESTDIR =
-DEBUG = false
-FETCH_WITH_INET6 = true
-FETCH_WITH_OPENSSL = true
-
-WARNINGS = -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \
-           -Wpointer-arith -Wcast-align
-
-CFLAGS  ?= -O2 -pipe
-
-CFLAGS  += -fPIC $(WARNINGS)
-CFLAGS  += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES
-CFLAGS  += -DFTP_COMBINE_CWDS -DNETBSD
-
-ifeq ($(strip $(FETCH_WITH_INET6)), true)
-CFLAGS  += -DINET6
-endif
-
-ifeq ($(strip $(FETCH_WITH_OPENSSL)), true)
-CFLAGS  += -DWITH_SSL
-LDADD   += -Wl,-lssl -Wl,-lcrypto
-endif
-
-INSTALL = install -c -D
-
-OBJS= fetch.o common.o ftp.o http.o file.o
-INCS= fetch.h common.h
-GEN = ftperr.h httperr.h
-MAN = libdownload.3
-
-all: libfetch.so libfetch.a
-.PHONY: all
-
-%.o: %.c $(INCS) $(GEN)
-	$(CC) $(CFLAGS) -c $<
-
-ftperr.h: ftp.errors Makefile errlist.sh
-	./errlist.sh ftp_errlist FTP ftp.errors > $@
-
-httperr.h: http.errors Makefile errlist.sh
-	./errlist.sh http_errlist HTTP http.errors > $@
-
-libfetch.so: $(GEN) $(INCS) $(OBJS)
-	rm -f $@
-	$(CC) $(LDFLAGS) $(OBJS) $(LDADD) -shared -fPIC -o $@
-
-libfetch.a: $(GEN) $(INCS) $(OBJS)
-	rm -f $@
-	$(AR) rcs $@ $(OBJS)
-
-clean:
-	rm -f libfetch.so libfetch.a *.o $(GEN)
-.PHONY: clean
-
-install: all
-	$(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so
-	$(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a
-	$(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h
-	$(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3
-.PHONY: install
-
-uninstall:
-	rm -f $(DESTDIR)$(prefix)/lib/libfetch.so
-	rm -f $(DESTDIR)$(prefix)/lib/libfetch.a
-	rm -f $(DESTDIR)$(prefix)/include/fetch.h
-	rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3
-.PHONY: uninstall
diff --git a/core/libfetch/PKGBUILD b/core/libfetch/PKGBUILD
deleted file mode 100644
index 328ebcf88..000000000
--- a/core/libfetch/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id:$
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Xavier Chantry <shiningxc@gmail.com>
-
-pkgname=libfetch
-pkgver=2.33
-pkgrel=3
-pkgdesc="URL based download library"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('openssl>=1.0.0')
-url="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/"
-source=(Makefile
-        ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz
-        fetch-handle-temp-redirect.patch)
-md5sums=('7dffdd5a81bb32084a2f45e61f70dcf9'
-         'a176b94f7f30344ef8a71c047ca2136b'
-         '2ee40d7e7d76c39ae5500d89075ef8a6')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-# source PKGBUILD && mksource
-mksource() {
-  export CVSROOT=:pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot
-  D=pkgsrc/net/libfetch
-  [ -d "$D" ] && cvs up "$D" || cvs co "$D"
-  pushd "$D"
-  dirname=$(sed -n 's/DISTNAME=.*\(libfetch-.*$\)/\1/p' Makefile)
-  cp -r files $dirname
-  tar -czv --exclude=CVS -f ../../../$dirname.tar.gz $dirname
-  rm -r $dirname
-  popd
-}
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  cp $srcdir/Makefile .
-  make || return 1
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  licdir=$pkgdir/usr/share/licenses/libfetch/
-  mkdir -p $licdir
-  sed -n -e '/Copyright (c)/,/SUCH DAMAGE\./p' common.c | cut -c '4-' > $licdir/LICENSE
-}
diff --git a/core/libfetch/fetch-handle-temp-redirect.patch b/core/libfetch/fetch-handle-temp-redirect.patch
deleted file mode 100644
index 351cbcfd8..000000000
--- a/core/libfetch/fetch-handle-temp-redirect.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: http.c
-===================================================================
-RCS file: /cvsroot/pkgsrc/net/libfetch/files/http.c,v
-retrieving revision 1.29
-diff -u -r1.29 http.c
---- http.c	24 Jan 2010 19:10:35 -0000	1.29
-+++ http.c	19 Apr 2011 13:29:04 -0000
-@@ -974,6 +974,7 @@
- 		case HTTP_MOVED_PERM:
- 		case HTTP_MOVED_TEMP:
- 		case HTTP_SEE_OTHER:
-+		case HTTP_TEMP_REDIRECT:
- 			/*
- 			 * Not so fine, but we still have to read the
- 			 * headers to get the new location.
diff --git a/core/libnl/fix-compilation.patch b/core/libnl/fix-compilation.patch
deleted file mode 100644
index 891562a39..000000000
--- a/core/libnl/fix-compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-local.h	2009-06-26 11:15:33.186011844 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD
deleted file mode 100644
index d69936a88..000000000
--- a/core/linux-api-headers/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 145919 2012-01-04 01:25:14Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=linux-api-headers
-pkgver=3.1.6
-_basever=3.1
-pkgrel=1
-pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL2')
-provides=("kernel-headers=${pkgver}")
-conflicts=('kernel-headers')
-replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
-	http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz)
-# NOTE: signatures are not automatically verified by makepkg
-        #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
-	#http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
-md5sums=('edbdc798f23ae0f8045c82f6fa22c536'
-         'b59adeac6d593fe993e964ea9e259c42')
-
-build() {
-  cd ${srcdir}/linux-${_basever}
-  [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver}
-
-  make mrproper
-  make headers_check
-}
-
-package() {
-  cd ${srcdir}/linux-${_basever}
-  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
-
-  # use headers from libdrm
-  rm -rf ${pkgdir}/usr/include/drm
-  
-  # clean-up unnecessary files generated during install
-  find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f
-}
diff --git a/core/man-db/1361_1360.diff b/core/man-db/1361_1360.diff
deleted file mode 100644
index c93856980..000000000
--- a/core/man-db/1361_1360.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-=== modified file 'src/straycats.c'
---- src/straycats.c	2011-01-10 20:08:22 +0000
-+++ src/straycats.c	2011-06-04 06:34:51 +0000
-@@ -177,6 +177,7 @@
- 			char *lang, *page_encoding;
- 			char *mandir_base;
- 			pipecmd *col_cmd;
-+			char *col_locale;
- 			char *fullpath;
- 
- 			/* we have a straycat. Need to filter it and get
-@@ -226,6 +227,12 @@
- 			col_cmd = pipecmd_new_argstr
- 				(get_def_user ("col", COL));
- 			pipecmd_arg (col_cmd, "-bx");
-+			col_locale = find_charset_locale ("UTF-8");
-+			if (col_locale) {
-+				pipecmd_setenv (col_cmd, "LC_CTYPE",
-+						col_locale);
-+				free (col_locale);
-+			}
- 			pipeline_command (decomp, col_cmd);
- 
- 			fullpath = canonicalize_file_name (catdir);
-
diff --git a/core/mpfr/mpfr-3.1.0.p3.patch b/core/mpfr/mpfr-3.1.0.p3.patch
deleted file mode 100644
index 16d944047..000000000
--- a/core/mpfr/mpfr-3.1.0.p3.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
-@@ -0,0 +1 @@
-+lib-search-path
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p1
-+3.1.0-p2
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p1"
-+#define MPFR_VERSION_STRING "3.1.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p1";
-+  return "3.1.0-p2";
- }
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
---- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-@@ -65,8 +65,24 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
---- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-@@ -1124,11 +1124,27 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
- all: all-am
- 
- .SUFFIXES:
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p2
-+3.1.0-p3
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p2"
-+#define MPFR_VERSION_STRING "3.1.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
---- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -1178,7 +1178,7 @@
-   mpfr_exp_t exp;
-   char * str;
-   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
--  const int keep_trailing_zeros = spec_g && spec.alt;
-+  const int keep_trailing_zeros = !spec_g || spec.alt;
- 
-   /* WARNING: an empty precision field is forbidden (it means precision = 6
-      and it should have been changed to 6 before the function call) */
-@@ -1356,7 +1356,7 @@
-   else
-     /* 1 <= |p| */
-     {
--      size_t nsd;  /* Number of significant digits */
-+      size_t str_len;
- 
-       /* Determine the position of the most significant decimal digit. */
-       exp = floor_log10 (p);
-@@ -1365,12 +1365,10 @@
-         /* P is too large to print all its integral part digits */
-         return -1;
- 
--      np->ip_size = exp + 1;
--
--      nsd = spec.prec + np->ip_size;
-       if (dec_info == NULL)
--        {
--          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
-+        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
-+          str =
-+            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
-           register_string (np->sl, str);
-         }
-       else
-@@ -1379,81 +1377,60 @@
-           str = dec_info->str;
-         }
-       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
-+      str_len = strlen (str);
-+
-+      /* integral part */
-+      if (exp > str_len)
-+        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
-+           power of 10 (p integer, so no fractional part) */
-+        {
-+          np->ip_trailing_zeros = exp - str_len;
-+          np->ip_size = str_len;
-+        }
-+      else
-+        np->ip_size = exp;
- 
-       if (spec.group)
-         /* thousands separator in integral part */
-         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
- 
--      if (nsd == 0 || (spec_g && !spec.alt))
--        /* compute how much non-zero digits in integral and fractional
--           parts */
-+      /* fractional part */
-+      str += np->ip_size;
-+      str_len -= np->ip_size;
-+      if (!keep_trailing_zeros)
-+        /* remove trailing zeros, if any */
-         {
--          size_t str_len;
--          str_len = strlen (str); /* note: the sign has been skipped */
--
--          if (exp > str_len)
--            /* mpfr_get_str doesn't give the trailing zeros when p is a
--               multiple of 10 (p integer, so no fractional part) */
--            {
--              np->ip_trailing_zeros = exp - str_len;
--              np->ip_size = str_len;
--              if (spec.alt)
--                np->point = MPFR_DECIMAL_POINT;
--            }
--          else
--            /* str may contain some digits which are in fractional part */
-+          char *ptr = str + str_len - 1; /* pointer to the last digit of
-+                                            str */
-+          while ((*ptr == '0') && (str_len != 0))
-             {
--              char *ptr;
--
--              ptr = str + str_len - 1; /* points to the end of str */
--              str_len -= np->ip_size;  /* number of digits in fractional
--                                          part */
--
--              if (!keep_trailing_zeros)
--                /* remove trailing zeros, if any */
--                {
--                  while ((*ptr == '0') && (str_len != 0))
--                    {
--                      --ptr;
--                      --str_len;
--                    }
--                }
--
--              if (str_len > INT_MAX)
--                /* too many digits in fractional part */
--                return -1;
--
--              if (str_len != 0)
--                /* some digits in fractional part */
--                {
--                  np->point = MPFR_DECIMAL_POINT;
--                  np->fp_ptr = str + np->ip_size;
--                  np->fp_size = str_len;
--                }
-+              --ptr;
-+              --str_len;
-             }
-         }
--      else
--        /* spec.prec digits in fractional part */
-+
-+      if (str_len > 0)
-+        /* some nonzero digits in fractional part */
-         {
--          if (np->ip_size == exp - 1)
--            /* the absolute value of the number has been rounded up to a power
--               of ten.
--               Insert an additional zero in integral part and put the rest of
--               them in fractional part. */
--            np->ip_trailing_zeros = 1;
-+          if (str_len > INT_MAX)
-+            /* too many digits in fractional part */
-+            return -1;
- 
--          if (spec.prec != 0)
--            {
--              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
--              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_ptr = str;
-+          np->fp_size = str_len;
-+        }
- 
--              np->point = MPFR_DECIMAL_POINT;
--              np->fp_ptr = str + np->ip_size;
--              np->fp_size = spec.prec;
--            }
--          else if (spec.alt)
--            np->point = MPFR_DECIMAL_POINT;
-+      if (keep_trailing_zeros && str_len < spec.prec)
-+        /* add missing trailing zeros */
-+        {
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_trailing_zeros = spec.prec - np->fp_size;
-         }
-+
-+      if (spec.alt)
-+        /* add decimal point even if no digits follow it */
-+        np->point = MPFR_DECIMAL_POINT;
-     }
- 
-   return 0;
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p2";
-+  return "3.1.0-p3";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
---- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -475,6 +475,18 @@
-   check_sprintf ("-1.", "%- #0.1RG", x);
- 
-   /* precision zero */
-+  mpfr_set_d (x, 9.5, MPFR_RNDN);
-+  check_sprintf ("9",    "%.0RDf", x);
-+  check_sprintf ("10",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 19.5, MPFR_RNDN);
-+  check_sprintf ("19",    "%.0RDf", x);
-+  check_sprintf ("20",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 99.5, MPFR_RNDN);
-+  check_sprintf ("99",    "%.0RDf", x);
-+  check_sprintf ("100",   "%.0RUf", x);
-+
-   mpfr_set_d (x, -9.5, MPFR_RNDN);
-   check_sprintf ("-10",    "%.0RDf", x);
-   check_sprintf ("-10",    "%.0RYf", x);
-@@ -1078,6 +1090,23 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+bug20111102 (void)
-+{
-+  mpfr_t t;
-+  char s[100];
-+
-+  mpfr_init2 (t, 84);
-+  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
-+  mpfr_sprintf (s, "%.20RNg", t);
-+  if (strcmp (s, "1000") != 0)
-+    {
-+      printf ("Error in bug20111102, expected 1000, got %s\n", s);
-+      exit (1);
-+    }
-+  mpfr_clear (t);
-+}
-+
- /* In particular, the following test makes sure that the rounding
-  * for %Ra and %Rb is not done on the MPFR number itself (as it
-  * would overflow). Note: it has been reported on comp.std.c that
-@@ -1161,6 +1190,7 @@
-   locale = setlocale (LC_ALL, "C");
- #endif
- 
-+  bug20111102 ();
-   native_types ();
-   hexadecimal ();
-   binary ();
diff --git a/core/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/core/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch
deleted file mode 100644
index 4a5a138e7..000000000
--- a/core/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 nfs-utils-1.1.2/aclocal/kerberos5.m4
---- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4	2008-03-14 16:46:29.000000000 +0100
-+++ nfs-utils-1.1.2/aclocal/kerberos5.m4	2008-06-12 17:13:51.000000000 +0200
-@@ -1,112 +1,48 @@
--dnl Checks for Kerberos
--dnl NOTE: while we intend to do generic gss-api, currently we
--dnl have a requirement to get an initial Kerberos machine
--dnl credential.  Thus, the requirement for Kerberos.
--dnl The Kerberos gssapi library will be dynamically loaded?
- AC_DEFUN([AC_KERBEROS_V5],[
-+  K5CONFIG="krb5-config"
-   AC_MSG_CHECKING(for Kerberos v5)
--  AC_ARG_WITH(krb5,
--  [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])],
-+  AC_ARG_WITH(krb5-config,
-+  [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])],
-   [ case "$withval" in
-     yes|no)
--       krb5_with=""
-+       K5CONFIG="krb5-config"
-        ;;
-     *)
--       krb5_with="$withval"
-+       K5CONFIG="$withval"
-        ;;
-     esac ]
-   )
- 
--  for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \
--  	     /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do
--    dnl This ugly hack brought on by the split installation of
--    dnl MIT Kerberos on Fedora Core 1
--    K5CONFIG=""
--    if test -f $dir/bin/krb5-config; then
--      K5CONFIG=$dir/bin/krb5-config
--    elif test -f "/usr/kerberos/bin/krb5-config"; then
--      K5CONFIG="/usr/kerberos/bin/krb5-config"
--    elif test -f "/usr/lib/mit/bin/krb5-config"; then
--      K5CONFIG="/usr/lib/mit/bin/krb5-config"
--    fi
-     if test "$K5CONFIG" != ""; then
-       KRBCFLAGS=`$K5CONFIG --cflags`
-       KRBLIBS=`$K5CONFIG --libs gssapi`
--      K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
--      AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
--      if test -f $dir/include/gssapi/gssapi_krb5.h -a \
--                \( -f $dir/lib/libgssapi_krb5.a -o \
--                   -f $dir/lib64/libgssapi_krb5.a -o \
--                   -f $dir/lib64/libgssapi_krb5.so -o \
--                   -f $dir/lib/libgssapi_krb5.so \) ; then
-+    if $K5CONFIG --version | grep -q -e heimdal; then
-+      K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'`
-+      AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-+      gssapi_lib=gssapi
-+      KRBIMPL="heimdal"
-+    elif $K5CONFIG --version | grep -q -e mit; then
-+      K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'`
-          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
--         KRBDIR="$dir"
--  dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
--  dnl private function (gss_krb5_ccache_name) to get correct
--  dnl behavior of changing the ccache used by gssapi.
--  dnl Starting in 1.3.2, we *DO NOT* want to use
--  dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME
--  dnl to get gssapi to use a different ccache
-          if test $K5VERS -le 131; then
-            AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable])
-          fi
-          gssapi_lib=gssapi_krb5
--         break
--      dnl The following ugly hack brought on by the split installation
--      dnl of Heimdal Kerberos on SuSe
--      elif test \( -f $dir/include/heim_err.h -o\
--      		 -f $dir/include/heimdal/heim_err.h \) -a \
--                -f $dir/lib/libroken.a; then
--         AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
--         KRBDIR="$dir"
--         gssapi_lib=gssapi
--        break
--      fi
--    fi
--  done
--  dnl We didn't find a usable Kerberos environment
--  if test "x$KRBDIR" = "x"; then
--    if test "x$krb5_with" = "x"; then
--      AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=)
-+      KRBIMPL="mit-krb5"
-     else
--      AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with)
--    fi
-+      AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.)
-+      KRBIMPL="unknown"
-   fi
--  AC_MSG_RESULT($KRBDIR)
--
--  dnl Check if -rpath=$(KRBDIR)/lib is needed
--  echo "The current KRBDIR is $KRBDIR"
--  if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \
--       -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then
--    KRBLDFLAGS="";
--  elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then
--    KRBLDFLAGS="";
--  else
--    KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib"
-+    AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
-   fi
-+  AC_MSG_RESULT($KRBIMPL)
- 
--  dnl Now check for functions within gssapi library
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context,
--    AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes,
--    AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name,
--    AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
--
--  dnl Check for newer error message facility
--  AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
--    AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
- 
--  dnl Check for function to specify addressless tickets
--  AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless,
--    AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
--
--  dnl If they specified a directory and it didn't work, give them a warning
--  if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then
--    AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!)
--  fi
--
--  AC_SUBST([KRBDIR])
-   AC_SUBST([KRBLIBS])
-   AC_SUBST([KRBCFLAGS])
-   AC_SUBST([KRBLDFLAGS])
diff --git a/core/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/core/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch
deleted file mode 100644
index 7f6c7a751..000000000
--- a/core/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c nfs-utils-1.1.6/utils/gssd/krb5_util.c
---- utils/gssd/krb5_util.c      2009-04-20 19:32:50.000000000 +0200
-+++ utils/gssd/krb5_util.c      2009-04-20 20:57:31.000000000 +0200
-@@ -940,9 +940,37 @@
- {
- 	krb5_error_code ret;
- 	krb5_creds creds;
--	krb5_cc_cursor cur;
- 	int found = 0;
- 
-+#ifdef HAVE_HEIMDAL
-+	krb5_creds pattern;
-+	krb5_realm *client_realm;
-+
-+	krb5_cc_clear_mcred(&pattern);
-+
-+	client_realm = krb5_princ_realm (context, principal);
-+
-+	ret = krb5_make_principal (context, &pattern.server,
-+				   *client_realm, KRB5_TGS_NAME, *client_realm,
-+				   NULL);
-+	if (ret)
-+	  krb5_err (context, 1, ret, "krb5_make_principal");
-+	pattern.client = principal;
-+
-+	ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
-+	krb5_free_principal (context, pattern.server);
-+	if (ret) {
-+	  if (ret == KRB5_CC_END)
-+            return 1;
-+	  krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
-+	}
-+
-+	found = creds.times.endtime > time(NULL);
-+
-+	krb5_free_cred_contents (context, &creds);
-+#else
-+	krb5_cc_cursor cur;
-+
- 	ret = krb5_cc_start_seq_get(context, ccache, &cur);
- 	if (ret) 
- 		return 0;
-@@ -962,6 +990,7 @@
- 		krb5_free_cred_contents(context, &creds);
- 	}
- 	krb5_cc_end_seq_get(context, ccache, &cur);
-+#endif
- 
- 	return found;
- }
-@@ -1008,6 +1037,9 @@
- 	}
- 	krb5_free_principal(context, principal);
- err_princ:
-+#ifdef HAVE_HEIMDAL
-+#define KRB5_TC_OPENCLOSE              0x00000001
-+#endif
- 	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
- 	krb5_cc_close(context, ccache);
- err_cache:
-@@ -1262,7 +1294,7 @@
- 	if (context != NULL) {
- 		origmsg = krb5_get_error_message(context, code);
- 		msg = strdup(origmsg);
--		krb5_free_error_message(context, origmsg);
-+		krb5_free_error_string(context, origmsg);
- 	}
- #endif
- 	if (msg != NULL)
diff --git a/core/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/core/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch
deleted file mode 100644
index 917136a8c..000000000
--- a/core/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: nfs-utils-1.1.6/utils/gssd/context_lucid.c
-===================================================================
---- nfs-utils-1.1.6.orig/utils/gssd/context_lucid.c
-+++ nfs-utils-1.1.6/utils/gssd/context_lucid.c
-@@ -51,8 +51,10 @@
- #include "context.h"
- 
- #ifndef OM_uint64
-+#ifndef GSSAPI_GSSAPI_H_
- typedef uint64_t OM_uint64;
- #endif
-+#endif
- 
- static int
- write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key)
-@@ -177,10 +179,10 @@
- 	int retcode = 0;
- 
- 	printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");
--	maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
-+	maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
- 						1, &return_ctx);
- 	if (maj_stat != GSS_S_COMPLETE) {
--		pgsserr("gss_export_lucid_sec_context",
-+		pgsserr("gss_krb5_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
- 		goto out_err;
- 	}
-@@ -204,9 +206,9 @@
- 	else
- 		retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf, endtime);
- 
--	maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
-+	maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx);
- 	if (maj_stat != GSS_S_COMPLETE) {
--		pgsserr("gss_export_lucid_sec_context",
-+		pgsserr("gss_krb5_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
- 		printerr(0, "WARN: failed to free lucid sec context\n");
- 	}
-Index: nfs-utils-1.1.6/utils/gssd/krb5_util.c
-===================================================================
---- nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c
-+++ nfs-utils-1.1.6/utils/gssd/krb5_util.c
-@@ -332,10 +332,10 @@
- 		return -1;
- 	}
- 
--	maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid,
-+	maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
- 					     num_enctypes, &enctypes);
- 	if (maj_stat != GSS_S_COMPLETE) {
--		pgsserr("gss_set_allowable_enctypes",
-+		pgsserr("gss_krb5_set_allowable_enctypes",
- 			maj_stat, min_stat, &krb5oid);
- 		gss_release_cred(&min_stat, &credh);
- 		return -1;
diff --git a/core/psmisc/COMM_LEN-to-18.patch b/core/psmisc/COMM_LEN-to-18.patch
deleted file mode 100644
index 5cec62507..000000000
--- a/core/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/core/usbutils/usb.ids-2011.08.17 b/core/usbutils/usb.ids-2011.08.17
deleted file mode 100644
index a194ddaec..000000000
--- a/core/usbutils/usb.ids-2011.08.17
+++ /dev/null
@@ -1,16529 +0,0 @@
-#
-#	List of USB ID's
-#
-#	Maintained by Stephen J. Gowdy <linux.usb.ids@gmail.com>
-#	If you have any new entries, please submit them via
-#		http://www.linux-usb.org/usb-ids.html
-#	or send entries as patches (diff -u old new) in the
-#	body of your email (a bot will attempt to deal with it).
-#	The latest version can be obtained from
-#		http://www.linux-usb.org/usb.ids
-#
-# Version: 2011.08.10
-# Date:    2011-08-10 20:34:03
-#
-
-# Vendors, devices and interfaces. Please keep sorted.
-
-# Syntax:
-# vendor  vendor_name
-#	device  device_name				<-- single tab
-#		interface  interface_name		<-- two tabs
-
-0001  Fry's Electronics
-	142b  Arbiter Systems, Inc.
-0002  Ingram
-0003  Club Mac
-0004  Nebraska Furniture Mart
-0053  Planex
-	5301  GW-US54ZGL 802.11bg
-0079  DragonRise Inc.
-	0006  Generic USB Joystick
-	0011  Gamepad
-0105  Trust International B.V.
-	145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
-0145  Unknown
-	0112  Card Reader
-0204  Chipsbank Microelectronics Co., Ltd
-	6025  CBM2080 Flash drive controller
-	6026  CBM1180 Flash drive controller
-0218  Hangzhou Worlde
-	0301  MIDI Port
-02ad  HUMAX Co., Ltd.
-	138c  PVR Mass Storage
-0300  MM300 eBook Reader
-0324  OCZ Technology Inc
-	bc06  OCZ ATV USB 2.0 Flash Drive
-	bc08  OCZ Rally2/ATV USB 2.0 Flash Drive
-0325  OCZ Technology Inc
-	ac02  ATV Turbo / Rally2 Dual Channel USB 2.0 Flash Drive
-0386  LTS
-	0001  PSX for USB Converter
-03da  Bernd Walter Computer Technology
-	0002  HD44780 LCD interface
-03e8  EndPoints, Inc.
-	0004  SE401 Webcam
-	0008  101 Ethernet [klsi]
-	0015  ATAPI Enclosure
-	2123  SiPix StyleCam Deluxe
-	8004  Aox 99001
-03e9  Thesys Microelectronics
-03ea  Data Broadcasting Corp.
-03eb  Atmel Corp.
-	0902  4-Port Hub
-	2002  Mass Storage Device
-	2015  at90usbkey sample firmware (HID keyboard)
-	2018  at90usbkey sample firmware (CDC ACM)
-	2019  stk525 sample firmware (microphone)
-	201c  at90usbkey sample firmware (HID mouse)
-	201d  at90usbkey sample firmware (HID generic)
-	2022  at90usbkey sample firmware (composite device)
-	2040  LUFA Test PID
-	2041  LUFA Mouse Demo Application
-	2042  LUFA Keyboard Demo Application
-	2043  LUFA Joystick Demo Application
-	2044  LUFA CDC Demo Application
-	2045  LUFA Mass Storage Demo Application
-	2046  LUFA Audio Output Demo Application
-	2047  LUFA Audio Input Demo Application
-	2048  LUFA MIDI Demo Application
-	2049  Stripe Snoop Magnetic Stripe Reader
-	204a  LUFA CDC Class Bootloader
-	204b  LUFA USB to Serial Adapter Project
-	204c  LUFA RNDIS Demo Application
-	204d  LUFA Combined Mouse and Keyboard Demo Application
-	204e  LUFA Dual CDC Demo Application
-	204f  LUFA Generic HID Demo Application
-	2060  Benito Programmer Project
-	2061  LUFA Combined Mass Storage and Keyboard Demo Application
-	2062  LUFA Combined CDC and Mouse Demo Application
-	2063  LUFA Datalogger Device
-	2064  Interfaceless Control-Only LUFA Devices
-	2065  LUFA Test and Measurement Demo Application
-	2066  LUFA Multiple Report HID Demo
-	2068  LUFA Virtual Serial/Mass Storage Demo
-	2069  LUFA Webserver Project
-	2103  JTAG ICE mkII
-	2104  AVR ISP mkII
-	2105  AVRONE!
-	2106  STK600 development board
-	2107  AVR Dragon
-	210d  XPLAIN evaluation kit (CDC ACM)
-	2122  XMEGA-A1 Explained evaluation kit
-	2310  EVK11xx evaluation board
-	2ffb  at90usb AVR DFU bootloader
-	2ffd  at89c5130/c5131 DFU bootloader
-	2fff  at89c5132/c51snd1c DFU bootloader
-	3301  at43301 4-Port Hub
-	3312  4-Port Hub
-	4102  AirVast W-Buddie WN210
-	5601  at76c510 Prism-II 802.11b Access Point
-	5603  Cisco 7920 WiFi IP Phone
-	6124  at91sam SAMBA bootloader
-	7603  D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a]
-	7604  at76c503a 802.11b Adapter
-	7605  at76c503a 802.11b Adapter
-	7606  at76c505 802.11b Adapter
-	7611  at76c510 rfmd2948 802.11b Access Point
-	7613  WL-1130 USB
-	7614  AT76c505a Wireless Adapter
-	7615  AT76C505AMX Wireless Adapter
-	7617  AT76C505AS Wireless Adapter
-	7800  Mini Album
-	ff07  Tux Droid fish dongle
-03ec  Iwatsu America, Inc.
-03ed  Mitel Corp.
-03ee  Mitsumi
-	0000  CD-R/RW Drive
-	2501  eHome Infrared Receiver
-	2502  eHome Infrared Receiver
-	5609  Japanese Keyboard
-	641f  WIF-0402C Bluetooth Adapter
-	6438  Bluetooth Device
-	6440  WML-C52APR Bluetooth Adapter
-	6901  SmartDisk FDD
-	6902  Floppy Disk Drive
-	7500  CD-R/RW
-	ffff  Dongle with BlueCore in DFU mode
-03f0  Hewlett-Packard
-	0004  DeskJet 895c
-	0011  OfficeJet G55
-	0012  DeskJet 1125C Printer Port
-	0024  KU-0316 Keyboard
-	002a  LaserJet P1102
-	0101  ScanJet 4100c
-	0102  PhotoSmart S20
-	0104  DeskJet 880c/970c
-	0105  ScanJet 4200c
-	0107  CD-Writer Plus
-	010c  Multimedia Keyboard Hub
-	0111  G55xi Printer/Scanner/Copier
-	0117  LaserJet 3200
-	011c  hn210w 802.11b Adapter
-	011d  Integrated Bluetooth Module
-	0121  HP49g+ Calculator
-	0122  HID Internet Keyboard
-	0201  ScanJet 6200c
-	0202  PhotoSmart S20
-	0204  DeskJet 815c
-	0205  ScanJet 3300c
-	0207  CD-Writer Plus 8200e
-	020c  Multimedia Keyboard
-	0211  OfficeJet G85
-	0212  DeskJet 1220C
-	0217  LaserJet 2200
-	0218  APOLLO P2500/2600
-	0304  DeskJet 810c/812c
-	0305  ScanJet 4300c
-	0307  CD-Writer+ CD-4e
-	0311  OfficeJet G85xi
-	0312  Color Inkjet CP1700
-	0314  designjet 30/130 series
-	0317  LaserJet 1200
-	0324  SK-2885 keyboard
-	0401  ScanJet 5200c
-	0404  DeskJet 830c/832c
-	0405  ScanJet 3400cse
-	0411  OfficeJet G95
-	0412  Printing Support
-	0417  LaserJet 1200 series
-	0423  HS-COMBO
-	0504  DeskJet 885c
-	0505  ScanJet 2100c
-	0507  DVD+RW
-	050c  5219 Wireless Keyboard
-	0511  OfficeJet K60
-	0512  DeckJet 450
-	0517  LaserJet 1000
-	051d  Wireless (Bluetooth + WLAN) Interface [Integrated Module]
-	0601  ScanJet 6300c
-	0604  DeskJet 840c
-	0605  ScanJet 2200c
-	0611  OfficeJet K60xi
-	0612  business inkjet 3000
-	0624  Bluetooth Dongle
-	0701  ScanJet 5300c/5370c
-	0704  DeskJet 825c
-	0705  ScanJet 4400c
-	0711  OfficeJet K80
-	0712  DeskJet 1180c
-	0714  Printing Support
-	0801  ScanJet 7400c
-	0804  DeskJet 816c
-	0805  HP4470C
-	0811  OfficeJet K80xi
-	0817  LaserJet 3300
-	0901  ScanJet 2300c
-	0904  DeskJet 845c
-	0912  Printing Support
-	0917  LaserJet 3330
-	0924  Modular Smartcard Keyboard
-	0a01  ScanJet 2400c
-	0a17  color LaserJet 3700
-	0b01  ScanJet 82x0C
-	0b0c  Wireless Keyboard and Optical Mouse receiver
-	0b17  LaserJet 2300d
-	0c17  LaserJet 1010
-	0c24  Bluetooth Dongle
-	0d12  OfficeJet 9100 series
-	0d17  LaserJet 1012
-	0e17  LaserJet 1015
-	0f0c  Wireless Keyboard and Optical Mouse receiver
-	0f11  OfficeJet V40
-	0f12  Printing Support
-	0f17  LaserJet 1150
-	1001  Photo Scanner 1000
-	1002  PhotoSmart 140 series
-	1004  DeskJet 970c/970cse
-	1005  ScanJet 5400c
-	1011  OfficeJet V40xi
-	1016  Jornada 548 / iPAQ HW6515 Pocket PC
-	1017  LaserJet 1300
-	1024  Smart Card Keyboard
-	1027  Virtual keyboard and mouse
-	1102  PhotoSmart 240 series
-	1104  DeskJet 959c
-	1105  ScanJet 5470c/5490c
-	1111  OfficeJet v60
-	1116  Jornada 568 Pocket PC
-	1117  LaserJet 1300n
-	1151  PSC-750xi Printer/Scanner/Copier
-	1202  PhotoSmart 320 series
-	1204  DeskJet 930c
-	1205  ScanJet 4500C/5550C
-	1211  OfficeJet v60xi
-	1217  LaserJet 2300L
-	1302  PhotoSmart 370 series
-	1305  ScanJet 4570c
-	1311  OfficeJet V30
-	1312  DeskJet 460
-	1317  LaserJet 1005
-	1405  ScanJet 3670
-	1411  PSC 750
-	1424  f2105 Monitor Hub
-	1502  PhotoSmart 420 series
-	1504  DeskJet 920c
-	150c  Mood Lighting (Microchip Technology Inc.)
-	1511  PSC 750xi
-	1512  Printing Support
-	1517  color LaserJet 3500
-	1524  Smart Card Keyboard - KR
-	1602  PhotoSmart 330 series
-	1604  DeskJet 940c
-	1605  ScanJet 5530C PhotoSmart
-	1611  psc 780
-	1617  LaserJet 3015
-	161d  Wireless Rechargeable Optical Mouse (HID)
-	1624  Smart Card Keyboard - JP
-	1702  PhotoSmart 380 series
-	1704  DeskJet 948C
-	1705  ScanJet 5590
-	1711  psc 780xi
-	1712  Printing Support
-	1717  LaserJet 3020
-	171d  Wireless (Bluetooth + WLAN) Interface [Integrated Module]
-	1801  Inkjet P-2000U
-	1802  PhotoSmart 470 series
-	1804  DeskJet 916C
-	1805  ScanJet 7650
-	1811  PSC 720
-	1812  OfficeJet Pro K550
-	1817  LaserJet 3030
-	181d  integrated module with Bluetooth 2.0 wireless technology.
-	1902  PhotoSmart A430 series
-	1904  DeskJet 3820
-	1911  OfficeJet V45
-	1917  LaserJet 3380
-	1a02  PhotoSmart A510 series
-	1a11  OfficeJet 5100 series
-	1a17  color LaserJet 4650
-	1b02  PhotoSmart A610 series
-	1b04  DeskJet 3810
-	1b05  ScanJet 4850C/4890C
-	1b07  Premium Starter Webcam
-	1c02  PhotoSmart A710 series
-	1c17  Color LaserJet 2550l
-	1d02  PhotoSmart A310 series
-	1d17  LaserJet 1320
-	1e02  PhotoSmart A320 Printer series
-	1e11  PSC-950
-	1e17  LaserJet 1160 series
-	1f02  PhotoSmart A440 Printer series
-	1f11  PSC 920
-	1f12  OfficeJet Pro K5300
-	1f17  color LaserJet 5550
-	1f1d  un2400 Gobi Wireless Modem
-	2001  Floppy
-	2002  Hub
-	2004  DeskJet 640c
-	2005  ScanJet 3570c
-	2012  OfficeJet Pro K5400
-	201d  un2400 Gobi Wireless Modem (QDL mode)
-	2102  PhotoSmart 7345
-	2104  DeskJet 630c
-	2112  OfficeJet Pro L7500
-	211d  Sierra MC5725 [ev2210]
-	2202  PhotoSmart 7600 series
-	2205  ScanJet 3500c
-	2212  OfficeJet Pro L7600
-	2217  color LaserJet 9500 MFP
-	2302  PhotoSmart 7600 series
-	2304  DeskJet 656c
-	2305  ScanJet 3970c
-	2311  OfficeJet d series
-	2312  OfficeJet Pro L7700
-	2317  LaserJet 4350
-	2402  PhotoSmart 7700 series
-	2404  Deskjet F2280 series
-	2405  ScanJet 4070 PhotoSmart
-	2417  LaserJet 4250
-	241d  Gobi 2000 Wireless Modem (QDL mode)
-	2424  LP1965 19" Monitor Hub
-	2502  PhotoSmart 7700 series
-	2504  DeskJet F4200 series
-	2505  ScanJet 3770
-	2512  OfficeJet Pro L7300
-	2517  LaserJet 2410
-	251d  Gobi 2000 Wireless Modem
-	2524  LP3065 30" Monitor Hub
-	2602  PhotoSmart A520 series
-	2605  ScanJet 3800c
-	2611  OfficeJet 7100 series
-	2617  Color LaserJet 2820 series
-	2624  Pole Display (HP522 2 x 20 Line Display)
-	2702  PhotoSmart A620 series
-	2704  DeskJet 915
-	2717  Color LaserJet 2830
-	2811  PSC-2100
-	2817  Color LaserJet 2840
-	2902  PhotoSmart A820 series
-	2911  PSC 2200
-	2917  LaserJet 2420
-	2a11  PSC 2150 series
-	2a17  LaserJet 2430
-	2b11  PSC 2170 series
-	2b17  LaserJet 1020
-	2c12  Officejet J4680
-	2c17  LaserJet 1022
-	2c24  Logitech M-UAL-96 Mouse
-	2d11  OfficeJet 6110
-	2d17  Printing Support
-	2e11  PSC 1000
-	2e17  LaserJet 2600n
-	2e24  LP2275w Monitor Hub
-	2f11  PSC 1200
-	2f17  EWS 2605dn
-	2f24  LP2475w Monitor Hub
-	3002  PhotoSmart P1000
-	3004  DeskJet 980c
-	3005  ScanJet 4670v
-	3011  PSC 1100 series
-	3017  Printing Support
-	3102  PhotoSmart P1100 Printer w/ Card Reader
-	3104  DeskJet 960c
-	3111  OfficeJet 4100 series
-	3117  EWS 2605dtn
-	311d  Atheros AR9285 Malbec Bluetooth Adapter
-	3202  PhotoSmart 1215
-	3207  4 GB flash drive
-	3211  OfficeJet 4105 series
-	3217  LaserJet 3050
-	3302  PhotoSmart 1218
-	3304  DeskJet 990c
-	3312  OfficeJet J6410
-	3317  LaserJet 3052
-	3402  PhotoSmart 1115
-	3404  DeskJet 6122
-	3417  LaserJet 3055
-	3502  PhotoSmart 230
-	3504  DeskJet 6127c
-	3511  PSC 2300
-	3517  LaserJet 3390
-	3602  PhotoSmart 1315
-	3611  PSC 2410 PhotoSmart
-	3617  Color LaserJet 2605
-	3711  PSC 2500
-	3717  EWS UPD
-	3724  Webcam
-	3802  PhotoSmart 100
-	3817  LaserJet P2015 series
-	3902  PhotoSmart 130
-	3a02  PhotoSmart 7150
-	3a11  OfficeJet 5500 series
-	3a17  Printing Support
-	3b02  PhotoSmart 7150~
-	3b11  PSC 1300 series
-	3b17  LaserJet M1005 MFP
-	3c02  PhotoSmart 7350
-	3c11  PSC 1358
-	3c17  EWS UPD
-	3d02  PhotoSmart 7350~
-	3d11  OfficeJet 4215
-	3d17  LaserJet P1005
-	3e02  PhotoSmart 7550
-	3e17  LaserJet P1006
-	3f02  PhotoSmart 7550~
-	3f11  PSC-1315/PSC-1317
-	4002  PhotoSmart 635/715/720/735/935 (storage)
-	4004  cp1160
-	4102  PhotoSmart 618
-	4105  ScanJet 4370
-	4111  OfficeJet 7200 series
-	4117  LaserJet 1018
-	4202  PhotoSmart 812
-	4205  ScanJet G3010
-	4211  OfficeJet 7300 series
-	4217  EWS CM1015
-	4302  PhotoSmart 850 (ptp)
-	4305  ScanJet G3110
-	4311  OfficeJet 7400 series
-	4317  Color LaserJet CM1017
-	4402  PhotoSmart 935 (ptp)
-	4417  EWS UPD
-	4502  PhotoSmart 945 (PTP mode)
-	4505  ScanJet G4010
-	4511  PhotoSmart 2600
-	4512  E709n [Officejet 6500 Wireless]
-	4517  EWS UPD
-	4605  ScanJet G4050
-	4611  PhotoSmart 2700
-	4717  Color LaserJet CP1215
-	4811  PSC 1600
-	4911  PSC 2350
-	4b11  OfficeJet 6200
-	4c11  PSC 1500 series
-	4c17  EWS UPD
-	4d11  PSC 1400
-	4d17  EWS UPD
-	4e11  PhotoSmart 2570 series
-	4f11  OfficeJet 5600 (USBHUB)
-	5004  DeskJet 995c
-	5011  PhotoSmart 3100 series
-	5017  EWS UPD
-	5111  PhotoSmart 3200 series
-	5211  PhotoSmart 3300 series
-	5311  OfficeJet 6300
-	5312  Officejet Pro 8500A
-	5411  OfficeJet 4300
-	5511  DeskJet F300 series
-	5611  PhotoSmart C3180
-	5617  LaserJet M1120 MFP
-	5711  PhotoSmart C4100 series
-	5717  LaserJet M1120n MFP
-	5811  PhotoSmart C5100 series
-	5817  LaserJet M1319f MFP
-	5911  PhotoSmart C6180
-	5a11  PhotoSmart C7100 series
-	5b11  OfficeJet J2100 series
-	5c11  PhotoSmart C4200 Printer series
-	5d11  PhotoSmart C5200 series
-	5e11  PhotoSmart D7400 series
-	6004  DeskJet 5550
-	6102  Hewlett Packard Digital Camera
-	6104  DeskJet 5650c
-	6117  color LaserJet 3550
-	6202  PhotoSmart 215
-	6204  DeskJet 5150c
-	6217  Color LaserJet 4700
-	6302  PhotoSmart 318/612
-	6317  Color LaserJet 4730mfp
-	6402  PhotoSmart 715 (ptp)
-	6411  PhotoSmart C8100 series
-	6417  LaserJet 5200
-	6502  PhotoSmart 120 (ptp)
-	6511  PhotoSmart C7200 series
-	6602  PhotoSmart 320
-	6611  PhotoSmart C4380 series
-	6617  LaserJet 5200L
-	6702  PhotoSmart 720 (ptp)
-	6717  Color LaserJet 3000
-	6802  PhotoSmart 620 (ptp)
-	6811  PhotoSmart D5300 series
-	6817  Color LaserJet 3800
-	6911  PhotoSmart D7200 series
-	6917  Color LaserJet 3600
-	6a02  PhotoSmart 735 (ptp)
-	6a11  PhotoSmart C6200 series
-	6a17  LaserJet 4240
-	6b02  PhotoSmart R707 (PTP mode)
-	6b11  Photosmart C4500 series
-	6c17  Color LaserJet 4610
-	6f17  Color LaserJet CP6015 series
-	7004  DeskJet 3320c
-	7102  PhotoSmart 635 (PTP mode)
-	7104  DeskJet 3420c
-	7117  CM8060 Color MFP with Edgeline Technology
-	7202  PhotoSmart 43x (ptp)
-	7204  DeskJet 36xx
-	7217  LaserJet M5035 MFP
-	7302  PhotoSmart M307 (PTP mode)
-	7304  DeskJet 35xx
-	7311  Photosmart Premium C309
-	7317  LaserJet P3005
-	7404  Printing Support
-	7417  LaserJet M4345 MFP
-	7504  Printing Support
-	7517  LaserJet M3035 MFP
-	7604  DeskJet 3940
-	7611  DeskJet F2492 All-in-One
-	7617  LaserJet P3004
-	7702  PhotoSmart R817 (PTP mode)
-	7704  DeskJet D4100
-	7717  CM8050 Color MFP with Edgeline Technology
-	7804  DeskJet D1360
-	7817  Color LaserJet CP3505
-	7917  LaserJet M5025 MFP
-	7a02  PhotoSmart M415 (PTP mode)
-	7a04  DeskJet D2460
-	7a17  LaserJet M3027 MFP
-	7b02  PhotoSmart M23 (PTP mode)
-	7b17  Color LaserJet CP4005
-	7c17  Color LaserJet CM6040 series
-	7d04  DeskJet F2100 Printer series
-	7d17  Color LaserJet CM4730 MFP
-	7e04  DeskJet F4100 Printer series
-	8017  LaserJet P4515
-	8104  Printing Support
-	8117  LaserJet P4015
-	811c  Ethernet HN210E
-	8204  Printing Support
-	8207  FHA-3510 2.4GHz Wireless Optical Mobile Mouse
-	8217  LaserJet P4014
-	8317  LaserJet M9050 MFP
-	8404  DeskJet 6800 series
-	8417  LaserJet M9040 MFP
-	8504  DeskJet 6600 series
-	8604  DeskJet 5440
-	8704  DeskJet 5940
-	8804  DeskJet 6980 series
-	8904  DeskJet 6940 series
-	8c07  Digital Stereo Headset
-	8c11  Deskjet F4500 series
-	9002  PhotoSmart M437
-	9102  PhotoSmart M537
-	9302  PhotoSmart R930 series
-	9402  PhotoSmart R837
-	9502  PhotoSmart R840 series
-	9602  PhotoSmart M730 series
-	9702  PhotoSmart R740 series
-	9802  PhotoSmart Mz60 series
-	9902  PhotoSmart M630 series
-	9a02  PhotoSmart E330 series
-	9b02  PhotoSmart M540 series
-	9c02  PhotoSmart M440 series
-	a004  DeskJet 5850c
-	b002  PhotoSmart 7200 series
-	b102  PhotoSmart 7200 series
-	b116  Webcam
-	b202  PhotoSmart 7600 series
-	b302  PhotoSmart 7600 series
-	b402  PhotoSmart 7700 series
-	b502  PhotoSmart 7700 series
-	b602  PhotoSmart 7900 series
-	b702  PhotoSmart 7900 series
-	b802  PhotoSmart 7400 series
-	b902  PhotoSmart 7800 series
-	ba02  PhotoSmart 8100 series
-	bb02  PhotoSmart 8400 series
-	bc02  PhotoSmart 8700 series
-	bd02  PhotoSmart Pro B9100 series
-	bef4  NEC Picty760
-	c002  PhotoSmart 7800 series
-	c102  PhotoSmart 8000 series
-	c202  PhotoSmart 8200 series
-	c302  DeskJet D2300
-	c402  PhotoSmart D5100 series
-	c502  PhotoSmart D6100 series
-	c602  PhotoSmart D7100 series
-	c702  PhotoSmart D7300 series
-	c802  PhotoSmart D5060 Printer
-	d104  Bluetooth Dongle
-	efbe  NEC Picty900
-	f0be  NEC Picty920
-	f1be  NEC Picty800
-03f1  Genoa Technology
-03f2  Oak Technology, Inc.
-03f3  Adaptec, Inc.
-	0020  AWN-8020 WLAN
-	0080  AVC-1100 Audio Capture
-	0083  AVC-2200 Device
-	0087  AVC-2210 Loader
-	0088  AVC-2210 Device
-	008b  AVC-2310 Loader
-	008c  AVC-2310 Device
-	0094  eHome Infrared Receiver
-	009b  AVC-1410 GameBridge TV NTSC
-	2000  USBXchange
-	2001  USBXchange Adapter
-	2002  USB2-Xchange
-	2003  USB2-Xchange Adapter
-	adcc  Composite Device Support
-03f4  Diebold, Inc.
-03f5  Siemens Electromechanical
-03f8  Epson Imaging Technology Center
-03f9  KeyTronic Corp.
-	0100  Keyboard
-	0101  Keyboard
-	0102  Keyboard Mouse
-03fb  OPTi, Inc.
-03fc  Elitegroup Computer Systems
-03fd  Xilinx, Inc.
-03fe  Farallon Comunications
-0400  National Semiconductor Corp.
-	05dc  Rigol Technologies DS1000USB Oscilloscope
-	0807  Bluetooth Dongle
-	080a  Bluetooth Device
-	09c4  Rigol Technologies DG1022 Arbitrary Waveform Generator
-	1000  Mustek BearPaw 1200 Scanner
-	1001  Mustek BearPaw 2400 Scanner
-	1237  Hub
-	a000  Smart Display Reference Device
-	c359  Logitech Harmony (Boot loader mode)
-	c35b  Printing Support
-	c55d  Rigol Technologies DS5000USB Oscilloscope
-0401  National Registry, Inc.
-0402  ALi Corp.
-	5462  M5462 IDE Controller
-	5602  M5602 Video Camera Controller
-	5603  M5603 Video Camera Controller
-	5606  M5606 Video Camera Controller [UVC]
-	5621  M5621 High-Speed IDE Controller
-	5623  M5623 Scanner Controller
-	5627  Welland ME-740PS USB2 3.5" Power Saving Enclosure
-	5632  M5632 Host-to-Host Link
-	5635  M5635 Flash Card Reader
-	5636  USB 2.0 Storage Device
-	5637  M5637 IDE Controller
-	5661  M5661 MP3 player
-	5667  M5667 MP3 player
-	9665  Gateway Webcam
-0403  Future Technology Devices International, Ltd
-	0000  H4SMK 7 Port Hub
-	0232  Serial Converter
-	1060  JTAG adapter
-	6001  FT232 USB-Serial (UART) IC
-	6007  Serial Converter
-	6008  Serial Converter
-	6009  Serial Converter
-	6010  FT2232C Dual USB-UART/FIFO IC
-	6011  FT4232H Quad HS USB-UART/FIFO IC
-	6014  FT232H Single HS USB-UART/FIFO IC
-	8040  4 Port Hub
-	8070  7 Port Hub
-	8370  7 Port Hub
-	8371  PS/2 Keyboard And Mouse
-	8372  FT8U100AX Serial Port
-	bcd8  Stellaris Development Board
-	bcd9  Stellaris Evaluation Board
-	c630  lcd2usb interface
-	c631  i2c-tiny-usb interface
-	c632  xu1541 c64 floppy drive interface
-	c633  TinyCrypt dongle
-	c634  glcd2usb interface
-	c7d0  RR-CirKits LocoBuffer-USB
-	c8b8  Alpermann+Velte MTD TCU
-	c8b9  Alpermann+Velte MTD TCU 1HE
-	c8ba  Alpermann+Velte Rubidium H1
-	c8bb  Alpermann+Velte Rubidium H3
-	c8bc  Alpermann+Velte Rubidium S1
-	c8bd  Alpermann+Velte Rubidium T1
-	c8be  Alpermann+Velte Rubidium D1
-	cc48  product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi
-	cc49  product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru
-	cc4a  product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal
-	d010  SCS PTC-IIusb
-	d011  SCS Position-Tracker/TNC
-	d012  SCS DRAGON 1
-	d013  SCS DRAGON 1
-	d6f8  UNI Black BOX
-	d9a9  Actisense USG-1 NMEA Serial Gateway
-	d9aa  Actisense NGT-1 NMEA2000 PC Interface
-	e0d0  Total Phase Aardvark I2C/SPI Host Adapter
-	e521  EVER Sinline XL Series UPS
-	e6c8  PYRAMID Computer GmbH LCD
-	e700  Elster Unicom III Optical Probe
-	e888  Expert ISDN Control USB
-	e889  USB-RS232 OptoBridge
-	e88a  Expert mouseCLOCK USB II
-	e88b  Precision Clock MSF USB
-	e88c  Expert mouseCLOCK USB II HBG
-	ea90  Eclo 1-Wire Adapter
-	ed71  HAMEG HO870 Serial Port
-	ed72  HAMEG HO720 Serial Port
-	ed73  HAMEG HO730 Serial Port
-	ed74  HAMEG HO820 Serial Port
-	ef10  FT1245BL
-	f070  Serial Converter 422/485 [Vardaan VEUSB422R3]
-	f1a0  Asix PRESTO Programmer
-	f208  Papenmeier Braille-Display
-	f3c0  4N-GALAXY Serial Converter
-	f680  Suunto Sports Instrument
-	f758  GW Instek GDS-8x0 Oscilloscope
-	f850  USB-UIRT (Universal Infrared Receiver+Transmitter)
-	f918  Ant8 Logic Probe
-	fa00  Matrix Orbital USB Serial
-	fa01  Matrix Orbital MX2 or MX3
-	fa02  Matrix Orbital MX4 or MX5
-	fa03  Matrix Orbital VK/LK202 Family
-	fa04  Matrix Orbital VK/LK204 Family
-	fc08  Crystalfontz CFA-632 USB LCD
-	fc09  Crystalfontz CFA-634 USB LCD
-	fc0b  Crystalfontz CFA-633 USB LCD
-	fc0c  Crystalfontz CFA-631 USB LCD
-	fc0d  Crystalfontz CFA-635 USB LCD
-	fc82  SEMC DSS-20/DSS-25 SyncStation
-	fd48  ShipModul MiniPlex-4xUSB NMEA Multiplexer
-	fd49  ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer
-	ff08  ToolHouse LoopBack Adapter
-	ff18  Logbook Bus
-	ff19  Logbook Bus
-	ff1a  Logbook Bus
-	ff1b  Logbook Bus
-	ff1c  Logbook Bus
-	ff1d  Logbook Bus
-	ff1e  Logbook Bus
-	ff1f  Logbook Bus
-0404  NCR Corp.
-	0202  78XX Scanner
-	0203  78XX Scanner - Embedded System
-	0310  K590 Printer, Self-Service
-	0311  7167 Printer, Receipt/Slip
-	0312  7197 Printer Receipt
-	0320  5932-USB Keyboard
-	0321  5953-USB Dynakey
-	0322  5932-USB Enhanced Keyboard
-	0323  5932-USB Enhanced Keyboard, Flash-Recovery/Download
-	0324  5953-USB Enhanced Dynakey
-	0325  5953-USB Enhanced Dynakey Flash-Recovery/Download
-	0328  K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages)
-	0329  K018: USB-MSR JIS 2-Track MSR: POS Standard
-	032a  K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode
-	032b  K016/K018: USB-MSR Flash-Recovery/Download
-0405  Synopsys, Inc.
-0406  Fujitsu-ICL Computers
-0407  Fujitsu Personal Systems, Inc.
-0408  Quanta Computer, Inc.
-	0103  FV TouchCam N1 (Audio)
-	030c  HP Webcam
-	03b2  HP Webcam
-	1030  FV TouchCam N1 (Video)
-	3000  Optical dual-touch panel
-	3001  Optical Touch Screen
-0409  NEC Corp.
-	0011  PC98 Series Layout Keyboard Mouse
-	0012  ATerm IT75DSU ISDN TA
-	0014  Japanese Keyboard
-	0019  109 Japanese Keyboard with Bus-Powered Hub
-	001a  PC98 Series Layout Keyboard with Bus-Powered Hub
-	0025  Mini Keyboard with Bus-Powered Hub
-	0027  MultiSync Monitor
-	002c  Clik!-USB Drive
-	0034  109 Japanese Keyboard with One-touch start buttons
-	003f  Wireless Keyboard with One-touch start buttons
-	0040  Floppy
-	004e  SuperScript 1400 Series
-	004f  Wireless Keyboard with One-touch start buttons
-	0058  HighSpeed Hub
-	0059  HighSpeed Hub
-	005a  HighSpeed Hub
-	006a  Conceptronic USB Harddisk Box
-	0081  SuperScript 1400 Series
-	0082  SuperScript 1400 Series
-	0094  Japanese Keyboard with One-touch start buttons
-	0095  Japanese Keyboard
-	00a9  AtermIT21L 128K Support Standard
-	00aa  AtermITX72 128K Support Standard
-	00ab  AtermITX62 128K Support Standard
-	00ac  AtermIT42 128K Support Standard
-	00ae  INSMATEV70G-MAX Standard
-	00af  AtermITX70 128K Support Standard
-	00b0  AtermITX80 128K Support Standard
-	00b2  AtermITX80D 128K Support Standard
-	00c0  Wireless Remocon
-	00f7  Smart Display PK-SD10
-	011d  e228 Mobile Phone
-	0203  HID Audio Controls
-	021d  Aterm WL54SU2 802.11g Wireless Adapter [Atheros AR5523]
-	0248  Aterm PA-WL54GU
-	0249  Aterm WL300NU-G
-	02b4  Aterm WL300NU-AG
-	02b6  Aterm WL300NU-GS 802.11n Wireless Adapter
-	55aa  Hub
-	55ab  Hub [iMac/iTouch kbd]
-	8010  Intellibase Hub
-	8011  Intellibase Hub
-	efbe  P!cty 900 [HP DJ]
-	f0be  P!cty 920 [HP DJ 812c]
-040a  Kodak Co.
-	0001  DVC-323
-	0002  DVC-325
-	0100  DC-220
-	0110  DC-260
-	0111  DC-265
-	0112  DC-290
-	0120  DC-240
-	0121  DC-240 (PTP firmware)
-	0130  DC-280
-	0131  DC-5000
-	0132  DC-3400
-	0140  DC-4800
-	0160  DC4800
-	0170  DX3900
-	0200  Digital Camera
-	0300  EZ-200
-	0400  MC3
-	0402  Digital Camera
-	0403  Z7590
-	0500  DX3500
-	0510  DX3600
-	0525  DX3215
-	0530  DX3700
-	0535  EasyShare CX4230 Camera
-	0540  LS420
-	0550  DX4900
-	0555  DX4330
-	0560  CX4200
-	0565  CX4210
-	0566  CX4300
-	0567  LS753
-	0568  LS443
-	0569  LS663
-	0570  DX6340
-	0571  CX6330
-	0572  DX6440
-	0573  CX6230
-	0574  CX6200
-	0575  DX6490
-	0576  DX4530
-	0577  DX7630
-	0578  CX7300/CX7310
-	0579  CX7220
-	057a  CX7330
-	057b  CX7430
-	057c  CX7530
-	057d  DX7440
-	057e  C300
-	057f  DX7590
-	0580  Z730
-	0581  Digital Camera
-	0582  Digital Camera
-	0583  Digital Camera
-	0584  CX6445
-	0585  Digital Camera
-	0586  CX7525
-	0587  Digital Camera
-	0588  Digital Camera
-	0589  EasyShare C360
-	058a  C310
-	058b  Digital Camera
-	058c  C330
-	058d  C340
-	058e  V530
-	058f  V550
-	0590  Digital Camera
-	0591  Digital Camera
-	0592  Digital Camera
-	0593  Digital Camera
-	0594  Digital Camera
-	0595  Digital Camera
-	0596  Digital Camera
-	0597  Digital Camera
-	0598  Digital Camera
-	0599  Digital Camera
-	059a  Digital Camera
-	059b  Digital Camera
-	059c  Digital Camera
-	059d  Digital Camera
-	059e  Digital Camera
-	059f  Digital Camera
-	05a0  Digital Camera
-	05a1  Digital Camera
-	05a2  Digital Camera
-	05a3  Digital Camera
-	05a4  Digital Camera
-	05a5  Digital Camera
-	05a6  Digital Camera
-	05a7  Digital Camera
-	05a8  Digital Camera
-	05a9  Digital Camera
-	05aa  Digital Camera
-	05ab  Digital Camera
-	05ac  Digital Camera
-	05ad  Digital Camera
-	05ae  Digital Camera
-	05af  Digital Camera
-	05b0  Digital Camera
-	05b1  Digital Camera
-	05b2  Digital Camera
-	05b3  EasyShare Z710 Camera
-	05b4  Digital Camera
-	05b5  Digital Camera
-	05b6  Digital Camera
-	05b7  Digital Camera
-	05b8  Digital Camera
-	05b9  Digital Camera
-	05ba  Digital Camera
-	05bb  Digital Camera
-	05bc  Digital Camera
-	05bd  Digital Camera
-	05be  Digital Camera
-	05bf  Digital Camera
-	05c0  Digital Camera
-	05c1  Digital Camera
-	05c2  Digital Camera
-	05c3  Digital Camera
-	05c4  Digital Camera
-	05c5  Digital Camera
-	05c8  EASYSHARE Z1485 IS Digital Camera
-	05d3  EasyShare M320 Camera
-	05d4  EasyShare C180 Digital Camera
-	1001  EasyShare SV811 Digital Picture Frame
-	4000  InkJet Color Printer
-	4109  EasyShare Printer Dock Series 3
-	410d  EasyShare G600 Printer Dock
-	5010  Wireless Adapter
-	5012  DBT-220 Bluetooth Adapter
-	6001  i30
-	6002  i40
-	6003  i50
-	6004  i60
-	6005  i80
-040b  Weltrend Semiconductor
-	6510  Weltrend Bar Code Reader
-	6520  XBOX Xploder
-	6533  Speed-Link Competition Pro
-040c  VTech Computers, Ltd
-040d  VIA Technologies, Inc.
-	3184  VNT VT6656 USB-802.11 Wireless LAN Adapter
-	6205  USB 2.0 Card Reader
-040e  MCCI
-040f  Echo Speech Corp.
-0411  BUFFALO INC. (formerly MelCo., Inc.)
-	0001  LUA-TX Ethernet [pegasus]
-	0005  LUA-TX Ethernet
-	0006  WLI-USB-L11 Wireless LAN Adapter
-	0009  LUA2-TX Ethernet
-	000b  WLI-USB-L11G-WR Wireless LAN Adapter
-	000d  WLI-USB-L11G Wireless LAN Adapter
-	0012  LUA-KTX Ethernet
-	0013  USB2-IDE Adapter
-	0016  WLI-USB-S11 802.11b Adapter
-	0018  USB2-IDE Adapter
-	001c  USB-IDE Bridge: DUB-PxxG
-	0027  WLI-USB-KS11G 802.11b Adapter
-	003d  LUA-U2-KTX Ethernet
-	0044  WLI-USB-KB11 Wireless LAN Adapter
-	004b  WLI-USB-G54 802.11g Adapter [Broadcom 4320 USB]
-	004d  WLI-USB-B11 Wireless LAN Adapter
-	0050  WLI2-USB2-G54 Wireless LAN Adapter
-	005e  WLI-U2-KG54-YB WLAN
-	0065  Python2 WDM Encoder
-	0066  WLI-U2-KG54 WLAN
-	0067  WLI-U2-KG54-AI WLAN
-	0089  Buffalo RUF-C/U2 Flash Drive
-	008b  Nintendo Wi-Fi
-	0091  WLI-U2-KAMG54 Wireless LAN Adapter
-	0092  WLI-U2-KAMG54 Bootloader
-	0097  WLI-U2-KG54-BB
-	00a9  WLI-U2-AMG54HP Wireless LAN Adapter
-	00aa  WLI-U2-AMG54HP Bootloader
-	00b3  PC-OP-RS1 RemoteStation
-	00bc  WLI-U2-KG125S 802.11g Adapter [Broadcom 4320 USB]
-	00ca  802.11n Network Adapter
-	00cb  WLI-U2-G300N 802.11n Adapter
-	00d8  WLI-U2-SG54HP
-	00d9  WLI-U2-G54HP
-	00da  WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B]
-	00e8  WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]
-	012e  WLI-UC-AG300N Wireless LAN Adapter
-	0148  WLI-UC-G300HP Wireless LAN Adapter
-	0150  WLP-UC-AG300 Wireless LAN Adapter
-	0157  External Hard Drive HD-PEU2
-	0158  WLI-UC-GNHP Wireless LAN Adapter
-	015d  WLI-UC-GN Wireless LAN Adapter [Ralink RT3070]
-	016f  WLI-UC-G301N Wireless LAN Adapter
-	017f  Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
-	019e  WLI-UC-GNP Wireless LAN Adapter
-	01a1  MiniStation Metro
-	01a2  WLI-UC-GNM Wireless LAN Adapter
-0412  Award Software International
-0413  Leadtek Research, Inc.
-	1310  WinFast TV - NTSC + FM
-	1311  WinFast TV - NTSC + MTS + FM
-	1312  WinFast TV - PAL BG + FM
-	1313  WinFast TV - PAL BG+TXT + FM
-	1314  WinFast TV Audio - PHP PAL I
-	1315  WinFast TV Audio - PHP PAL I+TXT
-	1316  WinFast TV Audio - PHP PAL DK
-	1317  WinFast TV Audio - PHP PAL DK+TXT
-	1318  WinFast TV - PAL I/DK + FM
-	1319  WinFast TV - PAL N + FM
-	131a  WinFast TV Audio - PHP SECAM LL
-	131b  WinFast TV Audio - PHP SECAM LL+TXT
-	131c  WinFast TV Audio - PHP SECAM DK
-	131d  WinFast TV - SECAM DK + TXT + FM
-	131e  WinFast TV - NTSC Japan + FM
-	1320  WinFast TV - NTSC
-	1321  WinFast TV - NTSC + MTS
-	1322  WinFast TV - PAL BG
-	1323  WinFast TV - PAL BG+TXT
-	1324  WinFast TV Audio - PHP PAL I
-	1325  WinFast TV Audio - PHP PAL I+TXT
-	1326  WinFast TV Audio - PHP PAL DK
-	1327  WinFast TV Audio - PHP PAL DK+TXT
-	1328  WinFast TV - PAL I/DK
-	1329  WinFast TV - PAL N
-	132a  WinFast TV Audio - PHP SECAM LL
-	132b  WinFast TV Audio - PHP SECAM LL+TXT
-	132c  WinFast TV Audio - PHP SECAM DK
-	132d  WinFast TV - SECAM DK + TXT
-	132e  WinFast TV - NTSC Japan
-	6023  EMP Audio Device
-	6024  WinFast PalmTop/Novo TV Video
-	6025  WinFast DTV Dongle (cold state)
-	6026  WinFast DTV Dongle (warm state)
-	6029  WinFast DTV Dongle Gold
-	6125  WinFast DTV Dongle
-	6126  WinFast DTV Dongle BDA Driver
-	6f00  WinFast DTV Dongle (STK7700P based)
-0414  Giga-Byte Technology Co., Ltd
-0416  Winbond Electronics Corp.
-	0035  W89C35 802.11bg WLAN Adapter
-	0101  Hub
-	0961  AVL Flash Card Reader
-	3810  Smart Card Controller
-	3811  Generic Controller - Single interface
-	3812  Smart Card Controller_2Interface
-	3813  Panel Display
-	5518  4-Port Hub
-	551a  PC Sync Keypad
-	551b  PC Async Keypad
-	551c  Sync Tenkey
-	551d  Async Tenkey
-	551e  Keyboard
-	551f  Keyboard w/ Sys and Media
-	5521  Keyboard
-	6481  16-bit Scanner
-	7721  Memory Stick Reader/Writer
-	7722  Memory Stick Reader/Writer
-	7723  SD Card Reader
-0417  Symbios Logic
-0418  AST Research
-0419  Samsung Info. Systems America, Inc.
-	0001  IrDA Remote Controller / Creative Cordless Mouse
-	0600  Desktop Wireless 6000
-	3001  Xerox P1202 Laser Printer
-	3003  Olivetti PG L12L
-	3201  Docuprint P8ex
-	3404  SCX-5x12 series
-	3406  MFP 830 series
-	3407  ML-912
-	3601  InkJet Color Printer
-	3602  InkJet Color Printer
-	4602  Remote NDIS Network Device
-	8001  Hub
-	8002  SyncMaster HID Monitor Control
-	aa03  SDAS-3 MP3 Player
-041a  Phoenix Technologies, Ltd
-041b  d'TV
-041d  S3, Inc.
-041e  Creative Technology, Ltd
-	1002  Nomad II
-	1003  Blaster GamePad Cobra
-	1050  GamePad Cobra
-	1053  Mouse Gamer HD7600L
-	200c  MuVo V100
-	2020  Zen X-Fi 2
-	2029  ZiiO
-	2801  Prodikeys PC-MIDI multifunction keyboard
-	3000  SoundBlaster Extigy
-	3002  SB External Composite Device
-	3010  SoundBlaster MP3+
-	3014  SB External Composite Device
-	3015  Sound Blaster Digital Music LX
-	3020  SoundBlaster Audigy 2 NX
-	3030  SB External Composite Device
-	3040  SoundBlaster Live! 24-bit External SB0490
-	3060  Sound Blaster Audigy 2 ZS External
-	3061  SoundBlaster Audigy 2 ZS Video Editor
-	3090  Sound Blaster Digital Music SX
-	30d3  Sound Blaster Play!
-	3f00  E-Mu Xboard 25 MIDI Controller
-	3f02  E-Mu 0202
-	3f04  E-Mu 0404
-	3f07  E-Mu Xmidi 1x1
-	4003  VideoBlaster Webcam Go Plus [W9967CF]
-	4004  Nomad II MG
-	4005  Webcam Blaster Go ES
-	4007  Go Mini
-	400a  PC-Cam 300
-	400b  PC-Cam 600
-	400c  Webcam 5 [pwc]
-	400d  Webcam PD1001
-	400f  PC-CAM 550 (Composite)
-	4011  Webcam PRO eX
-	4012  PC-CAM350
-	4013  PC-Cam 750
-	4015  CardCam Value
-	4016  CardCam
-	4017  Webcam Mobile [PD1090]
-	4018  Webcam Vista [PD1100]
-	4019  Audio Device
-	401a  Webcam Vista [PD1100]
-	401c  Webcam NX [PD1110]
-	401d  Webcam NX Ultra
-	401e  Webcam NX Pro
-	401f  Webcam Notebook [PD1171]
-	4020  Webcam NX
-	4021  Webcam NX Ultra
-	4022  Webcam NX Pro
-	4028  Vista Plus cam [VF0090]
-	4029  Webcam Live!
-	402f  DC-CAM 3000Z
-	4034  Webcam Instant
-	4035  Webcam Instant
-	4036  Webcam Live!/Live! Pro
-	4037  Webcam Live!
-	4038  ORITE CCD Webcam [PC370R]
-	4039  Webcam Live! Effects
-	403a  Webcam NX Pro 2
-	403b  Creative Webcam Vista [VF0010]
-	403c  Webcam Live! Ultra
-	403d  Webcam Notebook Ultra
-	403e  Webcam Vista Plus
-	4041  Webcam Live! Motion
-	4043  Vibra Plus Webcam
-	4045  Live! Cam Voice
-	4049  Live! Cam Voice
-	4051  Live! Cam Notebook Pro [VF0250]
-	4052  Live! Cam Vista IM
-	4053  Live! Cam Video IM
-	4054  Live! Cam Video IM
-	4055  Live! Cam Video IM Pro
-	4056  Live! Cam Video IM Pro
-	4057  Live! Cam Optia
-	4058  Live! Cam Optia AF
-	4061  Live! Cam Notebook Pro [VF0400]
-	4063  Live! Cam Video IM Pro
-	4068  Live! Cam Notebook [VF0470]
-	406c  Live! Cam Sync [VF0520]
-	4083  Live! Cam Socialize [VF0640]
-	4100  Nomad Jukebox 2
-	4101  Nomad Jukebox 3
-	4102  NOMAD MuVo^2
-	4106  Nomad MuVo
-	4107  NOMAD MuVo
-	4108  Nomad Jukebox Zen
-	4109  Nomad Jukebox Zen NX
-	410b  Nomad Jukebox Zen USB 2.0
-	410c  Nomad MuVo NX
-	410f  NOMAD MuVo^2 (Flash)
-	4110  Nomad Jukebox Zen Xtra
-	4111  Dell Digital Jukebox
-	4116  MuVo^2
-	4117  Nomad MuVo TX
-	411b  Zen Touch
-	411c  Nomad MuVo USB 2.0
-	411d  Zen
-	411e  Zen Micro
-	4120  Nomad MuVo TX FM
-	4123  Zen Portable Media Center
-	4124  MuVo^2 FM (uHDD)
-	4126  Dell DJ (2nd gen)
-	4127  Dell DJ
-	4128  NOMAD Jukebox Zen Xtra (mtp)
-	412b  MuVo N200 with FM radio
-	412f  Dell Digital Jukebox 2.Gen
-	4130  Zen Micro (mtp)
-	4131  Zen Touch (mtp)
-	4133  Mass Storage Device
-	4134  Zen Neeon
-	4136  Zen Sleek
-	4137  Zen Sleek (mtp)
-	4139  Zen Nano Plus
-	413c  Zen MicroPhoto
-	4150  Zen V (MTP)
-	4151  Zen Vision:M (mtp)
-	4152  Zen V Plus
-	4153  Zen Vision W
-	4155  Zen Stone plus
-	4157  Zen (MTP)
-	500f  Broadband Blaster 8012U-V
-	5015  TECOM Bluetooth Device
-	ffff  Webcam Live! Ultra
-041f  LCS Telegraphics
-0420  Chips and Technologies
-	1307  Celly SIM Card Reader
-0421  Nokia Mobile Phones
-	0001  E61i (PC Suite mode)
-	0018  6288 GSM Smartphone
-	0019  6288 GSM Smartphone (imaging mode)
-	001a  6288 GSM Smartphone (file transfer mode)
-	0024  5610 XpressMusic (Storage mode)
-	0025  5610 XpressMusic (PC Suite mode)
-	0028  5610 XpressMusic (Imaging mode)
-	002d  6120 Phone (Mass storage mode)
-	002e  6120 Phone (Media-Player mode)
-	002f  6120 Phone (PC-Suite mode)
-	0042  E51 (PC Suite mode)
-	0064  3109c GSM Phone
-	006b  5310 Xpress Music (PC Suite mode)
-	006c  5310 Xpress music (Storage mode)
-	006d  N95 (Storage mode)
-	006e  N95 (Multimedia mode)
-	006f  N95 (Printing mode)
-	0070  N95 (PC Suite mode)
-	0096  N810 Internet Tablet
-	00aa  E71 (Mass storage mode)
-	00ab  E71 (PC Suite mode)
-	00e4  E71 (Media transfer mode)
-	0103  ADL Flashing Engine AVALON Parent
-	0104  ADL Re-Flashing Engine Parent
-	0105  Nokia Firmware Upgrade Mode
-	0106  ROM Parent
-	0154  5800 XpressMusic (PC Suite mode)
-	0155  5800 XpressMusic (Multimedia mode)
-	0156  5800 XpressMusic (Storage mode)
-	0157  5800 XpressMusic (Imaging mode)
-	0199  6700 Classic (msc)
-	019a  6700 Classic (PC Suite)
-	019b  6700 Classic (mtp)
-	01b0  6303 classic Phone (PC Suite mode)
-	01b1  6303 classic Phone (Mass storage mode)
-	01b2  6303 classic Phone (Printing and media mode)
-	01c7  N900 (Storage Mode)
-	01c8  N900 (PC-Suite Mode)
-	0228  5530 XpressMusic
-	026a  N97 (mass storage)
-	026b  N97 (Multimedia)
-	026c  N97 (PC Suite)
-	026d  N97 (Pictures)
-	0295  660i/6600i Slide Phone (Mass Storage)
-	0297  660i/6600i Slide Phone (Still Image)
-	02e1  5230 (Storage mode)
-	02e2  5230 (Multimedia mode)
-	02e3  5230 (PC-Suite mode)
-	02e4  5230 (Imaging mode)
-	03a4  C5 (Storage mode)
-	0400  7600 Phone Parent
-	0401  6650 GSM Phone
-	0402  6255 Phone Parent
-	0404  5510
-	0405  9500 GSM Communicator
-	0407  Music Player HDR-1(tm)
-	040b  N-Gage GSM Phone
-	040d  6620 Phone Parent
-	040e  6651 Phone Parent
-	040f  6230 GSM Phone
-	0410  6630 Imaging Smartphone
-	0411  7610 Phone Parent
-	0413  6260 Phone Parent
-	0414  7370
-	0415  9300 GSM Smartphone
-	0416  6170 Phone Parent
-	0417  7270 Phone Parent
-	0418  E70 (PC Suite mode)
-	0419  E60 (PC Suite mode)
-	041a  9500 GSM Communicator (RNDIS)
-	041b  9300 GSM Smartphone (RNDIS)
-	041c  7710 Phone Parent
-	041d  6670 Phone Parent
-	041e  6680
-	041f  6235 Phone Parent
-	0421  3230 Phone Parent
-	0422  6681 Phone Parent
-	0423  6682 Phone Parent
-	0428  6230i Modem
-	0429  6230i MultiMedia Card
-	0431  770 Internet Tablet
-	0432  N90 Phone Parent
-	0435  E70 (IP Passthrough/RNDIS mode)
-	0436  E60 (IP Passthrough/RNDIS mode)
-	0437  6265 Phone Parent
-	043a  N70 USB Phone Parent
-	043b  3155 Phone Parent
-	043c  6155 Phone Parent
-	043d  6270 Phone Parent
-	0443  N70 Phone Parent
-	0444  N91
-	044c  NM850iG Phone Parent
-	044d  E61 (PC Suite mode)
-	044e  E61 (Data Exchange mode)
-	044f  E61 (IP Passthrough/RNDIS mode)
-	0453  9300 Phone Parent
-	0456  6111 Phone Parent
-	0457  6111 Phone (Printing mode)
-	045a  6280 Phone Parent
-	045d  6282 Phone Parent
-	046e  6110 Navigator
-	0471  6110 Navigator
-	0485  MTP Device
-	04b9  5300
-	04c3  N800 Internet Tablet
-	04ce  E90 Communicator (PC Suite mode)
-	04cf  E90 Communicator (Storage mode)
-	04f0  Nokia N95 (PC Suite mode)
-	04f9  6300 (PC Suite mode)
-	0508  E65 (PC Suite mode)
-	0509  E65 (Storage mode)
-	0600  Digital Pen SU-1B
-	0610  CS-15 (Internet Stick 3G modem)
-	0800  Connectivity Cable DKU-5
-	0801  Data Cable DKU-6
-	0802  CA-42 Phone Parent
-0422  ADI Systems, Inc.
-0423  Computer Access Technology Corp.
-	000a  NetMate Ethernet
-	000c  NetMate2 Ethernet
-	000d  USB Chief Analyzer
-	0100  Generic Universal Protocol Analyzer
-	0101  UPA USBTracer
-	0200  Generic 10K Universal Protocol Analyzer
-	020a  PETracer ML
-	0300  Generic Universal Protocol Analyzer
-	0301  2500H Tracer Trainer
-	030a  PETracer x1
-	1237  Andromeda Hub
-0424  Standard Microsystems Corp.
-	0001  Integrated Hub
-	0acd  Sitecom Internal Multi Memory reader/writer MD-005
-	0fdc  Floppy
-	10cd  Sitecom Internal Multi Memory reader/writer MD-005
-	2020  USB Hub
-	20cd  Sitecom Internal Multi Memory reader/writer MD-005
-	20fc  6-in-1 Card Reader
-	2228  9-in-2 Card Reader
-	223a  8-in-1 Card Reader
-	2503  USB 2.0 Hub
-	2504  USB 2.0 Hub
-	2512  USB 2.0 Hub
-	2514  USB 2.0 Hub
-	2517  Hub
-	2524  USB MultiSwitch Hub
-	2602  USB 2.0 Hub
-	2640  USB 2.0 Hub
-	4060  Ultra Fast Media Reader
-	4064  Ultra Fast Media Reader
-0425  Motorola Semiconductors HK, Ltd
-	0101  G-Tech Wireless Mouse & Keyboard
-	f102  G-Tech U+P Wireless Mouse
-0426  Integrated Device Technology, Inc.
-	0426  WDM Driver
-0427  Motorola Electronics Taiwan, Ltd
-0428  Advanced Gravis Computer Tech, Ltd
-	4001  GamePad Pro
-0429  Cirrus Logic
-042a  Ericsson Austrian, AG
-042b  Intel Corp.
-	9316  8x931Hx Customer Hub
-042c  Innovative Semiconductors, Inc.
-042d  Micronics
-042e  Acer, Inc.
-	0380  MP3 Player
-042f  Molex, Inc.
-0430  Sun Microsystems, Inc.
-	0002  109 Keyboard
-	0005  Type 6 Keyboard
-	000a  109 Japanese Keyboard
-	000b  109 Japanese Keyboard
-	0082  109 Japanese Keyboard
-	0083  109 Japanese Keyboard
-	00a2  Type 7 Keyboard
-	0100  3-button Mouse
-	100e  24.1" LCD Monitor v4 / FID-638 Mouse
-	36ba  Bus Powered Hub
-	cdab  Raritan KVM dongle
-0431  Itac Systems, Inc.
-	0100  Mouse-Trak 3-button Track Ball
-0432  Unisys Corp.
-0433  Alps Electric, Inc.
-	1101  IBM Game Controller
-	abab  Keyboard
-0434  Samsung Info. Systems America, Inc.
-0435  Hyundai Electronics America
-0436  Taugagreining HF
-	0005  CameraMate (DPCM_USB)
-0437  Framatome Connectors USA
-0438  Advanced Micro Devices, Inc.
-0439  Voice Technologies Group
-043d  Lexmark International, Inc.
-	0001  Laser Printer
-	0002  Optra E310 Printer
-	0003  Laser Printer
-	0004  Laser Printer
-	0005  Laser Printer
-	0006  Laser Printer
-	0007  Laser Printer
-	0008  Inkjet Color Printer
-	0009  Optra S2450 Printer
-	000a  Laser Printer
-	000b  Inkjet Color Printer
-	000c  Optra E312 Printer
-	000d  Laser Printer
-	000e  Laser Printer
-	000f  Laser Printer
-	0010  Laser Printer
-	0011  Laser Printer
-	0012  Inkjet Color Printer
-	0013  Inkjet Color Printer
-	0014  InkJet Color Printer
-	0015  InkJet Color Printer
-	0016  Z12 Color Jetprinter
-	0017  Z32 printer
-	0018  Z52 Printer
-	0019  Forms Printer
-	001a  Z65 Printer
-	001b  InkJet Photo Printer
-	001c  Kodak Personal Picture Maker 200 Printer
-	001d  InkJet Color Printer
-	001e  InkJet Photo Printer
-	001f  Kodak Personal Picture Maker 200 Card Reader
-	0020  Z51 Printer
-	0021  Z33 Printer
-	0022  InkJet Color Printer
-	0023  Laser Printer
-	0024  Laser Printer
-	0025  InkJet Color Printer
-	0026  InkJet Color Printer
-	0027  InkJet Color Printer
-	0028  InkJet Color Printer
-	0029  Scan Print Copy
-	002a  Scan Print Copy
-	002b  Scan Print Copy
-	002c  Scan Print Copy
-	002d  X70/X73 Scan/Print/Copy
-	002e  Scan Print Copy
-	002f  Scan Print Copy
-	0030  Scan Print Copy
-	0031  Scan Print Copy
-	0032  Scan Print Copy
-	0033  Scan Print Copy
-	0034  Scan Print Copy
-	0035  Scan Print Copy
-	0036  Scan Print Copy
-	0037  Scan Print Copy
-	0038  Scan Print Copy
-	0039  Scan Print Copy
-	003a  Scan Print Copy
-	003b  Scan Print Copy
-	003c  Scan Print Copy
-	003d  X83 Scan/Print/Copy
-	003e  Scan Print Copy
-	003f  Scan Print Copy
-	0040  Scan Print Copy
-	0041  Scan Print Copy
-	0042  Scan Print Copy
-	0043  Scan Print Copy
-	0044  Scan Print Copy
-	0045  Scan Print Copy
-	0046  Scan Print Copy
-	0047  Scan Print Copy
-	0048  Scan Print Copy
-	0049  Scan Print Copy
-	004a  Scan Print Copy
-	004b  Scan Print Copy
-	004c  Scan Print Copy
-	004d  Laser Printer
-	004e  Laser Printer
-	004f  InkJet Color Printer
-	0050  InkJet Color Printer
-	0051  Laser Printer
-	0052  Laser Printer
-	0053  InkJet Color Printer
-	0054  InkJet Color Printer
-	0057  Z35 Printer
-	0058  Laser Printer
-	005a  X63
-	005c  InkJet Color Printer
-	0060  X74/X75 Scanner
-	0061  X74 Hub
-	0065  X5130
-	0069  X74/X75 Printer
-	006d  X125
-	006e  C510
-	0072  X6170 Printer
-	0073  InkJet Color Printer
-	0078  InkJet Color Printer
-	0079  InkJet Color Printer
-	007a  Generic Hub
-	007b  InkJet Color Printer
-	007c  Lexmark X1110/X1130/X1140/X1150/X1170/X1180/X1185
-	007d  Photo 3150
-	008a  4200 series
-	008b  InkJet Color Printer
-	008c  to CF/SM/SD/MS Card Reader
-	008e  InkJet Color Printer
-	008f  X422
-	0093  X5250
-	0095  E220 Printer
-	0096  2200 series
-	0097  P6250
-	0098  7100 series
-	009e  P910 series Human Interface Device
-	009f  InkJet Color Printer
-	00a9  IBM Infoprint 1410 MFP
-	00ab  InkJet Color Printer
-	00b2  3300 series
-	00b8  7300 series
-	00b9  8300 series
-	00ba  InkJet Color Printer
-	00bb  2300 series
-	00bd  Printing Support
-	00be  Printing Support
-	00bf  Printing Support
-	00c0  6300 series
-	00c1  4300 series
-	00c7  Printing Support
-	00c8  Printing Support
-	00c9  Printing Support
-	00cb  Printing Support
-	00cc  E120(n)
-	00d0  9300 series
-	00d3  X340 Scanner
-	00d4  X342n Scanner
-	00d5  Printing Support
-	00d6  X340 Scanner
-	00e8  X642e
-	00e9  2400 series
-	00f6  3400 series
-	00f7  InkJet Color Printer
-	00ff  InkJet Color Printer
-	010b  2500 series
-	010d  3500-4500 series
-	010f  6500 series
-	0142  X3650 (Printer, Scanner, Copier)
-	4303  Xerox WorkCentre Pro 412
-043e  LG Electronics USA, Inc.
-	3001  AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323]
-	42bd  Flatron 795FT Plus Monitor
-	4a4d  Flatron 915FT Plus Monitor
-	7001  MF-PD100 Soul Digital MP3 Player
-	7013  MP3 Player
-	8484  LPC-U30 Webcam II
-	8585  LPC-UC35 Webcam
-	8888  Electronics VCS Camera II(LPC-U20)
-	9800  Remote Control Receiver_iMON
-	9803  eHome Infrared Receiver
-	9804  DMB Receiver Control
-	9c01  LGE Sync
-043f  RadiSys Corp.
-0440  Eizo Nanao Corp.
-0441  Winbond Systems Lab.
-	1456  Hub
-0442  Ericsson, Inc.
-	abba  Bluetooth Device
-0443  Gateway, Inc.
-	000e  Multimedia Keyboard
-	002e  Millennium Keyboard
-0445  Lucent Technologies, Inc.
-0446  NMB Technologies Corp.
-	6781  Keyboard with PS/2 Mouse Port
-	6782  Keyboard
-0447  Momentum Microsystems
-044a  Shamrock Tech. Co., Ltd
-044b  WSI
-044c  CCL/ITRI
-044d  Siemens Nixdorf AG
-044e  Alps Electric Co., Ltd
-	1104  Japanese Keyboard
-	2002  MD-5500 Printer
-	2014  Bluetooth Device
-	3001  UGTZ4 Bluetooth
-	3002  Bluetooth Device
-	3003  Bluetooth Device
-	3004  Bluetooth Adapter
-	3005  Integrated Bluetooth Device
-	3006  Bluetooth Adapter
-	3007  Bluetooth Controller (ALPS/UGX)
-	300c  Bluetooth Controller (ALPS/UGPZ6)
-	300d  Bluetooth Controller (ALPS/UGPZ6)
-	3010  Bluetooth Adapter
-	3017  BCM2046 Bluetooth Device
-	ffff  Compaq Bluetooth Multiport Module
-044f  ThrustMaster, Inc.
-	0400  HOTAS Cougar
-	a003  Rage 3D Game Pad
-	a01b  PK-GP301 Driving Wheel
-	a0a0  Top Gun Joystick
-	a0a1  Top Gun Joystick (rev2)
-	a0a3  Fusion Digital GamePad
-	a201  PK-GP201 PlayStick
-	b10a  T.16000M Joystick
-	b203  360 Modena Pro Wheel
-	b300  Firestorm Dual Power
-	b304  Firestorm Dual Power
-	b307  vibrating Upad
-	b30b  Wireless VibrationPad
-	b323  Dual Trigger 3-in-1 (PC Mode)
-	b324  Dual Trigger 3-in-1 (PS3 Mode)
-	b603  force feedback Wheel
-	b605  force feedback Racing Wheel
-	b651  Ferrari GT Rumble Force Wheel
-	b653  RGT Force Feedback Clutch Racing Wheel
-	b654  Ferrari GT Force Feedback Wheel
-	b700  Tacticalboard
-0450  DFI, Inc.
-0451  Texas Instruments, Inc.
-	1234  Bluetooth Device
-	1428  Hub
-	1446  TUSB2040/2070 Hub
-	16a6  BM-USBD1 BlueRobin RF heart rate sensor receiver
-	2036  TUSB2036 Hub
-	2046  TUSB2046 Hub
-	2077  TUSB2077 Hub
-	3410  TUSB3410 Microcontroller
-	3f00  OMAP1610
-	3f02  SMC WSKP100 Wi-Fi Phone
-	5409  Frontier Labs NEX IA+ Digital Audio Player
-	6000  AU5 ADSL Modem (pre-reenum)
-	6001  AU5 ADSL Modem
-	6060  RNDIS/BeWAN ADSL2+
-	6070  RNDIS/BeWAN ADSL2+
-	625f  TUSB6250 ATA Bridge
-	dbc0  Device Bay Controller
-	e001  GraphLink
-	e003  TI-84 Plus Calculator
-	e004  TI-89 Titanium Calculator
-	e008  TI-84 Plus Silver Calculator
-	f430  MSP-FET430UIF JTAG Tool
-	f432  eZ430 Development Tool
-	ffff  Bluetooth Device
-0452  Mitsubishi Electronics America, Inc.
-	0021  HID Monitor Controls
-	0050  Diamond Pro 900u CRT Monitor
-	0051  Integrated Hub
-0453  CMD Technology
-	6781  NMB Keyboard
-	6783  Chicony Composite Keyboard
-0454  Vobis Microcomputer AG
-0455  Telematics International, Inc.
-0456  Analog Devices, Inc.
-	f000  FT2232 JTAG ICE [gnICE]
-	f001  FT2232H Hi-Speed JTAG ICE [gnICE+]
-0457  Silicon Integrated Systems Corp.
-	0150  Super Talent 1GB Flash Drive
-	0151  Super Flash 1GB / GXT  64MB Flash Drive
-	0162  SiS162 usb Wireless LAN Adapter
-	0163  802.11 Wireless LAN Adapter
-	5401  Wireless Adapter RO80211GS-USB
-0458  KYE Systems Corp. (Mouse Systems)
-	0001  Mouse
-	0002  Genius NetMouse Pro
-	0003  Genius NetScroll+
-	0006  Easy Mouse+ USB(USB\Vid_0458&Pid;_0006) Mouse
-	000b  NetMouse Wheel(P+U)
-	000c  TACOMA Fingerprint V1.06.01
-	000e  VideoCAM Web
-	0013  TACOMA Fingerprint Mouse V1.06.01
-	001a  Genius WebScroll+
-	0036  Pocket Mouse LE
-	0039  NetScroll+ Superior
-	003a  NetScroll+ Mini Traveler / Genius NetScroll 120
-	004c  Slimstar Pro Keyboard
-	0056  Ergo 300 Mouse
-	0057  Enhanced Gaming Device
-	0059  Enhanced Laser Device
-	005a  Enhanced Device
-	005b  Enhanced Device
-	005c  Enhanced Laser Gaming Device
-	005d  Enhanced Device
-	0061  Bluetooth Dongle
-	0072  Navigator 335
-	0083  Bluetooth Dongle
-	0087  Ergo 525V Laser Mouse
-	0100  EasyPen Tablet
-	0101  CueCat
-	011b  NetScroll T220
-	1001  Joystick
-	1002  Game Pad
-	1003  Genius VideoCam
-	1004  Flight2000 F-23 Joystick
-	100a  Aashima Technology Trust Sight Fighter Vibration Feedback Joystick
-	2001  ColorPage-Vivid Pro Scanner
-	2004  ColorPage-HR6 V1 Scanner
-	2005  ColorPage-HR6/Vivid3
-	2007  ColorPage-HR6 V2 Scanner
-	2008  ColorPage-HR6 V2 Scanner
-	2009  ColorPage-HR6A Scanner
-	2011  ColorPage-Vivid3x Scanner
-	2012  Plustek Scanner
-	2013  ColorPage-HR7 Scanner
-	2014  ColorPage-Vivid4
-	2015  ColorPage-HR7LE Scanner
-	2016  ColorPage-HR6X Scanner
-	2017  ColorPage-Vivid3xe
-	2018  ColorPage-HR7X
-	2019  ColorPage-HR6X Slim
-	201a  ColorPage-Vivid4xe
-	201b  ColorPage-Vivid4x
-	201c  ColorPage-HR8
-	201d  ColorPage-Vivid 1200 X
-	201e  ColorPage-Slim 1200
-	201f  ColorPage-Vivid 1200 XE
-	2020  ColorPage-Slim 1200 USB2
-	2021  ColorPage-SF600
-	3017  SPEED WHEEL 3 Vibration
-	3018  Wireless 2.4Ghz Game Pad
-	3019  10-Button USB Joystick with Vibration
-	301a  MaxFire G-12U Vibration
-	301d  Genius MaxFire MiniPad
-	400f  Genius TVGo DVB-T02Q MCE
-	4012  TVGo DVB-T03
-	5003  G-pen 560 Tablet
-	5004  G-pen Tablet
-	6001  GF3000F Ethernet Adapter
-	7004  VideoCAM Express V2
-	7006  Dsc 1.3 Smart Camera Device
-	7007  VideoCAM Web
-	7009  G-Shot G312 Still Camera Device
-	700c  VideoCAM Web V3
-	700d  G-Shot G511 Composite Device
-	700f  VideoCAM Web
-	7012  WebCAM USB2.0
-	7014  VideoCAM Live V3
-	701c  G-Shot G512 Still Camera
-	7020  Sim 321C
-	7025  Eye 311Q Camera
-	7029  Genius Look 320s (SN9C201 + HV7131R)
-	702f  Genius Slim 322
-	7035  i-Look 325T Camera
-	7045  Genius Look 1320 V2
-	704c  Genius i-Look 1321
-	704d  Slim 1322AF
-	7055  Slim 2020AF camera
-	705a  Asus USB2.0 Webcam
-	705c  Genius iSlim 1300AF
-	7079  FaceCam 2025R
-0459  Adobe Systems, Inc.
-045a  SONICblue, Inc.
-	07da  Supra Express 56K modem
-	0b4a  SupraMax 2890 56K Modem [Lucent Atlas]
-	0b68  SupraMax 56K Modem
-	5001  Rio 600 MP3 Player
-	5002  Rio 800 MP3 Player
-	5003  Nike Psa/Play MP3 Player
-	5005  Rio S10 MP3 Player
-	5006  Rio S50 MP3 Player
-	5007  Rio S35 MP3 Player
-	5008  Rio 900 MP3 Player
-	5009  Rio S30 MP3 Player
-	500d  Fuse MP3 Player
-	500e  Chiba MP3 Player
-	500f  Cali MP3 Player
-	5010  Rio S11 MP3 Player
-	501c  Virgin MPF-1000
-	501d  Rio Fuse
-	501e  Rio Chiba
-	501f  Rio Cali
-	503f  Cali256 MP3 Player
-	5202  Rio Riot MP3 Player
-	5210  Rio Karma Music Player
-	5220  Rio Nitrus MP3 Player
-	5221  Rio Eigen
-045b  Hitachi, Ltd
-045d  Nortel Networks, Ltd
-045e  Microsoft Corp.
-	0007  SideWinder Game Pad
-	0008  SideWinder Precision Pro
-	0009  IntelliMouse
-	000b  Natural Keyboard Elite
-	000e  SideWinder® Freestyle Pro
-	0014  Digital Sound System 80
-	001a  SideWinder Precision Racing Wheel
-	001b  SideWinder Force Feedback 2 Joystick
-	001c  Internet Keyboard Pro
-	001d  Natural Keyboard Pro
-	001e  IntelliMouse Explorer
-	0023  Trackball Optical
-	0024  Trackball Explorer
-	0025  IntelliEye Mouse
-	0026  SideWinder GamePad Pro
-	0027  SideWinder PnP GamePad
-	0028  SideWinder Dual Strike
-	0029  IntelliMouse Optical
-	002b  Internet Keyboard Pro
-	002d  Internet Keyboard
-	002f  Integrated Hub
-	0033  Sidewinder Strategic Commander
-	0034  SideWinder Force Feedback Wheel
-	0038  SideWinder Precision 2
-	0039  IntelliMouse Optical
-	003b  SideWinder Game Voice
-	003c  SideWinder Joystick
-	0040  Wheel Mouse Optical
-	0047  IntelliMouse Explorer 3.0
-	0048  Office Keyboard 1.0A
-	0053  Optical Mouse
-	0059  Wireless IntelliMouse Explorer
-	005c  Office Keyboard (106/109)
-	005f  Wireless MultiMedia Keyboard
-	0061  Wireless MultiMedia Keyboard (106/109)
-	0063  Wireless Natural MultiMedia Keyboard
-	0065  Wireless Natural MultiMedia Keyboard (106/109)
-	006a  Wireless Optical Mouse (IntelliPoint)
-	006d  eHome Remote Control Keyboard keys
-	006e  MN-510 802.11b Wireless Adapter [Intersil ISL3873B]
-	006f  Smart Display Reference Device
-	0070  Wireless MultiMedia Keyboard
-	0071  Wireless MultiMedia Keyboard (106/109)
-	0072  Wireless Natural MultiMedia Keyboard
-	0073  Wireless Natural MultiMedia Keyboard (106/109)
-	0079  IXI Ogo CT-17 handheld device
-	007a  10/100 USB NIC
-	007d  Notebook Optical Mouse
-	007e  Wireless Transceiver for Bluetooth
-	0080  Digital Media Pro Keyboard
-	0083  Basic Optical Mouse
-	0084  Basic Optical Mouse
-	008a  Wireless Keyboard and Mouse
-	008b  Dual Receiver Wireless Mouse (IntelliPoint)
-	008c  Wireless Intellimouse Explorer 2.0
-	0095  IntelliMouse Explorer 4.0 (IntelliPoint)
-	009c  Wireless Transceiver for Bluetooth 2.0
-	009d  Wireless Optical Desktop 3.0
-	00a0  eHome Infrared Receiver
-	00b0  Digital Media Pro Keyboard
-	00b9  Wireless Optical Mouse 3.0
-	00bb  Fingerprint Reader
-	00bc  Fingerprint Reader
-	00bd  Fingerprint Reader
-	00c2  MN-710 802.11g Wireless Adapter [Intersil ISL3886]
-	00c9  MTP Device
-	00ca  Fingerprint Reader
-	00cb  Basic Optical Mouse v2.0
-	00ce  Generic PPC Flash device
-	00d1  Optical Mouse with Tilt Wheel
-	00da  eHome Infrared Receiver
-	00db  Natural Ergonomic Keyboard 4000 V1.0
-	00dd  Comfort Curve Keyboard 2000 V1.0
-	00e1  Wireless Laser Mouse 6000 Reciever
-	00f4  LifeCam VX-6000 (SN9C20x + OV9650)
-	00f5  LifeCam VX-3000
-	00f6  Comfort Optical Mouse 1000
-	00f7  LifeCam VX-1000
-	00f8  LifeCam NX-6000
-	00f9  Wireless Desktop Receiver 3.1
-	0202  Xbox Controller
-	0280  XBox Device
-	0283  Xbox Communicator
-	0284  Xbox DVD Playback Kit
-	0285  Xbox Controller S
-	0288  Xbox Controller S Hub
-	0289  Xbox Controller S
-	028b  Xbox360 DVD Emulator
-	028d  Xbox360 Memory Unit 64MB
-	028e  Xbox360 Controller
-	028f  Xbox360 Wireless Controller
-	0290  Xbox360 Performance Pipe (PIX)
-	0291  Xbox 360 Wireless Receiver for Windows
-	0292  Xbox360 Wireless Networking Adapter
-	029c  Xbox360 HD-DVD Drive
-	029d  Xbox360 HD-DVD Drive
-	029e  Xbox360 HD-DVD Memory Unit
-	02a0  Xbox360 Big Button IR
-	02a8  Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280]
-	02ad  Xbox NUI Audio
-	02ae  Xbox NUI Camera
-	02b0  Xbox NUI Motor
-	0400  Windows Powered Pocket PC 2002
-	0401  Windows Powered Pocket PC 2002
-	0402  Windows Powered Pocket PC 2002
-	0403  Windows Powered Pocket PC 2002
-	0404  Windows Powered Pocket PC 2002
-	0405  Windows Powered Pocket PC 2002
-	0406  Windows Powered Pocket PC 2002
-	0407  Windows Powered Pocket PC 2002
-	0408  Windows Powered Pocket PC 2002
-	0409  Windows Powered Pocket PC 2002
-	040a  Windows Powered Pocket PC 2002
-	040b  Windows Powered Pocket PC 2002
-	040c  Windows Powered Pocket PC 2002
-	040d  Windows Powered Pocket PC 2002
-	040e  Windows Powered Pocket PC 2002
-	040f  Windows Powered Pocket PC 2002
-	0410  Windows Powered Pocket PC 2002
-	0411  Windows Powered Pocket PC 2002
-	0412  Windows Powered Pocket PC 2002
-	0413  Windows Powered Pocket PC 2002
-	0414  Windows Powered Pocket PC 2002
-	0415  Windows Powered Pocket PC 2002
-	0416  Windows Powered Pocket PC 2002
-	0417  Windows Powered Pocket PC 2002
-	0432  Windows Powered Pocket PC 2003
-	0433  Windows Powered Pocket PC 2003
-	0434  Windows Powered Pocket PC 2003
-	0435  Windows Powered Pocket PC 2003
-	0436  Windows Powered Pocket PC 2003
-	0437  Windows Powered Pocket PC 2003
-	0438  Windows Powered Pocket PC 2003
-	0439  Windows Powered Pocket PC 2003
-	043a  Windows Powered Pocket PC 2003
-	043b  Windows Powered Pocket PC 2003
-	043c  Windows Powered Pocket PC 2003
-	043d  Becker Traffic Assist Highspeed 7934
-	043e  Windows Powered Pocket PC 2003
-	043f  Windows Powered Pocket PC 2003
-	0440  Windows Powered Pocket PC 2003
-	0441  Windows Powered Pocket PC 2003
-	0442  Windows Powered Pocket PC 2003
-	0443  Windows Powered Pocket PC 2003
-	0444  Windows Powered Pocket PC 2003
-	0445  Windows Powered Pocket PC 2003
-	0446  Windows Powered Pocket PC 2003
-	0447  Windows Powered Pocket PC 2003
-	0448  Windows Powered Pocket PC 2003
-	0449  Windows Powered Pocket PC 2003
-	044a  Windows Powered Pocket PC 2003
-	044b  Windows Powered Pocket PC 2003
-	044c  Windows Powered Pocket PC 2003
-	044d  Windows Powered Pocket PC 2003
-	044e  Windows Powered Pocket PC 2003
-	044f  Windows Powered Pocket PC 2003
-	0450  Windows Powered Pocket PC 2003
-	0451  Windows Powered Pocket PC 2003
-	0452  Windows Powered Pocket PC 2003
-	0453  Windows Powered Pocket PC 2003
-	0454  Windows Powered Pocket PC 2003
-	0455  Windows Powered Pocket PC 2003
-	0456  Windows Powered Pocket PC 2003
-	0457  Windows Powered Pocket PC 2003
-	0458  Windows Powered Pocket PC 2003
-	0459  Windows Powered Pocket PC 2003
-	045a  Windows Powered Pocket PC 2003
-	045b  Windows Powered Pocket PC 2003
-	045c  Windows Powered Pocket PC 2003
-	045d  Windows Powered Pocket PC 2003
-	045e  Windows Powered Pocket PC 2003
-	045f  Windows Powered Pocket PC 2003
-	0460  Windows Powered Pocket PC 2003
-	0461  Windows Powered Pocket PC 2003
-	0462  Windows Powered Pocket PC 2003
-	0463  Windows Powered Pocket PC 2003
-	0464  Windows Powered Pocket PC 2003
-	0465  Windows Powered Pocket PC 2003
-	0466  Windows Powered Pocket PC 2003
-	0467  Windows Powered Pocket PC 2003
-	0468  Windows Powered Pocket PC 2003
-	0469  Windows Powered Pocket PC 2003
-	046a  Windows Powered Pocket PC 2003
-	046b  Windows Powered Pocket PC 2003
-	046c  Windows Powered Pocket PC 2003
-	046d  Windows Powered Pocket PC 2003
-	046e  Windows Powered Pocket PC 2003
-	046f  Windows Powered Pocket PC 2003
-	0470  Windows Powered Pocket PC 2003
-	0471  Windows Powered Pocket PC 2003
-	0472  Windows Powered Pocket PC 2003
-	0473  Windows Powered Pocket PC 2003
-	0474  Windows Powered Pocket PC 2003
-	0475  Windows Powered Pocket PC 2003
-	0476  Windows Powered Pocket PC 2003
-	0477  Windows Powered Pocket PC 2003
-	0478  Windows Powered Pocket PC 2003
-	0479  Windows Powered Pocket PC 2003
-	047a  Windows Powered Pocket PC 2003
-	047b  Windows Powered Pocket PC 2003
-	04c8  Windows Powered Smartphone 2002
-	04c9  Windows Powered Smartphone 2002
-	04ca  Windows Powered Smartphone 2002
-	04cb  Windows Powered Smartphone 2002
-	04cc  Windows Powered Smartphone 2002
-	04cd  Windows Powered Smartphone 2002
-	04ce  Windows Powered Smartphone 2002
-	04d7  Windows Powered Smartphone 2003
-	04d8  Windows Powered Smartphone 2003
-	04d9  Windows Powered Smartphone 2003
-	04da  Windows Powered Smartphone 2003
-	04db  Windows Powered Smartphone 2003
-	04dc  Windows Powered Smartphone 2003
-	04dd  Windows Powered Smartphone 2003
-	04de  Windows Powered Smartphone 2003
-	04df  Windows Powered Smartphone 2003
-	04e0  Windows Powered Smartphone 2003
-	04e1  Windows Powered Smartphone 2003
-	04e2  Windows Powered Smartphone 2003
-	04e3  Windows Powered Smartphone 2003
-	04e4  Windows Powered Smartphone 2003
-	04e5  Windows Powered Smartphone 2003
-	04e6  Windows Powered Smartphone 2003
-	04e7  Windows Powered Smartphone 2003
-	04e8  Windows Powered Smartphone 2003
-	04e9  Windows Powered Smartphone 2003
-	04ea  Windows Powered Smartphone 2003
-	04ec  Windows Phone (Zune)
-	063e  Zune HD Media Player
-	0640  KIN Phone
-	0641  KIN Phone
-	0642  KIN Phone
-	0707  Wireless Laser Mouse 8000
-	0708  Transceiver v 3.0 for Bluetooth
-	070a  Charon Bluetooth Dongle (DFU)
-	0710  Zune Media Player
-	0713  Wireless Presenter Mouse 8000
-	0719  Xbox 360 Wireless Adapter
-	071f  Mouse/Keyboard 2.4GHz Transceiver V2.0
-	0721  LifeCam NX-3000 (UVC-compliant)
-	0723  LifeCam VX-7000 (UVC-compliant)
-	0734  Wireless Optical Desktop 700
-	0737  Compact Optical Mouse 500
-	0745  Nano Transceiver v1.0 for Bluetooth
-	0750  Wired Keyboard 600
-	075d  LifeCam Cinema
-	0768  Sidewinder X4
-	076d  LifeCam HD-5000
-	930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
-	fff8  Keyboard
-	ffff  Windows CE Mass Storage
-0460  Ace Cad Enterprise Co., Ltd
-	0004  Tablet (5x3.75)
-	0006  LCD Tablet (12x9)
-	0008  Tablet (3x2.25)
-0461  Primax Electronics, Ltd
-	0300  G2-300 Scanner
-	0301  G2E-300 Scanner
-	0302  G2-300 #2 Scanner
-	0303  G2E-300 #2 Scanner
-	0340  Colorado 9600 Scanner
-	0341  Colorado 600u Scanner
-	0345  Visioneer 6200 Scanner
-	0346  Memorex Maxx 6136u Scanner
-	0347  Primascan Colorado 2600u/Visioneer 4400 Scanner
-	0360  Colorado 19200 Scanner
-	0361  Colorado 1200u Scanner
-	0363  VistaScan Astra 3600(ENG)
-	0364  LG Electronics Scanworks 600U Scanner
-	0365  VistaScan Astra 3600(ENG)
-	0366  6400
-	0367  VistaScan Astra 3600(ENG)
-	0371  Visioneer Onetouch 8920 Scanner
-	0374  UMAX Astra 2500
-	0375  VistaScan Astra 3600(ENG)
-	0377  Medion MD 5345 Scanner
-	0378  VistaScan Astra 3600(ENG)
-	037b  Medion MD 6190 Scanner
-	037c  VistaScan Astra 3600(ENG)
-	0380  G2-600 Scanner
-	0381  ReadyScan 636i Scanner
-	0382  G2-600 #2 Scanner
-	0383  G2E-600 Scanner
-	038a  UMAX Astra 3000/3600
-	038b  Xerox 2400 Onetouch
-	038c  UMAX Astra 4100
-	0392  Medion/Lifetec/Tevion/Cytron MD 6190
-	03a8  9420M
-	0813  IBM UltraPort Camera
-	0815  Micro Innovations IC200 Webcam
-	0819  Fujifilm IX-30 Camera [webcam mode]
-	081a  Fujifilm IX-30 Camera [storage mode]
-	081c  Elitegroup ECS-C11 Camera
-	081d  Elitegroup ECS-C11 Storage
-	0a00  Micro Innovations Web Cam 320
-	4d01  Comfort Keyboard
-	4d02  Mouse-in-a-Box
-	4d03  Kensington Mouse-in-a-box
-	4d04  Mouse
-	4d06  Balless Mouse (HID)
-	4d15  Dell Optical Mouse
-	4d17  Optical Mouse
-	4d2a  PoPo Elixir Mouse (HID)
-	4d2b  Wireless Laser Mini Mouse (HID)
-	4d2c  PoPo Mini Pointer Mouse (HID)
-	4d2e  Optical Mobile Mouse (HID)
-	4d51  0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse]
-	4d75  Rocketfish RF-FLBTAD Bluetooth Adapter
-	4de7  webcam
-0463  MGE UPS Systems
-	0001  UPS
-	ffff  UPS
-0464  AMP/Tycoelectronics Corp.
-0467  AT&T Paradyne
-0468  Wieson Technologies Co., Ltd
-046a  Cherry GmbH
-	0001  My3000 Keyboard
-	0003  My3000 Hub
-	0004  CyBoard Keyboard
-	0005  XX33 SmartCard Reader Keyboard
-	0008  Wireless Keyboard and Mouse
-	0010  SmartBoard XX44
-	0011  G83 (RS 6000) Keyboard
-	0021  CyMotion Expert Combo
-	0023  CyMotion Master Linux Keyboard
-	0027  CyMotion Master Solar Keyboard
-	002a  Wireless Mouse & Keyboard
-	002d  SmartTerminal XX44
-	003e  SmartTerminal ST-2xxx
-	0080  eHealth Terminal ST 1503
-	0081  eHealth Keyboard G87 1504
-	0106  R-300 Wireless Mouse Receiver
-046b  American Megatrends, Inc.
-	0001  Keyboard
-	0101  PS/2 Keyboard, Mouse & Joystick Ports
-	0301  USB 1.0 Hub
-	0500  Serial & Parallel Ports
-046c  Toshiba Corp., Digital Media Equipment
-046d  Logitech, Inc.
-	0082  Acer Aspire 5672 Webcam
-	0200  WingMan Extreme Joystick
-	0203  M2452 Keyboard
-	0301  M4848 Mouse
-	0401  HP PageScan
-	0402  NEC PageScan
-	040f  Logitech/Storm PageScan
-	0430  Mic (Cordless)
-	0801  QuickCam Home
-	0802  Webcam C200
-	0804  Webcam C250
-	0805  Webcam C300
-	0807  Webcam B500
-	0808  Webcam C600
-	0809  Webcam Pro 9000
-	080a  Portable Webcam C905
-	080f  Webcam C120
-	0810  QuickCam Pro
-	0819  Webcam C210
-	081b  Webcam C310
-	0820  QuickCam VC
-	0821  HD Webcam C910
-	0825  Webcam C270
-	0828  HD Webcam B990
-	0830  QuickClip
-	0840  QuickCam Express
-	0850  QuickCam Web
-	0870  QuickCam Express
-	0890  QuickCam Traveler
-	0892  OrbiCam
-	0894  CrystalCam
-	0895  QuickCam for Dell Notebooks
-	0896  OrbiCam
-	0897  QuickCam for Dell Notebooks
-	0899  QuickCam for Dell Notebooks
-	089d  QuickCam E2500 series
-	08a0  QuickCam IM
-	08a1  QuickCam IM with sound
-	08a2  Labtec Webcam Pro
-	08a3  QuickCam QuickCam Chat
-	08a6  QuickCam IM
-	08a7  QuickCam Image
-	08a9  Notebook Deluxe
-	08aa  Labtec Notebooks
-	08ac  QuickCam Cool
-	08ad  QuickCam Communicate STX
-	08ae  QuickCam for Notebooks
-	08af  QuickCam Easy/Cool
-	08b0  QuickCam 3000 Pro [pwc]
-	08b1  QuickCam Notebook Pro
-	08b2  QuickCam Pro 4000
-	08b3  QuickCam Zoom
-	08b4  QuickCam Zoom
-	08b5  QuickCam Sphere
-	08b9  QuickCam IM
-	08bd  Microphone (Pro 4000)
-	08c0  QuickCam Pro 3000
-	08c1  QuickCam Fusion
-	08c2  QuickCam PTZ
-	08c3  Camera (Notebooks Pro)
-	08c5  QuickCam Pro 5000
-	08c6  QuickCam for DELL Notebooks
-	08c7  QuickCam OEM Cisco VT Camera II
-	08c9  QuickCam Ultra Vision
-	08ca  Mic (Fusion)
-	08cb  Mic (Notebooks Pro)
-	08cc  Mic (PTZ)
-	08ce  QuickCam Pro 5000
-	08cf  QuickCam UpdateMe
-	08d0  QuickCam Express
-	08d7  QuickCam Communicate STX
-	08d8  QuickCam for Notebook Deluxe
-	08d9  QuickCam IM/Connect
-	08da  QuickCam Messanger
-	08dd  QuickCam for Notebooks
-	08e0  QuickCam Express
-	08e1  Labtec Webcam
-	08f0  QuickCam Messenger
-	08f1  QuickCam Express
-	08f2  Microphone (Messenger)
-	08f3  QuickCam Express
-	08f4  Labtec Webcam
-	08f5  QuickCam Messenger Communicate
-	08f6  QuickCam Messenger Plus
-	0900  ClickSmart 310
-	0901  ClickSmart 510
-	0903  ClickSmart 820
-	0905  ClickSmart 820
-	0910  QuickCam Cordless
-	0920  QuickCam Express
-	0921  Labtec Webcam
-	0922  QuickCam Live
-	0928  QuickCam Express
-	0929  Labtec Webcam Pro
-	092a  QuickCam for Notebooks
-	092b  Labtec Webcam Plus
-	092c  QuickCam Chat
-	092d  QuickCam Express / Go
-	092e  QuickCam Chat
-	092f  QuickCam Express Plus
-	0950  Pocket Camera
-	0960  ClickSmart 420
-	0970  Pocket750
-	0990  QuickCam Pro 9000
-	0991  QuickCam Pro for Notebooks
-	0992  QuickCam Communicate Deluxe
-	0994  QuickCam Orbit/Sphere AF
-	09a1  QuickCam Communicate MP/S5500
-	09a2  QuickCam Communicate Deluxe/S7500
-	09a4  QuickCam E 3500
-	09a5  Quickcam 3000 For Business
-	09a6  QuickCam Vision Pro
-	09b0  Acer OrbiCam
-	09b2  Fujitsu Webcam
-	09c0  QuickCam for Dell Notebooks Mic
-	09c1  QuickCam Deluxe for Notebooks
-	0a01  USB Headset
-	0a02  Premium Stereo USB Headset 350
-	0a03  Logitech USB Microphone
-	0a04  V20 portable speakers (USB powered)
-	0a07  Z-10 Speakers
-	0a0b  ClearChat Pro USB
-	0a0c  Clear Chat Comfort USB Headset
-	0a13  Z-5 Speakers
-	0a17  G330 Headset
-	0b02  BT Mini-Receiver (HID proxy mode)
-	8801  Video Camera
-	b305  BT Mini-Receiver
-	bfe4  Premium Optical Wheel Mouse
-	c000  N43 [Pilot Mouse]
-	c001  N48/M-BB48 [FirstMouse Plus]
-	c002  M-BA47 [MouseMan Plus]
-	c003  MouseMan
-	c004  WingMan Gaming Mouse
-	c005  WingMan Gaming Wheel Mouse
-	c00b  MouseMan Wheel
-	c00c  Optical Wheel Mouse
-	c00d  MouseMan Wheel+
-	c00e  M-BJ58/M-BJ69 Optical Wheel Mouse
-	c00f  MouseMan Traveler/Mobile
-	c011  Optical MouseMan
-	c012  Mouseman Dual Optical
-	c014  Corded Workstation Mouse
-	c015  Corded Workstation Mouse
-	c016  Optical Wheel Mouse
-	c018  Optical Wheel Mouse
-	c019  Optical Tilt Wheel Mouse
-	c01a  M-BQ85 Optical Wheel Mouse
-	c01b  MX310 Optical Mouse
-	c01c  Optical Mouse
-	c01d  MX510 Optical Mouse
-	c01e  MX518 Optical Mouse
-	c024  MX300 Optical Mouse
-	c025  MX500 Optical Mouse
-	c030  iFeel Mouse
-	c031  iFeel Mouse+
-	c032  MouseMan iFeel
-	c033  iFeel MouseMan+
-	c034  MouseMan Optical
-	c035  Mouse
-	c036  Mouse
-	c037  Mouse
-	c038  Mouse
-	c03d  M-BT96a Pilot Optical Mouse
-	c03e  Premium Optical Wheel Mouse (M-BT58)
-	c03f  M-BT85 [UltraX Optical Mouse]
-	c040  Corded Tilt-Wheel Mouse
-	c041  G5 Laser Mouse
-	c042  G3 Laser Mouse
-	c043  MX320/MX400 Laser Mouse
-	c044  LX3 Optical Mouse
-	c045  Optical Mouse
-	c046  RX1000 Laser Mouse
-	c047  Laser Mouse
-	c048  G9 Laser Mouse
-	c049  G5 Laser Mouse
-	c050  RX 250 Optical Mouse
-	c051  G3 (MX518) Optical Mouse
-	c053  Laser Mouse
-	c058  M115 Mouse
-	c05a  Optical Mouse M90
-	c05d  Optical Mouse
-	c061  RX1500 Laser Mouse
-	c062  LS1 Laser Mouse, corded
-	c063  DELL Laser Mouse
-	c068  G500 Laser Mouse
-	c101  UltraX Media Remote
-	c110  Harmony 885 Remote
-	c11f  Harmony 900 Remote
-	c122  Harmony 700 Remote
-	c201  WingMan Extreme Joystick with Throttle
-	c202  WingMan Formula
-	c207  WingMan Extreme Digital 3D
-	c208  WingMan Gamepad Extreme
-	c209  WingMan Gamepad
-	c20a  WingMan RumblePad
-	c20b  WingMan Action Pad
-	c20c  WingMan Precision
-	c20d  WingMan Attack 2
-	c20e  WingMan Formula GP
-	c211  iTouch Cordless Reciever
-	c212  WingMan Extreme Digital 3D
-	c213  J-UH16 (Freedom 2.4 Cordless Joystick)
-	c214  ATK3 (Attack III Joystick)
-	c215  Extreme 3D Pro
-	c216  Dual Action Gamepad
-	c218  Logitech RumblePad 2 USB
-	c219  Cordless RumblePad 2
-	c21a  Precision Gamepad
-	c21c  G13 Advanced Gameboard
-	c21d  F310 Gamepad [XInput Mode]
-	c21f  F710 Wireless Gamepad [XInput Mode]
-	c221  G11/G15 Keyboard / Keyboard
-	c222  G15 Keyboard / LCD
-	c223  G11/G15 Keyboard / USB Hub
-	c225  G11/G15 Keyboard / G keys
-	c226  G15 Refresh Keyboard
-	c227  G15 Refresh Keyboard
-	c22d  G510 Gaming Keyboard
-	c22e  G510 Gaming Keyboard onboard audio
-	c281  WingMan Force
-	c283  WingMan Force 3D
-	c285  WingMan Strike Force 3D
-	c286  Force 3D Pro
-	c287  Flight System G940
-	c291  WingMan Formula Force
-	c293  WingMan Formula Force GP
-	c294  Driving Force
-	c295  Momo Force Steering Wheel
-	c298  Driving Force Pro
-	c299  G25 Racing Wheel
-	c29b  G27 Racing Wheel
-	c29c  Speed Force Wireless Wheel for Wii
-	c2a0  Wingman Force Feedback Mouse
-	c2a1  WingMan Force Feedback Mouse
-	c301  iTouch Keyboard
-	c302  iTouch Pro Keyboard
-	c303  iTouch Keyboard
-	c305  Internet Keyboard
-	c307  Internet Keyboard
-	c308  Internet Navigator Keyboard
-	c309  Internet Keyboard
-	c30a  iTouch Composite
-	c30b  NetPlay Keyboard
-	c30c  Internet Keys (X)
-	c30d  Internet Keys
-	c30e  UltraX Keyboard (Y-BL49)
-	c30f  Logicool HID-Compliant Keyboard (106 key)
-	c311  Y-UF49 [Internet Pro Keyboard]
-	c312  DeLuxe 250 Keyboard
-	c313  Internet 350 Keyboard
-	c315  Classic New Touch Keyboard
-	c316  HID-Compliant Keyboard
-	c317  Wave Corded Keyboard
-	c318  Illuminated Keyboard
-	c31a  Comfort Wave 450
-	c31b  Compact Keyboard K300
-	c31c  Keyboard K120 for Business
-	c401  TrackMan Marble Wheel
-	c402  Marble Mouse (2-button)
-	c403  Turbo TrackMan Marble FX
-	c404  TrackMan Wheel
-	c408  Marble Mouse (4-button)
-	c501  Cordless Mouse Receiver
-	c502  Cordless Mouse & iTouch Keys
-	c503  Cordless Mouse+Keyboard Receiver
-	c504  Cordless Mouse+Keyboard Receiver
-	c505  Cordless Mouse+Keyboard Receiver
-	c506  MX700 Cordless Mouse Receiver
-	c508  Cordless Trackball
-	c509  Cordless Keyboard & Mouse
-	c50a  Cordless Mouse
-	c50b  Cordless Desktop Optical
-	c50c  Cordless Desktop S510
-	c50d  Cordless Mouse
-	c50e  Cordless Mouse Receiver
-	c510  Cordless Mouse
-	c512  LX-700 Cordless Desktop Receiver
-	c513  MX3000 Cordless Desktop Receiver
-	c514  Cordless Mouse
-	c515  Cordless 2.4 GHz Presenter Presentation remote control
-	c517  LX710 Cordless Desktop Laser
-	c518  MX610 Laser Cordless Mouse
-	c51a  MX Revolution/G7 Cordless Mouse
-	c51b  V220 Cordless Optical Mouse for Notebooks
-	c521  Cordless Mouse Receiver
-	c525  MX Revolution Cordless Mouse
-	c526  Nano Receiver
-	c529  diNovo Keyboard for notebooks
-	c52b  Unifying Receiver
-	c52f  Wireless Mouse M305
-	c623  3Dconnexion Space Traveller 3D Mouse
-	c625  3Dconnexion Space Pilot 3D Mouse
-	c626  3Dconnexion Space Navigator 3D Mouse
-	c627  3Dconnexion Space Explorer 3D Mouse
-	c702  Cordless Presenter
-	c703  Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth)
-	c704  diNovo Wireless Desktop
-	c705  MX900 Bluetooth Wireless Hub (C-UJ16A)
-	c707  Bluetooth wireless hub
-	c708  Bluetooth wireless hub
-	c709  BT Mini-Receiver (HCI mode)
-	c70a  MX5000 Cordless Desktop
-	c70b  BT Mini-Receiver (HID proxy mode)
-	c70c  BT Mini-Receiver (HID proxy mode)
-	c70d  Bluetooth wireless hub
-	c70e  MX1000 Bluetooth Laser Mouse
-	c70f  Bluetooth wireless hub
-	c712  Bluetooth wireless hub
-	c714  diNovo Edge Keyboard
-	c715  Bluetooth wireless hub
-	c71a  Bluetooth wireless hub
-	c71d  Bluetooth wireless hub
-	c71f  diNovo Mini Wireless Keyboard
-	c720  Bluetooth wireless hub
-	ca03  MOMO Racing
-	ca04  Formula Vibration Feedback Wheel
-	cab1  Cordless Keyboard for Wii HID Receiver
-	d001  QuickCam Pro
-046e  Behavior Tech. Computer Corp.
-	0100  Keyboard
-	3001  Mass Storage Device
-	3002  Mass Storage Device
-	3003  Mass Storage Device
-	3005  Mass Storage Device
-	3008  Mass Storage Device
-	5250  KeyMaestro Multimedia Keyboard
-	5273  KeyMaestro Multimedia Keyboard
-	52e6  Cordless Mouse
-	5308  KeyMaestro Keyboard
-	5408  KeyMaestro Multimedia Keyboard/Hub
-	5500  Portable Keyboard 86+9 keys (Model 6100C US)
-	5720  Smart Card Reader
-	6782  BTC 7932 mouse+keyboard
-046f  Crystal Semiconductor
-0471  Philips (or NXP)
-	0101  DSS350 Digital Speaker System
-	0104  DSS330 Digital Speaker System [uda1321]
-	0105  UDA1321
-	014f  GoGear SA9200
-	0160  MP3 Player
-	0161  MP3 Player
-	0163  GoGear SA1100
-	0164  GoGear SA1110/02
-	0165  GoGear SA1330
-	0201  Hub
-	0222  Creative Nomad Jukebox
-	0302  PCA645VC Webcam [pwc]
-	0303  PCA646VC Webcam [pwc]
-	0304  Askey VC010 Webcam [pwc]
-	0307  PCVC675K Webcam [pwc]
-	0308  PCVC680K Webcam [pwc]
-	030b  PC VGA Camera (Vesta Fun)
-	030c  PCVC690K Webcam [pwc]
-	0310  PCVC730K Webcam [pwc]
-	0311  PCVC740K ToUcam Pro [pwc]
-	0312  PCVC750K Webcam [pwc]
-	0314  DMVC 1000K
-	0316  DMVC 2000K Video Capture
-	0321  FunCam
-	0322  DMVC1300K PC Camera
-	0325  SPC 200NC PC Camera
-	0326  SPC 300NC PC Camera
-	0327  Webcam SPC 6000 NC (Webcam w/ mic)
-	0328  SPC 700NC PC Camera
-	0329  SPC 900NC PC Camera / ORITE CCD Webcam(PC370R)
-	032d  SPC 210NC PC Camera
-	032e  SPC 315NC PC Camera
-	0330  SPC 710NC PC Camera
-	0331  SPC 1300NC PC Camera
-	0332  SPC 1000NC PC Camera
-	0333  SPC 620NC PC Camera
-	0334  SPC 520/525NC PC Camera
-	0401  Semiconductors CICT Keyboard
-	0402  PS/2 Mouse on Semiconductors CICT Keyboard
-	0406  15 inch Detachable Monitor
-	0407  10 inch Mobile Monitor
-	0408  SG3WA1/74 802.11b WLAN Adapter [Atmel AT76C503A]
-	0471  Digital Speaker System
-	0601  OVU1020 IR Dongle (Kbd+Mouse)
-	0602  ATI Remote Wonder II Input Device
-	0603  ATI Remote Wonder II Controller
-	0608  eHome Infrared Receiver
-	060a  TSU9600 Remote Control
-	060c  Consumer Infrared Transceiver (HP)
-	060d  Consumer Infrared Transceiver (SRM5100)
-	060e  RF Dongle
-	060f  Consumer Infrared Transceiver
-	0613  Infrared Transceiver
-	0617  IEEE802.15.4 RF Dongle
-	0619  TSU9400 Remote Control
-	0666  Hantek DDS-3005 Arbitrary Waveform Generator
-	0700  Semiconductors CICT Hub
-	0701  150P1 TFT Display
-	0809  AVNET Bluetooth Device
-	0811  JR24 CDRW
-	0814  DCCX38/P data cable
-	0815  eHome Infrared Receiver
-	0844  SA2111/02 1GB Flash Audio Player
-	084a  GoGear SA3125
-	084e  GoGear SA60xx (mtp)
-	0888  Hantek DDS-3005 Arbitrary Waveform Generator
-	1103  Digital Speaker System
-	1120  Creative Rhomba MP3 player
-	1125  Nike psa[128max Player
-	1137  HDD065 MP3 player
-	1201  Arima Bluetooth Device
-	1230  Wireless Adapter 11g
-	1232  SNU6500 Wireless Adapter
-	1233  Wireless Adapter Bootloader Download
-	1236  SNU5600 802.11bg
-	1237  TalkTalk SNU5630NS/05 802.11bg
-	1552  ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit
-	1801  Diva MP3 player
-	200a  Wireless Network Adapter
-	200f  802.11n Wireless Adapter
-	2021  SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L]
-	2022  GoGear SA52XX
-	2034  Webcam SPC530NC
-	2036  Webcam SPC1030NC
-	203f  TSU9200 Remote Control
-	2046  TSU9800 Remote Control
-	204e  GoGear RaGa (SA1942/02)
-	205e  TSU9300 Remote Control
-	2070  GoGear Mix
-	2076  GoGear Aria
-	2079  GoGear Opus
-	2088  MCE IR Receiver with ALS- Spinel plus for ASUS
-	262c  SPC230NC Webcam
-	485d  Senselock SenseIV v2.x
-	df55  LPCXpresso LPC-Link
-0472  Chicony Electronics Co., Ltd
-	0065  PFU-65 Keyboard [Chicony]
-	b086  Asus USB2.0 Webcam
-	b091  Webcam
-0473  Sanyo Information Business Co., Ltd
-0474  Sanyo Electric Co., Ltd
-	0110  Digital Voice Recorder R200
-	0217  Xacti J2
-	022f  C5 Digital Media Camera (mass storage mode)
-	0230  C5 Digital Media Camera (PictBridge mode)
-	0231  C5 Digital Media Camera (PC control mode)
-	0401  Optical Drive
-	0701  SCP-4900 Cellphone
-	071f  Usb Com Port Enumerator
-	0722  W33SA Camera
-0475  Relisys/Teco Information System
-	0100  NEC Petiscan
-	0103  Eclipse 1200U/Episode
-	0210  Scorpio Ultra 3
-0476  AESP
-0477  Seagate Technology, Inc.
-0478  Connectix Corp.
-	0001  QuickCam
-	0002  QuickClip
-	0003  QuickCam Pro
-0479  Advanced Peripheral Laboratories
-047a  Semtech Corp.
-	0004  ScreenCoder UR7HCTS2-USB
-047b  Silitek Corp.
-	0001  Keyboard
-	0002  Keyboard and Mouse
-	0011  SK-1688U Keyboard
-	00f9  SK-1789u Keyboard
-	0101  BlueTooth Keyboard and Mouse
-	020b  SK-3105 SmartCard Reader
-	050e  Internet Compact Keyboard
-	1000  Trust Office Scan USB 19200
-	1002  HP ScanJet 4300c Parallel Port
-047c  Dell Computer Corp.
-047d  Kensington
-	1001  Mouse*in*a*Box
-	1002  Expert Mouse Pro
-	1003  Orbit TrackBall
-	1004  MouseWorks
-	1005  TurboBall
-	1006  TurboRing
-	1009  Orbit TrackBall for Mac
-	1012  PocketMouse
-	1013  Mouse*in*a*Box Optical Pro
-	1014  Expert Mouse Pro Wireless
-	1015  Expert Mouse
-	1016  ADB/USB Orbit
-	1018  Studio Mouse
-	101d  Mouse*in*a*Box Optical Pro
-	101e  Studio Mouse Wireless
-	101f  PocketMouse Pro
-	1020  Expert Mouse Trackball
-	1021  Expert Mouse Wireless
-	1022  Orbit Optical
-	1023  Pocket Mouse Pro Wireless
-	1024  PocketMouse
-	1025  Mouse*in*a*Box Optical Elite Wireless
-	1026  Pocket Mouse Pro
-	1027  StudioMouse
-	1028  StudioMouse Wireless
-	1029  Mouse*in*a*Box Optical Elite
-	102a  Mouse*in*a*Box Optical
-	102b  PocketMouse
-	102c  Iridio
-	102d  Pilot Optical
-	102e  Pilot Optical Pro
-	102f  Pilot Optical Pro Wireless
-	1043  Ci65m Wireless Notebook Optical Mouse
-	104a  PilotMouse Mini Retractable
-	105d  PocketMouse Bluetooth
-	105e  Bluetooth EDR Dongle
-	1061  PocketMouse Grip
-	1062  PocketMouse Max
-	1063  PocketMouse Max Wireless
-	1064  PocketMouse 2.0 Wireless
-	1065  PocketMouse 2.0
-	1066  PocketMouse Max Glow
-	1067  ValueMouse
-	1068  ValueOpt White
-	1069  ValueOpt Black
-	106a  PilotMouse Laser Wireless Mini
-	106b  PilotMouse Laser - 3 Button
-	106c  PilotMouse Laser - Gaming
-	106d  PilotMouse Laser - Wired
-	106e  PilotMouse Micro Laser
-	1070  ValueOpt Travel
-	1071  ValueOpt RF TX
-	1072  PocketMouse Colour
-	1073  PilotMouse Laser - 6 Button
-	1074  PilotMouse Laser Wireless Mini
-	1075  SlimBlade Presenter Media Mouse
-	1076  SlimBlade Media Mouse
-	1077  SlimBlade Presenter Mouse
-	1152  Bluetooth EDR Dongle
-	2002  Optical Elite Wireless
-	2010  Wireless Presentation Remote
-	2012  Wireless Presenter with Laser Pointer
-	2021  PilotBoard Wireless
-	2030  PilotBoard Wireless
-	2034  SlimBlade Media Notebook Set
-	2041  SlimBlade Trackball
-	4003  Gravis Xterminator Digital Gamepad
-	4005  Gravis Eliminator GamePad Pro
-	4006  Gravis Eliminator AfterShock
-	4007  Gravis Xterminator Force
-	4008  Gravis Destroyer TiltPad
-	5001  Cabo I Camera
-	5002  VideoCam CABO II
-	5003  VideoCam
-047e  Agere Systems, Inc. (Lucent)
-	0300  ORiNOCO Card
-	1001  USS720 Parallel Port
-	2892  Systems Soft Modem
-	bad1  Lucent 56k Modem
-	f101  Atlas Modem
-047f  Plantronics, Inc.
-	0101  Bulk Driver
-	0301  Bulk Driver
-	0ca1  USB DSP v4 Audio Interface
-	4254  BUA-100 Bluetooth Adapter
-0480  Toshiba America Info. Systems, Inc.
-	0001  InTouch Module
-	0004  InTouch Module
-	0011  InTouch Module
-	0014  InTouch Module
-0481  Zenith Data Systems
-0482  Kyocera Corp.
-	000e  FS-1020D Printer
-	0100  Finecam S3x
-	0101  Finecam S4
-	0103  Finecam S5
-	0105  Finecam L3
-	0106  Finecam
-	0107  Digital Camera Device
-	0108  Digital Camera Device
-	0203  AH-K3001V
-	0204  iBurst Terminal
-0483  SGS Thomson Microelectronics
-	0137  BeWAN ADSL USB ST (blue or green)
-	0138  Unicorn II (ST70138B + MTC-20174TQ chipset)
-	1307  Cytronix 6in1 Card Reader
-	163d  Cool Icam Digi-MP3
-	2015  TouchChip� Fingerprint Reader
-	2016  Fingerprint Reader
-	2017  Biometric Smart Card Reader
-	2018  BioSimKey
-	2302  Portable Flash Device (PFD)
-	3744  STLINK Pseudo disk
-	3748  ST-LINK/V2
-	4810  ISDN adapter
-	481d  BT Digital Access adapter
-	5000  ST Micro/Ergenic ERG BT-002 Bluetooth Adapter
-	5001  ST Micro Bluetooth Device
-	5721  Hantek DDS-3X25 Arbitrary Waveform Generator
-	7270  ST Micro Serial Bridge
-	7554  56k SoftModem
-	df11  STM Device in DFU Mode
-	ff10  Swann ST56 Modem
-0484  Specialix
-0485  Nokia Monitors
-0486  ASUS Computers, Inc.
-	0185  EeePC T91MT HID Touch Panel
-0487  Stewart Connector
-0488  Cirque Corp.
-0489  Foxconn / Hon Hai
-	0502  SmartMedia Card Reader Firmware Loader
-	0503  SmartMedia Card Reader
-	d00c  Rollei Compactline (Storage Mode)
-	d00e  Rollei Compactline (Video Mode)
-	e000  T-Com TC 300
-	e003  Pirelli DP-L10
-	e00f  Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]
-	e016  Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]
-	e02c  Atheros AR5BBU12 Bluetooth Device
-048a  S-MOS Systems, Inc.
-048c  Alps Electric Ireland, Ltd
-048d  Integrated Technology Express, Inc.
-	9009  Zolid HD DVD Maker
-	9135  Zolid Mini DVB-T Stick
-048f  Eicon Tech.
-0490  United Microelectronics Corp.
-0491  Capetronic
-	0003  Taxan Monitor Control
-0492  Samsung SemiConductor, Inc.
-	0140  MP3 player
-	0141  MP3 Player
-0493  MAG Technology Co., Ltd
-0495  ESS Technology, Inc.
-0496  Micron Electronics
-0497  Smile International
-	c001  Camera Device
-0498  Capetronic (Kaohsiung) Corp.
-0499  Yamaha Corp.
-	1000  UX256 MIDI I/F
-	1001  MU1000
-	1002  MU2000
-	1003  MU500
-	1004  UW500
-	1005  MOTIF6
-	1006  MOTIF7
-	1007  MOTIF8
-	1008  UX96 MIDI I/F
-	1009  UX16 MIDI I/F
-	100a  EOS BX
-	100c  UC-MX
-	100d  UC-KX
-	100e  S08
-	100f  CLP-150
-	1010  CLP-170
-	1011  P-250
-	1012  TYROS
-	1013  PF-500
-	1014  S90
-	1015  MOTIF-R
-	1016  MDP-5
-	1017  CVP-204
-	1018  CVP-206
-	1019  CVP-208
-	101a  CVP-210
-	101b  PSR-1100
-	101c  PSR-2100
-	101d  CLP-175
-	101e  PSR-K1
-	101f  EZ-J24
-	1020  EZ-250i
-	1021  MOTIF ES 6
-	1022  MOTIF ES 7
-	1023  MOTIF ES 8
-	1024  CVP-301
-	1025  CVP-303
-	1026  CVP-305
-	1027  CVP-307
-	1028  CVP-309
-	1029  CVP-309GP
-	102a  PSR-1500
-	102b  PSR-3000
-	102e  ELS-01/01C
-	1030  PSR-295/293
-	1031  DGX-205/203
-	1032  DGX-305
-	1033  DGX-505
-	1037  PSR-E403
-	103c  MOTIF-RACK ES
-	1054  S90XS Keyboard/Music Synthesizer
-	2000  DGP-7
-	2001  DGP-5
-	3001  YST-MS55D USB Speaker
-	3003  YST-M45D USB Speaker
-	4000  NetVolante RTA54i Broadband&ISDN Router
-	4001  NetVolante RTW65b Broadband Wireless Router
-	4002  NetVolante RTW65i Broadband&ISDN Wireless Router
-	4004  NetVolante RTA55i Broadband VoIP Router
-	5000  CS1D
-	5001  DSP1D
-	5002  DME32
-	5003  DM2000
-	5004  02R96
-	5005  ACU16-C
-	5006  NHB32-C
-	5007  DM1000
-	5008  01V96
-	5009  SPX2000
-	500a  PM5D
-	500b  DME64N
-	500c  DME24N
-	6001  CRW2200UX Lightspeed 2 External CD-RW Drive
-	7000  DTX
-	7010  UB99
-049a  Gandalf Technologies, Ltd
-049b  Curtis Computer Products
-049c  Acer Advanced Labs, Inc.
-	0002  Keyboard (???)
-049d  VLSI Technology
-049f  Compaq Computer Corp.
-	0002  InkJet Color Printer
-	0003  iPAQ PocketPC
-	000e  Internet Keyboard
-	0012  InkJet Color Printer
-	0018  PA-1/PA-2 MP3 Player
-	0019  InkJet Color Printer
-	001a  S4 100 Scanner
-	001e  IJ650 Inkjet Printer
-	001f  WL215 Adapter
-	0021  S200 Scanner
-	0027  Bluetooth Multiport Module by Compaq
-	002a  1400P Inkjet Printer
-	002b  A3000
-	002c  Lexmark X125
-	0032  802.11b Adapter [ipaq h5400]
-	0033  Wireless LAN MultiPort W100 [Intersil PRISM 2.5]
-	0036  Bluetooth Multiport Module
-	0051  KU-0133 Easy Access Interner Keyboard
-	0076  Wireless LAN MultiPort W200
-	0080  GPRS Multiport
-	0086  Bluetooth Device
-	504a  Personal Jukebox PJB100
-	505a  Linux-USB "CDC Subset" Device, or Itsy (experimental)
-	8511  iPAQ Networking 10/100 Ethernet [pegasus2]
-04a0  Digital Equipment Corp.
-04a1  SystemSoft Corp.
-	fff0  Telex Composite Device
-04a2  FirePower Systems
-04a3  Trident Microsystems, Inc.
-04a4  Hitachi, Ltd
-	0004  DVD-CAM DZ-MV100A Camcorder
-	001e  DVDCAM USB HS Interface
-04a5  Acer Peripherals Inc. (now BenQ Corp.)
-	0001  Keyboard
-	0002  API Ergo K/B
-	0003  API Generic K/B Mouse
-	12a6  AcerScan C310U
-	1a20  Prisa 310U
-	1a2a  Prisa 620U
-	2022  Prisa 320U/340U
-	2040  Prisa 620UT
-	205e  ScanPrisa 640BU
-	2060  Prisa 620U+/640U
-	207e  Prisa 640BU
-	209e  ScanPrisa 640BT
-	20ae  S2W 3000U
-	20b0  S2W 3300U/4300U
-	20be  Prisa 640BT
-	20c0  Prisa 1240UT
-	20de  S2W 4300U+
-	20f8  Benq 5000
-	20fc  Benq 5000
-	20fe  SW2 5300U
-	2137  Benq 5150/5250
-	2202  Benq 7400UT
-	2311  Benq 5560
-	3003  Benq Webcam
-	3008  Benq 1500
-	300a  Benq 3410
-	300c  Benq 1016
-	3019  Benq DC C40
-	4000  P30 Composite Device
-	4013  BenQ-Siemens EF82/SL91
-	4044  BenQ-Siemens SF71
-	4045  BenQ-Siemens E81
-	4048  BenQ M7
-	6001  Mass Storage Device
-	6002  Mass Storage Device
-	6003  ATA/ATAPI Adapter
-	6004  Mass Storage Device
-	6005  Mass Storage Device
-	6006  Mass Storage Device
-	6007  Mass Storage Device
-	6008  Mass Storage Device
-	6009  Mass Storage Device
-	600a  Mass Storage Device
-	600b  Mass Storage Device
-	600c  Mass Storage Device
-	600d  Mass Storage Device
-	600e  Mass Storage Device
-	600f  Mass Storage Device
-	6010  Mass Storage Device
-	6011  Mass Storage Device
-	6012  Mass Storage Device
-	6013  Mass Storage Device
-	6014  Mass Storage Device
-	6015  Mass Storage Device
-	6125  MP3 Player
-	6180  MP3 Player
-	6200  MP3 Player
-	7500  Hi-Speed Mass Storage Device
-	9000  AWL300 Wireless Adapter
-	9001  AWL400 Wireless Adapter
-	9213  Kbd Hub
-04a6  Nokia Display Products
-	00b9  Audio
-	0180  Hub Type P
-	0181  HID Monitor Controls
-04a7  Visioneer
-	0100  StrobePro
-	0101  Strobe Pro Scanner (1.01)
-	0102  StrobePro Scanner
-	0211  OneTouch 7600 Scanner
-	0221  OneTouch 5300 Scanner
-	0223  OneTouch 8200
-	0224  OneTouch 4800 USB/Microtek Scanport 3000
-	0225  VistaScan Astra 3600(ENG)
-	0226  OneTouch 5300 USB
-	0229  OneTouch 7100
-	022a  OneTouch 6600
-	022c  OneTouch 9000/9020
-	0231  6100 Scanner
-	0311  6200 EPP/USB Scanner
-	0321  OneTouch 8100 EPP/USB Scanner
-	0331  OneTouch 8600 EPP/USB Scanner
-	0341  6400
-	0361  VistaScan Astra 3600(ENG)
-	0362  OneTouch 9320
-	0371  OneTouch 8700/8920
-	0380  OneTouch 7700
-	0382  Photo Port 7700
-	0390  9650
-	03a0  Xerox 4800 One Touch
-	0410  OneTouch Pro 8800/8820
-	0421  9450 USB
-	0423  9750 Scanner
-	0424  Strobe XP 450
-	0425  Strobe XP 100
-	0426  Strobe XP 200
-	0427  Strobe XP 100
-	0444  OneTouch 7300
-	0445  CardReader 100
-	0446  Xerox DocuMate 510
-	0447  XEROX DocuMate 520
-	0448  XEROX DocuMate 250
-	0449  Xerox DocuMate 252
-	044a  Xerox 6400
-	044c  Xerox DocuMate 262
-	0474  Strobe XP 300
-	0475  Xerox DocuMate 272
-	0478  Strobe XP 220
-	0479  Strobe XP 470
-	047a  9450
-	047b  9650
-	047d  9420
-	0480  9520
-	048f  Strobe XP 470
-	0491  Strobe XP 450
-	0493  9750
-	0494  Strobe XP 120
-	0497  Patriot 430
-	0498  Patriot 680
-	0499  Patriot 780
-	049b  Strobe XP 100
-	04a0  7400
-	04ac  Xerox Travel Scanner 100
-04a8  Multivideo Labs, Inc.
-	0101  Hub
-	0303  Peripheral Switch
-	0404  Peripheral Switch
-04a9  Canon, Inc.
-	1005  BJ Printer Hub
-	1035  PD Printer Storage
-	1050  BJC-8200
-	1051  BJC-3000 Color Printer
-	1052  BJC-6100
-	1053  BJC-6200
-	1054  BJC-6500
-	1055  BJC-85
-	1056  BJC-2110 Color Printer
-	1057  LR1
-	105a  BJC-55
-	105b  S600 Printer
-	105c  S400
-	105d  S450 Printer
-	105e  S800
-	1062  S500 Printer
-	1063  S4500
-	1064  S300 Printer
-	1065  S100
-	1066  S630
-	1067  S900
-	1068  S9000
-	1069  S820
-	106a  S200 Printer
-	106b  S520 Printer
-	106d  S750 Printer
-	106e  S820D
-	1070  S530D
-	1072  I850 Printer
-	1073  I550 Printer
-	1074  S330 Printer
-	1076  i70
-	1077  i950
-	107a  S830D
-	107b  i320
-	107c  i470D
-	107d  i9100
-	107e  i450
-	107f  i860
-	1082  i350
-	1084  i250
-	1085  i255
-	1086  i560
-	1088  i965
-	108a  i455
-	108b  i900D
-	108c  i475D
-	108d  PIXMA iP2000
-	108f  i80
-	1090  i9900 Photo Printer
-	1091  PIXMA iP1500
-	1093  PIXMA iP4000
-	1094  PIXMA iP3000x Printer
-	1095  PIXMA iP6000D
-	1097  PIXMA iP5000
-	1098  PIXMA iP1000
-	1099  PIXMA iP8500
-	109c  PIXMA iP4000R
-	109d  iP90
-	10a0  PIXMA iP1600 Printer
-	10a2  iP4200
-	10a4  iP5200R
-	10a5  iP5200
-	10a7  iP6210D
-	10a8  iP6220D
-	10a9  iP6600D
-	10b6  PIXMA iP4300 Printer
-	10c2  PIXMA iP1800 Printer
-	10c4  Pixma iP4500 Printer
-	1404  W6400PG
-	1405  W8400PG
-	150f  BIJ2350 PCL
-	1510  BIJ1350 PCL
-	1512  BIJ1350D PCL
-	1601  DR-2080C Scanner
-	1607  DR-6080 Scanner
-	1700  PIXMA MP110 Scanner
-	1701  PIXMA MP130 Scanner
-	1702  MP410 Composite
-	1703  MP430 Composite
-	1704  MP330 Composite
-	1706  PIXMA MP750 Scanner
-	1707  PIXMA MP780 Scanner
-	1708  PIXMA MP760 Scanner
-	1709  PIXMA MP150 Scanner
-	170a  PIXMA MP170 Scanner
-	170b  PIXMA MP450 Scanner
-	170c  PIXMA MP500 Scanner
-	170d  PIXMA MP800 Scanner
-	170e  MP800R
-	1710  MP950
-	1712  MP530
-	1713  PIXMA MP830 Scanner
-	1714  MP160
-	1715  MP180 Storage
-	1716  MP460 Composite
-	1717  MP510
-	1718  MP600 Storage
-	171a  MP810 Storage
-	171b  MP960
-	1721  MP210 ser
-	1723  MP470 ser
-	1725  MP610 ser
-	1726  MP970 ser
-	1727  MX300 ser
-	1728  MX310 ser
-	1729  MX700 ser
-	172b  MP140 ser
-	173e  MP560
-	173f  Pixma MP640 Multifunction device
-	1748  Pixma MG5150
-	1900  CanoScan LiDE 90
-	1901  CanoScan 8800F
-	1904  CanoScan LiDE 100
-	1905  CanoScan LiDE 200
-	1906  CanoScan 5600F
-	1907  CanoScan LiDE 700F
-	1909  CanoScan LiDE 110
-	190a  CanoScan LiDE 210
-	2200  CanoScan LiDE 25
-	2201  CanoScan FB320U
-	2202  CanoScan FB620U
-	2204  CanoScan FB630U
-	2205  CanoScan FB1210U
-	2206  CanoScan N650U/N656U
-	2207  CanoScan 1220U
-	2208  CanoScan D660U
-	220a  CanoScan D2400UF
-	220b  CanoScan D646U
-	220c  CanoScan D1250U2
-	220d  CanoScan N670U/N676U/LiDE 20
-	220e  CanoScan N1240U/LiDE 30
-	220f  CanoScan 8000F
-	2210  CanoScan 9900F
-	2212  CanoScan 5000F
-	2213  CanoScan LiDE 50/LiDE 35/LiDE 40
-	2214  CanoScan LiDE 80
-	2215  CanoScan 3000/3000F/3000ex
-	2216  CanoScan 3200F
-	2217  CanoScan 5200F
-	2219  CanoScan 9950F
-	221b  CanoScan 4200F
-	221c  CanoScan LiDE 60
-	221e  CanoScan 8400F
-	221f  CanoScan LiDE 500F
-	2220  CanoScan LIDE 25
-	2224  CanoScan LiDE 600F
-	2225  CanoScan LiDE 70
-	2228  CanoScan 4400F
-	2602  MultiPASS C555
-	2603  MultiPASS C755
-	260a  CAPT Printer
-	260e  LBP-2000
-	2610  MPC600F
-	2611  SmartBase MPC400
-	2612  MultiPASS C855
-	2617  CAPT Printer
-	261a  iR1600
-	261b  iR1610
-	261c  iC2300
-	261f  MPC200 Printer
-	2621  iR2000
-	2622  iR2010
-	2623  FAX-B180C
-	2629  FAXPHONE L75
-	262b  LaserShot LBP-1120 Printer
-	262d  iR C3200
-	262f  MultiPASS MP730
-	2630  MultiPASS MP700
-	2631  LASER CLASS 700
-	2632  FAX-L2000
-	2635  MPC190
-	2637  iR C6800
-	2638  iR C3100
-	263c  Smartbase MP360
-	263d  MP370
-	263e  MP390 FAX
-	263f  MP375
-	2646  MF5530 Scanner Device V1.9.1
-	2647  MF5550 Composite
-	264d  PIXMA MP710
-	264e  MF5630
-	264f  MF5650 (FAX)
-	2650  iR 6800C EUR
-	2651  iR 3100C EUR
-	2655  FP-L170/MF350/L380/L398
-	2659  MF8100
-	265b  CAPT Printer
-	265c  iR C3220
-	265d  MF5730
-	265e  MF5750
-	265f  MF5770
-	2660  MF3110
-	2663  iR3570/iR4570
-	2664  iR2270/iR2870
-	2665  iR C2620
-	2666  iR C5800
-	2667  iR85PLUS
-	2669  iR105PLUS
-	266a  CAPT Device
-	266b  iR8070
-	266c  iR9070
-	266d  iR 5800C EUR
-	266e  CAPT Device
-	266f  iR2230
-	2670  iR3530
-	2671  iR5570/iR6570
-	2672  iR C3170
-	2673  iR 3170C EUR
-	2674  L120
-	2675  iR2830
-	2676  CAPT Device
-	2677  iR C2570
-	2678  iR 2570C EUR
-	2679  CAPT Device
-	267a  iR2016
-	267b  iR2020
-	267d  MF7100 series
-	2684  MF3200 series
-	2686  MF6500 series
-	2687  iR4530
-	2688  LBP3460
-	268c  iR C6870
-	268d  iR 6870C EUR
-	268e  iR C5870
-	268f  iR 5870C EUR
-	2691  iR7105
-	26a3  MF4100 series
-	26b0  MF4600 series
-	26b4  MF4010 series
-	26b5  MF4200 series
-	3041  PowerShot S10
-	3042  CanoScan FS4000US Film Scanner
-	3043  PowerShot S20
-	3044  EOS D30
-	3045  PowerShot S100
-	3046  IXY Digital
-	3047  Digital IXUS
-	3048  PowerShot G1
-	3049  PowerShot Pro90 IS
-	304a  CP-10
-	304b  IXY Digital 300
-	304c  PowerShot S300
-	304d  Digital IXUS 300
-	304e  PowerShot A20
-	304f  PowerShot A10
-	3050  PowerShot unknown 1
-	3051  PowerShot S110
-	3052  Digital IXUS V
-	3055  PowerShot G2
-	3056  PowerShot S40
-	3057  PowerShot S30
-	3058  PowerShot A40
-	3059  PowerShot A30
-	305b  ZR45MC Digital Camcorder
-	305c  PowerShot unknown 2
-	3060  EOS D60
-	3061  PowerShot A100
-	3062  PowerShot A200
-	3063  CP-100
-	3065  PowerShot S200
-	3066  Digital IXUS 330
-	3067  MV550i Digital Video Camera
-	3069  PowerShot G3
-	306a  Digital unknown 3
-	306b  MVX2i Digital Video Camera
-	306c  PowerShot S45
-	306d  PowerShot S45 PtP Mode
-	306e  PowerShot G3 (normal mode)
-	306f  PowerShot G3 (ptp)
-	3070  PowerShot S230
-	3071  PowerShot S230 (ptp)
-	3072  PowerShot SD100 / Digital IXUS II (ptp)
-	3073  PowerShot A70 (ptp)
-	3074  PowerShot A60 (ptp)
-	3075  IXUS 400 Camera
-	3076  PowerShot A300
-	3077  PowerShot S50
-	3078  ZR70MC Digital Camcorder
-	307a  MV650i (normal mode)
-	307b  MV630i Digital Video Camera
-	307c  MV630i (normal mode)
-	307d  CP-300
-	307f  Optura 20
-	3080  MVX150i (normal mode) / Optura 20 (normal mode)
-	3081  Optura 10
-	3082  MVX100i / Optura 10
-	3083  EOS 10D
-	3084  EOS 300D / EOS Digital Rebel
-	3085  PowerShot G5
-	3087  Elura 50 (PTP mode)
-	3088  Elura 50 (normal mode)
-	308d  MVX3i
-	308e  FV M1 (normal mode) / MVX 3i (normal mode) / Optura Xi (normal mode)
-	3093  Optura 300
-	3096  IXY DV M2 (normal mode) / MVX 10i (normal mode)
-	3099  EOS 300D (ptp)
-	309a  PowerShot A80
-	309b  Digital IXUS (ptp)
-	309c  PowerShot S1 IS
-	309d  Camera
-	309f  Camera
-	30a0  Camera
-	30a1  Camera
-	30a2  Camera
-	30a8  Elura 60E/Optura 40 (ptp)
-	30a9  MVX25i (normal mode) / Optura 40 (normal mode)
-	30b1  PowerShot S70 (normal mode) / PowerShot S70 (PTP mode)
-	30b2  PowerShot S60 (normal mode) / PowerShot S60 (PTP mode)
-	30b3  PowerShot G6 (normal mode) / PowerShot G6 (PTP mode)
-	30b4  PowerShot S500
-	30b5  PowerShot A75
-	30b6  Digital IXUS II2  / Digital IXUS II2 (PTP mode) / PowerShot SD110 (PTP mode) / PowerShot SD110 Digital ELPH
-	30b7  PowerShot A400 / PowerShot A400 (PTP mode)
-	30b8  PowerShot A310 / PowerShot A310 (PTP mode)
-	30b9  Powershot A85
-	30ba  PowerShot S410 Digital Elph
-	30bb  PowerShot A95
-	30bd  CP-220
-	30be  CP-330
-	30bf  Digital IXUS 40
-	30c0  Digital IXUS 30 (PTP mode) / PowerShot SD200 (PTP mode)
-	30c1  Digital IXUS 50 (normal mode) / IXY Digital 55 (normal mode) / PowerShot A520 (PTP mode) / PowerShot SD400 (normal mode)
-	30c2  PowerShot A510 (normal mode) / PowerShot A510 (PTP mode)
-	30c4  Digital IXUS i5 (normal mode) / IXY Digital L2 (normal mode) / PowerShot SD20 (normal mode)
-	30ea  EOS 1D Mark II (PTP mode)
-	30eb  EOS 20D
-	30ec  EOS 20D (ptp)
-	30ee  EOS 350D
-	30ef  EOS 350D (ptp)
-	30f0  PowerShot S2 IS (PTP mode)
-	30f2  Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode)
-	30f6  SELPHY CP400
-	30f8  Powershot A430
-	30f9  PowerShot A410 (PTP mode)
-	30fc  PowerShot A620 (PTP mode)
-	30fd  PowerShot A610 (normal mode)/PowerShot A610 (PTP mode)
-	30fe  Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode)
-	30ff  Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode)
-	310b  SELPHY CP600
-	310e  Digital IXUS 50 (PTP mode)
-	3110  EOS Digital Rebel XTi
-	3116  Digital IXUS 750 (PTP mode)
-	3117  PowerShot A700
-	312d  Elura 100
-	3138  PowerShot A710 IS
-	3147  EOS 1Ds Mark III
-	3155  PowerShot A450
-	315a  PowerShot G9
-	315d  PowerShot A720
-	3160  Digital IXUS 860 IS
-	3175  IXY Digital 25 IS
-	3176  PowerShot A590
-	317a  Powershot A470
-	3184  Digital IXUS 80 IS (PTP mode)
-	319a  EOS 7D
-	31bc  PowerShot D10
-	31c0  PowerShot SX200 IS
-	31e5  Digital IXUS 200 IS
-	31ee  SELPHY ES40
-	31f3  PowerShot Digital ELPH SD1400 IS
-	31ff  Digital IXUS 55
-04aa  DaeWoo Telecom, Ltd
-04ab  Chromatic Research
-04ac  Micro Audiometrics Corp.
-04ad  Dooin Electronics
-	2501  Bluetooth Device
-04af  Winnov L.P.
-04b0  Nikon Corp.
-	0102  Coolpix 990
-	0103  Coolpix 880
-	0104  Coolpix 995
-	0106  Coolpix 775
-	0107  Coolpix 5000
-	0108  Coolpix 2500
-	0109  Coolpix 2500 (ptp)
-	010a  Coolpix 4500
-	010b  Coolpix 4500 (ptp)
-	010d  Coolpix 5700 (ptp)
-	010e  Coolpix 4300 (storage)
-	010f  Coolpix 4300 (ptp)
-	0110  Coolpix 3500 (Sierra Mode)
-	0111  Coolpix 3500 (ptp)
-	0112  Coolpix 885 (ptp)
-	0113  Coolpix 5000 (ptp)
-	0114  Coolpix 3100 (storage)
-	0115  Coolpix 3100 (ptp)
-	0117  Coolpix 2100 (ptp)
-	0119  Coolpix 5400 (ptp)
-	011d  Coolpix 3700 (ptp)
-	0121  Coolpix 3200 (ptp)
-	0122  Coolpix 2200 (ptp)
-	0124  Coolpix 8400 (mass storage mode)
-	0125  Coolpix 8400 (ptp)
-	0126  Coolpix 8800
-	0129  Coolpix 4800 (ptp)
-	012c  Coolpix 4100 (storage)
-	012d  Coolpix 4100 (ptp)
-	012e  Coolpix 5600 (ptp)
-	0130  Coolpix 4600 (ptp)
-	0135  Coolpix 5900 (ptp)
-	0136  Coolpix 7900 (storage)
-	0137  Coolpix 7900 (ptp)
-	013a  Coolpix 100 (storage)
-	013b  Coolpix 100 (ptp)
-	0141  Coolpix P2 (storage)
-	0142  Coolpix P2 (ptp)
-	0163  Coolpix P5100 (ptp)
-	0169  Coolpix P50 (ptp)
-	0202  Coolpix SQ (ptp)
-	0203  Coolpix 4200 (mass storage mode)
-	0204  Coolpix 4200 (ptp)
-	0205  Coolpix 5200 (storage)
-	0206  Coolpix 5200 (ptp)
-	0301  Coolpix 2000 (storage)
-	0302  Coolpix 2000 (ptp)
-	0317  Coolpix L20 (ptp)
-	0402  DSC D100 (ptp)
-	0403  D2H (mass storage mode)
-	0404  D2H SLR (ptp)
-	0405  D70 (mass storage mode)
-	0406  DSC D70 (ptp)
-	0408  D2X SLR (ptp)
-	0409  D50 digital camera
-	040a  D50 (ptp)
-	040c  D2Hs
-	040e  DSC D70s (ptp)
-	040f  D200 (mass storage mode)
-	0410  D200 (ptp)
-	0413  D40 (mass storage mode)
-	0422  D700 (ptp)
-	0425  D300S
-	0f03  PD-10 Wireless Printer Adapter
-	4000  Coolscan LS 40 ED
-	4001  LS 50 ED/Coolscan V ED
-	4002  Super Coolscan LS-5000 ED
-04b1  Pan International
-04b3  IBM Corp.
-	3003  Rapid Access III Keyboard
-	3004  Media Access Pro Keyboard
-	300a  Rapid Access IIIe Keyboard
-	3016  UltraNav Keyboard Hub
-	3018  UltraNav Keyboard
-	301b  SK-8815 Keyboard
-	301c  Enhanced Performance Keyboard
-	3020  Enhanced Performance Keyboard
-	3100  NetVista Mouse
-	3103  ScrollPoint Pro Mouse
-	3104  ScrollPoint Wireless Mouse
-	3105  ScrollPoint Optical (HID)
-	3107  ThinkPad 800dpi Optical Travel Mouse
-	3108  800dpi Optical Mouse w/ Scroll Point
-	3109  Optical ScrollPoint Pro Mouse
-	310b  Red Wheel Mouse
-	310c  Wheel Mouse
-	4427  Portable CD ROM
-	4482  Serial Converter
-	4485  Serial Converter
-	4525  Double sided CRT
-	4550  NVRAM (128 KB)
-	4554  Cash Drawer
-	4580  Hub w/ NVRAM
-	4581  4800-2xx Hub w/ Cash Drawer
-	4604  Keyboard w/ Card Reader
-	4671  4820 LCD w/ MSR/KB
-04b4  Cypress Semiconductor Corp.
-	0000  Dacal DC-101 CD Library
-	0001  Mouse
-	0002  CY7C63x0x Thermometer
-	0033  Mouse
-	0100  Cino FuzzyScan F760-B
-	0101  Keyboard/Hub
-	0102  Keyboard with APM
-	0130  MyIRC Remote Receiver
-	0306  Telephone Receiver
-	0407  Optical Skype Mouse
-	0bad  MetaGeek Wi-Spy
-	1002  CY7C63001 R100 FM Radio
-	1006  Human Interface Device
-	2050  hub
-	2830  Opera1 DVB-S (cold state)
-	4381  SCAPS USC-1 Scanner Controller
-	4611  Storage Adapter FX2 (CY)
-	4616  Flash Disk (TPP)
-	5201  Combi Keyboard-Hub (Hub)
-	5202  Combi Keyboard-Hub (Keyboard)
-	5500  HID->COM RS232 Adapter
-	6370  ViewMate Desktop Mouse CC2201
-	6560  CY7C65640 USB-2.0 "TetraHub"
-	6830  CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI
-	6831  Storage Adapter ISD-300LP (CY)
-	7417  Wireless PC Lock/Ultra Mouse
-	8329  USB To keyboard/Mouse Converter
-	8613  CY7C68013 EZ-USB FX2 USB 2.0 Development Kit
-	8614  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
-	861f  Anysee E30 USB 2.0 DVB-T Receiver
-	bca1  Barcode Reader
-	cc04  Centor USB RACIA-ALVAR USB PORT
-	cc06  Centor-P RACIA-ALVAR USB PORT
-	d5d5  CY7C63x0x Zoltrix Z-Boxer GamePad
-	de61  Barcode Reader
-	de64  Barcode Reader
-	f000  CY30700 Licorice evaluation board
-	f111  CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit
-	f115  PSoC FirstTouch Programmer
-04b5  ROHM LSI Systems USA, LLC
-	3064  Hantek DSO-3064
-04b6  Hint Corp.
-04b7  Compal Electronics, Inc.
-04b8  Seiko Epson Corp.
-	0001  Stylus Color 740 / Photo 750
-	0002  ISD Smart Cable for Mac
-	0003  ISD Smart Cable
-	0004  Printer
-	0005  Printer
-	0006  Printer
-	0007  Printer
-	0101  Perfection 636
-	0102  GT-2200
-	0103  Perfection 610
-	0104  Perfection 1200
-	0105  StylusScan 2000
-	0106  Stylus Scan 2500
-	0107  Expression 1600U
-	0109  Expression 1640 XL
-	010a  Perfection 1640SU
-	010b  Perfection 1240
-	010c  Perfection 640
-	010e  Perfection 1680
-	010f  Perfection 1250
-	0110  Perfection 1650
-	0112  Perfection 2450
-	0114  Perfection 660
-	0116  Perfection 3170 (GT-9400)
-	0118  Perfection 4180 (GF-F600)
-	0119  Perfection 4490 Photo
-	011a  1000 ICS
-	011b  Perfection 2400 Photo
-	011c  Perfection 3200
-	011d  Perfection 1260 Photo
-	011e  Perfection 1660 Photo
-	011f  Perfection 1670
-	0120  Perfection 1270 scanner
-	0121  Perfection 2480/2580 Photo [GT-F500]
-	0122  Perfection 3590 scanner
-	0126  GT-15000 (ES-7000)
-	0128  Perfection 4870 (GT-X700)
-	0129  Expression 10000XL (ES-10000G)
-	012a  Perfection 4990 Photo scanner
-	012b  GT-2500 (ES-H300)
-	012c  Perfection V700 Photo (GT-X900)
-	012d  Perfection V10/V100 (GT-S600/F650)
-	012f  Perfection V350 (GT-F700)
-	0130  Perfection V500 (GT-X770)
-	0131  Perfection V300
-	0136  GT-S80 (ES-D400)
-	0137  GT-S50 (ES-D200)
-	0202  Receipt Printer M129C
-	0401  CP 800 Digital Camera
-	0402  PhotoPC 850z
-	0403  PhotoPC 3000z
-	0509  JVC PIX-MC10
-	0601  Stylus Photo 875DC Card Reader
-	0602  Stylus Photo 895 Card Reader
-	0801  Stylus CX5200/CX5400/CX6600
-	0802  Stylus CX3200
-	0803  Printer (Composite Device)
-	0804  Storage Device
-	0805  Stylus CX6400
-	0806  Stylus Photo RX600/610
-	0807  Stylus Photo RX500/510
-	0808  Stylus CX5200
-	0809  Storage Device
-	080a  Storage Device
-	080c  ME100
-	080d  Stylus CX4500/4600
-	080e  CX-3500/3600/3650 MFP
-	080f  Stylus Photo RX425 scanner
-	0810  Stylus Photo RX700 (PM-A900)
-	0811  Stylus Photo RX620 all-in-one
-	0812  MFP Composite Device
-	0813  Stylus CX6500/6600
-	0814  (PM-A700)
-	0815  AcuLaser CX11 (LP-A500)
-	0816  Printer (Composite Device)
-	0817  (LP-M5500)
-	0818  Stylus CX3700/CX3800/DX3800
-	0819  Stylus CX4700/CX4800/DX4800 (PX-A750)
-	081a  Stylus Photo RX520/RX530 (PM-A750)
-	081b  MFP Composite Device
-	081c  Stylus Photo RX640/RX650 (PM-A890)
-	081d  (PM-A950)
-	081e  MFP Composite Device
-	081f  Stylus CX7700/7800
-	0820  CX4200 MP scanner
-	0821  MFP Composite Device
-	0822  Storage Device
-	0823  MFP Composite Device
-	0824  Storage Device
-	0825  MFP Composite Device
-	0826  Storage Device
-	0827  Stylus Photo RX560/580/590 (PM-A820)
-	0828  (PM-A970)
-	0829  (PM-T990)
-	082a  (PM-A920)
-	082b  Stylus DX5050
-	082c  Storage Device
-	082d  Storage Device
-	082e  0x082e  DX-60x0 MFP scanner
-	082f  Stylus DX4050
-	0830  Stylus CX2800/CX2900/ME200
-	0831  MFP Composite Device
-	0832  MFP Composite Device
-	0833  (LP-M5600)
-	0834  MFP Composite Device
-	0835  AcuLaser CX21
-	0836  MFP Composite Device
-	0837  MFP Composite Device
-	0838  CX7300/CX7400/DX7400
-	0839  CX8300/CX8400/DX8400
-	083a  CX9300F/CX9400Fax/DX9400F
-	083b  MFP Composite Device
-	083c  MFP Composite Device
-	083d  MFP Composite Device
-	083e  MFP Composite Device
-	083f  Stylus DX4450
-	0849  Stylus SX205
-	084d  Stylus SX115
-	0851  Stylus SX410
-	0856  Stylus SX515W
-	085c  Stylus SX125
-04b9  Rainbow Technologies, Inc.
-	0300  SafeNet USB SuperPro/UltraPro
-	1000  iKey 1000 Token
-	1001  iKey 1200 Token
-	1002  iKey Token
-	1003  iKey Token
-	1004  iKey Token
-	1005  iKey Token
-	1006  iKey Token
-	1200  iKey 2000 Token
-	1201  iKey Token
-	1202  iKey 2032 Token
-	1203  iKey Token
-	1204  iKey Token
-	1205  iKey Token
-	1206  iKey 4000 Token
-	1300  iKey 3000 Token
-	1301  iKey 3000
-	1302  iKey Token
-	1303  iKey Token
-	1304  iKey Token
-	1305  iKey Token
-	1306  iKey Token
-04ba  Toucan Systems, Ltd
-04bb  I-O Data Device, Inc.
-	0101  USB2-IDE/ATAPI Bridge Adapter
-	0201  USB2-IDE/ATAPI Bridge Adapter
-	0204  DVD Multi-plus unit iU-CD2
-	0206  DVD Multi-plus unit DVR-UEH8
-	0301  Storage Device
-	0314  USB-SSMRW SD-card
-	0319  USB2-IDE/ATAPI Bridge Adapter
-	031a  USB2-IDE/ATAPI Bridge Adapter
-	031b  USB2-IDE/ATAPI Bridge Adapter
-	031e  USB-SDRW SD-card
-	0502  Nogatech Live! (BT)
-	0528  GV-USB Video Capture
-	0901  USB ETT
-	0904  ET/TX Ethernet [pegasus]
-	0913  ET/TX-S Ethernet [pegasus2]
-	0919  USB WN-B11
-	0922  IOData AirPort WN-B11/USBS 802.11b
-	0930  ETG-US2
-	0937  WN-WAG/USL Wireless LAN Adapter
-	0938  WN-G54/USL Wireless LAN Adapter
-	093b  WN-GDN/USB
-	093f  WNGDNUS2 802.11n
-	0944  WHG-AGDN/US Wireless LAN Adapter
-	0945  WN-GDN/US3 Wireless LAN Adapter
-	0947  WN-G150U Wireless LAN Adapter
-	0948  WN-G300U Wireless LAN Adapter
-	0a03  Serial USB-RSAQ1
-	0a07  USB2-iCN Adapter
-	0a08  USB2-iCN Adapter
-	0c01  FM-10 Pro Disk
-04bd  Toshiba Electronics Taiwan Corp.
-04be  Telia Research AB
-04bf  TDK Corp.
-	0100  MediaReader CF
-	0115  USB-PDC Adapter UPA9664
-	0116  USB-cdmaOne Adapter UCA1464
-	0117  USB-PHS Adapter UHA6400
-	0118  USB-PHS Adapter UPA6400
-	0135  MediaReader Dual
-	0202  73S1121F Smart Card Reader-
-	0309  Bluetooth USB dongle
-	030a  IBM Bluetooth Ultraport Module
-	030b  Bluetooth Device
-	030c  Ultraport Bluetooth Device
-	0310  Integrated Bluetooth
-	0311  Integrated Bluetooth Device
-	0317  Bluetooth UltraPort Module from IBM
-	0318  IBM Integrated Bluetooth
-	0319  Bluetooth Adapter
-	0320  Bluetooth Adapter
-	0321  Bluetooth Device
-	0a28  INDI AV-IN Device
-04c1  U.S. Robotics (3Com)
-	0020  56K Voice Pro
-	0022  56K Voice Pro
-	007e  ISDN TA
-	0082  OfficeConnect Analog Modem
-	008f  Pro ISDN TA
-	0097  OfficeConnect Analog
-	009d  HomeConnect Webcam [vicam]
-	00a9  ISDN Pro TA-U
-	00b9  HomeConnect IDSL Modem
-	3021  56k Voice FaxModem Pro
-04c2  Methode Electronics Far East PTE, Ltd
-04c3  Maxi Switch, Inc.
-	1102  Mouse
-	2102  Mouse
-04c4  Lockheed Martin Energy Research
-04c5  Fujitsu, Ltd
-	1029  fi-4010c Scanner
-	1033  fi-4110CU
-	1041  fi-4120c Scanner
-	1042  fi-4220c Scanner
-	105b  AH-F401U Air H device
-	1096  fi-5110EOX
-	1097  fi-5110C
-	10ae  fi-4120C2
-	10af  fi-4220C2
-	10e0  fi-5120c Scanner
-	10e1  fi-5220C
-	10e7  fi-5900C
-	10fe  S500
-04c6  Toshiba America Electronic Components
-04c7  Micro Macro Technologies
-04c8  Konica Corp.
-	0720  Digital Color Camera
-	0721  e-miniD Camera
-	0722  e-mini
-	0723  KD-200Z Camera
-	0726  KD-310Z Camera
-	0728  Revio C2 Mass Storage Device
-	0729  Revio C2 Digital Camera
-	072c  Revio KD20M
-	072d  Revio KD410Z
-04ca  Lite-On Technology Corp.
-	1766  HID Monitor Controls
-	9304  Hub
-04cb  Fuji Photo Film Co., Ltd
-	0100  FinePix 30i/40i/50i, A101/201, 1300/2200, 1400/2400/2600/2800/4500/4700/4800/4900/6800/6900 Zoom
-	0103  FinePix NX-500/NX-700 printer
-	0104  FinePix A101, 2600/2800/4800/6800 Zoom (PC CAM)
-	0108  FinePix F601 Zoom (DSC)
-	0109  FinePix F601 Zoom (PC CAM)
-	010a  FinePix S602 (Pro) Zoom (DSC)
-	010b  FinePix S602 (Pro) Zoom (PC CAM)
-	010d  FinePix Digital Camera 020531
-	010e  FinePix F402 Zoom (DSC)
-	010f  FinePix F402 Zoom (PC CAM)
-	0110  FinePix M603 Zoom (DSC)
-	0111  FinePix M603 Zoom (PC CAM)
-	0112  FinePix A202, A200 Zoom (DSC)
-	0113  FinePix A202, A200 Zoom (PC CAM)
-	0114  FinePix F401 Zoom (DSC)
-	0115  FinePix F401 Zoom (PC CAM)
-	0116  FinePix A203 Zoom (DSC)
-	0117  FinePix A203 Zoom (PC CAM)
-	0118  FinePix A303 Zoom (DSC)
-	0119  FinePix A303 Zoom (PC CAM)
-	011a  FinePix S304/3800 Zoom (DSC)
-	011b  FinePix S304/3800 Zoom (PC CAM)
-	011c  FinePix A204/2650 Zoom (DSC)
-	011d  FinePix A204/2650 Zoom (PC CAM)
-	0120  FinePix F700 Zoom (DSC)
-	0121  FinePix F700 Zoom (PC CAM)
-	0122  FinePix F410 Zoom (DSC)
-	0123  FinePix F410 Zoom (PC CAM)
-	0124  FinePix A310 Zoom (DSC)
-	0125  FinePix A310 Zoom (PC CAM)
-	0126  FinePix A210 Zoom (DSC)
-	0127  FinePix A210 Zoom (PC CAM)
-	0128  FinePix A205(S) Zoom (DSC)
-	0129  FinePix A205(S) Zoom (PC CAM)
-	012a  FinePix F610 Zoom (DSC)
-	012b  FinePix Digital Camera 030513
-	012c  FinePix S7000 Zoom (DSC)
-	012d  FinePix S7000 Zoom (PC CAM)
-	012f  FinePix Digital Camera 030731
-	0130  FinePix S5000 Zoom (DSC)
-	0131  FinePix S5000 Zoom (PC CAM)
-	013b  FinePix Digital Camera 030722
-	013c  FinePix S3000 Zoom (DSC)
-	013d  FinePix S3000 Zoom (PC CAM)
-	013e  FinePix F420 Zoom (DSC)
-	013f  FinePix F420 Zoom (PC CAM)
-	0142  FinePix S7000 Zoom (PTP)
-	0148  FinePix A330 Zoom (DSC)
-	0149  FinePix A330 Zoom (UVC)
-	014a  FinePix A330 Zoom (PTP)
-	014b  FinePix A340 Zoom (DSC)
-	014c  FinePix A340 Zoom (UVC)
-	0159  FinePix F710 Zoom (DSC)
-	0165  FinePix S3500 Zoom (DSC)
-	0168  FinePix E500 Zoom (DSC)
-	0169  FinePix E500 Zoom (UVC)
-	016b  FinePix E510 Zoom (DSC)
-	016c  FinePix E510 Zoom (PC CAM)
-	016e  FinePix S5500 Zoom (DSC)
-	016f  FinePix S5500 Zoom (UVC)
-	0171  FinePix E550 Zoom (DSC)
-	0172  FinePix E550 Zoom (UVC)
-	0177  FinePix F10 (DSC)
-	0179  Finepix F10 (PTP)
-	0186  FinePix S5200/S5600 Zoom (DSC)
-	0188  FinePix S5200/S5600 Zoom (PTP)
-	018e  FinePix S9500 Zoom (DSC)
-	018f  FinePix S9500 Zoom (PTP)
-	0192  FinePix E900 Zoom (DSC)
-	0193  FinePix E900 Zoom (PTP)
-	019b  FinePix F30 (PTP)
-	01af  FinePix A700 (PTP)
-	01bf  FinePix F6000fd/S6500fd Zoom (PTP)
-	01c0  FinePix F20 (PTP)
-	01c1  FinePix F31fd (PTP)
-	01c4  FinePix S5700 Zoom (PTP)
-	01c5  FinePix F40fd (PTP)
-	01c6  FinePix A820 Zoom (PTP)
-	01d2  FinePix A800 Zoom (PTP)
-	01d3  FinePix A920 (PTP)
-	01d4  FinePix F50fd (PTP)
-	01d5  FinePix F47 (PTP)
-	01f7  FinePix J250 (PTP)
-	01fd  A160
-	023e  FinePix AX300
-04cc  ST-Ericsson
-	1122  Hub
-	1520  USB 2.0 Hub (Avocent KVM)
-	1521  USB 2.0 Hub
-	1a62  GW Instek GSP-830 Spectrum Analyzer (HID)
-	2323  Ux500 serial debug port
-	2533  NFC device (PN533)
-	8116  Camera
-04cd  Tatung Co. Of America
-04ce  ScanLogic Corp.
-	0002  SL11R-IDE IDE Bridge
-	0100  USB2PRN Printer Class
-	0300  Phantom 336CX - C3 scanner
-	04ce  SL11DEMO, VID: 0x4ce, PID: 0x4ce
-	07d1  SL11R, VID: 0x4ce, PID: 0x07D1
-04cf  Myson Century, Inc.
-	0800  MTP800 Mass Storage Device
-	8810  CS8810 Mass Storage Device
-	8811  CS8811 Mass Storage Device
-	8813  CS8813 Mass Storage Device
-	8818  USB2.0 to ATAPI Bridge Controller
-	8819  USB 2.0 SD/MMC Reader
-	9920  CS8819A2-114 Mass Storage Device
-04d0  Digi International
-04d1  ITT Canon
-04d2  Altec Lansing Technologies
-	0070  ADA70 Speakers
-	0305  Non-Compliant Audio Device
-	0311  ADA-310 Speakers
-	2060  Claritel-i750 - vp
-	ff05  ADA-305 Speakers
-	ff47  Lansing HID Audio Controls
-	ff49  Lansing HID Audio Controls
-04d3  VidUS, Inc.
-04d4  LSI Logic, Inc.
-04d5  Forte Technologies, Inc.
-04d6  Mentor Graphics
-04d7  Oki Semiconductor
-	1be4  Bluetooth Device
-04d8  Microchip Technology, Inc.
-	0002  PicoLCD 20x2
-	0003  PICkit 2 Microcontroller Programmer
-	000a  CDC RS-232 Emulation Demo
-	000b  PIC18F2550 (32K Flashable 10 Channel, 10 Bit A/D USB Microcontroller)
-	0032  PICkit1
-	0033  PICkit2
-	0036  PICkit Serial Analyzer
-	00e0  PIC32 Starter Board
-	0a04  AGP LIN Serial Analyzer
-	8000  In-Circuit Debugger
-	8001  ICD2 in-circuit debugger
-	8101  PIC24F Starter Kit
-	900a  PICkit3
-	c001  PicoLCD 20x4
-	fbba  DiscFerret Magnetic Disc Analyser (bootloader mode)
-	fbbb  DiscFerret Magnetic Disc Analyser (active mode)
-	fc92  Open Bench Logic Sniffer
-	ffef  PICoPLC [APStech]
-04d9  Holtek Semiconductor, Inc.
-	0022  Portable Keyboard
-	048e  Optical Mouse
-	0499  Optical Mouse
-	1203  Keyboard
-	1400  PS/2 keyboard + mouse controller
-	1503  Shortboard Lefty
-	1603  Keyboard
-	2221  Keyboard
-04da  Panasonic (Matsushita)
-	0901  LS-120 Camera
-	0912  SDR-S10
-	0b01  CD-R/RW Drive
-	0b03  SuperDisk 240MB
-	0d01  CD-R Drive KXL-840AN
-	0d09  CD-R Drive KXL-RW32AN
-	0d0a  CD-R Drive KXL-CB20AN
-	0d0d  CDRCB03
-	0d0e  DVD-ROM & CD-R/RW
-	0f40  Printer
-	1500  MFSUSB Driver
-	1800  DY-WL10 802.11abgn Adapter [Broadcom BCM4323]
-	1b00  MultiMediaCard
-	2121  EB-VS6
-	2316  DVC Mass Storage Device
-	2317  DVC USB-SERIAL Driver for WinXP
-	2318  NV-GS11/230/250 (webcam mode)
-	2319  NV-GS15 (webcam mode)
-	231a  NV-GS11/230/250 (DV mode)
-	231d  DVC Web Camera Device
-	231e  DVC DV Stream Device
-	2372  Lumix Camera
-	2374  DMC-FZ18/FZ20
-	2451  HDC-SD9
-	2497  HDC-TM700
-	250c  Gobi Wireless Modem (QDL mode)
-	250d  Gobi Wireless Modem
-	3904  N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010]
-	3c04  JT-P100MR-20 [ePassport Reader]
-04db  Hypertec Pty, Ltd
-04dc  Huan Hsin Holdings, Ltd
-04dd  Sharp Corp.
-	13a6  MFC2000
-	6006  AL-1216
-	6007  AL-1045
-	6008  AL-1255
-	6009  AL-1530CS
-	600a  AL-1540CS
-	600b  AL-1456
-	600c  AL-1555
-	600d  AL-1225
-	600e  AL-1551CS
-	600f  AR-122E
-	6010  AR-152E
-	6011  AR-157E
-	6012  SN-1045
-	6013  SN-1255
-	6014  SN-1456
-	6015  SN-1555
-	6016  AR-153E
-	6017  AR-122E N
-	6018  AR-153E N
-	6019  AR-152E N
-	601a  AR-157E N
-	601b  AL-1217
-	601c  AL-1226
-	601d  AR-123E
-	6021  IS01
-	7002  DVC Ver.1.0
-	7004  VE-CG40U Digital Still Camera
-	7005  VE-CG30 Digital Still Camera
-	7007  VL-Z7S Digital Camcorder
-	8004  Zaurus SL-5000D/SL-5500 PDA
-	8005  Zaurus A-300
-	8006  Zaurus SL-B500/SL-5600 PDA
-	8007  Zaurus C-700 PDA
-	9014  IM-DR80 Portable NetMD Player
-	9031  Zaurus C-750/C-760/C-860/SL-C3000 PDA
-	9032  Zaurus SL-6000
-	903a  GSM GPRS
-	9050  Zaurus C-860 PDA
-	9056  Viewcam Z
-	9073  AM-900
-	9074  GSM GPRS
-	90a9  Sharp Composite
-	90d0  USB-to-Serial Comm. Port
-	90f2  Sharp 3G GSM USB Control
-	9120  WS004SH
-	9122  WS007SH
-	9123  W-ZERO3 ES Smartphone
-	91a3  922SH Internet Machine
-04de  MindShare, Inc.
-04df  Interlink Electronics
-04e1  Iiyama North America, Inc.
-	0201  Monitor Hub
-04e2  Exar Corp.
-04e3  Zilog, Inc.
-04e4  ACC Microelectronics
-04e5  Promise Technology
-04e6  SCM Microsystems, Inc.
-	0001  E-USB ATA Bridge
-	0002  eUSCSI SCSI Bridge
-	0003  eUSB SmartMedia Card Reader
-	0005  eUSB SmartMedia/CompactFlash Card Reader
-	0006  eUSB SmartMedia Card Reader
-	0007  Hifd
-	0009  eUSB ATA/ATAPI Adapter
-	000a  eUSB CompactFlash Adapter
-	000b  eUSCSI Bridge
-	000c  eUSCSI Bridge
-	000d  Dazzle MS
-	0012  Dazzle SD/MMC
-	0101  eUSB ATA Bridge (Sony Spressa USB CDRW)
-	0311  Dazzle DM-CF
-	0312  Dazzle DM-SD/MMC
-	0313  Dazzle SM
-	0314  Dazzle MS
-	0322  e-Film Reader-5
-	0325  eUSB ORCA Quad Reader
-	0327  Digital Media Reader
-	03fe  DMHS2 DFU Adapter
-	0406  eUSB SmartDM Reader
-	04e6  eUSB DFU Adapter
-	04e7  STCII DFU Adapter
-	04e8  eUSBDM DFU Adapter
-	04e9  DM-E DFU Adapter
-	0500  Veridicom 5thSense Fingerprint Sensor and eUSB SmartCard
-	0701  DCS200 Loader Device
-	0702  DVD Creation Station 200
-	0703  DVC100 Loader Device
-	0704  Digital Video Creator 100
-	1001  SCR300 Smart Card Reader
-	1010  USBAT-2 CompactFlash Card Reader
-	1014  e-Film Reader-3
-	1020  USBAT ATA/ATAPI Adapter
-	2007  RSA SecurID ComboReader
-	2009  Citibank Smart Card Reader
-	200a  Reflex v.2 Smart Card Reader
-	200d  STR391 Reader
-	5111  SCR331-DI SmartCard Reader
-	5113  SCR333 SmartCard Reader
-	5114  SCR331-DI SmartCard Reader
-	5115  SCR335 SmartCard Reader
-	5116  SCR331-LC1 / SCR3310 SmartCard Reader
-	5117  SCR3320 - Smart Card Reader
-	5118  Expresscard SIM Card Reader
-	5119  SCR3340 - ExpressCard54 Smart Card Reader
-	511b  SmartCard Reader
-	511d  SCR3311 Smart Card Reader
-	5120  SCR331-DI SmartCard Reader
-	5121  SDI010 Smart Card Reader
-	5151  SCR338 Keyboard Smart Card Reader
-	5292  SCL011 RFID reader
-	5410  SCR35xx Smart Card Reader
-	e000  SCRx31 Reader
-	e001  SCR331 SmartCard Reader
-	e003  SPR532 PinPad SmartCard Reader
-04e7  Elo TouchSystems
-	0001  TouchScreen
-	0002  Touchmonitor Interface 2600 Rev 2
-	0004  4000U CarrollTouch® Touchmonitor Interface
-	0007  2500U IntelliTouch® Touchmonitor Interface
-	0008  3000U AccuTouch® Touchmonitor Interface
-	0009  4000U CarrollTouch® Touchmonitor Interface
-	0020  Touchscreen Interface (2700)
-	0021  Touchmonitor Interface
-	0030  4500U CarrollTouch® Touchmonitor Interface
-	0032  Touchmonitor Interface
-	0033  Touchmonitor Interface
-	0041  5010 Surface Capacitive Touchmonitor Interface
-	0042  Touchmonitor Interface
-	0050  2216 AccuTouch® Touchmonitor Interface
-	0071  Touchmonitor Interface
-	0072  Touchmonitor Interface
-	0081  Touchmonitor Interface
-	0082  Touchmonitor Interface
-	00ff  Touchmonitor Interface
-04e8  Samsung Electronics Co., Ltd
-	0100  Kingston Flash Drive (128MB)
-	0110  Connect3D Flash Drive
-	0111  Connect3D Flash Drive
-	1003  MP3 Player and Recorder
-	1006  SDC-200Z
-	1f06  HX-MU064DA portable harddisk
-	2018  WIS09ABGN LinkStick Wireless LAN Adapter
-	2035  Digital Photo Frame Mass Storage
-	2036  Digital Photo Frame Mini Monitor
-	3004  ML-4600
-	3005  Docuprint P1210
-	3008  ML-6060 laser printer
-	300c  ML-1210 Printer
-	300e  Laser Printer
-	3104  ML-3550N
-	3210  ML-5200A Laser Printer
-	3226  Laser Printer
-	3228  Laser Printer
-	322a  Laser Printer
-	322c  Laser Printer
-	3230  ML-1440
-	3232  Laser Printer
-	3236  ML-1450
-	3238  ML-1430
-	323a  ML-1710 Printer
-	323b  Phaser 3130
-	323c  Laser Printer
-	323d  Phaser 3120
-	323e  Laser Printer
-	3240  Laser Printer
-	3242  ML-1510 Laser Printer
-	3248  Color Laser Printer
-	324a  Laser Printer
-	324c  ML-1740 Printer
-	324d  Phaser 3121
-	3256  ML-1520 Laser Printer
-	325b  Xerox Phaser 3117 Laser Printer
-	325f  Phaser 3425 Laser Printer
-	3260  CLP-510 Color Laser Printer
-	3268  ML-1610 Mono Laser Printer
-	326c  ML-2010P Mono Laser Printer
-	3276  ML-3050/ML-3051 Laser Printer
-	328e  CLP-310 Color Laser Printer
-	3296  ML-2580N Mono Laser Printer
-	3297  ML-191x/ML-252x Laser Printer
-	3409  SCX-4216F Scanner
-	340c  SCX-5x15 series
-	340d  SCX-6x20 series
-	340e  MFP 560 series
-	340f  Printing Support
-	3412  SCX-4x20 series
-	3413  SCX-4100 Scanner
-	3415  Composite Device
-	3419  Composite Device
-	341a  Printing Support
-	341b  SCX-4200 series
-	341c  Composite Device
-	341d  Composite Device
-	341f  Composite Device
-	3420  Composite Device
-	3426  SCX-4500 Laser Printer
-	3605  InkJet Color Printer
-	3606  InkJet Color Printer
-	3609  InkJet Color Printer
-	3902  InkJet Color Printer
-	3903  Xerox WorkCentre XK50cx
-	390f  InkJet Color Printer
-	3911  SCX-1020 series
-	4005  GT-S8000 Jet (msc)
-	4f1f  GT-S8000 Jet (mtp)
-	5000  YP-MF series
-	5001  YP-100
-	5002  YP-30
-	5003  YP-700
-	5004  YP-30
-	5005  YP-300
-	5006  YP-750
-	500d  MP3 Player
-	5010  Yepp YP-35
-	5011  YP-780
-	5013  YP-60
-	5015  yepp upgrade
-	501b  MP3 Player
-	5021  Yepp YP-ST5
-	5026  YP-MT6V
-	5027  YP-T7
-	502b  YP-F1
-	5032  YP-J70
-	503b  YP-U1 MP3 Player
-	503d  YP-T7F
-	5041  YP-Z5
-	5050  YP-U2 MP3 Player
-	5051  YP-F2R
-	5055  YP-T9
-	507d  YP-U3 (mtp)
-	507f  YP-T9J
-	5080  Yepp YP-K3 (msc)
-	5081  Yepp YP-K3 (mtp)
-	5082  YP-P2 (msc)
-	5083  YP-P2 (mtp)
-	508a  YP-T10
-	508b  YP-S5 MP3 Player
-	508c  YP-S5
-	5090  YP-S3 (msc)
-	5091  YP-S3 (mtp)
-	5092  YP-U4 (msc)
-	5093  YP-U4 (mtp)
-	5095  YP-S2
-	510f  YP-R1
-	5119  Yepp YP-P3
-	511c  YP-Q2
-	5121  YP-U5
-	5123  Yepp YP-M1
-	5a00  YP-NEU
-	5a01  YP-NDU
-	5a03  Yepp MP3 Player
-	5a04  YP-800
-	5a08  YP-90
-	5a0f  Meizu M6 MiniPlayer
-	5b01  Memory Stick Reader/Writer
-	5b02  Memory Stick Reader/Writer
-	5b03  Memory Stick Reader/Writer
-	5b04  Memory Stick Reader/Writer
-	5b05  Memory Stick Reader/Writer
-	5b11  SEW-2001u Card
-	5f00  NEXiO Sync
-	5f01  NEXiO Sync
-	5f02  NEXiO Sync
-	5f03  NEXiO Sync
-	5f04  NEXiO Sync
-	6032  G2 Portable hard drive
-	6601  Mobile Phone
-	6602  Galaxy
-	6603  Galaxy
-	6611  MITs Sync
-	6613  MITs Sync
-	6615  MITs Sync
-	6617  MITs Sync
-	6619  MITs Sync
-	661b  MITs Sync
-	661e  Handheld
-	6620  Handheld
-	6622  Handheld
-	6624  Handheld
-	662e  MITs Sync
-	6630  MITs Sync
-	6632  MITs Sync
-	663e  D900e Phone
-	663f  SGH-E720/SGH-E840
-	6640  Usb Modem Enumerator
-	6702  X830
-	6708  U600 Phone
-	6709  U600
-	6734  Juke
-	6759  D900e Media Player
-	675a  D900e Mass Storage
-	675b  D900e Camera
-	6772  Standalone LTE device (Trial)
-	6795  S5230
-	6802  Standalone HSPA device
-	6806  Composite LTE device (Trial)
-	6807  Composite HSPA device
-	681c  Galaxy Portal/Spica/S
-	681d  Galaxy Portal/Spica Android Phone
-	684e  Wave (GT-S8500)
-	6875  GT-B3710 Standalone LTE device (Commercial)
-	6876  GT-B3710 LTE Modem
-	6877  Galaxy S
-	6888  GT-B3730 Composite LTE device (Commercial)
-	6889  GT-B3730 Composite LTE device (Commercial)
-	689a  LTE Storage Driver [CMC2xx]
-	689e  GT-S5670 [Galaxy Fit]
-	7011  SEW-2003U Card
-	7021  Bluetooth Device
-	7061  eHome Infrared Receiver
-	7080  Anycall SCH-W580
-	7081  Human Interface Device
-	8001  Handheld
-	e020  SERI E02 SCOM 6200 UMTS Phone
-	e021  SERI E02 SCOM 6200 Virtual UARTs
-	e022  SERI E02 SCOM 6200 Flash Load Disk
-	ff30  SG_iMON
-04e9  PC-Tel, Inc.
-04ea  Brooktree Corp.
-04eb  Northstar Systems, Inc.
-	e004  eHome Infrared Transceiver
-04ec  Tokyo Electron Device, Ltd
-04ed  Annabooks
-04ef  Pacific Electronic International, Inc.
-04f0  Daewoo Electronics Co., Ltd
-04f1  Victor Company of Japan, Ltd
-	0001  GC-QX3 Digital Still Camera
-	0004  GR-DVL815U Digital Video Camera
-	0006  DV Camera Storage
-	0008  GZ-MG30AA/MC500E Digital Video Camera
-	0009  GR-DX25EK Digital Video Camera
-	000a  GR-D72 Digital Video Camera
-	1001  GC-A50 Camera Device
-	3008  MP-PRX1 Ethernet
-	3009  MP-XP7250 WLAN Adapter
-04f2  Chicony Electronics Co., Ltd
-	0001  KU-8933 Keyboard
-	0002  NT68P81 Keyboard
-	0110  KU-2971 Keyboard
-	0111  KU-9908 Keyboard
-	0112  KU-8933 Keyboard with PS/2 Mouse port
-	0116  KU-2971/KU-0325 Keyboard
-	0220  Wireless HID Receiver
-	0402  Genius LuxeMate i200 Keyboard
-	0403  KU-0420 keyboard
-	0418  KU-0418 Tactical Pad
-	0760  Acer KU-0760 Keyboard
-	0860  2.4G Multimedia Wireless Kit
-	a001  E-Video DC-100 Camera
-	a120  ORITE CCD Webcam(PC370R)
-	a121  ORITE CCD Webcam(PC370R)
-	a122  ORITE CCD Webcam(PC370R)
-	a123  ORITE CCD Webcam(PC370R)
-	a124  ORITE CCD Webcam(PC370R)
-	a128  PC Camera (SN9C202 + OV7663 + EEPROM)
-	a133  Gateway Webcam
-	a136  LabTec Webcam 5500
-	a204  DSC WIA Device (1300)
-	a208  DSC WIA Device (2320)
-	a209  Labtec DC-2320
-	a20a  DSC WIA Device (3310)
-	a20c  DSC WIA Device (3320)
-	a210  Audio Device
-	b008  USB 2.0 Camera
-	b009  Integrated Camera
-	b010  Integrated Camera
-	b012  1.3 MPixel UVC Webcam
-	b013  USB 2.0 Camera
-	b015  VGA 24fps UVC Webcam
-	b016  VGA 30fps UVC Webcam
-	b018  2M UVC Webcam
-	b021  ViewSonic 1.3M, USB2.0 Webcam
-	b022  Gateway USB 2.0 Webcam
-	b023  Gateway USB 2.0 Webcam
-	b024  USB 2.0 Webcam
-	b025  Camera
-	b027  Gateway USB 2.0 Webcam
-	b028  VGA UVC Webcam
-	b029  1.3M UVC Webcam
-	b036  Asus Integrated 0.3M UVC Webcam
-	b044  Acer CrystalEye Webcam
-	b057  integrated USB webcam
-	b071  2.0M UVC Webcam / CNF7129
-	b091  Webcam
-	b104  CNF7069 Webcam
-	b107  CNF7070 Webcam
-	b14c  CNF8050 Webcam
-	b175  4-Port Hub
-	b1aa  Webcam-101
-	b1b4  Lenovo Integrated Camera
-	b1cf  Lenovo Integrated Camera
-04f3  Elan Microelectronics Corp.
-	0210  AM-400 Hama Optical Mouse
-	0212  Laser Mouse
-	0214  Lynx M9 Optical Mouse
-	0230  3D Optical Mouse
-	02f4  2.4G Cordless Mouse
-04f4  Harting Elektronik, Inc.
-04f5  Fujitsu-ICL Systems, Inc.
-04f6  Norand Corp.
-04f7  Newnex Technology Corp.
-04f8  FuturePlus Systems
-04f9  Brother Industries, Ltd
-	0002  HL-1050 Laser Printer
-	0005  Printer
-	0006  HL-1240 Laser Printer
-	0007  HL-1250 Laser Printer
-	0008  HL-1270 Laser Printer
-	0009  Printer
-	000a  P2500 series
-	000b  Printer
-	000c  Printer
-	000d  HL-1440 Laser Printer
-	000e  HL-1450 series
-	000f  HL-1470N series
-	0010  Printer
-	0011  Printer
-	0012  Printer
-	0013  Printer
-	0014  Printer
-	0015  Printer
-	0016  Printer
-	0017  Printer
-	0018  Printer
-	001a  HL-1430 Laser Printer
-	001c  Printer
-	001e  Printer
-	0020  HL-5130 series
-	0021  HL-5140 series
-	0022  HL-5150D series
-	0023  HL-5170DN series
-	0024  Printer
-	0025  Printer
-	0027  HL-2030 Laser Printer
-	0028  Printer
-	0029  Printer
-	002a  HL-52x0 series
-	002b  HL-5250DN Printer
-	002c  Printer
-	002d  Printer
-	0100  MFC8600/9650 series
-	0101  MFC9600/9870 series
-	0102  MFC9750/1200 series
-	0104  MFC-8300J
-	0105  MFC-9600J
-	0106  MFC-7300C
-	0107  MFC-7400C
-	0108  MFC-9200C
-	0109  MFC-830
-	010a  MFC-840
-	010b  MFC-860
-	010c  MFC-7400J
-	010d  MFC-9200J
-	010e  MFC3100C Scanner
-	010f  MFC 5100C
-	0110  MFC4800 Scanner
-	0111  MFC 6800
-	0112  DCP1000 Port(FaxModem)
-	0113  MFC-8500
-	0114  MFC9700 Port(FaxModem)
-	0115  MFC9800 Scanner
-	0116  DCP1400 Scanner
-	0119  MFC-9660
-	011b  MFC-9880
-	011c  MFC-9760
-	011d  MFC-9070
-	011e  MFC-9180
-	011f  MFC-9160
-	0120  MFC580 Port(FaxModem)
-	0121  MFC-590
-	0122  MFC-5100J
-	0129  Imagistics 2500 (MFC-8640D clone)
-	012f  FAX-4750e
-	0132  MFC-5200C RemovableDisk
-	0135  MFC-100 Scanner
-	0136  MFC-150CL Scanner
-	013c  MFC-890 Port
-	013d  MFC-5200J Printer
-	013e  MFC-4420C RemovableDisk
-	013f  MFC-4820C RemovableDisk
-	0140  DCP-8020
-	0141  DCP-8025D
-	0142  MFC-8420
-	0143  MFC-8820D
-	0144  DCP-4020C RemovableDisk
-	0146  MFC-3220C
-	0147  FAX-1820C Printer
-	0148  MFC-3320CN Printer
-	0149  FAX-1920CN Printer
-	014a  MFC-3420C
-	014b  MFC-3820CN
-	014d  FAX-1815C Printer
-	014e  MFC-8820J
-	0150  MFC-8220 Port(FaxModem)
-	0151  MFC-8210J
-	0157  MFC-3420J Printer
-	0158  MFC-3820JN Port(FaxModem)
-	015d  MFC Composite Device
-	015e  DCP-8045D
-	015f  MFC-8440
-	0160  MFC-8840D
-	0161  MFC-210C
-	0162  MFC-420CN Remote Setup Port
-	0163  MFC-410CN RemovableDisk
-	0165  MFC-620CN
-	0166  MFC-610CLN RemovableDisk
-	0168  MFC-620CLN
-	0169  DCP-110C RemovableDisk
-	016b  DCP-310CN RemovableDisk
-	016c  FAX-2440C Printer
-	016d  MFC-5440CN
-	016e  MFC-5840CN Remote Setup Port
-	0170  FAX-1840C Printer
-	0171  FAX-1835C Printer
-	0172  FAX-1940CN Printer
-	0173  MFC-3240C Remote Setup Port
-	0174  MFC-3340CN RemovableDisk
-	017b  Imagistics sx2100
-	0180  MFC-7420
-	0181  MFC-7820N Port(FaxModem)
-	0182  Composite Device
-	0183  DCP-7020
-	0184  DCP-7025 Printer
-	0185  MFC-7220 Printer
-	0186  Composite Device
-	0187  FAX-2820 Printer
-	0188  FAX-2920 Printer
-	018a  MFC-9420CN
-	018c  DCP-115C
-	018d  DCP-116C
-	018e  DCP-117C
-	018f  DCP-118C
-	0190  DCP-120C
-	0191  DCP-315CN
-	0192  DCP-340CW
-	0193  MFC-215C
-	0194  MFC-425CN
-	0195  MFC-820CW Remote Setup Port
-	0196  MFC-820CN Remote Setup Port
-	0197  MFC-640CW
-	019a  MFC-840CLN Remote Setup Port
-	01a2  MFC-8640D
-	01a3  Composite Device
-	01a4  DCP-8065DN Printer
-	01a5  MFC-8460N Port(FaxModem)
-	01a6  MFC-8860DN Port(FaxModem)
-	01a7  MFC-8870DW Printer
-	01a8  DCP-130C
-	01a9  DCP-330C
-	01aa  DCP-540CN
-	01ab  MFC-240C
-	01ae  DCP-750CW RemovableDisk
-	01af  MFC-440CN
-	01b0  MFC-660CN
-	01b1  MFC-665CW Remote Setup Port
-	01b2  MFC-845CW Remote Setup Port
-	01b4  MFC-460CN Remote Setup Port
-	01b5  MFC-630CD
-	01b6  MFC-850CDN
-	01b7  MFC-5460CN Remote Setup Port
-	01b8  MFC-5860CN
-	01ba  MFC-3360C
-	01bd  MFC-8660DN
-	01be  DCP-750CN RemovableDisk
-	01bf  MFC-860CDN Remote Setup Port
-	01c0  DCP-128C
-	01c1  DCP-129C
-	01c2  DCP-131C
-	01c3  DCP-329C
-	01c4  DCP-331C
-	01c5  MFC-239C
-	01ca  MFC-9440CN Remote Setup Port
-	01ce  DCP-135C
-	01cf  DCP-150C
-	01d0  DCP-350C
-	01d1  DCP-560CN
-	01d4  MFC-230C
-	01d5  MFC-235C
-	01d6  MFC-260C
-	01df  DCP-155C
-	01e0  MFC-265C
-	01e1  DCP-153C
-	01e2  DCP-157C
-	01e3  DCP-353C
-	01e4  DCP-357C
-	01e7  MFC-7340
-	01e9  DCP-7040
-	01ea  DCP-7030
-	01eb  MFC-7320
-	01f4  MFC-5890CN
-	1000  Printer
-	1002  Printer
-	2002  PTUSB Printing
-	2004  PT-2300/2310 p-Touch Laber Printer
-	2015  QL-500 P-touch label printer
-	2016  QL-550 P-touch label printer
-	201a  PT-18R P-touch label printer
-	2027  QL-560 P-Touch Label Printer
-	2100  Card Reader Writer
-04fa  Dallas Semiconductor
-	2490  DS1490F 2-in-1 Fob, 1-Wire adapter
-	4201  DS4201 Audio DAC
-04fb  Biostar Microtech International Corp.
-04fc  Sunplus Technology Co., Ltd
-	0003  CM1092 Optical Scroller Mouse
-	0005  USB OpticalWheel Mouse
-	0013  ViewMate Desktop Mouse CC2201
-	0015  ViewMate Desktop Mouse CC2201
-	00d3  00052486 / Laser Mouse M1052 [hama]
-	0171  SPCA1527A/SPCA1528 SD card camera (Mass Storage mode)
-	0232  Fingerprint
-	0538  Wireless Optical Mouse 2.4G [Bright]
-	0561  Flexcam 100
-	05d8  Wireless keyboard/mouse
-	0c15  SPIF215A SATA bridge
-	0c25  SATALink SPIF225A
-	1528  SPCA1527A/SPCA1528 SD card camera (webcam mode)
-	1533  Mass Storage
-	2080  ASUS Webcam
-	500c  CA500C Digital Camera
-	504a  Aiptek Mini PenCam 1.3
-	504b  Aiptek Mega PockerCam 1.3/Maxell MaxPocket LE 1.3
-	5330  Digitrex 2110
-	5331  Vivitar Vivicam 10
-	5360  Sunplus Generic Digital Camera
-	5720  Card Reader Driver
-	7333  Finet Technology Palmpix DC-85
-	757a  Aiptek, MP315 MP3 Player
-	ffff  PureDigital Ritz Disposable
-04fd  Soliton Systems, K.K.
-	0003  Smart Card Reader II
-04fe  PFU, Ltd
-04ff  E-CMOS Corp.
-0500  Siam United Hi-Tech
-	0001  DART Keyboard Mouse
-	0002  DART-2 Keyboard
-0501  Fujikura DDK, Ltd
-0502  Acer, Inc.
-	0001  Handheld
-	0736  Handheld
-	15b1  PDA n311
-	1631  c10 Series
-	1632  c20 Series
-	16e1  n10 Handheld Sync
-	16e2  n20 Pocket PC Sync
-	16e3  n30 Handheld Sync
-	3202  Liquid
-	3203  Liquid (Debug mode)
-	3341  Iconia tablet A500
-	d001  Divio NW801/DVC-V6+ Digital Camera
-0503  Hitachi America, Ltd
-0504  Hayes Microcomputer Products
-0506  3Com Corp.
-	009d  HomeConnect Camera
-	00a0  3CREB96 Bluetooth Adapter
-	00a1  Bluetooth Device
-	00a2  Bluetooth Device
-	00df  3Com Home Connect lite
-	0100  HomeConnect ADSL Modem Driver
-	03e8  3C19250 Ethernet [klsi]
-	0a01  3CRSHEW696 Wireless Adapter
-	0a11  3CRWE254G72 802.11g Adapter
-	11f8  HomeConnect 3C460
-	2922  HomeConnect Cable Modem External with
-	3021  U.S.Robotics 56000 Voice FaxModem Pro
-	4601  3C460B 10/100 Ethernet Adapter
-	f002  3CP4218 ADSL Modem (pre-init)
-	f003  3CP4218 ADSL Modem
-	f100  3CP4218 ADSL Modem (pre-init)
-0507  Hosiden Corp.
-	0011  Konami ParaParaParadise Controller
-0508  Clarion Co., Ltd
-0509  Aztech Systems, Ltd
-	0801  ADSL Modem
-	0802  ADSL Modem (RFC1483)
-	0806  DSL Modem
-	080f  Binatone ADSL500 Modem Network Interface
-	0812  Pirelli ADSL Modem Network Interface
-050a  Cinch Connectors
-050b  Cable System International
-050c  InnoMedia, Inc.
-050d  Belkin Components
-	0004  Direct Connect
-	0012  F8T012 Bluetooth Adapter
-	0013  F8T013 Bluetooth Adapter
-	0017  B8T017 Bluetooth+EDR 2.1
-	003a  Universal Media Reader
-	0050  F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a]
-	0081  F8T001v2 Bluetooth
-	0083  Bluetooth Device
-	0084  F8T003v2 Bluetooth
-	0102  Flip KVM
-	0103  F5U103 Serial Adapter [etek]
-	0106  VideoBus II Adapter, Video
-	0108  F1DE108B KVM
-	0109  F5U109/F5U409 PDA Adapter
-	0115  SCSI Adapter
-	0119  F5U120-PC Dual PS/2 Ports / F5U118-UNV ADB Adapter
-	0121  F5D5050 100Mbps Ethernet
-	0122  Ethernet Adapter
-	0131  Bluetooth Device with trace filter
-	016a  Bluetooth Mini Dongle
-	0201  Peripheral Switch
-	0208  USBView II Video Adapter [nt1004]
-	0210  F5U228 Hi-Speed USB 2.0 DVD Creator
-	0211  F5U211 USB 2.0 15-in-1 Media Reader & Writer
-	0224  F5U224 USB 2.0 4-Port Hub
-	0234  F5U234 USB 2.0 4-Port Hub
-	0237  F5U237 USB 2.0 7-Port Hub
-	0240  F5U240 USB 2.0 CF Card Reader
-	0249  USB 2 Flash Media Device
-	0257  F5U257 Serial
-	0304  FSU304 USB 2.0 - 4 Ports Hub
-	0409  F5U409 Serial
-	0551  F6C550-AVR UPS
-	0706  2-N-1 USB 2.0 7-Port Hub (Lower half)
-	0802  Nostromo n40 Gamepad
-	0803  Nostromo 1745 GamePad
-	0805  Nostromo N50 GamePad
-	0815  Nostromo n52 HID SpeedPad Mouse Wheel
-	0826  ErgoFit Wireless Optical Mouse (HID)
-	0980  HID UPS Battery
-	1102  F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CE-VAU]
-	1202  F5U120-PC Parallel Printer Port
-	1203  F5U120-PC Serial Port
-	2103  F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]
-	258a  F5U258 Host to Host cable
-	3101  F1DF102U/F1DG102U Flip Hub
-	3201  F1DF102U/F1DG102U Flip KVM
-	4050  ZD1211B
-	5055  F5D5055 Gigabit Network Adapter [AX88xxx]
-	6051  F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201]
-	615a  F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323]
-	7050  F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]
-	7051  F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB]
-	705a  F5D7050 Wireless G Adapter v3000 [Ralink RT2571W]
-	705b  Wireless G Adapter
-	705c  F5D7050 Wireless G Adapter v4000 [Zydas ZD1211B]
-	705e  F5D7050 Wireless G Adapter v5000 [Realtek RTL8187B]
-	706a  2-N-1 USB 2.0 7-Port Hub (Lower half)
-	8053  F5D8053 N Wireless USB Adapter v1000/v4000 [Ralink RT2870]
-	805c  F5D8053 N Wireless Adapter v3000 [Ralink RT2870]
-	805e  F5D8053 N Wireless USB Adapter v5000 [Realtek RTL8192U]
-	815c  F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870]
-	815f  F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU]
-	825a  F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870]
-	825b  F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070]
-	845a  F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU]
-	905b  F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573]
-	905c  F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573]
-	935a  F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT2870]
-	935b  F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070]
-	945a  F7D1101 Basic Wireless USB Adapter v1000 [Realtek RTL8188SU]
-050e  Neon Technology, Inc.
-050f  KC Technology, Inc.
-	0001  Hub
-	0003  KC82C160S Hub
-	0180  KC-180 IrDA Dongle
-	0190  KC2190 USB Host-to-Host cable
-0510  Sejin Electron, Inc.
-	0001  Keyboard
-	1000  Keyboard with PS/2 Mouse Port
-	e001  Mouse
-0511  N'Able (DataBook) Technologies, Inc.
-0512  Hualon Microelectronics Corp.
-0513  digital-X, Inc.
-0514  FCI Electronics
-0515  ACTC
-0516  Longwell Electronics
-0517  Butterfly Communications
-0518  EzKEY Corp.
-	0001  USB to PS2 Adaptor v1.09
-	0002  EZ-9900C Keyboard
-0519  Star Micronics Co., Ltd
-	0003  TSP100ECO/TSP100II
-	c002  Xlive Bluetooth XBM-100S MP3 Player
-051a  WYSE Technology
-	a005  Smart Display Version 9973
-051b  Silicon Graphics
-051c  Shuttle, Inc.
-	0005  VFD Module
-	c001  eHome Infrared Receiver
-	c002  eHome Infrared Receiver
-051d  American Power Conversion
-	0001  UPS
-	0002  Uninterruptible Power Supply
-	0003  UPS
-051e  Scientific Atlanta, Inc.
-051f  IO Systems (Elite Electronics), Inc.
-0520  Taiwan Semiconductor Manufacturing Co.
-0521  Airborn Connectors
-0522  Advanced Connectek, Inc.
-0523  ATEN GmbH
-0524  Sola Electronics
-0525  Netchip Technology, Inc.
-	100d  RFMD Bluetooth Device
-	1080  NET1080 USB-USB Bridge
-	1265  File-backed Storage Gadget
-	a140  USB Clik! 40
-	a141  (OME) PocketZip 40 MP3 Player Driver
-	a220  GVC Bluetooth Wireless Adapter
-	a4a0  Linux-USB "Gadget Zero"
-	a4a1  Linux-USB Ethernet Gadget
-	a4a2  Linux-USB Ethernet/RNDIS Gadget
-	a4a3  Linux-USB user-mode isochronous source/sink
-	a4a4  Linux-USB user-mode bulk source/sink
-	a4a5  Linux-USB File Storage Gadget
-	a4a6  Linux-USB Serial Gadget
-	a4a7  Linux-USB Serial Gadget (CDC ACM mode)
-	a4a8  Linux-USB Printer Gadget
-	a4a9  Linux-USB OBEX Gadget
-	a4aa  Linux-USB CDC Composite Gadge (Ethernet and ACM)
-0526  Temic MHS S.A.
-0527  ALTRA
-0528  ATI Technologies, Inc.
-	7561  TV Wonder
-	7562  TV Wonder, Edition (FN5)
-	7563  TV Wonder, Edition (FI)
-	7564  TV Wonder, Edition (FQ)
-	7565  TV Wonder, Edition (NTSC+)
-	7566  TV Wonder, Edition (FN5)
-	7567  TV Wonder, Edition (FI)
-	7568  TV Wonder, Edition (FQ)
-	7569  Live! Pro (A)
-	756a  Live! Pro Audio (O)
-0529  Aladdin Knowledge Systems
-	0001  HASP v0.06
-	030b  eToken R1 v3.1.3.x
-	0313  eToken R1 v3.2.3.x
-	031b  eToken R1 v3.3.3.x
-	0323  eToken R1 v3.4.3.x
-	0412  eToken R2 v2.2.4.x
-	041a  eToken R2 v2.2.4.x
-	0422  eToken R2 v2.4.4.x
-	042a  eToken R2 v2.5.4.x
-	050c  eToken Pro v4.1.5.x
-	0514  eToken Pro v4.2.5.4
-	0600  eToken Pro 64k (4.2)
-052a  Crescent Heart Software
-052b  Tekom Technologies, Inc.
-	0102  Ca508A HP1020 Camera v.1.3.1.6
-	0801  Yakumo MegaImage 37
-	1512  Yakumo MegaImage IV
-	1513  Aosta CX100 Webcam
-	1514  Aosta CX100 Webcam Storage
-	1905  Yakumo MegaImage 47
-	1911  Yakumo MegaImage 47 SL
-	2202  WDM Still Image Capture
-	2203  Sound Vision Stream Driver
-	3a06  DigiLife DDV-5120A
-	d001  P35U Camera Capture
-052c  Canon Information Systems, Inc.
-052d  Avid Electronics Corp.
-052e  Standard Microsystems Corp.
-052f  Unicore Software, Inc.
-0530  American Microsystems, Inc.
-0531  Wacom Technology Corp.
-0532  Systech Corp.
-0533  Alcatel Mobile Phones
-0534  Motorola, Inc.
-0535  LIH TZU Electric Co., Ltd
-0536  Hand Held Products (Welch Allyn, Inc.)
-	01a0  PDT
-0537  Inventec Corp.
-0538  Caldera International, Inc. (SCO)
-0539  Shyh Shiun Terminals Co., Ltd
-053a  PrehKeyTec GmbH
-	0b00  Hub
-053b  Global Village Communication
-053c  Institut of Microelectronic & Mechatronic Systems
-053d  Silicon Architect
-053e  Mobility Electronics
-053f  Synopsys, Inc.
-0540  UniAccess AB
-	0101  Panache Surf ISDN TA
-0541  Sirf Technology, Inc.
-0543  ViewSonic Corp.
-	00fe  G773 Monitor Hub
-	00ff  P815 Monitor Hub
-	0bf2  airpanel V150 Wireless Smart Display
-	0bf3  airpanel V110 Wireless Smart Display
-	0ed9  Color Pocket PC V35
-	0f01  airsync Wi-Fi Wireless Adapter
-	1527  Color Pocket PC V36
-	1529  Color Pocket PC V37
-	152b  Color Pocket PC V38
-	152e  Pocket PC
-	1921  Communicator Pocket PC
-	1922  Smartphone
-	1923  Pocket PC V30
-	1a11  Wireless 802.11g Adapter
-	1e60  TA310 - ATSC/NTSC/PAL Driver(PCM4)
-	4153  ViewSonic G773 Control (?)
-0544  Cristie Electronics, Ltd
-0545  Xirlink, Inc.
-	7333  Trution Web Camera
-	8002  IBM NetCamera
-	8009  Veo PC Camera
-	800c  Veo Stingray
-	800d  Veo PC Camera
-	8080  IBM C-It Webcam
-	808a  Veo PC Camera
-	808b  Veo Stingray
-	808d  Veo PC Camera
-	810a  Veo Advanced Connect Webcam
-	810b  Veo PC Camera
-	810c  Veo PC Camera
-	8135  Veo Mobile/Advanced Web Camera
-	813a  Veo PC Camera
-	813b  Veo PC Camera
-	813c  Veo Mobile/Advanced Web Camera
-	8333  Veo Stingray/Connect Web Camera
-	888c  eVision 123 digital camera
-	888d  eVision 123 digital camera
-0546  Polaroid Corp.
-	0daf  PDC 2300Z
-	1bed  PDC 1320 Camera
-	3097  PDC 310
-	3155  PDC 3070 Camera
-	3187  Digital Camera
-	3191  Ion 80 Camera
-	3273  PDC 2030 Camera
-	3304  a500 Digital Camera
-	dccf  Sound Vision Stream Driver
-0547  Anchor Chips, Inc.
-	0001  ICSI Bluetooth Device
-	1002  Python2 WDM Encoder
-	2131  AN2131 EZUSB Microcontroller
-	2235  AN2235 EZUSB-FX Microcontroller
-	2710  EZ-Link Loader (EZLNKLDR.SYS)
-	2720  AN2720 USB-USB Bridge
-	2727  Xircom PGUNET USB-USB Bridge
-	2750  EZ-Link (EZLNKUSB.SYS)
-	2810  Cypress ATAPI Bridge
-	7777  Bluetooth Device
-	9999  AN2131 uninitialized (?)
-0548  Tyan Computer Corp.
-	1005  EZ Cart II GameBoy Flash Programmer
-0549  Pixera Corp.
-054a  Fujitsu Microelectronics, Inc.
-054b  New Media Corp.
-054c  Sony Corp.
-	0001  HUB
-	0002  Standard HUB
-	0010  DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera
-	0014  Nogatech USBVision (SY)
-	0022  Storage Adapter V2 (TPP)
-	0023  CD Writer
-	0024  Mavica CD-1000 Camera
-	0025  NW-MS7 Walkman MemoryStick Reader
-	002b  Portable USB Harddrive V2
-	002c  USB Floppy Disk Drive
-	002d  MSAC-US1 MemoryStick Reader
-	002e  Sony HandyCam MemoryStick Reader
-	0030  Storage Adapter V2 (TPP)
-	0032  MemoryStick MSC-U01 Reader
-	0035  Network Walkman (E)
-	0036  Net MD
-	0037  MG Memory Stick Reader/Writer
-	0038  Clie PEG-S300/D PalmOS PDA
-	0039  Network Walkman (MS)
-	003c  VAIO-MX LCD Control
-	0045  Digital Imaging Video
-	0046  Network Walkman
-	004a  Memory Stick Hi-Fi System
-	004b  Memory Stick Reader/Writer
-	004e  DSC-xxx (ptp)
-	0056  MG Memory Stick Reader/Writer
-	0058  Clie PEG-N7x0C PalmOS PDA Mass Storage
-	0066  Clie PEG-N7x0C/PEG-T425 PalmOS PDA Serial
-	0067  CMR-PC3 Webcam
-	0069  Memorystick MSC-U03 Reader
-	006c  FeliCa S310 [PaSoRi]
-	006d  Clie PEG-T425 PDA Mass Storage
-	006f  Network Walkman (EV)
-	0073  Storage CRX1750U
-	0075  Net MD
-	0076  Storage Adapter ACR-U20
-	007c  Net MD
-	007f  IC Recorder (MS)
-	0080  Net MD
-	0081  Net MD
-	0084  Net MD
-	0085  Net MD
-	0086  Net MD
-	008b  Micro Vault 64M Mass Storage
-	0095  Sony Clie s360
-	0099  Clie NR70 PDA Mass Storage
-	009a  Clie NR70 PDA Serial
-	00ab  Visual Communication Camera (PCGA-UVC10)
-	00af  DPP-EX Series Digital Photo Printer
-	00bf  IC Recorder (S)
-	00c0  Handycam DCR-30
-	00c6  Net MD
-	00c7  Net MD
-	00c8  MZ-N710 Minidisc Walkman
-	00c9  Net MD
-	00ca  MZ-DN430 Minidisc Walkman
-	00cb  MSAC-US20 Memory Stick Reader
-	00da  Sony Clie nx60
-	00e8  Network Walkman (MS)
-	00e9  Handheld
-	00eb  Net MD
-	0101  Net MD
-	0103  IC Recorder (ST)
-	0105  Micro Vault Hub
-	0107  VCC-U01 Visual Communication Camera
-	0110  Digital Imaging Video
-	0113  Net MD
-	0116  IC Recorder (P)
-	0144  Clie PEG-TH55 PDA
-	0147  Visual Communication Camera (PCGA-UVC11)
-	014c  Aiwa AM-NX9 Net MD Music Recorder MDLP
-	014d  Memory Stick Reader/Writer
-	0154  Eyetoy Audio Device
-	015f  IC Recorder (BM)
-	0169  Clie PEG-TJ35 PDA Serial
-	016a  Clie PEG-TJ35 PDA Mass Storage
-	016b  Mobile HDD
-	016d  IC Recorder (SX)
-	016e  DPP-EX50 Digital Photo Printer
-	0171  Fingerprint Sensor 3500
-	017e  Net MD
-	017f  Hi-MD WALKMAN
-	0180  Net MD
-	0181  Hi-MD WALKMAN
-	0182  Net MD
-	0183  Hi-MD WALKMAN
-	0184  Net MD
-	0185  Hi-MD WALKMAN
-	0186  Net MD
-	0187  Hi-MD MZ-NH600 WALKMAN
-	0188  Net MD
-	018a  Net MD
-	018b  Hi-MD SOUND GATE
-	019e  Micro Vault 1.0G Mass Storage
-	01ad  ATRAC HDD PA
-	01bb  FeliCa S320 [PaSoRi]
-	01bd  MRW62E Multi-Card Reader/Writer
-	01c3  NW-E55 Network Walkman
-	01c6  MEMORY P-AUDIO
-	01c7  Printing Support
-	01c8  PSP Type A
-	01c9  PSP Type B
-	01d0  DVD+RW External Drive DRU-700A
-	01d5  IC RECORDER
-	01de  VRD-VC10 [Video Capture]
-	01e9  Net MD
-	01ea  Hi-MD WALKMAN
-	01ee  IC RECORDER
-	01fa  Sony IC Recorder (P)
-	01fb  NW-E405 Network Walkman
-	020f  Device
-	0210  ATRAC HDD PA
-	0219  Net MD
-	021a  Hi-MD WALKMAN
-	021b  Net MD
-	021c  Hi-MD WALKMAN
-	021d  Net MD
-	0227  Printing Support
-	022c  Net MD
-	022d  Hi-MD AUDIO
-	0233  ATRAC HDD PA
-	0236  Mobile HDD
-	023b  DVD+RW External Drive DRU-800UL
-	023c  Net MD
-	023d  Hi-MD WALKMAN
-	0243  MicroVault Flash Drive
-	024b  Vaio VGX Mouse
-	0257  IFU-WLM2 USB Wireless LAN Module (Wireless Mode)
-	0258  IFU-WLM2 USB Wireless LAN Module (Memory Mode)
-	0259  IC RECORDER
-	0267  Tachikoma Device
-	0268  Batoh Device / PlayStation 3 Controller
-	0269  HDD WALKMAN
-	026a  HDD WALKMAN
-	0271  IC Recorder (P)
-	027c  NETWORK WALKMAN
-	027e  SONY Communicator
-	027f  IC RECORDER
-	0286  Net MD
-	0287  Hi-MD WALKMAN
-	0290  VGP-UVC100 Visual Communication Camera
-	029b  PRS-500 eBook reader
-	02a5  MicroVault Flash Drive
-	02af  Handycam DCR-DVD306E
-	02c4  Device
-	02d1  DVD RW
-	02d2  PSP Slim
-	02e1  FeliCa S330 [PaSoRi]
-	02ea  PlayStation 3 Memory Card Adaptor
-	02f9  DSC-H9
-	0317  WALKMAN
-	031a  Walkman NWD-B103F
-	031e  PRS-300/PRS-505 eBook reader
-	033e  DSC-W120
-	0346  Handycam DCR-SR55E
-	0348  HandyCam HDR-TG3E
-	0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
-	03bc  Webbie HD - MHS-CM1
-	03d3  DR-BT100CX
-	03d5  PlayStation Move motion controller
-	03fc  WALKMAN [NWZ-E345]
-	03fd  Walkman NWZ-E443
-	0440  DSC-H55
-	0485  MHS-PM5 HD camcorder
-	04cb  WALKMAN NWZ-E354
-	1000  Wireless Buzz! Receiver
-054d  Try Corp.
-054e  Proside Corp.
-054f  WYSE Technology Taiwan
-0550  Fuji Xerox Co., Ltd
-	0002  InkJet Color Printer
-	0004  InkJet Color Printer
-	0005  InkJet Color Printer
-0551  CompuTrend Systems, Inc.
-0552  Philips Monitors
-0553  STMicroelectronics Imaging Division (VLSI Vision)
-	0001  TerraCAM
-	0002  CPiA Webcam
-	0100  STV0672 Camera
-	0140  Video Camera
-	0150  CDE CAM 100
-	0151  Digital Blue QX5 Microscope
-	0200  Dual-mode Camera0
-	0201  Dual-mode Camera1
-	0202  Aiptek PenCam 1
-	0674  Multi-mode Camera
-	0679  NMS Video Camera (Webcam)
-	1002  Che-ez! Splash
-0554  Dictaphone Corp.
-0555  ANAM S&T Co., Ltd
-0556  Asahi Kasei Microsystems Co., Ltd
-	0001  AK5370 I/F A/D Converter
-0557  ATEN International Co., Ltd
-	2001  UC-1284 Printer Port
-	2002  10Mbps Ethernet [klsi]
-	2004  UC-100KM PS/2 Mouse and Keyboard adapter
-	2006  UC-1284B Printer Port
-	2007  UC-110T 100Mbps Ethernet [pegasus]
-	2008  UC-232A Serial Port [pl2303]
-	2009  UC-210T Ethernet
-	2011  UC-2324 4xSerial Ports [mos7840]
-	2202  CS124U Miniview II KVM Switch
-	2213  CS682 2-Port USB 2.0 DVI KVM Switch
-	2404  4-port switch
-	2600  IDE Bridge
-	2701  CE700A KVM Extender
-	4000  DSB-650 10Mbps Ethernet [klsi]
-	7000  Hub
-	7820  UC-2322 2xSerial Ports [mos7820]
-0558  Truevision, Inc.
-	1009  GW Instek GDS-1000 Oscilloscope
-	100a  GW Instek GDS-1000A Oscilloscope
-	2009  GW Instek GDS-2000 Oscilloscope
-0559  Cadence Design Systems, Inc.
-055a  Kenwood USA
-055b  KnowledgeTek, Inc.
-055c  Proton Electronic Ind.
-055d  Samsung Electro-Mechanics Co.
-	0001  Keyboard
-	0bb1  Bluetooth Device
-	1030  Optical Wheel Mouse (OMS3CB/OMGB30)
-	1031  Optical Wheel Mouse (OMA3CB/OMGI30)
-	1040  Mouse HID Device
-	1050  E-Mail Optical Wheel Mouse (OMS3CE)
-	1080  Optical Wheel Mouse (OMS3CH)
-	2020  Floppy Disk Drive
-	6780  Keyboard V1
-	6781  Keyboard Mouse
-	8001  E.M. Hub
-	9000  AnyCam [pwc]
-	9001  MPC-C30 AnyCam Premium for Notebooks [pwc]
-	a000  SWL-2100U
-	a010  WLAN Adapter(SWL-2300)
-	a011  Boot Device
-	a012  WLAN Adapter(SWL-2300)
-	a013  WLAN Adapter(SWL-2350)
-	a230  Boot Device
-	b000  11Mbps WLAN Mini Adapter
-	b230  Netopia 802.11b WLAN Adapter
-	b231  LG Wireless LAN 11b Adapter
-055e  CTX Opto-Electronics Corp.
-055f  Mustek Systems, Inc.
-	0001  ScanExpress 1200 CU
-	0002  ScanExpress 600 CU
-	0003  ScanExpress 1200 USB
-	0006  ScanExpress 1200 UB
-	0007  ScanExpress 1200 USB Plus
-	0008  ScanExpress 1200 CU Plus
-	0010  BearPaw 1200F
-	0210  ScanExpress A3 USB
-	0218  BearPaw 2400 TA
-	0219  BearPaw 2400 TA Plus
-	021a  BearPaw 2448 TA Plus
-	021b  BearPaw 1200 CU Plus
-	021c  BearPaw 1200 CU Plus
-	021d  BearPaw 2400 CU Plus
-	021e  BearPaw 1200 TA/CS
-	021f  SNAPSCAN e22
-	0400  BearPaw 2400 TA Pro
-	0401  P 3600 A3 Pro
-	0408  BearPaw 2448 CU Pro
-	0409  BearPaw 2448 TA Pro
-	040b  ScanExpress A3 USB 1200 PRO
-	0873  ScanExpress 600 USB
-	1000  BearPaw 4800 TA Pro
-	a350  gSmart 350 Camera
-	a800  MDC 800 Camera
-	b500  MDC 3000 Camera
-	c005  PC CAM 300A
-	c200  gSmart 300
-	c211  Kowa Bs888e Microcamera
-	c220  gSmart mini
-	c230  Digicam 330K
-	c232  MDC3500 Camera
-	c360  DV 4000 Camera
-	c420  gSmart mini 2 Camera
-	c430  gSmart LCD 2 Camera
-	c440  DV 3000 Camera
-	c520  gSmart mini 3 Camera
-	c530  gSmart LCD 2 Camera
-	c540  gSmart D30 Camera
-	c630  MDC 4000 Camera
-	c631  MDC 4000 Camera
-	c650  MDC 5500Z Camera
-	d001  WCam 300
-	d003  WCam 300A
-	d004  WCam 300AN
-0560  Interface Corp.
-0561  Oasis Design, Inc.
-0562  Telex Communications, Inc.
-	0001  Enhanced Microphone
-	0002  Telex Microphone
-0563  Immersion Corp.
-0564  Kodak Digital Product Center, Japan Ltd. (formerly Chinon Industries Inc.)
-0565  Peracom Networks, Inc.
-	0001  Serial Port [etek]
-	0002  Enet Ethernet [klsi]
-	0003  @Home Networks Ethernet [klsi]
-	0005  Enet2 Ethernet [klsi]
-	0041  Peracom Remote NDIS Ethernet Adapter
-0566  Monterey International Corp.
-	0110  ViewMate Desktop Mouse CC2201
-	1001  ViewMate Desktop Mouse CC2201
-	1002  ViewMate Desktop Mouse CC2201
-	1003  ViewMate Desktop Mouse CC2201
-	1004  ViewMate Desktop Mouse CC2201
-	1005  ViewMate Desktop Mouse CC2201
-	1006  ViewMate Desktop Mouse CC2201
-	1007  ViewMate Desktop Mouse CC2201
-	2800  MIC K/B
-	2801  MIC K/B Mouse
-	2802  Kbd Hub
-	3004  Genius KB-29E
-0567  Xyratex International, Ltd
-0568  Quartz Ingenierie
-0569  SegaSoft
-056a  Wacom Co., Ltd
-	0000  PenPartner
-	0001  PenPartner 4x5
-	0002  PenPartner 6x8
-	0003  Cintiq Partner
-	0010  Graphire
-	0011  Graphire 2 4x5
-	0012  Graphire 2 5x7
-	0013  Graphire 3 4x5
-	0014  Graphire 3 6x8
-	0015  Graphire 4 4x5
-	0016  Graphire 4 6x8
-	0017  Bamboo Fun 4x5
-	0018  Bamboo Fun 6x8
-	0019  Bamboo One Medium
-	0020  Intuos 4x5
-	0021  Intuos 6x8
-	0022  Intuos 9x12
-	0023  Intuos 12x12
-	0024  Intuos 12x18
-	0030  PL400
-	0031  PL500
-	0032  PL600
-	0033  PL600SX
-	0034  PL550
-	0035  PL800
-	0037  PL700
-	0038  PL510
-	0039  DTU-710
-	003f  Cintiq 21UX
-	0041  Intuos2 4x5
-	0042  Intuos2 6x8
-	0043  Intuos2 9x12
-	0044  Intuos2 12x12
-	0045  Intuos2 12x18
-	0047  Intuos2 6x8
-	0060  Volito
-	0061  PenStation2
-	0062  Volito2 4x5
-	0063  Volito2 2x3
-	0064  PenPartner2
-	0065  Bamboo
-	0069  Bamboo One
-	0081  Graphire Wireless 6x8
-	0090  TPC90
-	0093  TPC93
-	009a  TPC9A
-	00b0  Intuos3 4x5
-	00b1  Intuos3 6x18
-	00b2  Intuos3 9x12
-	00b3  Intuos3 12x12
-	00b4  Intuos3 12x19
-	00b5  Intuos3 6x11 (PTZ-631W)
-	00b7  Intuos3 4x6
-	00b8  Intuos4 4x6
-	00b9  Intuos4 6x9
-	00ba  Intuos4 8x13
-	00bb  Intuos4 12x19
-	00c0  DTF-521
-	00c4  DTF-720
-	00c5  Cintiq 20WSX
-	00c6  Cintiq 12WX
-	00c7  DTU-1931
-	00d1  Bamboo Pen & Touch (CTH-460-DE)
-	00d3  Bamboo Fun (CTH-661)
-	00db  Bamboo Fun (CTH-661SE-NL)
-	0400  PenPartner 4x5
-	4850  PenPartner 6x8
-056b  Decicon, Inc.
-056c  eTEK Labs
-	0006  KwikLink Host-Host Connector
-	8007  Kwik232 Serial Port
-	8100  KwikLink Host-Host Connector
-	8101  KwikLink USB-USB Bridge
-056d  EIZO Corp.
-	0000  Hub
-	0001  Monitor
-	0002  HID Monitor Controls
-	0003  Device Bay Controller
-056e  Elecom Co., Ltd
-	0002  29UO Mouse
-	200c  LD-USB/TX
-	4002  Laneed 100Mbps Ethernet LD-USB/TX [pegasus]
-	4005  LD-USBL/TX
-	400b  LD-USB/TX
-	4010  LD-USB20
-	5003  UC-SGT
-	5004  UC-SGT
-	6008  Flash Disk
-	abc1  LD-USB/TX
-056f  Korea Data Systems Co., Ltd
-	cd00  CDM-751 CD organizer
-0570  Epson America
-0571  Interex, Inc.
-	0002  echoFX InterView Lite
-0572  Conexant Systems (Rockwell), Inc.
-	0001  Ezcam II Webcam
-	0002  Ezcam II Webcam
-	0040  Wondereye CP-115 Webcam
-	0041  Webcam Notebook
-	0042  Webcam Notebook
-	1232  V.90 modem
-	1234  Typhoon Redfun Modem V90 56k
-	1252  HCF V90 Data Fax Voice Modem
-	1253  Zoom V.92 Faxmodem
-	1300  SoftK56 Data Fax Voice CARP
-	1301  Modem Enumerator
-	2000  SoftGate 802.11 Adapter
-	2002  SoftGate 802.11 Adapter
-	8390  WinFast PalmTop/Novo TV Video
-	8392  WinFast PalmTop/Novo TV Video
-	cafe  AccessRunner ADSL Modem
-	cb00  ADSL Modem
-	cb01  ADSL Modem
-	cb06  StarModem Network Interface
-0573  Zoran Co. Personal Media Division (Nogatech)
-	0003  USBGear USBG-V1
-	0400  D-Link V100
-	0600  Dazzle USBVision (1006)
-	1300  leadtek USBVision (1006)
-	2000  X10 va10a Wireless Camera
-	2001  Dazzle EmMe (2001)
-	2101  Zoran Co. PMD (Nogatech) AV-grabber Manhattan
-	2d00  Osprey 50
-	2d01  Hauppauge USB-Live Model 600
-	3000  Dazzle MicroCam (NTSC)
-	3001  Dazzle MicroCam (PAL)
-	4000  Nogatech TV! (NTSC)
-	4001  Nogatech TV! (PAL)
-	4002  Nogatech TV! (PAL-I-)
-	4003  Nogatech TV! (MF-)
-	4008  Nogatech TV! (NTSC) (T)
-	4009  Nogatech TV! (PAL) (T)
-	4010  Nogatech TV! (NTSC) (A)
-	4100  USB-TV FM (NTSC)
-	4110  PNY USB-TV (NTSC) FM
-	4400  Nogatech TV! Pro (NTSC)
-	4401  Nogatech TV! Pro (PAL)
-	4450  PixelView PlayTv-USB PRO (PAL) FM
-	4451  Nogatech TV! Pro (PAL+)
-	4452  Nogatech TV! Pro (PAL-I+)
-	4500  Nogatech TV! Pro (NTSC)
-	4501  Nogatech TV! Pro (PAL)
-	4550  ZTV ZT-721 2.4GHz A/V Receiver
-	4551  Dazzle TV! Pro Audio (P+)
-	4d00  Hauppauge WinTV-USB USA
-	4d01  Hauppauge WinTV-USB
-	4d02  Hauppauge WinTV-USB UK
-	4d03  Hauppauge WinTV-USB France
-	4d04  Hauppauge WinTV (PAL D/K)
-	4d10  Hauppauge WinTV-USB with FM USA radio
-	4d11  Hauppauge WinTV-USB (PAL) with FM radio
-	4d12  Hauppauge WinTV-USB UK with FM Radio
-	4d14  Hauppauge WinTV (PAL D/K FM)
-	4d20  Hauppauge WinTV-USB II (PAL) with FM radio
-	4d21  Hauppauge WinTV-USB II (PAL)
-	4d22  Hauppauge WinTV-USB II (PAL) Model 566
-	4d23  Hauppauge WinTV-USB France 4D23
-	4d24  Hauppauge WinTV Pro (PAL D/K)
-	4d25  Hauppauge WinTV-USB Model 40209 rev B234
-	4d26  Hauppauge WinTV-USB Model 40209 rev B243
-	4d27  Hauppauge WinTV-USB Model 40204 Rev B281
-	4d28  Hauppauge WinTV-USB Model 40204 rev B283
-	4d29  Hauppauge WinTV-USB Model 40205 rev B298
-	4d2a  Hauppague WinTV-USB Model 602 Rev B285
-	4d2b  Hauppague WinTV-USB Model 602 Rev B282
-	4d2c  Hauppauge WinTV Pro (PAL/SECAM)
-	4d30  Hauppauge WinTV-USB FM Model 40211 Rev B123
-	4d31  Hauppauge WinTV-USB III (PAL) with FM radio Model 568
-	4d32  Hauppauge WinTV-USB III (PAL) FM Model 573
-	4d34  Hauppauge WinTV Pro (PAL D/K FM)
-	4d35  Hauppauge WinTV-USB III (PAL) FM Model 597
-	4d36  Hauppauge WinTV Pro (PAL B/G FM)
-	4d37  Hauppauge WinTV-USB Model 40219 rev E189
-	4d38  Hauppauge WinTV Pro (NTSC FM)
-0574  City University of Hong Kong
-0575  Philips Creative Display Solutions
-0576  BAFO/Quality Computer Accessories
-0577  ELSA
-0578  Intrinsix Corp.
-0579  GVC Corp.
-057a  Samsung Electronics America
-057b  Y-E Data, Inc.
-	0000  FlashBuster-U Floppy
-	0001  Tri-Media Reader Floppy
-	0006  Tri-Media Reader Card Reader
-	0010  Memory Stick Reader Writer
-	0020  HEXA Media Drive 6-in-1 Card Reader Writer
-	0030  Memory Card Viewer (TV)
-057c  AVM GmbH
-	0b00  ISDN-Controller B1 Family
-	0c00  ISDN-Controller FRITZ!Card
-	1000  ISDN-Controller FRITZ!Card v2.0
-	1900  ISDN-Controller FRITZ!Card v2.1
-	2000  ISDN-Connector FRITZ!X
-	2200  BlueFRITZ!
-	2300  Teledat X130 DSL
-	2800  ISDN-Connector TA
-	3200  Teledat X130 DSL
-	3500  FRITZ!Card DSL SL
-	3701  FRITZ!Box SL
-	3702  FRITZ!Box
-	3800  BlueFRITZ! Bluetooth Stick
-	3a00  FRITZ!Box Fon
-	3c00  FRITZ!Box WLAN
-	3d00  Fritz!Box
-	3e01  FRITZ!Box (Annex A)
-	4001  FRITZ!Box Fon (Annex A)
-	4101  FRITZ!Box WLAN (Annex A)
-	4201  FRITZ!Box Fon WLAN (Annex A)
-	4601  Eumex 5520PC (WinXP/2000)
-	4602  Eumex 400 (WinXP/2000)
-	4701  AVM FRITZ!Box Fon ata
-	5401  Eumex 300 IP
-	5601  AVM Fritz!WLAN [Texas Instruments TNETW1450]
-	6201  AVM Fritz!WLAN v1.1 [Texas Instruments TNETW1450]
-	62ff  AVM Fritz!WLAN USB (in CD-ROM-mode)
-	8401  AVM Fritz!WLAN N [Atheros AR9001U]
-	8402  AVM Fritz!WLAN N 2.4 [Atheros AR9001U]
-	84ff  AVM Fritz!WLAN USB N (in CD-ROM-mode)
-057d  Shark Multimedia, Inc.
-057e  Nintendo Co., Ltd
-	0305  Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]
-	0306  Wii Remote Controller RVL-003
-057f  QuickShot, Ltd
-	6238  USB StrikePad
-0580  Denron, Inc.
-0581  Racal Data Group
-0582  Roland Corp.
-	0000  UA-100
-	0002  UM-4/MPU-64 MIDI Interface
-	0003  SoundCanvas SC-8850
-	0004  U-8
-	0005  Edirol UM-2 MIDI Adapter
-	0007  SoundCanvas SC-8820
-	0008  PC-300
-	0009  Edirol UM-1SX MIDI Adapter
-	000b  SK-500
-	000c  SC-D70
-	0010  EDIROL UA-5
-	0011  Edirol UA-5 Sound Capture
-	0012  XV-5050
-	0013  XV-5050
-	0014  EDIROL UM-880 MIDI I/F (native)
-	0015  EDIROL UM-880 MIDI I/F (generic)
-	0016  EDIROL SD-90
-	0017  EDIROL SD-90
-	0018  UA-1A
-	001b  MMP-2
-	001c  MMP-2
-	001d  V-SYNTH
-	001e  V-SYNTH
-	0023  EDIROL UM-550
-	0024  EDIROL UM-550
-	0025  EDIROL UA-20
-	0026  EDIROL UA-20
-	0027  EDIROL SD-20
-	0028  EDIROL SD-20
-	0029  EDIROL SD-80
-	002a  EDIROL SD-80
-	002b  EDIROL UA-700
-	002c  EDIROL UA-700
-	002d  XV-2020 Synthesizer
-	002e  XV-2020 Synthesizer
-	002f  VariOS
-	0030  VariOS
-	0033  EDIROL PCR
-	0034  EDIROL PCR
-	0037  Digital Piano
-	0038  Digital Piano
-	003b  BOSS GS-10
-	003c  BOSS GS-10
-	0040  GI-20
-	0041  GI-20
-	0042  RS-70
-	0043  RS-70
-	0044  EDIROL UA-1000
-	0047  EDIROL UR-80 WAVE
-	0048  EDIROL UR-80 MIDI
-	0049  EDIROL UR-80 WAVE
-	004a  EDIROL UR-80 MIDI
-	004b  EDIROL M-100FX
-	004c  EDIROL PCR-A WAVE
-	004d  EDIROL PCR-A MIDI
-	004e  EDIROL PCR-A WAVE
-	004f  EDIROL PCR-A MIDI
-	0050  EDIROL UA-3FX
-	0052  EDIROL UM-1SX
-	0054  Digital Piano
-	0060  EXR Series
-	0064  EDIROL PCR-1 WAVE
-	0065  EDIROL PCR-1 MIDI
-	0066  EDIROL PCR-1 WAVE
-	0067  EDIROL PCR-1 MIDI
-	006a  SP-606
-	006b  SP-606
-	006d  FANTOM-X
-	006e  FANTOM-X
-	0073  EDIROL UA-25
-	0074  EDIROL UA-25
-	0075  BOSS DR-880
-	0076  BOSS DR-880
-	007a  RD
-	007b  RD
-	007d  EDIROL UA-101
-	0080  G-70
-	0081  G-70
-	008b  EDIROL PC-50
-	008c  EDIROL PC-50
-	008d  EDIROL UA-101 USB1
-	0092  EDIROL PC-80 WAVE
-	0093  EDIROL PC-80 MIDI
-	0096  EDIROL UA-1EX
-	009a  EDIROL UM-3EX
-	009d  EDIROL UM-1
-	00a2  Digital Piano
-	00a3  EDIROL UA-4FX
-	00a6  Juno-G
-	00ad  SH-201
-	00c4  EDIROL M-16DX
-	00db  BOSS GT-10 Guitar Effects Processor
-	00de  Fantom-G7
-	00e6  EDIROL UA-25EX (Advanced mode)
-	00e7  EDIROL UA-25EX
-	010f  A-PRO
-	0110  A-PRO
-0583  Padix Co., Ltd (Rockfire)
-	0001  4 Axis 12 button +POV
-	0002  4 Axis 12 button +POV
-	2030  RM-203 USB Nest [mode 1]
-	2031  RM-203 USB Nest [mode 2]
-	2032  RM-203 USB Nest [mode 3]
-	2033  RM-203 USB Nest [mode 4]
-	2050  PX-205 PSX Bridge
-	205f  PSX/USB converter
-	206f  USB, 2-axis 8-button gamepad
-	3050  QF-305u Gamepad
-	3379  Rockfire X-Force
-	337f  Rockfire USB RacingStar Vibra
-	509f  USB,4-Axis,12-Button with POV
-	5259  Rockfire USB SkyShuttle Vibra
-	525f  USB Vibration Pad
-	5308  USB Wireless VibrationPad
-	5359  Rockfire USB SkyShuttle Pro
-	535f  USB,real VibrationPad
-	5659  Rockfire USB SkyShuttle Vibra
-	565f  USB VibrationPad
-	6009  Revenger
-	600f  USB,GameBoard II
-	6258  USB, 4-axis, 6-button joystick w/view finder
-	6889  Windstorm Pro
-	688f  QF-688uv Windstorm Pro Joystick
-	7070  QF-707u Bazooka Joystick
-	a000  MaxFire G-08XU Gamepad
-	a015  4-Axis,16-Button with POV
-	a019  USB, Vibration ,4-axis, 8-button joystick w/view finder
-	a020  USB,4-Axis,10-Button with POV
-	a021  USB,4-Axis,12-Button with POV
-	a022  USB,4-Axis,14-Button with POV
-	a023  USB,4-Axis,16-Button with POV
-	a024  4axis,12button vibrition audio gamepad
-	a025  4axis,12button vibrition audio gamepad
-	a130  USB Wireless 2.4GHz Gamepad
-	a131  USB Wireless 2.4GHz Joystick
-	a132  USB Wireless 2.4GHz Wheelpad
-	a133  USB Wireless 2.4GHz Wheel&Gamepad
-	a202  ForceFeedbackWheel
-	a209  MetalStrike FF
-	b000  USB,4-Axis,12-Button with POV
-	b001  USB,4-Axis,12-Button with POV
-	b002  Vibration,12-Button USB Wheel
-	b005  USB,12-Button Wheel
-	b008  USB Wireless 2.4GHz Wheel
-	b009  USB,12-Button  Wheel
-	b00a  PSX/USB converter
-	b00b  PSX/USB converter
-	b00c  PSX/USB converter
-	b00d  PSX/USB converter
-	b00e  4-Axis,12-Button with POV
-	b00f  USB,5-Axis,10-Button with POV
-	b010  MetalStrike Pro
-	b012  Wireless MetalStrike
-	b013  USB,Wiress  2.4GHZ Joystick
-	b016  USB,5-Axis,10-Button with POV
-	b018  TW6 Wheel
-	ff60  USB Wireless VibrationPad
-0584  RATOC System, Inc.
-	0008  Fujifilm MemoryCard ReaderWriter
-	0220  U2SCX SCSI Converter
-	b000  REX-USB60
-0585  FlashPoint Technology, Inc.
-	0001  Digital Camera
-	0002  Digital Camera
-	0003  Digital Camera
-	0004  Digital Camera
-	0005  Digital Camera
-	0006  Digital Camera
-	0007  Digital Camera
-	0008  Digital Camera
-	0009  Digital Camera
-	000a  Digital Camera
-	000b  Digital Camera
-	000c  Digital Camera
-	000d  Digital Camera
-	000e  Digital Camera
-	000f  Digital Camera
-0586  ZyXEL Communications Corp.
-	0025  802.11b/g/n USB Wireless Network Adapter
-	0102  omni.net II ISDN TA
-	1000  Omni NET Modem / ISDN TA
-	1500  Omni 56K Plus
-	2011  Scorpion-980N keyboard
-	3304  LAN Modem
-	3309  ADSL Modem Prestige 600 series
-	330a  ADSL Modem Interface
-	330e  USB Broadband ADSL Modem Rev 1.10
-	3400  ZyAIR B-220 IEEE 802.11b Adapter
-	3401  ZyAIR G-220 802.11bg
-	3402  ZyAIR G-220F 802.11bg
-	3407  G-200 v2 802.11bg
-	3409  AG-225H 802.11bg
-	340a  M-202 802.11bg
-	340f  G-220 v2 802.11bg
-	3410  ZyAIR G-202 802.11bg
-	3412  802.11bg
-	3413  ZyAIR AG-225H v2 802.11bg
-	3415  G-210H 802.11g Wireless Adapter
-	3416  NWD-210N 802.11b/g/n-draft wireless adapter
-	3417  NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG]
-	3418  NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870]
-	341a  NWD-270N Wireless N-lite USB Adapter
-	341f  NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]
-0587  America Kotobuki Electronics Industries, Inc.
-0588  Sapien Design
-0589  Victron
-058a  Nohau Corp.
-058b  Infineon Technologies
-058c  In Focus Systems
-	0007  Flash
-	0008  LP130
-	000a  LP530
-	0010  Projector
-	0011  Projector
-	0012  Projector
-	0013  Projector
-	0014  Projector
-	0015  Projector
-	0016  Projector
-	0017  Projector
-	0018  Projector
-	0019  Projector
-	001a  Projector
-	001b  Projector
-	001c  Projector
-	001d  Projector
-	001e  Projector
-	001f  Projector
-058d  Micrel Semiconductor
-058e  Tripath Technology, Inc.
-058f  Alcor Micro Corp.
-	1234  Flash Drive
-	2412  SCard R/W CSR-145
-	2802  Monterey Keyboard
-	5492  Hub
-	6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
-	6254  USB Hub
-	6331  SD/MMC/MS Card Reader
-	6332  Multi-Function Card Reader
-	6335  SD/MMC Card Reader
-	6360  Multimedia Card Reader
-	6361  Multimedia Card Reader
-	6362  Flash Card Reader/Writer
-	6366  Multi Flash Reader
-	6377  Multimedia Card Reader
-	6386  Memory Card
-	6387  Transcend JetFlash Flash Drive
-	6390  USB 2.0-IDE bridge
-	9213  MacAlly Kbd Hub
-	9215  AU9814 Hub
-	9254  Hub
-	9310  Mass Storage (UID4/5A & UID7A)
-	9320  Micro Storage Driver for Win98
-	9321  Micro Storage Driver for Win98
-	9330  SD Reader
-	9331  Micro Storage Driver for Win98
-	9340  Delkin eFilm Reader-32
-	9350  Delkin eFilm Reader-32
-	9360  8-in-1 Media Card Reader
-	9361  Multimedia Card Reader
-	9368  Multimedia Card Reader
-	9380  Flash Drive
-	9382  Acer/Sweex Flash drive
-	9384  qdi U2Disk T209M
-	9410  Keyboard
-	9472  Keyboard Hub
-	9510  ChunghwaTL USB02 Smartcard Reader
-	9520  EMV Certified Smart Card Reader
-	9720  USB-Serial Adapter
-0590  Omron Corp.
-	0004  Cable Modem
-	000b  MR56SVS
-	0028  HJ-720IT Pedometer / Blood Pressure Monitor HEM-7080IT-E
-0591  Questra Consulting
-0592  Powerware Corp.
-	0002  UPS (X-Slot)
-0593  Incite
-0594  Princeton Graphic Systems
-0595  Zoran Microelectronics, Ltd
-	1001  Digitrex DSC-1300/DSC-2100 (mass storage mode)
-	2002  DIGITAL STILL CAMERA 6M 4X
-	4343  Digital Camera EX-20 DSC
-0596  MicroTouch Systems, Inc.
-	0001  Touchscreen
-	0002  Touch Screen Controller
-	0500  PCT Multitouch HID Controller
-0597  Trisignal Communications
-0598  Niigata Canotec Co., Inc.
-0599  Brilliance Semiconductor, Inc.
-059a  Spectrum Signal Processing, Inc.
-059b  Iomega Corp.
-	0001  Zip 100 (Type 1)
-	000b  Zip 100 (Type 2)
-	0021  Win98 Disk Controller
-	0030  Zip 250 (Ver 1)
-	0031  Zip 100 (Type 3)
-	0032  Zip 250 (Ver 2)
-	0034  Zip 100 Driver
-	0037  Zip 750 MB
-	0040  SCSI Bridge
-	0042  Rev 70 GB
-	0050  Zip CD 650 Writer
-	0053  CDRW55292EXT CD-RW External Drive
-	0057  Mass Storage Device
-	005d  Mass Storage Device
-	005f  CDRW64892EXT3-C CD-RW 52x24x52x External Drive
-	0060  PCMCIA PocketZip Dock
-	0061  Varo PocketZip 40 MP3 Player
-	006d  HipZip MP3 Player
-	007c  Ultra Max USB/1394
-	007e  Mini 256MB/512MB Flash Drive [IOM2D5]
-	00db  FotoShow Zip 250 Driver
-	0150  Mass Storage Device
-	015d  Super DVD Writer
-	0173  Hi-Speed USB-to-IDE Bridge Controller
-	0174  Hi-Speed USB-to-IDE Bridge Controller
-	0176  Hi-Speed USB-to-IDE Bridge Controller
-	0177  Hi-Speed USB-to-IDE Bridge Controller
-	0178  Hi-Speed USB-to-IDE Bridge Controller
-	0179  Hi-Speed USB-to-IDE Bridge Controller
-	017a  HDD
-	017b  HDD/1394A
-	017c  HDD/1394B
-	0251  Optical
-	0252  Optical
-	027a  LPHD250-U [Portable Hard Drive Silver Series 250 Go]
-	0470  Prestige Portable Hard Drive
-	047a  Select Portable Hard Drive
-	0579  eGo Portable Hard Drive
-	1052  DVD+RW External Drive
-059c  A-Trend Technology Co., Ltd
-059d  Advanced Input Devices
-059e  Intelligent Instrumentation
-059f  LaCie, Ltd
-	0201  StudioDrive USB2
-	0202  StudioDrive USB2
-	0203  StudioDrive USB2
-	0211  PocketDrive
-	0212  PocketDrive
-	0213  PocketDrive USB2
-	0323  LaCie d2 Drive USB2
-	0421  Big Disk G465
-	0641  Mobile Hard Drive
-	1010  Desktop Hard Drive
-	1019  Desktop Hard Drive
-	1021  Little Disk
-	1027  iamaKey V2
-	102a  Rikiki Hard Drive
-	1049  rikiki Harddrive
-	a601  HardDrive
-	a602  CD R/W
-05a0  Vetronix Corp.
-05a1  USC Corp.
-05a2  Fuji Film Microdevices Co., Ltd
-05a3  ARC International
-	8388  Marvell 88W8388 802.11a/b/g WLAN
-05a4  Ortek Technology, Inc.
-	2000  WKB-2000 Wireless Keyboard with Touchpad
-	9720  Keyboard Mouse
-	9722  Keyboard
-	9731  MCK-600W/MCK-800USB Keyboard
-	9783  Wireless Keypad
-05a5  Sampo Technology Corp.
-05a6  Cisco Systems, Inc.
-	0001  CVA124 Cable Voice Adapter (WDM)
-	0002  CVA122 Cable Voice Adapter (WDM)
-	0003  CVA124E Cable Voice Adapter (WDM)
-	0004  CVA122E Cable Voice Adapter (WDM)
-05a7  Bose Corp.
-05a8  Spacetec IMC Corp.
-05a9  OmniVision Technologies, Inc.
-	0511  OV511 Webcam
-	0518  OV518 Webcam
-	0519  OV519 Microphone
-	1550  VEHO Filmscanner
-	2640  OV2640 Webcam
-	2643  Monitor Webcam
-	264b  Monitor Webcam
-	2800  SuperCAM
-	4519  Webcam Classic
-	7670  OV7670 Webcam
-	8519  OV519 Webcam
-	a511  OV511+ Webcam
-	a518  D-Link DSB-C310 Webcam
-05aa  Utilux South China, Ltd
-05ab  In-System Design
-	0002  Parallel Port
-	0030  Storage Adapter V2 (TPP)
-	0031  ATA Bridge
-	0060  USB 2.0 ATA Bridge
-	0061  Storage Adapter V3 (TPP-I)
-	0101  Storage Adapter (TPP)
-	0130  Compact Flash and Microdrive Reader (TPP)
-	0200  USS725 ATA Bridge
-	0201  Storage Adapter (TPP)
-	0202  ATA Bridge
-	0300  Portable Hard Drive (TPP)
-	0301  Portable Hard Drive V2
-	0350  Portable Hard Drive (TPP)
-	0351  Portable Hard Drive V2
-	081a  ATA Bridge
-	0cda  ATA Bridge for CD-R/RW
-	1001  BAYI Printer Class Support
-	5700  Storage Adapter V2 (TPP)
-	5701  USB Storage Adapter V2
-	5901  Smart Board (TPP)
-	5a01  ATI Storage Adapter (TPP)
-	5d01  DataBook Adapter (TPP)
-05ac  Apple, Inc.
-	0201  USB Keyboard [Alps or Logitech, M2452]
-	0202  Keyboard [ALPS]
-	0205  Extended Keyboard [Mitsumi]
-	0206  Extended Keyboard [Mitsumi]
-	020b  Pro Keyboard [Mitsumi, A1048/US layout]
-	020c  Extended Keyboard [Mitsumi]
-	020d  Pro Keyboard [Mitsumi, A1048/JIS layout]
-	020e  Internal Keyboard/Trackpad (ANSI)
-	020f  Internal Keyboard/Trackpad (ISO)
-	0214  Internal Keyboard/Trackpad (ANSI)
-	0215  Internal Keyboard/Trackpad (ISO)
-	0216  Internal Keyboard/Trackpad (JIS)
-	0217  Internal Keyboard/Trackpad (ANSI)
-	0218  Internal Keyboard/Trackpad (ISO)
-	0219  Internal Keyboard/Trackpad (JIS)
-	021a  Internal Keyboard/Trackpad (ANSI)
-	021b  Internal Keyboard/Trackpad (ISO)
-	021c  Internal Keyboard/Trackpad (JIS)
-	021d  Aluminum Mini Keyboard (ANSI)
-	021e  Aluminum Mini Keyboard (ISO)
-	021f  Aluminum Mini Keyboard (JIS)
-	0220  Aluminum Keyboard (ANSI)
-	0221  Aluminum Keyboard (ISO)
-	0222  Aluminum Keyboard (JIS)
-	0223  Internal Keyboard/Trackpad (ANSI)
-	0224  Internal Keyboard/Trackpad (ISO)
-	0225  Internal Keyboard/Trackpad (JIS)
-	0229  Internal Keyboard/Trackpad (MacBook Pro) (ANSI)
-	022a  Internal Keyboard/Trackpad (MacBook Pro) (ISO)
-	022b  Internal Keyboard/Trackpad (MacBook Pro) (JIS)
-	0230  Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI)
-	0231  Internal Keyboard/Trackpad (MacBook Pro 4,1) (ISO)
-	0232  Internal Keyboard/Trackpad (MacBook Pro 4,1) (JIS)
-	0236  Internal Keyboard/Trackpad (ANSI)
-	0237  Internal Keyboard/Trackpad (ISO)
-	0238  Internal Keyboard/Trackpad (JIS)
-	0301  USB Mouse [Mitsumi, M4848]
-	0302  Optical Mouse [Fujitsu]
-	0304  Optical USB Mouse [Mitsumi]
-	0306  Optical USB Mouse [Fujitsu]
-	030a  Internal Trackpad
-	030b  Internal Trackpad
-	030e  Wireless Trackpad [Magic Trackpad]
-	1000  Bluetooth HCI MacBookPro (HID mode)
-	1001  Keyboard Hub [ALPS]
-	1002  Extended Keyboard Hub [Mitsumi]
-	1003  Hub in Pro Keyboard [Mitsumi, A1048]
-	1006  Hub in Aluminum Keyboard
-	1101  Speakers
-	1201  3G iPod
-	1202  iPod 2G
-	1203  iPod 4.Gen Grayscale 40G
-	1204  iPod [Photo]
-	1205  iPod Mini 1.Gen/2.Gen
-	1206  iPod '06'
-	1207  iPod '07'
-	1208  iPod '08'
-	1209  iPod Video
-	120a  iPod Nano
-	1223  iPod Classic/Nano 3.Gen (DFU mode)
-	1224  iPod Nano 3.Gen (DFU mode)
-	1225  iPod Nano 4.Gen (DFU mode)
-	1227  Mobile Device (DFU Mode)
-	1231  iPod Nano 5.Gen (DFU mode)
-	1240  iPod Nano 2.Gen (DFU mode)
-	1242  iPod Nano 3.Gen (WTF mode)
-	1243  iPod Nano 4.Gen (WTF mode)
-	1245  iPod Classic 3.Gen (WTF mode)
-	1246  iPod Nano 5.Gen (WTF mode)
-	1255  iPod Nano 4.Gen (DFU mode)
-	1260  iPod Nano 2.Gen
-	1261  iPod Classic
-	1262  iPod Nano 3.Gen
-	1263  iPod Nano 4.Gen
-	1265  iPod Nano 5.Gen
-	1266  iPod Nano 6.Gen
-	1281  Apple Mobile Device [Recovery Mode]
-	1290  iPhone
-	1291  iPod Touch 1.Gen
-	1292  iPhone 3G
-	1293  iPod Touch 2.Gen
-	1294  iPhone 3GS
-	1296  iPod Touch 3.Gen (8GB)
-	1297  iPhone 4
-	1299  iPod Touch 3.Gen
-	129a  iPad
-	129e  iPod Touch 4.Gen
-	129f  iPad 2
-	1300  iPod Shuffle
-	1301  iPod Shuffle 2.Gen
-	1302  iPod Shuffle 3.Gen
-	1303  iPod Shuffle 4.Gen
-	1401  Modem
-	8202  HCF V.90 Data/Fax Modem
-	8203  Bluetooth HCI
-	8204  Bluetooth HCI [Bluetooth 2.0 + EDR, built-in]
-	8205  Bluetooth HCI
-	8206  Bluetooth HCI
-	820f  Bluetooth HCI
-	8215  Bluetooth USB Host Controller
-	8216  Bluetooth USB Host Controller
-	8217  Bluetooth USB Host Controller
-	8218  Bluetooth Host Controller
-	8240  IR Receiver [built-in]
-	8241  IR Receiver [built-in]
-	8242  IR Receiver [built-in]
-	8300  Built-in iSight (no firmware loaded)
-	8403  Internal Memory Card Reader
-	8501  Built-in iSight [Micron]
-	8502  Built-in iSight
-	8505  Built-in iSight
-	8507  Built-in iSight
-	911c  Hub in A1082 [Cinema HD Display 23"]
-	912f  Hub in 30" Cinema Display
-	921c  A1082 [Cinema HD Display 23"]
-	9221  30" Cinema Display
-	ffff  Bluetooth in DFU mode - Driver
-05ad  Y.C. Cable U.S.A., Inc.
-05ae  Synopsys, Inc.
-05af  Jing-Mold Enterprise Co., Ltd
-	0809  Wireless Keyboard and Mouse
-	0821  IDE to
-	3062  Cordless Keyboard
-	9167  KB 9151B - 678
-	9267  KB 9251B - 678 Mouse
-05b0  Fountain Technologies, Inc.
-05b1  First International Computer, Inc.
-	1389  Bluetooth Wireless Adapter
-05b4  LG Semicon Co., Ltd
-	4857  M-Any DAH-210
-	6001  Digisette DUO-MP3 AR-100
-05b5  Dialogic Corp.
-05b6  Proxima Corp.
-05b7  Medianix Semiconductor, Inc.
-05b8  Agiler, Inc.
-	3002  Scroll Mouse
-05b9  Philips Research Laboratories
-05ba  DigitalPersona, Inc.
-	0007  Fingerprint Reader
-	0008  Fingerprint Reader
-	000a  Fingerprint Reader
-05bb  Grey Cell Systems
-05bc  3G Green Green Globe Co., Ltd
-	0004  Trackball
-05bd  RAFI GmbH & Co. KG
-05be  Tyco Electronics (Raychem)
-05bf  S & S Research
-05c0  Keil Software
-05c1  Kawasaki Microelectronics, Inc.
-05c2  Media Phonics (Suisse) S.A.
-05c5  Digi International, Inc.
-	0002  AccelePort USB 2
-	0004  AccelePort USB 4
-	0008  AccelePort USB 8
-05c6  Qualcomm, Inc.
-	0114  Select RW-200 CDMA Wireless Modem
-	1000  Mass Storage Device
-	3100  CDMA Wireless Modem/Phone
-	3196  CDMA Wireless Modem
-	3197  CDMA Wireless Modem/Phone
-	6000  Siemens SG75
-	6503  AnyData APE-540H
-	6613  Onda H600/N501HS ZTE MF330
-	9000  SIMCom SIM5218 modem
-	9001  Gobi Wireless Modem
-	9002  Gobi Wireless Modem
-	9008  Gobi Wireless Modem (QDL mode)
-	9201  Gobi Wireless Modem (QDL mode)
-	9202  Gobi Wireless Modem
-	9203  Gobi Wireless Modem
-	9211  Acer Gobi Wireless Modem (QDL mode)
-	9212  Acer Gobi Wireless Modem
-	9214  Acer Gobi 2000 Wireless Modem (QDL mode)
-	9215  Acer Gobi 2000 Wireless Modem
-	9221  Gobi Wireless Modem (QDL mode)
-	9222  Gobi Wireless Modem
-	9224  Sony Gobi 2000 Wireless Modem (QDL mode)
-	9225  Sony Gobi 2000 Wireless Modem
-	9231  Gobi Wireless Modem (QDL mode)
-	9234  Top Global Gobi 2000 Wireless Modem (QDL mode)
-	9235  Top Global Gobi 2000 Wireless Modem
-	9244  Samsung Gobi 2000 Wireless Modem (QDL mode)
-	9245  Samsung Gobi 2000 Wireless Modem
-	9264  Asus Gobi 2000 Wireless Modem (QDL mode)
-	9265  Asus Gobi 2000 Wireless Modem
-	9274  iRex Technologies Gobi 2000 Wireless Modem (QDL mode)
-	9275  iRex Technologies Gobi 2000 Wireless Modem
-05c7  Qtronix Corp.
-	0113  PC Line Mouse
-	1001  Lynx Mouse
-	2001  Keyboard
-	2011  SCorpius Keyboard
-	6001  Ten-Keypad
-05c8  Cheng Uei Precision Industry Co., Ltd (Foxlink)
-	0103  FO13FF-65 PC-CAM
-	0403  Webcam
-05c9  Semtech Corp.
-05ca  Ricoh Co., Ltd
-	0101  RDC-5300 Camera
-	0325  Caplio GX (ptp)
-	032d  Caplio GX 8 (ptp)
-	032f  Caplio R3 (ptp)
-	03a1  IS200e
-	0403  Printing Support
-	0405  Type 101
-	0406  Type 102
-	1803  V5 camera [R5U870]
-	1810  Pavilion Webcam [R5U870]
-	1812  Pavilion Webcam
-	1814  HD Webcam
-	1830  Visual Communication Camera VGP-VCC2 [R5U870]
-	1832  Visual Communication Camera VGP-VCC3 [R5U870]
-	1833  Visual Communication Camera VGP-VCC2 [R5U870]
-	1834  Visual Communication Camera VGP-VCC2 [R5U870]
-	1835  Visual Communication Camera VGP-VCC5 [R5U870]
-	1836  Visual Communication Camera VGP-VCC4 [R5U870]
-	1837  Visual Communication Camera VGP-VCC4 [R5U870]
-	1839  Visual Communication Camera VGP-VCC6 [R5U870]
-	183a  Visual Communication Camera VGP-VCC7 [R5U870]
-	183b  Visual Communication Camera VGP-VCC8 [R5U870]
-	183d  Sony Vaio Integrated Webcam
-	183e  Visual Communication Camera VGP-VCC9 [R5U870]
-	1841  Fujitsu F01/ Lifebook U810 [R5U870]
-	1870  Webcam 1000
-	18b0  Sony Vaio Integrated Webcam
-	18b1  Sony Vaio Integrated Webcam
-	18b3  Sony Vaio Integrated Webcam
-	2201  RDC-7 Camera
-	2202  Caplio RR30
-	2203  Caplio 300G
-	2204  Caplio G3
-	2205  Caplio RR30 / Medion MD 6126 Camera
-	2206  Konica DG-3Z
-	2207  Caplio Pro G3
-	2208  Caplio G4
-	2209  Caplio 400G wide
-	220a  KONICA MINOLTA DG-4Wide
-	220b  Caplio RX
-	220c  Caplio GX
-	220d  Caplio R1/RZ1
-	220e  Sea & Sea 5000G
-	220f  Rollei dr5 / Rollei dr5 (PTP mode)
-	2211  Caplio R1S
-	2212  Caplio R1v Camera
-	2213  Caplio R2
-	2214  Caplio GX 8
-	2215  DSC 725
-	2216  Caplio R3
-	2222  RDC-i500
-05cb  PowerVision Technologies, Inc.
-	1483  PV8630 interface (scanners, webcams)
-05cc  ELSA AG
-	2100  MicroLink ISDN Office
-	2219  MicroLink ISDN
-	2265  MicroLink 56k
-	2267  MicroLink 56k (V.250)
-	2280  MicroLink 56k Fun
-	3000  Micolink USB2Ethernet [pegasus]
-	3100  AirLancer USB-11
-	3363  MicroLink ADSL Fun
-05cd  Silicom, Ltd
-05ce  sci-worx GmbH
-05cf  Sung Forn Co., Ltd
-05d0  GE Medical Systems Lunar
-05d1  Brainboxes, Ltd
-	0003  Bluetooth Adapter BL-554
-05d2  Wave Systems Corp.
-05d3  Tohoku Ricoh Co., Ltd
-05d5  Super Gate Technology Co., Ltd
-05d6  Philips Semiconductors, CICT
-05d7  Thomas & Betts Corp.
-	0099  10Mbps Ethernet [klsi]
-05d8  Ultima Electronics Corp.
-	4001  Artec Ultima 2000
-	4002  Artec Ultima 2000 (GT6801 based)/Lifetec LT9385/ScanMagic 1200 UB Plus Scanner
-	4003  Artec E+ 48U
-	4004  Artec E+ Pro
-	4005  MEM48U
-	4006  TRUST EASY WEBSCAN 19200
-	4007  TRUST 240H EASY WEBSCAN GOLD
-	4008  Trust Easy Webscan 19200
-	4009  Umax Astraslim
-	4013  IT Scan 1200
-	8105  Artec T1 USB TVBOX (cold)
-	8106  Artec T1 USB TVBOX (warm)
-	8107  Artec T1 USB TVBOX with AN2235 (cold)
-	8108  Artec T1 USB TVBOX with AN2235 (warm)
-	8109  Artec T1 USB2.0 TVBOX (cold
-05d9  Axiohm Transaction Solutions
-	a225  A225 Printer
-	a758  A758 Printer
-	a794  A794 Printer
-05da  Microtek International, Inc.
-	0091  ScanMaker X6u
-	0093  ScanMaker V6USL
-	0094  Phantom 336CX/C3
-	0099  ScanMaker X6/X6U
-	009a  Phantom C6
-	00a0  Phantom 336CX/C3 (#2)
-	00a3  ScanMaker V6USL
-	00ac  ScanMaker V6UL
-	00b6  ScanMaker V6UPL
-	00ef  ScanMaker V6UPL
-	1006  Jenoptik JD350 entrance
-	1011  NHJ Che-ez! Kiss Digital Camera
-	1018  Digital Dream Enigma 1.3
-	1020  Digital Dream l'espion xtra
-	1025  Take-it Still Camera Device
-	1026  Take-it
-	1043  Take-It 1300 DSC Bulk Driver
-	1045  Take-it D1
-	1047  Take-it Camera Composite Device
-	1048  Take-it Q3
-	1049  3M Still Camera Device
-	1051  Camcorder Series
-	1052  Mass Storage Device
-	1053  Take-it DV Composite Device
-	1054  Mass Storage Device
-	1055  Digital Camera Series(536)
-	1056  Mass Storage Device
-	1057  Take-it DSC Camera Device(536)
-	1058  Mass Storage Device
-	1059  Camcorder DSC Series
-	1060  Microtek Take-it MV500
-	2007  ArtixScan DI 1210
-	200c  1394_USB2 Scanner
-	200e  ArtixScan DI 810
-	2017  UF ICE Scanner
-	201c  4800 Scanner
-	201d  ArtixScan DI 1610
-	201f  4800 Scanner-ICE
-	202e  ArtixScan DI 2020
-	208b  ScanMaker 6800
-	208f  ArtixScan DI 2010
-	209e  ScanMaker 4700LP
-	20a7  ScanMaker 5600
-	20b0  ScanMaker X12USL
-	20b1  ScanMaker 8700
-	20b4  ScanMaker 4700
-	20bd  ScanMaker 5700
-	20c9  ScanMaker 6700
-	20d2  Microtek ArtixScan 1800f
-	20d6  PS4000
-	20de  ScanMaker 9800XL
-	20e0  ScanMaker 9700XL
-	20ed  ScanMaker 4700
-	20ee  Micortek ScanMaker X12USL
-	3008  Scanner
-	300a  4800 ICE Scanner
-	300b  4800 Scanner
-	300f  MiniScan C5
-	3020  4800dpi Scanner
-	3021  1200dpi Scanner
-	3022  Scanner 4800dpi
-	3023  USB1200II Scanner
-	30c1  USB600 Scanner
-	30ce  ScanMaker 3800
-	30cf  ScanMaker 4800
-	30d4  USB1200 Scanner
-	30d8  Scanner
-	30d9  USB2400 Scanner
-	30e4  ScanMaker 4100
-	30e5  USB3200 Scanner
-	30e6  ScanMaker i320
-	40b3  ScanMaker 3600
-	40b8  ScanMaker 3700
-	40c7  ScanMaker 4600
-	40ca  ScanMaker 3600
-	40cb  ScanMaker 3700
-	40dd  ScanMaker 3750i
-	40ff  ScanMaker 3600
-	5003  Goya
-	5013  3200 Scanner
-	80a3  ScanMaker V6USL (#2)
-	80ac  ScanMaker V6UL/SpicyU
-05db  Sun Corp. (Suntac?)
-	0003  SUNTAC U-Cable type D2
-	0005  SUNTAC U-Cable type P1
-	0009  SUNTAC Slipper U
-	000a  SUNTAC Ir-Trinity
-	000b  SUNTAC U-Cable type A3
-	0011  SUNTAC U-Cable type A4
-05dc  Lexar Media, Inc.
-	0001  jumpSHOT CompactFlash Reader
-	0002  JumpShot
-	0003  JumpShot
-	0080  Jumpdrive Secure 64MB
-	0081  RBC Compact Flash Drive
-	00a7  JumpDrive Impact
-	0100  JumpDrive PRO
-	0200  JumpDrive 2.0 Pro
-	0300  Jumpdrive Geysr
-	0301  JumpDrive Classic
-	0302  JD Micro
-	0303  JD Micro Pro
-	0304  JD Secure II
-	0310  JumpDrive
-	0311  JumpDrive Classic
-	0312  JD Micro
-	0313  JD Micro Pro
-	0320  JumpDrive
-	0321  JD Micro
-	0322  JD Micro Pro
-	0323  UFC
-	0330  JumpDrive Expression
-	0340  JumpDrive TAD
-	0350  Express Card
-	0400  UFDC
-	0401  UFDC
-	0403  Locked B Device
-	0405  Locked C Device
-	0407  Locked D Device
-	0409  Locked E Device
-	040b  Locked F Device
-	040d  Locked G Device
-	040f  Locked H Device
-	0410  JumpDrive
-	0411  JumpDrive
-	0413  Locked J Device
-	0415  Locked K Device
-	0417  Locked L Device
-	0419  Locked M Device
-	041b  Locked N Device
-	041d  Locked O Device
-	041f  Locked P Device
-	0420  JumpDrive
-	0421  JumpDrive
-	0423  Locked R Device
-	0425  Locked S Device
-	0427  Locked T Device
-	0429  Locked U Device
-	042b  Locked V Device
-	042d  Locked W Device
-	042f  Locked X Device
-	0431  Locked Y Device
-	0433  Locked Z Device
-	4d02  MP3 Player
-	4d12  MP3 Player
-	4d30  MP3 Player
-	a300  JumpDrive2
-	a400  JumpDrive trade; Pro 40-501
-	a410  JumpDrive 128MB/256MB
-	a411  JumpDrive Traveler
-	a420  JumpDrive Pro
-	a421  JumpDrive Pro II
-	a422  JumpDrive Micro Pro
-	a430  JumpDrive Secure
-	a431  JumpDrive Secure II
-	a432  JumpDrive Classic
-	a440  JumpDrive Lightning
-	a450  JumpDrive TouchGuard
-	a460  JD Mercury
-	a501  JumpDrive Classic
-	a510  JumpDrive Sport
-	a530  JumpDrive Expression
-	a531  JumpDrive Secure II
-	a560  JumpDrive FireFly
-	a701  JumpDrive FireFly
-	a731  JumpDrive FireFly
-	a790  JumpDrive 2GB
-	b002  USB CF Reader
-	b018  Multi-Card Reader
-	b047  SDHC Reader [RW047-7000]
-05dd  Delta Electronics, Inc.
-	ff31  AWU-120
-	ff32  FriendlyNET AeroLAN AL2011
-	ff35  PCW 100 - Wireless 802.11b Adapter
-	ff91  2Wire PC Port Phoneline 10Mbps Adapter
-05df  Silicon Vision, Inc.
-05e0  Symbol Technologies
-	0700  Bar Code Scanner (CS1504)
-	0800  Spectrum24 Wireless LAN Adapter
-	1200  DS6608 Bar Code Scanner
-	1900  SNAPI Imaging Device
-	2000  MC3090 Rugged Mobile Computer
-	200d  MC70 Rugged Mobile Computer
-05e1  Syntek Semiconductor Co., Ltd
-	0100  802.11g + Bluetooth Wireless Adapter
-	0408  STK1160 Video Capture Device
-	0500  DC-112X Webcam
-	0501  DC-1125 Webcam
-	0890  STK011 Camera
-	0892  STK013 Camera
-	0895  STK016 Camera
-	0896  STK017 Camera
-05e2  ElecVision, Inc.
-05e3  Genesys Logic, Inc.
-	000a  Keyboard with PS/2 Port
-	000b  Mouse
-	0100  Nintendo Game Boy Advance SP
-	0120  Pacific Image Electronics PrimeFilm 1800u slide/negative scanner
-	0131  CF/SM Reader/Writer
-	0142  Multiple Slides Scanner-3600
-	0143  Multiple Frames Film Scanner-36series
-	0180  Plustek Scanner
-	0182  Wize Media 1000
-	0189  ScanJet 4600 series
-	018a  Xerox 6400
-	0300  GLUSB98PT Parallel Port
-	0301  USB2LPT Cable Release2
-	0406  Hub
-	0501  GL620USB Host-Host interface
-	0502  GL620USB-A GeneLink USB-USB Bridge
-	0503  Webcam
-	0504  HID Keyboard Filter
-	0604  USB 1.1 Hub
-	0605  USB 2.0 Hub [ednet]
-	0606  USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub
-	0608  USB-2.0 4-Port HUB
-	0660  USB 2.0 Hub
-	0700  SIIG US2256 CompactFlash Card Reader
-	0701  USB 2.0 IDE Adapter
-	0702  USB 2.0 IDE Adapter [GL811E]
-	0703  Card Reader
-	0704  Card Reader
-	0705  Card Reader
-	0706  Card Reader
-	0707  Card Reader
-	0708  Card Reader
-	0709  Card Reader
-	070a  Pen Flash
-	070b  DMHS1B Rev 3 DFU Adapter
-	070e  USB 2.0 Card Reader
-	070f  Pen Flash
-	0710  USB 2.0 33-in-1 Card Reader
-	0711  Card Reader
-	0712  Delkin Mass Storage Device
-	0715  USB 2.0 microSD Reader
-	0716  USB 2.0 Multislot Card Reader/Writer
-	0717  All-in-1 Card Reader
-	0718  IDE/SATA Adapter
-	0723  GL827L SD/MMC/MS Flash Card Reader
-	0760  USB 2.0 Card Reader/Writer
-	0761  Genesys Mass Storage Device
-	0780  USBFS DFU Adapter
-	07a0  Pen Flash
-	0880  Wasp (SL-6612)
-	0927  Card Reader
-	1205  Afilias Optical Mouse H3003 / Trust Optical USB MultiColour Mouse MI-2330
-	a700  Pen Flash
-	f102  VX7012 TV Box
-	f103  VX7012 TV Box
-	f104  VX7012 TV Box
-	fd21  3M TL20 Temperature Logger
-	fe00  Razer Mouse
-05e4  Red Wing Corp.
-05e5  Fuji Electric Co., Ltd
-05e6  Keithley Instruments
-05e8  ICC, Inc.
-05e9  Kawasaki LSI
-	0008  KL5KUSB101B Ethernet [klsi]
-	0009  Sony 10Mbps Ethernet [pegasus]
-	000c  USB-to-RS-232
-	000d  USB-to-RS-232
-	0014  RS-232 J104
-	0040  Ethernet Adapter
-	2008  Ethernet Adapter
-05eb  FFC, Ltd
-05ec  COM21, Inc.
-05ee  Cytechinfo Inc.
-05ef  AVB, Inc. [anko?]
-	020a  Top Shot Pegasus Joystick
-	8884  Mag Turbo Force Wheel
-	8888  Top Shot Force Feedback Racing Wheel
-05f0  Canopus Co., Ltd
-	0101  DA-Port DAC
-05f1  Compass Communications
-05f2  Dexin Corp., Ltd
-	0010  AQ Mouse
-05f3  PI Engineering, Inc.
-	0007  Kinesis Advantage PRO MPC/USB Keyboard
-	0081  Kinesis Integrated Hub
-	00ff  VEC Footpedal
-	020b  PS2 Adapter
-	0232  X-Keys Switch Interface, Programming Mode
-	0261  X-Keys Switch Interface, SPLAT Mode
-	0264  X-Keys Switch Interface, Composite Mode
-05f5  Unixtar Technology, Inc.
-05f6  AOC International
-05f7  RFC Distribution(s) PTE, Ltd
-05f9  PSC Scanning, Inc.
-	2602  Datalogic Magellan 1100i Barcode Scanner
-05fa  Siemens Telecommunications Systems, Ltd
-	3301  Keyboard with PS/2 Mouse Port
-	3302  Keyboard
-	3303  Keyboard with PS/2 Mouse Port
-05fc  Harman Multimedia
-	7849  Harman/Kardon SoundSticks
-05fd  InterAct, Inc.
-	0239  SV-239 HammerHead Digital
-	0251  Raider Pro
-	0253  ProPad 8 Digital
-	0286  SV-286 Cyclone Digital
-	107a  PowerPad Pro X-Box pad
-	262a  3dfx HammerHead FX
-	262f  HammerHead Fx
-	daae  Game Shark
-05fe  Chic Technology Corp.
-	0001  Mouse
-	0003  Cypress USB Mouse
-	0005  Viewmaster 4D Browser Mouse
-	0007  Twinhead Mouse
-	0009  Inland Pro 4500/5000 Mouse
-	0011  Browser Mouse
-	0014  Gamepad
-	1010  Optical Wireless
-05ff  LeCroy Corp.
-0600  Barco Display Systems
-0601  Jazz Hipster Corp.
-	0003  Internet Security Co., Ltd. SecureKey
-0602  Vista Imaging, Inc.
-	1001  ViCam Webcam
-0603  Novatek Microelectronics Corp.
-	00f1  Keyboard
-	6871  Mouse
-0604  Jean Co., Ltd
-0605  Anchor C&C Co., Ltd
-0606  Royal Information Electronics Co., Ltd
-0607  Bridge Information Co., Ltd
-0608  Genrad Ads
-0609  SMK Manufacturing, Inc.
-	031d  eHome Infrared Receiver
-	0322  eHome Infrared Receiver
-	0334  eHome Infrared Receiver
-	ff12  SMK Bluetooth Device
-060a  Worthington Data Solutions, Inc.
-060b  Solid Year
-	0001  MacAlly Keyboard
-	0230  KSK-8003 UX Keyboard
-	1006  Japanese Keyboard - 260U
-	2101  Keyboard
-	2231  KSK-6001 UELX Keyboard
-	5811  ACK-571U Wireless Keyboard
-	5903  Japanese Keyboard - 595U
-	6001  SolidTek USB 2p HUB
-	6002  SolidTek USB Keyboard
-	6003  Japanese Keyboard - 600HM
-	a001  Maxwell Compact Pc PM3
-060c  EEH Datalink GmbH
-060d  Auctor Corp.
-060e  Transmonde Technologies, Inc.
-060f  Joinsoon Electronics Mfg. Co., Ltd
-0610  Costar Electronics, Inc.
-0611  Totoku Electric Co., Ltd
-0613  TransAct Technologies, Inc.
-0614  Bio-Rad Laboratories
-0615  Quabbin Wire & Cable Co., Inc.
-0616  Future Techno Designs PVT, Ltd
-0617  Swiss Federal Insitute of Technology
-0618  MacAlly
-	0101  Mouse
-0619  Seiko Instruments, Inc.
-	0101  SLP-100 Driver
-	0102  SLP-200 Driver
-	0103  SLP-100N Driver
-	0104  SLP-200N Driver
-	0105  SLP-240 Driver
-	0501  SLP-440 Driver
-	0502  SLP-450 Driver
-061a  Veridicom International, Inc.
-	0110  5thSense Fingerprint Sensor
-	0200  FPS200 Fingerprint Sensor
-	8200  VKI-A Fingerprint Sensor/Flash Storage (dumb)
-	9200  VKI-B Fingerprint Sensor/Flash Storage (smart)
-061b  Promptus Communications, Inc.
-061c  Act Labs, Ltd
-061d  Quatech, Inc.
-061e  Nissei Electric Co.
-	0001  nissei 128DE-USB -
-	0010  nissei 128DE-PNA -
-0620  Alaris, Inc.
-	0004  QuickVideo weeCam
-	0007  QuickVideo weeCam
-	000a  QuickVideo weeCam
-	000b  QuickVideo weeCam
-0621  ODU-Steckverbindungssysteme GmbH & Co. KG
-0622  Iotech, Inc.
-0623  Littelfuse, Inc.
-0624  Avocent Corp.
-	0294  Dell 03R874 KVM dongle
-0625  TiMedia Technology Co., Ltd
-0626  Nippon Systems Development Co., Ltd
-0627  Adomax Technology Co., Ltd
-0628  Tasking Software, Inc.
-0629  Zida Technologies, Ltd
-062a  Creative Labs
-	0000  Optical mouse
-	0001  Notebook Optical Mouse
-	0102  Wireless Keyboard/Mouse Combo [MK1152WC]
-	0201  Defender Office Keyboard (K7310) S Zodiak KM-9010
-	0252  Emerge Uni-retractable Laser Mouse
-	9003  VoIP Conference Hub (A16GH)
-	9004  USR9602 USB Internet Mini Phone
-062b  Greatlink Electronics Taiwan, Ltd
-062c  Institute for Information Industry
-062d  Taiwan Tai-Hao Enterprises Co., Ltd
-062e  Mainsuper Enterprises Co., Ltd
-062f  Sin Sheng Terminal & Machine, Inc.
-0631  JUJO Electronics Corp.
-0633  Cyrix Corp.
-0634  Micron Technology, Inc.
-	0655  Embedded Mass Storage Drive [RealSSD]
-0635  Methode Electronics, Inc.
-0636  Sierra Imaging, Inc.
-	0003  Vivicam 35Xx
-0638  Avision, Inc.
-	0268  iVina 1200U Scanner
-	026a  Minolta Dimage Scan Dual II
-	0a10  iVina FB1600/UMAX Astra 4500
-	0a13  AV600U
-	0a16  SC-215
-	0a30  UMAX Astra 6700 Scanner
-	0a41  Avision AM3000/MF3000 Series
-	0f01  fi-4010CU
-	4004  Minolta Dimage Scan Elite II
-0639  Chrontel, Inc.
-063a  Techwin Corp.
-063b  Taugagreining HF
-063c  Yamaichi Electronics Co., Ltd (Sakura)
-063d  Fong Kai Industrial Co., Ltd
-063e  RealMedia Technology, Inc.
-063f  New Technology Cable, Ltd
-0640  Hitex Development Tools
-	0026  LPC-Stick
-0641  Woods Industries, Inc.
-0642  VIA Medical Corp.
-0644  TEAC Corp.
-	0000  Floppy
-	0200  All-In-One Multi-Card Reader CA200/B/S
-	1000  CD-ROM Drive
-	800d  TASCAM Portastudio DP-01FX
-	800e  TASCAM US-122L
-	8021  TASCAM US-122mkII
-	d001  CD-R/RW Unit
-	d002  CD-R/RW Unit
-	d010  CD-RW/DVD Unit
-0645  Who? Vision Systems, Inc.
-0646  UMAX
-0647  Acton Research Corp.
-	0100  ARC SpectraPro UV/VIS/IR Monochromator/Spectrograph
-	0101  ARC AM-VM Mono Airpath/Vacuum Monochromator/Spectrograph
-	0102  ARC Inspectrum Mono
-	0103  ARC Filterwheel
-	03e9  Inspectrum 128x1024 F VIS Spectrograph
-	03ea  Inspectrum 256x1024 F VIS Spectrograph
-	03eb  Inspectrum 128x1024 B VIS Spectrograph
-	03ec  Inspectrum 256x1024 B VIS Spectrograph
-0648  Inside Out Networks
-0649  Weli Science Co., Ltd
-064b  Analog Devices, Inc. (White Mountain DSP)
-	0165  Blackfin 535 [ADZS HPUSB ICE]
-064c  Ji-Haw Industrial Co., Ltd
-064d  TriTech Microelectronics, Ltd
-064e  Suyin Corp.
-	a100  Acer OrbiCam
-	a101  Acer CrystalEye Webcam
-	a102  Acer/Lenovo Webcam [CN0316]
-	a103  Acer/HP Integrated Webcam [CN0314]
-	a110  HP Webcam
-	a136  Asus Integrated Webcam [CN031B]
-	a219  1.3M WebCam (notebook emachines E730, Acer sub-brand)
-	c107  HP webcam [dv6-1190en]
-	d101  Acer CrystalEye Webcam
-	e201  Lenovo Integrated Webcam
-	e203  Lenovo Integrated Webcam
-	f102  Lenovo Integrated Webcam [R5U877]
-	f103  Lenovo Integrated Webcam [R5U877]
-064f  WIBU-Systems AG
-	03e9  Propellerhead Record Ignition Key
-	03f2  CmStick/M (article no. 1010)
-	03f3  CmStick/M (article no. 1011)
-	0bd7  BOX/U
-	0bd8  BOX/RU
-0650  Dynapro Systems
-0651  Likom Technology Sdn. Bhd.
-0652  Stargate Solutions, Inc.
-0653  CNF, Inc.
-0654  Granite Microsystems, Inc.
-	0005  Device Bay Controller
-	0006  Hub
-	0007  Device Bay Controller
-	0016  Hub
-0655  Space Shuttle Hi-Tech Co., Ltd
-0656  Glory Mark Electronic, Ltd
-0657  Tekcon Electronics Corp.
-0658  Sigma Designs, Inc.
-0659  Aethra
-065a  Optoelectronics Co., Ltd
-	0001  Barcode scanner
-065b  Tracewell Systems
-065e  Silicon Graphics
-065f  Good Way Technology Co., Ltd & GWC technology Inc.
-0660  TSAY-E (BVI) International, Inc.
-0661  Hamamatsu Photonics K.K.
-0662  Kansai Electric Co., Ltd
-0663  Topmax Electronic Co., Ltd
-	0103  CobraPad
-0664  ET&T Technology Co., Ltd.
-	0301  Groovy Technology Corp. GTouch Touch Screen
-	0302  Groovy Technology Corp. GTouch Touch Screen
-	0303  Groovy Technology Corp. GTouch Touch Screen
-	0304  Groovy Technology Corp. GTouch Touch Screen
-	0305  Groovy Technology Corp. GTouch Touch Screen
-	0306  Groovy Technology Corp. GTouch Touch Screen
-	0307  Groovy Technology Corp. GTouch Touch Screen
-	0309  Groovy Technology Corp. GTouch Touch Screen
-0665  Cypress Semiconductor
-	5161  USB to Serial
-0667  Aiwa Co., Ltd
-	0fa1  TD-U8000 Tape Drive
-0668  WordWand
-0669  Oce' Printing Systems GmbH
-066a  Total Technologies, Ltd
-066b  Linksys, Inc.
-	0105  SCM eUSB SmartMedia Card Reader
-	010a  Melco MCR-U2 SmartMedia / CompactFlash Reader
-	200c  USB10TX
-	2202  USB10TX Ethernet [pegasus]
-	2203  USB100TX Ethernet [pegasus]
-	2204  USB100TX HomePNA Ethernet [pegasus]
-	2206  USB Ethernet [pegasus]
-	2207  HomeLink Phoneline 10M Network Adapter
-	2211  WUSB11 802.11b Adapter
-	2212  WUSB11v2.5 802.11b Adapter
-	2213  WUSB12v1.1 802.11b Adapter
-	2219  Instant Wireless Network Adapter
-	400b  USB10TX
-066d  Entrega, Inc.
-066e  Acer Semiconductor America, Inc.
-066f  SigmaTel, Inc.
-	003b  MP3 Player
-	003e  MP3 Player
-	003f  MP3 Player
-	0040  MP3 Player
-	0041  MP3 Player
-	0042  MP3 Player
-	0043  MP3 Player
-	004b  A-Max PA11 MP3 Player
-	3400  STMP3400 D-Major MP3 Player
-	3410  STMP3410 D-Major MP3 Player
-	3500  Player Recovery Device
-	4200  STIr4200 IrDA Bridge
-	4210  STIr4210 IrDA Bridge
-	8000  MSCN MP3 Player
-	8001  SigmaTel MSCN Audio Player
-	8004  MSCNMMC MP3 Player
-	8008  i-Bead 100 MP3 Player
-	8020  MP3 Player
-	8034  MP3 Player
-	8036  MP3 Player
-	8038  MP3 Player
-	8056  MP3 Player
-	8060  MP3 Player
-	8066  MP3 Player
-	807e  MP3 Player
-	8092  MP3 Player
-	8096  MP3 Player
-	809a  MP3 Player
-	80aa  MP3 Player
-	80ac  MP3 Player
-	80b8  MP3 Player
-	80ba  MP3 Player
-	80bc  MP3 Player
-	80bf  MP3 Player
-	80c5  MP3 Player
-	80c8  MP3 Player
-	80ca  MP3 Player
-	80cc  MP3 Player
-	8104  MP3 Player
-	8106  MP3 Player
-	8108  MP3 Player
-	810a  MP3 Player
-	810c  MP3 Player
-	8122  MP3 Player
-	8124  MP3 Player
-	8126  MP3 Player
-	8128  MP3 Player
-	8134  MP3 Player
-	8136  MP3 Player
-	8138  MP3 Player
-	813a  MP3 Player
-	813e  MP3 Player
-	8140  MP3 Player
-	8142  MP3 Player
-	8144  MP3 Player
-	8146  MP3 Player
-	8148  MP3 Player
-	814c  MP3 Player
-	8201  MP3 Player
-	8202  Jens of Sweden / I-BEAD 150M/150H MP3 player
-	8203  MP3 Player
-	8204  MP3 Player
-	8205  MP3 Player
-	8206  Digital MP3 Music Player
-	8207  MP3 Player
-	8208  MP3 Player
-	8209  MP3 Player
-	820a  MP3 Player
-	820b  MP3 Player
-	820c  MP3 Player
-	820d  MP3 Player
-	820e  MP3 Player
-	820f  MP3 Player
-	8210  MP3 Player
-	8211  MP3 Player
-	8212  MP3 Player
-	8213  MP3 Player
-	8214  MP3 Player
-	8215  MP3 Player
-	8216  MP3 Player
-	8217  MP3 Player
-	8218  MP3 Player
-	8219  MP3 Player
-	821a  MP3 Player
-	821b  MP3 Player
-	821c  MP3 Player
-	821d  MP3 Player
-	821e  MP3 Player
-	821f  MP3 Player
-	8220  MP3 Player
-	8221  MP3 Player
-	8222  MP3 Player
-	8223  MP3 Player
-	8224  MP3 Player
-	8225  MP3 Player
-	8226  MP3 Player
-	8227  MP3 Player
-	8228  MP3 Player
-	8229  MP3 Player
-	8230  MP3 Player
-	829c  MP3 Player
-	82e0  MP3 Player
-	835d  MP3 Player
-	9000  MP3 Player
-	9001  MP3 Player
-	9002  MP3 Player
-0670  Sequel Imaging
-	0001  Calibrator
-	0005  Enable Cable
-0672  Labtec, Inc.
-	1041  LCS1040 Speaker System
-	5000  SpaceBall 4000 FLX
-0673  HCL
-	5000  Keyboard
-0674  Key Mouse Electronic Enterprise Co., Ltd
-0675  DrayTek Corp.
-	0110  Vigor 128 ISDN TA
-	0530  Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280)
-	0550  Vigor550
-	1688  miniVigor 128 ISDN TA
-	6694  USB ISDN TA
-0676  Teles AG
-0677  Aiwa Co., Ltd
-	07d5  TM-ED1285(USB)
-	0fa1  TD-U8000 Tape Drive
-0678  ACard Technology Corp.
-067b  Prolific Technology, Inc.
-	0000  PL2301 USB-USB Bridge
-	0001  PL2302 USB-USB Bridge
-	0307  Motorola Serial Adapter
-	04bb  PL2303 Serial (IODATA USB-RSAQ2)
-	0610  Onext EG210U MODEM
-	0611  AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem
-	2303  PL2303 Serial Port
-	2305  PL2305 Parallel Port
-	2306  Raylink Bridge Controller
-	2307  PL2307 USB-ATAPI4 Bridge
-	2313  FITEL PHS U Cable Adaptor
-	2315  Flash Disk Embedded Hub
-	2316  Flash Disk Security Device
-	2317  Mass Storage Device
-	2501  PL2501 USB-USB Bridge (USB 2.0)
-	2507  PL2507 Hi-speed USB to IDE bridge controller
-	2515  Flash Disk Embedded Hub
-	2517  Flash Disk Mass Storage Device
-	25a1  PL25A1 Host-Host Bridge
-	3400  Hi-Speed Flash Disk with TruePrint AES3400
-	3500  Hi-Speed Flash Disk with TruePrint AES3500
-	3507  PL3507 ATAPI6 Bridge
-	aaa0  Prolific Pharos
-	aaa2  PL2303 Serial Adapter (IODATA USB-RSAQ3)
-067c  Efficient Networks, Inc.
-	1001  Siemens SpeedStream 100MBps Ethernet
-	1022  Siemens SpeedStream 1022 802.11b Adapter
-	1023  SpeedStream Wireless
-	4020  SpeedStream 4020 ATM/ADSL Installer
-	4031  Efficient ADSL Modem
-	4032  SpeedStream 4031 ATM/ADSL Installer
-	4033  SpeedStream 4031 ATM/ADSL Installer
-	4060  Alcatel Speedstream 4060 ADSL Modem
-	4062  Efficient Networks 4060 Loader
-	5667  Efficient Networks Virtual Bus for ADSL Modem
-	c031  SpeedStream 4031 ATM/ADSL Installer
-	c032  SpeedStream 4031 ATM/ADSL Installer
-	c033  SpeedStream 4031 ATM/ADSL Installer
-	c060  SpeedStream 4060 Miniport ATM/ADSL Adapter
-	d667  Efficient Networks Virtual Bus for ADSL Modem
-	e240  Speedstream Ethernet Adapter E240
-	e540  Speedstream Ethernet Adapter E240
-067d  Hohner Corp.
-067e  Intermec Technologies Corp.
-	0801  HID Keyboard, Barcode scanner
-	0803  VCP, Barcode scanner
-	0805  VCP + UVC, Barcode scanner
-	1001  Mobile Computer
-067f  Virata, Ltd
-	4552  DSL-200 ADSL Modem
-	6542  DSL Modem
-	6549  DSL Modem
-	7541  DSL Modem
-0680  Realtek Semiconductor Corp., CPP Div. (Avance Logic)
-	0002  Arowana Optical Wheel Mouse MSOP-01
-0681  Siemens Information and Communication Products
-	0001  Dect Base
-	0002  Gigaset 3075 Passive ISDN
-	0005  ID-Mouse with Fingerprint Reader
-	0012  I-Gate 802.11b Adapter
-	001b  WLL013
-	001d  Hipath 1000
-	0022  Gigaset SX353 ISDN
-	0026  DECT Data - Gigaset M34
-	002b  A-100-I ADSL Modem
-	002e  ADSL Router_S-141
-	0034  GSM module MC35/ES75 USB Modem
-	3c06  54g USB Network Adapter
-0682  Victor Company of Japan, Ltd
-0684  Actiontec Electronics, Inc.
-0686  Minolta Co., Ltd
-	2001  PagePro 4110W
-	2004  PagePro 1200W
-	2005  Magicolor 2300 DL
-	3001  PagePro 4100
-	3005  PagePro 1250E
-	3006  PagePro 1250W
-	3009  Magicolor 2300W
-	300b  PagePro 1350W
-	300c  PagePro 1300W
-	302e  Develop D 1650iD PCL
-	3034  Develop D 2050iD PCL
-	4001  Dimage 2300
-	4003  Dimage 2330 Zoom Camera
-	4004  Scan Elite II
-	4005  Minolta DiMAGE E201 Mass Storage Device
-	4006  Dimage 7 Camera
-	4007  Dimage S304 Camera
-	4008  Dimage 5 Camera
-	4009  Dimage X Camera
-	400a  Dimage S404 Camera
-	400b  Dimage 7i Camera
-	400c  Dimage F100 Camera
-	400d  Scan Dual III
-	400e  Dimage 5400
-	400f  Dimage 7Hi Camera
-	4010  Dimage Xi Camera
-	4011  Dimage F300 Camera
-	4012  Dimage F200 Camera
-	4014  Dimage S414 Camera
-	4015  Dimage XT Camera [storage]
-	4016  Dimage XT Camera [remote mode]
-	4017  Dimage E223
-	4018  Dimage Z1  Camera
-	4019  Dimage A1 Camera [remote mode]
-	401a  Dimage A1 Camera [storage]
-	401c  Dimage X20 Camera
-	401e  Dimage E323 Camera
-068a  Pertech, Inc.
-068b  Potrans International, Inc.
-068e  CH Products, Inc.
-	00d3  OEM 3 axis 5 button joystick
-	00e2  HFX OEM Joystick
-	00f1  Pro Throttle
-	00f2  Flight Sim Pedals
-	00f3  Fighterstick
-	00f4  Combatstick
-	00fa  Flight Sim Pedals
-	00ff  Flight Sim Yoke
-	0500  GameStick 3D
-	0501  CH Pro Pedals
-	0504  F-16 Combat Stick
-0690  Golden Bridge Electech, Inc.
-0693  Hagiwara Sys-Com Co., Ltd
-	0002  FlashGate SmartMedia Card Reader
-	0003  FlashGate CompactFlash Card Reader
-	0005  FlashGate
-	0006  SM PCCard R/W and SPD
-	0007  FlashGate ME (Authenticated)
-	000a  SDCard/MMC Reader/Writer
-0694  Lego Group
-	0001  Mindstorms Tower
-	0002  Mindstorms NXT
-0698  Chuntex (CTX)
-	1786  1300ex Monitor
-	2003  CTX M730V built in Camera
-	9999  VLxxxx Monitor+Hub
-0699  Tektronix, Inc.
-069a  Askey Computer Corp.
-	0001  VC010 Webcam [pwc]
-	0303  Cable Modem
-	0311  ADSL Router Remote NDIS Device
-	0318  Remote NDIS Device
-	0319  220V Remote NDIS Device
-	0320  IEEE 802.11b Wireless LAN Card
-	0321  Dynalink WLL013 / Compex WLU11A 802.11b Adapter
-	0402  Scientific Atlanta WebSTAR 100 & 200 series Cable Modem
-	0811  BT Virtual Bus for Helium
-	0821  BT Voyager 1010 802.11b Adapter
-	4402  Scientific Atlanta WebSTAR 2000 series Cable Modem
-	4403  Scientific Atlanta WebSTAR 300 series Cable Modem
-	4501  Scientific-Atlanta WebSTAR 2000 series Cable Modem
-069b  Thomson, Inc.
-	0704  DCM245 Cable Modem
-	0705  THG540K Cable Modem
-	070c  MP3 Player
-	070d  MP3 Player
-	070e  MP3 Player
-	070f  RCA Lyra RD1071 MP3 Player
-	0731  Lyra M200E256
-	0761  RCA H100A
-	0778  PEARL USB Device
-	2220  RCA Kazoo RD1000 MP3 Player
-	300a  RCA Lyra MP3 Player
-	3012  MP3 Player
-	3013  MP3 Player
-	5557  RCA CDS6300
-069d  Hughes Network Systems (HNS)
-	0001  Satellite Receiver Device
-	0002  Satellite Device
-069e  Welcat Inc.
-	0005  Marx CryptoBox v1.2
-069f  Allied Data Technologies BV
-	0010  Tornado Speakerphone FaxModem 56.0
-	0011  Tornado Speakerphone FaxModem 56.0
-	1000  ADT VvBus for CopperJet
-	1004  CopperJet 821 RouterPlus
-06a2  Topro Technology, Inc.
-	0033  USB Mouse
-06a3  Saitek PLC
-	0006  Cyborg Gold Joystick
-	0109  P880 Pad
-	0160  ST290 Pro
-	0200  Xbox Adrenalin Hub
-	0241  Xbox Adrenalin Gamepad
-	0255  X52 Flight Controller
-	040b  P990 Dual Analog Pad
-	040c  P2900 Wireless Pad
-	0422  ST90 Joystick
-	0460  ST290 Pro Flight Stick
-	0463  ST290
-	0464  Cyborg Evo
-	0471  Cyborg Graphite Stick
-	0501  R100 Sports Wheel
-	0502  ST200 Stick
-	0506  R220 Digital Wheel
-	051e  Cyborg Digital II Stick
-	052d  P750 Gamepad
-	053c  X45 Flight Controller
-	053f  X36F Flightstick
-	056c  P2000 Tilt Pad
-	056f  P2000 Tilt Pad
-	05d2  PC Dash 2
-	075c  X52 Flight Controller
-	0762  Saitek X52 Pro Flight Control System
-	0805  R440 Force Wheel
-	1003  GM2 Action Pad
-	1009  Action Pad
-	100a  SP550 Pad and Joystick Combo
-	100b  SP550 Pad
-	1509  P3000 Wireless Pad
-	1589  P3000 Wireless Pad
-	2541  X45 Flight Controller
-	3509  P3000 RF GamePad
-	353e  Cyborg Evo Wireless
-	3589  P3000 Wireless Pad
-	35be  Cyborg Evo
-	5509  P3000 Wireless Pad
-	8000  Gamers' Keyboard
-	801e  Cyborg 3D Digital Stick II
-	8020  Eclipse Keyboard
-	8021  Eclipse II Keyboard
-	802d  P750 Pad
-	803f  X36 Flight Controller
-	806f  P2000 Tilt Pad
-	80c0  Pro Gamer Command Unit
-	80c1  Cyborg Command Pad Unit
-	a502  Gaming Mouse
-	f518  P3200 Rumble Force Game Pad
-	ff04  R440 Force Wheel
-	ff0c  Cyborg Force Rumble Pad
-	ff0d  P2600 Rumble Force Pad
-	ff12  Cyborg 3D Force Stick
-	ff17  ST 330 Rumble Force Stick
-	ff52  Cyborg 3D Rumble Force Joystick
-	ffb5  Cyborg Evo Force Joystick
-06a4  Xiamen Doowell Electron Co., Ltd
-06a5  Divio
-	0000  Typhoon Webcam 100k [nw8000]
-	d001  ProLink DS3303u Webcam
-	d800  Chicony TwinkleCam
-	d820  Wize Media 1000
-06a7  MicroStore, Inc.
-06a8  Topaz Systems, Inc.
-	0042  SignatureGem 1X5 Pad
-	0043  SignatureGem 1X5-HID Pad
-06a9  Westell
-	0005  WireSpeed Dual Connect Modem
-	0006  WireSpeed Dual Connect Modem
-	000a  WireSpeed Dual Connect Modem
-	000b  WireSpeed Dual Connect Modem
-	000e  A90-211WG-01 802.11g Adapter [Intersil ISL3887]
-06aa  Sysgration, Ltd
-06ac  Fujitsu Laboratories of America, Inc.
-06ad  Greatland Electronics Taiwan, Ltd
-06ae  Professional Multimedia Testing Centre
-06af  Harting, Inc. of North America
-06b8  Pixela Corp.
-06b9  Alcatel Telecom
-	0120  SpeedTouch 120g 802.11g Wireless Adapter [Intersil ISL3886]
-	0121  SpeedTouch 121g Wireless Dongle
-	2001  SPEED TOUCH Card
-	4061  SpeedTouch ISDN or ADSL Modem
-	a5a5  DynaMiTe Modem
-06ba  Smooth Cord & Connector Co., Ltd
-06bb  EDA, Inc.
-06bc  Oki Data Corp.
-	000b  Okipage 14ex Printer
-	0a91  B2500MFP (printer+scanner)
-	3801  B6100 Laser Printer
-06bd  AGFA-Gevaert NV
-	0001  SnapScan 1212U
-	0002  SnapScan 1236U
-	0100  SnapScan Touch
-	0101  SNAPSCAN ELITE
-	0200  ScanMaker 8700
-	02bf  DUOSCAN f40
-	0400  CL30
-	0401  Mass Storage
-	0403  ePhoto CL18 Camera
-	0404  ePhoto CL20 Camera
-	2061  SnapScan 1212U (?)
-	208d  Snapscan e40
-	208f  SnapScan e50
-	2091  SnapScan e20
-	2093  SnapScan e10
-	2095  SnapScan e25
-	2097  SnapScan e26
-	20fd  SnapScan e52
-	20ff  SnapScan e42
-06be  AME Optimedia Technology Co., Ltd
-	0800  Optimedia Camera
-	1005  Dazzle DPVM! (1005)
-	d001  P35U Camera Capture
-06bf  Leoco Corp.
-06c2  Phidgets Inc. (formerly GLAB)
-	0030  PhidgetRFID
-	0038  4-Motor PhidgetServo v3.0
-	0039  1-Motor PhidgetServo v3.0
-	003a  8-Motor PhidgetAvancedServo
-	0040  PhidgetInterface Kit 0-0-4
-	0044  PhidgetInterface Kit 0-16-16
-	0045  PhidgetInterface Kit 8-8-8
-	0048  PhidgetStepper (Under Development)
-	0049  PhidgetTextLED Ver 1.0
-	004a  PhidgetLED Ver 1.0
-	004b  PhidgetEncoder Ver 1.0
-	0051  PhidgetInterface Kit 0-5-7 (Custom)
-	0052  PhidgetTextLCD
-	0053  PhidgetInterfaceKit 0-8-8
-	0058  PhidgetMotorControl Ver 1.0
-	0070  PhidgetTemperatureSensor Ver 1.0
-	0071  PhidgetAccelerometer Ver 1.0
-	0072  PhidgetWeightSensor Ver 1.0
-	0073  PhidgetHumiditySensor
-	0074  PhidgetPHSensor
-	0075  PhidgetGyroscope
-06c4  Bizlink International Corp.
-06c5  Hagenuk, GmbH
-06c6  Infowave Software, Inc.
-06c8  SIIG, Inc.
-06c9  Taxan (Europe), Ltd
-	0005  Monitor Control
-	0007  Monitor Control
-	0009  Monitor Control
-06ca  Newer Technology, Inc.
-06cb  Synaptics, Inc.
-	0001  HID Device
-	0002  HID Device
-	0003  HID Device
-	0005  Touchpad/FPS
-	0006  HID Device
-	0007  HID Device
-	0008  HID Device
-	0009  Composite TouchPad and TrackPoint
-	000e  HID Device
-	0010  Composite Human Interface Device
-	0013  Human Interface Device
-06cc  Terayon Communication Systems
-	0101  Cable Modem
-	0102  Cable Modem
-	0103  Cable Modem
-	0104  Cable Modem
-	0304  Cable Modem
-06cd  Keyspan
-	0101  USA-28 PDA [no firmware]
-	0102  USA-28X PDA [no firmware]
-	0103  USA-19 PDA [no firmware]
-	0104  PDA [prerenum]
-	0105  USA-18X PDA [no firmware]
-	0106  USA-19W PDA [no firmware]
-	0107  USA-19 PDA
-	0108  USA-19W PDA
-	0109  USA-49W serial adapter [no firmware]
-	010a  USA-49W serial adapter
-	010b  USA-19Qi serial adapter [no firmware]
-	010c  USA-19Qi serial adapter
-	010d  USA-19Q serial Adapter (no firmware)
-	010e  USA-19Q serial Adapter
-	010f  USA-28 PDA
-	0110  USA-28Xb PDA
-	0111  USA-18 serial Adapter
-	0112  USA-18X PDA
-	0113  USA-28Xb PDA [no firmware]
-	0114  USA-28Xa PDA [no firmware]
-	0115  USA-28Xa PDA
-	0116  USA-18XA serial Adapter (no firmware)
-	0117  USA-18XA serial Adapter
-	0118  USA-19QW PDA [no firmware]
-	0119  USA-19QW PDA
-	011a  USA-49Wlc serial adapter [no firmware]
-	011b  MPR Serial Preloader (MPRQI)
-	011c  MPR Serial (MPRQI)
-	011d  MPR Serial Preloader (MPRQ)
-	011e  MPR Serial (MPRQ)
-	0121  USA-19hs serial adapter
-	012a  USA-49Wlc serial adapter
-	0201  UIA-10 Digital Media Remote [Cypress AN2131SC]
-	0202  UIA-11 Digital Media Remote
-06cf  SpheronVR AG
-	1010  PanoCam 10
-	1012  PanoCam 12/12X
-06d0  LapLink, Inc.
-	0622  LapLink Gold USB-USB Bridge [net1080]
-06d1  Daewoo Electronics Co., Ltd
-06d3  Mitsubishi Electric Corp.
-	0380  CP8000D Port
-	0381  CP770D Port
-	0385  CP900D Port
-	0387  CP980D Port
-	038b  CP3020D Port
-	038c  CP900DW(ID) Port
-	0393  CP9500D/DW Port
-	0394  CP9000D/DW Port
-	03a1  CP9550D/DW Port
-06d4  Cisco Systems
-06d5  Toshiba
-	4000  Japanese Keyboard
-06d6  Aashima Technology B.V.
-	0025  Gamepad
-	0026  Predator TH 400 Gamepad
-	002d  Trust PowerC@m 350FT
-	002e  Trust PowerC@m 350FS
-	0030  Trust 710 LCD POWERC@M ZOOM - MSD
-	0031  Trust 610/710 LCD POWERC@M ZOOM
-	003a  Trust PowerC@m 770Z (mass storage mode)
-	003b  Trust PowerC@m 770Z (webcam mode)
-	003c  Trust 910z PowerC@m
-	003f  Trust 735S POWERC@M ZOOM, WDM DSC Bulk Driver
-	0050  Trust 738AV LCD PV Digital Camera
-	0062  TRUST 782AV LCD P. V. Video Capture
-	0066  TRUST Digital PCTV and Movie Editor
-	0067  Trust 350FS POWERC@M FLASH
-	006b  TRUST AUDIO VIDEO EDITOR
-06d7  Network Computing Devices (NCD)
-06d8  Technical Marketing Research, Inc.
-06da  Phoenixtec Power Co., Ltd
-	0002  UPS
-	0003  1300VA UPS
-06db  Paradyne
-06dc  Foxlink Image Technology Co., Ltd
-	0012  Scan 1200c Scanner
-	0014  Prolink Winscan Pro 2448U
-06de  Heisei Electronics Co., Ltd
-06e0  Multi-Tech Systems, Inc.
-	f101  MT5634ZBA-USB MultiModemUSB (old firmware)
-	f103  MT5634MU MultiMobileUSB
-	f104  MT5634ZBA-USB MultiModemUSB (new firmware)
-	f107  MT5634ZBA-USB-V92 MultiModemUSB
-06e1  ADS Technologies, Inc.
-	0008  UBS-10BT Ethernet [klsi]
-	0009  UBS-10BT Ethernet
-	0833  Mass Storage Device
-	a155  FM Radio Receiver/Instant FM Music (RDX-155-EF)
-	a160  Instant Video-To-Go RDX-160 (no firmware)
-	a161  Instant Video-To-Go RDX-160
-	a190  Instand VCD Capture
-	a191  Instant VideoXpress
-	a337  Mini DigitalTV
-	a701  DVD Xpress
-	b337  Mini DigitalTV
-	b701  DVD Xpress B
-06e4  Alcatel Microelectronics
-06e6  Tiger Jet Network, Inc.
-	0200  Internet Phone
-	0201  Internet Phone
-	0202  Composite Device
-	0203  Internet Phone
-	0210  Composite Device
-	0211  Internet Phone
-	0212  Internet Phone
-	031c  Internet Phone
-	031d  Internet Phone
-	031e  Internet Phone
-	3200  Composite Device
-	3201  Internet Phone
-	3202  Composite Device
-	3203  Composite Device
-	7200  Composite Device
-	7210  Composite Device
-	7250  Composite Device
-	825c  Internet Phone
-	831c  Internet Phone
-	831d  Composite Device
-	831e  Composite Device
-	b200  Composite Device
-	b201  Composite Device
-	b202  Internet Phone
-	b210  Internet Phone
-	b211  Composite Device
-	b212  Composite Device
-	b250  Composite Device
-	b251  Internet Phone
-	b252  Internet Phone
-	c200  Internet Phone
-	c201  Internet Phone
-	c202  Composite Device
-	c203  Internet Phone
-	c210  Personal PhoneGateway
-	c211  Personal PhoneGateway
-	c212  Personal PhoneGateway
-	c213  PPG Device
-	c25c  Composite Device
-	c290  PPG Device
-	c291  PPG Device
-	c292  PPG Device
-	c293  Personal PhoneGateway
-	c31c  Composite Device
-	c39c  Personal PhoneGateway
-	c39d  PPG Device
-	c39e  PPG Device
-	c39f  PPG Device
-	c700  Internet Phone
-	c701  Internet Phone
-	c702  Composite Device
-	c703  Internet Phone
-	c710  VoIP Combo Device
-	c711  VoIP Combo
-	c712  VoIP Combo Device
-	c713  VoIP Combo Device
-	cf00  Composite Device
-	cf01  Internet Phone
-	cf02  Internet Phone
-	cf03  Composite Device
-	d210  Personal PhoneGateway
-	d211  PPG Device
-	d212  PPG Device
-	d213  Personal PhoneGateway
-	d700  Composite Device
-	d701  Composite Device
-	d702  Internet Phone
-	d703  Composite Device
-	d710  VoIP Combo
-	d711  VoIP Combo Device
-	d712  VoIP Combo
-	d713  VoIP Combo
-	df00  Composite Device
-	df01  Composite Device
-	df02  Internet Phone
-	df03  Internet Phone
-	f200  Internet Phone
-	f201  Internet Phone
-	f202  Composite Device
-	f203  Composite Device
-	f210  Internet Phone
-	f250  Composite Device
-	f252  Internet Phone
-	f310  Internet Phone
-	f350  Composite Device
-06ea  Sirius Technologies
-	0001  NetCom Roadster II 56k
-	0002  Roadster II 56k
-06eb  PC Expert Tech. Co., Ltd
-06ef  I.A.C. Geometrische Ingenieurs B.V.
-06f0  T.N.C Industrial Co., Ltd
-	de01  DualCam Video Camera
-	de02  DualCam Still Camera
-06f1  Opcode Systems, Inc.
-	a011  SonicPort
-	a021  SonicPort Optical
-06f2  Emine Technology Co.
-	0011  KVM Switch Keyboard
-06f6  Wintrend Technology Co., Ltd
-06f7  Wailly Technology Ltd
-	0003  USB->Din 4 Adaptor
-06f8  Guillemot Corp.
-	3002  Hercules Blog Webcam
-	3004  Hercules Classic Silver
-	3005  Hercules Dualpix Exchange
-	3007  Hercules Dualpix Chat and Show
-	a300  Dual Analog Leader GamePad
-	b000  Hercules DJ Console
-	c000  Hercules Muse Pocket
-	d002  Hercules DJ Console
-	e000  HWGUSB2-54 WLAN
-	e010  HWGUSB2-54-LB
-	e020  HWGUSB2-54V2-AP
-	e031  Hercules HWNUm-300 Wireless N mini [Realtek RTL8191SU]
-	e032  HWGUm-54 [Hercules Wireless G Ultra Mini Key]
-	e033  Hercules HWNUp-150 802.11n Wireless N Pico [Realtek RTL8188CUS]
-06f9  ASYST electronic d.o.o.
-06fa  HSD S.r.L
-06fc  Motorola Semiconductor Products Sector
-06fd  Boston Acoustics
-	0101  Audio Device
-	0102  Audio Device
-	0201  2-piece Audio Device
-06fe  Gallant Computer, Inc.
-0701  Supercomal Wire & Cable SDN. BHD.
-0703  Bvtech Industry, Inc.
-0705  NKK Corp.
-0706  Ariel Corp.
-0707  Standard Microsystems Corp.
-	0100  2202 Ethernet [klsi]
-	0200  2202 Ethernet [pegasus]
-	0201  EZ Connect USB Ethernet
-	ee04  SMCWUSB32 802.11b Wireless LAN Card
-	ee06  SMC2862W-G v1 EZ Connect 802.11g Adapter [Intersil ISL3886]
-	ee13  SMC2862W-G v2 EZ Connect 802.11g Adapter [Intersil ISL3887]
-0708  Putercom Co., Ltd
-	047e  USB-1284 BRIDGE
-0709  Silicon Systems, Ltd (SSL)
-070a  Oki Electric Industry Co., Ltd
-	4002  Bluetooth Device
-	4003  Bluetooth Device
-070d  Comoss Electronic Co., Ltd
-070e  Excel Cell Electronic Co., Ltd
-0710  Connect Tech, Inc.
-	0001  WhiteHeat (fake ID)
-	8001  WhiteHeat
-0711  Magic Control Technology Corp.
-	0100  Hub
-	0180  IRXpress Infrared Device
-	0181  IRXpress Infrared Device
-	0200  BAY-3U1S1P Serial Port
-	0210  MCT1S Serial Port
-	0230  MCT-232 Serial Port
-	0231  PS/2 Mouse Port
-	0232  Serial On Port
-	0240  PS/2 to USB Converter
-	0300  BAY-3U1S1P Parallel Port
-	0302  Parallel Port
-	0900  SVGA Adapter
-	5001  Trigger UV-002BD[Startech USBVGAE]
-0713  Interval Research Corp.
-0714  NewMotion, Inc.
-	0003  ADB to USB convertor
-0717  ZNK Corp.
-0718  Imation Corp.
-	0002  SuperDisk 120MB
-	0003  SuperDisk 120MB (Authenticated)
-	0060  Flash Drive
-	0061  Flash Drive
-	0062  Flash Drive
-	0063  Swivel Flash Drive
-	0064  Flash Drive
-	0065  Flash Drive
-	0066  Flash Drive
-	0067  Flash Drive
-	0068  Flash Drive
-	0084  Flash Drive Mini
-	0582  Revo Flash Drive
-	d000  Disc Stakka CD/DVD Manager
-0719  Tremon Enterprises Co., Ltd
-071b  Domain Technologies, Inc.
-	0002  DTI-56362-USB Digital Interface Unit
-	0101  Audio4-USB DSP Data Acquisition Unit
-	0201  Audio4-5410 DSP Data Acquisition Unit
-	0301  SB-USB JTAG Emulator
-	3203  Rockchip Media Player
-	32bb  Music Mediatouch
-071c  Xionics Document Technologies, Inc.
-071d  Eicon Networks Corp.
-	1000  Diva ISDN TA
-	1003  Diva
-	2000  Teledat Surf
-071e  Ariston Technologies
-0723  Centillium Communications Corp.
-	0002  Palladia 300/400 Adsl Modem
-0726  Vanguard International Semiconductor-America
-0729  Amitm
-	1000  USC-1000 Serial Port
-072e  Sunix Co., Ltd
-072f  Advanced Card Systems, Ltd
-	0001  AC1030-based SmartCard Reader
-	0008  ACR 80 Smart Card Reader
-	1000  PLDT Drive
-	1001  PLDT Drive
-	8002  AET63 BioTRUSTKey
-	8003  ACR120
-	8103  ACR120
-	9000  ACR38 AC1038-based Smart Card Reader
-	90cc  ACR38 SmartCard Reader
-	90cf  ACR38 SAM Smart Card Reader
-	90d0  PertoSmart EMV - Card Reader
-0731  Susteen, Inc.
-	0528  SonyEricsson DCU-11 Cable
-0732  Goldfull Electronics & Telecommunications Corp.
-0733  ViewQuest Technologies, Inc.
-	0101  Digital Video Camera
-	0110  VQ110 Video Camera
-	0401  CS330 Webcam
-	0402  M-318B Webcam
-	0430  Intel Pro Share Webcam
-	0630  VQ630 Dual Mode Digital Camera(Bulk)
-	0631  Hercules Dualpix
-	0780  Smart Cam Deluxe(composite)
-	1310  Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470
-	1311  Digital Dream Epsilon 1.3
-	1314  Mercury 2.1MEG Deluxe Classic Cam
-	2211  Jenoptik jdc 21 LCD Camera
-	2221  Mercury Digital Pro 3.1p
-	3261  Concord 3045 spca536a Camera
-	3281  Cyberpix S550V
-0734  Lasat Communications A/S
-	0001  560V Modem
-	0002  Lasat 560V Modem
-	043a  DVS Audio
-	043b  3DeMon USB Capture
-0735  Asuscom Network
-	2100  ISDN Adapter
-	2101  ISDN Adapter
-	6694  ISDNlink 128K
-	c541  ISDN TA 280
-0736  Lorom Industrial Co., Ltd
-0738  Mad Catz, Inc.
-	4507  XBox Device
-	4516  XBox Device
-	4520  XBox Device
-	4526  XBox Device
-	4536  XBox Device
-	4540  XBox Device
-	4556  XBox Device
-	4566  XBox Device
-	4576  XBox Device
-	4586  XBox Device
-	4588  XBox Device
-	8818  Street Fighter IV Arcade FightStick (PS3)
-073a  Chaplet Systems, Inc.
-073b  Suncom Technologies
-073c  Industrial Electronic Engineers, Inc.
-	0305  Pole Display (PC305-3415  2 x 20 Line Display)
-	0322  Pole Display (PC322-3415  2 x 20 Line Display)
-	0324  Pole Display (LB324-USB   4 x 20 Line Display)
-	0330  Pole Display (P330-3415   2 x 20 Line Display)
-	0424  Pole Display (SP324-4415  4 x 20 Line Display)
-	0450  Pole Display (L450-USB   Graphic Line Display)
-	0505  Pole Display (SPC505-3415 2 x 20 Line Display)
-	0522  Pole Display (SPC522-3415 2 x 20 Line Display)
-	0624  Pole Display (SP324-3415  4 x 20 Line Display)
-073d  Eutron S.p.a.
-	0005  Crypto Token
-	0007  CryptoIdentity CCID
-	0025  SmartKey 3
-	0c00  Pocket Reader
-	0d00  StarSign Bio Token 3.0 EU
-073e  NEC, Inc.
-	0301  Game Pad
-0745  Syntech Information Co., Ltd
-0746  Onkyo Corp.
-	5500  SE-U55 Audio Device
-0747  Labway Corp.
-0748  Strong Man Enterprise Co., Ltd
-0749  EVer Electronics Corp.
-074a  Ming Fortune Industry Co., Ltd
-074b  Polestar Tech. Corp.
-074c  C-C-C Group PLC
-074d  Micronas GmbH
-	3553  Composite USB-Device
-	3554  Composite USB-Device
-	3556  Composite USB-Device
-074e  Digital Stream Corp.
-	0001  PS/2 Adapter
-	0002  PS/2 Adapter
-0755  Aureal Semiconductor
-0757  Network Technologies, Inc.
-075b  Sophisticated Circuits, Inc.
-	0001  Kick-off! Watchdog
-0763  Midiman
-	0115  O2 / KeyRig 25
-	0117  Trigger Finger
-	0119  MidAir
-	0150  M-Audio Uno
-	0160  M-Audio 1x1
-	0192  M-Audio Keystation 88es
-	0193  ProKeys 88
-	0194  ProKeys 88sx
-	0195  Oxygen 8 v2
-	0196  Oxygen 49
-	0197  Oxygen 61
-	0198  Axiom 25
-	0199  Axiom 49
-	019a  Axiom 61
-	019b  KeyRig 49
-	019c  KeyStudio
-	1001  MidiSport 2x2
-	1002  MidiSport 2x2
-	1003  MidiSport 2x2
-	1010  MidiSport 1x1
-	1011  MidiSport 1x1
-	1014  M-Audio Keystation Loader
-	1015  M-Audio Keystation
-	1020  Midisport 4x4
-	1021  MidiSport 4x4
-	1030  Midisport 8x8
-	1031  MidiSport 8x8/s Loader
-	1033  MidiSport 8x8/s
-	1040  M-Audio MidiSport 2x4 Loader
-	1041  M-Audio MidiSport 2x4
-	1110  MidiSport 1x1
-	2001  M Audio Quattro
-	2002  M Audio Duo
-	2003  M Audio AudioPhile
-	2004  M-Audio MobilePre
-	2006  M-Audio Transit
-	2007  M-Audio Sonica Theater
-	2008  M-Audio Ozone
-	200d  M-Audio OmniStudio
-	200f  M-Audio MobilePre
-	2010  M-Audio Fast Track
-	2012  M-Audio Fast Track Pro
-	2013  M-Audio JamLab
-	2015  M-Audio RunTime DFU
-	2016  M-Audio RunTime DFU
-	2019  M-Audio Ozone Academic
-	201a  M-Audio Micro
-	201b  M-Audio RunTime DFU
-	201d  M-Audio Producer
-	2080  M-Audio RunTime DFU
-	2081  M-Audio RunTime DFU / Fast Track Ultra 8R
-	2803  M-Audio Audiophile DFU
-	2804  M-Audio MobilePre DFU
-	2806  M-Audio Transit DFU
-	2815  M-Audio DFU
-	2816  M-Audio DFU
-	281b  M-Audio DFU
-	2880  M-Audio DFU
-	2881  M-Audio DFU
-0764  Cyber Power System, Inc.
-	0005  Cyber Power UPS
-	0501  CP1500 AVR UPS
-0765  X-Rite, Inc.
-	d094  X-Rite DTP94 [Quato Silver Haze Pro]
-0766  Jess-Link Products Co., Ltd
-	0204  TopSpeed Cyberlink Remote Control
-0767  Tokheim Corp.
-0768  Camtel Technology Corp.
-	0006  Camtel Technology USB TV Genie Pro FM Model TVB330
-	0023  eHome Infrared Receiver
-0769  Surecom Technology Corp.
-	11f2  EP-9001-g 802.11g 54M WLAN Adapter
-	11f3  RT2570
-	11f7  802.11g 54M WLAN Adapter
-	31f3  RT2573
-076a  Smart Technology Enablers, Inc.
-076b  OmniKey AG
-	0596  CardMan 2020
-	1021  CardMan 1021
-	1221  CardMan 1221
-	1784  CardMan 6020
-	3021  CardMan 3121
-	3610  CardMan 3620
-	3621  CardMan 3621
-	3821  CardMan 3821
-	4321  CardMan 4321
-	5121  CardMan 5121
-	5125  CardMan 5125
-	6622  CardMan 6121
-	a011  CCID Smart Card Reader Keyboard
-	a021  CCID Smart Card Reader
-	a022  CardMan Smart@Link
-	c000  CardMan 3x21 CS
-	c001  CardMan 5121 CS
-076c  Partner Tech
-076d  Denso Corp.
-076e  Kuan Tech Enterprise Co., Ltd
-076f  Jhen Vei Electronic Co., Ltd
-0770  Welch Allyn, Inc - Medical Division
-0771  Observator Instruments BV
-	4455  OMC45III
-	ae0f  OMC45III
-0774  AmTRAN Technology Co., Ltd
-0775  Longshine Electronics Corp.
-0776  Inalways Corp.
-0777  Comda Enterprise Corp.
-0778  Volex, Inc.
-0779  Fairchild Semiconductor
-077a  Sankyo Seiki Mfg. Co., Ltd
-077b  Linksys
-	08be  BEFCMU10 v4 Cable Modem
-	2219  WUSB11 V2.6 802.11b Adapter
-	2226  USB200M 100baseTX Adapter
-	2227  Network Everywhere NWU11B
-077c  Forward Electronics Co., Ltd
-	0005  NEC Keyboard
-077d  Griffin Technology
-	0223  IMic Audio In/Out
-	0405  iMate, ADB Adapter
-	0410  PowerMate
-	041a  PowerWave
-	04aa  SoundKnob
-	07af  iMic
-	1016  AirClick
-	627a  Radio SHARK
-077f  Well Excellent & Most Corp.
-0780  Sagem Monetel GmbH
-	1202  ORGA 900 Smart Card Terminal Virtual Com Port
-	1302  ORGA 6000 Smart Card Terminal Virtual Com Port
-	1303  ORGA 6000 Smart Card Terminal USB RNDIS
-	df55  ORGA 900/6000 Smart Card Terminal DFU
-0781  SanDisk Corp.
-	0001  SDDR-05a ImageMate CompactFlash Reader
-	0002  SDDR-31 ImageMate II CompactFlash Reader
-	0005  SDDR-05b (CF II) ImageMate CompactFlash Reader
-	0100  ImageMate SDDR-12
-	0200  SDDR-09 (SSFDC) ImageMate SmartMedia Reader [eusb]
-	0400  SecureMate SD/MMC Reader
-	0621  SDDR-86 Imagemate 6-in-1 Reader
-	0720  Sansa C200 series in recovery mode
-	0729  Sansa E200 series in recovery mode
-	0810  SDDR-75 ImageMate CF-SM Reader
-	0830  ImageMate CF/MMC/SD Reader
-	1234  Cruzer Mini Flash Drive
-	5150  SDCZ2 Cruzer Mini Flash Drive (thin)
-	5151  Cruzer Micro Flash Drive
-	5153  Cruzer Flash Drive
-	5402  U3 Cruzer Micro
-	5406  Cruzer Micro U3
-	5408  Cruzer Titanium U3
-	540e  Cruzer Contour Flash Drive
-	5530  Cruzer
-	5567  Cruzer Blade
-	5e10  Encrypted
-	6100  Ultra II SD Plus 2GB
-	7100  Cruzer Mini
-	7101  Pen Flash
-	7102  Cruzer Mini
-	7103  Cruzer Mini
-	7104  Cruzer Micro Mini 256MB Flash Drive
-	7105  Cruzer Mini
-	7106  Cruzer Mini
-	7112  Cruzer Micro 128MB Flash Drive
-	7113  Cruzer Micro 256MB Flash Drive
-	7114  Cruzer Mini
-	7115  Cruzer Mini
-	7301  Sansa e100 series (mtp)
-	7302  Sansa e100 series (msc)
-	7400  Sansa M200 series (mtp)
-	7401  Sansa M200 series (msc)
-	7420  Sansa E200 series (mtp)
-	7421  Sansa E200 Series (msc)
-	7422  Sansa E200 series v2 (mtp)
-	7423  Sansa E200 series v2 (msc)
-	7430  Sansa M200 series
-	7431  Sansa M200 series V4 (msc)
-	7432  Sansa Clip (mtp)
-	7433  Sansa Clip (msc)
-	7434  Sansa Clip V2 (mtp)
-	7435  Sansa Clip V2 (msc)
-	7450  Sansa C250
-	7451  Sansa C240
-	7460  Sansa Express
-	7480  Sansa Connect
-	7481  Sansa Connect (in recovery mode)
-	74b0  Sansa View (msc)
-	74b1  Sansa View (mtp)
-	74c0  Sansa Fuze (mtp)
-	74c1  Sansa Fuze (msc)
-	74c2  Sansa Fuze V2 (mtp)
-	74c3  Sansa Fuze V2 (msc)
-	74d0  Sansa Clip+ (mtp)
-	74d1  Sansa Clip+ (msc)
-	8181  Pen Flash
-	8183  Hi-Speed Mass Storage Device
-	8185  SDCZ2 Cruzer Mini Flash Drive (older, thick)
-	8888  Card Reader
-	8889  SDDR-88 Imagemate 8-in-1 Reader
-	8919  Card Reader
-	8989  ImageMate 12-in-1 Reader
-	9191  ImageMate CF
-	9219  Card Reader
-	9292  ImageMate CF Reader/Writer
-	9393  ImageMate SD-MMC
-	9595  ImageMate xD-SM
-	9797  ImageMate MS-PRO
-	9919  Card Reader
-	9999  SDDR-99 5-in-1 Reader
-	a7e8  SDDR-113 MicroMate SDHC Reader
-	b2b3  SDDR-103 MobileMate SD+ Reader
-	b4b5  SDDR-89 V4 ImageMate 12-in-1 Reader
-0782  Trackerball
-0783  C3PO
-	0003  LTC31 SmartCard Reader
-	0006  LTC31v2
-	0009  KBR36
-	0010  LTC32
-0784  Vivitar, Inc.
-	0100  Vivicam 2655
-	1310  Vivicam 3305
-	1688  Vivicam 3665
-	1689  Gateway DC-M42/Labtec DC-505/Vivitar Vivicam 3705
-	2620  AOL Photocam Plus
-	2888  Polaroid DC700
-	3330  Nytec ND-3200 Camera
-	4300  Traveler D1
-	5260  Werlisa Sport PX 100 / JVC GC-A33 Camera
-	5300  Pretec dc530
-0785  NTT-ME
-	0001  MN128mini-V ISDN TA
-	0003  MN128mini-J ISDN TA
-0789  Logitec Corp.
-	0026  LHD Device
-	0033  DVD Multi-plus unit LDR-H443SU2
-	0063  LDR Device
-	0064  LDR-R Device
-	00b3  DVD Multi-plus unit LDR-H443U2
-	010c  Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter
-	0162  LAN-WN22/U2 Wireless LAN Adapter
-	0163  LAN-WN12/U2 Wireless LAN Adapter
-	0164  LAN-W150/U2M Wireless LAN Adapter
-	0166  LAN-W300N/U2 Wireless LAN Adapter
-	0168  LAN-W150N/U2 Wireless LAN Adapter
-078b  Happ Controls, Inc.
-	0010  Driving UGCI
-	0020  Flying UGCI
-	0030  Fighting UGCI
-078c  GTCO/CalComp
-	0090  Tablet Adapter
-	0100  Tablet Adapter
-	0200  Tablet Adapter
-	0300  Tablet Adapter
-	0400  Digitizer (Whiteboard)
-078e  Brincom, Inc.
-0790  Pro-Image Manufacturing Co., Ltd
-0791  Copartner Wire and Cable Mfg. Corp.
-0792  Axis Communications AB
-0793  Wha Yu Industrial Co., Ltd
-0794  ABL Electronics Corp.
-0795  RealChip, Inc.
-0796  Certicom Corp.
-0797  Grandtech Semiconductor Corp.
-	6801  Flatbed Scanner
-	6802  InkJet Color Printer
-	8001  SmartCam
-	801a  Typhoon StyloCam
-	801c  Meade Binoculars/Camera
-	8901  ScanHex SX-35a
-	8909  ScanHex SX-35b
-	8911  ScanHex SX-35c
-0798  Optelec
-	0001  Braille Voyager
-0799  Altera
-	7651  Programming Unit
-079b  Sagem
-	0027  USB-Serial Controller
-	002f  Mobile
-	0030  Mobile Communication Device
-	0042  Mobile
-	004a  XG-760A 802.11bg
-	004b  Wi-Fi 11g adapter
-	0056  Agfa AP1100 Photo Printer
-	005d  Mobile Mass Storage
-	0062  XG-76NA 802.11bg
-	0078  Laser Pro Monochrome MFP
-079d  Alfadata Computer Corp.
-	0201  GamePort Adapter
-07a1  Digicom S.p.A.
-	d952  Palladio USB V.92 Modem
-07a2  National Technical Systems
-07a3  Onnto Corp.
-07a4  Be, Inc.
-07a6  ADMtek, Inc.
-	07c2  AN986A Ethernet
-	0986  AN986 Pegasus Ethernet
-	8266  Infineon WildCard-USB Wireless LAN Adapter
-	8511  ADM8511 Pegasus II Ethernet
-	8513  AN8513 Ethernet
-	8515  AN8515 Ethernet
-07aa  Corega K.K.
-	0001  Ether USB-T Ethernet [klsi]
-	0004  FEther USB-TX Ethernet [pegasus]
-	000c  WirelessLAN USB-11
-	000d  FEther USB-TXS
-	0011  Wireless LAN USB-11 mini
-	0012  Stick-11 802.11b Adapter
-	0017  FEther USB2-TX
-	0018  Wireless LAN USB-11 mini 2
-	001a  ULUSB-11 Key
-	001c  CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]
-	002f  CG-WLUSB2GNL
-	003c  CG-WLUSB2GNL
-	003f  CG-WLUSB300AGN
-	0041  CG-WLUSB300GNS
-	0042  CG-WLUSB300GNM
-	0043  CG-WLUSB300N rev A2 [Realtek RTL8192U]
-	0047  CG-WLUSBNM
-	0051  CG-WLUSB300NM
-	7613  Stick-11 V2 802.11b Adapter
-	9601  FEther USB-TXC
-07ab  Freecom Technologies
-	fc01  IDE bridge
-	fc02  Cable II USB-2
-	fc03  USB2-IDE IDE bridge
-	fcd6  Freecom HD Classic
-	fcf6  DataBar 512 MB
-	fcf8  Freecom Classic SL Network Drive
-	fcfe  Hard Drive 80GB
-07af  Microtech
-	0004  SCSI-DB25 SCSI Bridge [shuttle]
-	0005  SCSI-HD50 SCSI Bridge [shuttle]
-	0006  CameraMate SmartMedia and CompactFlash Card Reader [eusb/shuttle]
-	fc01  Freecom USB-IDE
-07b0  Trust Technologies
-	0001  ISDN TA
-	0002  ISDN TA128 Plus
-	0003  ISDN TA128 Deluxe
-	0005  ISDN TA128 SE
-	0006  ISDN TA128 CE
-	0007  ISDN TA
-	0008  ISDN TA
-07b1  IMP, Inc.
-07b2  Motorola BCS, Inc.
-	0100  SURFboard Voice over IP Cable Modem
-	0900  SURFboard Gateway
-	0950  SURFboard SBG950 Gateway
-	1000  SURFboard SBG1000 Gateway
-	4100  SurfBoard SB4100 Cable Modem
-	4200  SurfBoard SB4200 Cable Modem
-	4210  SurfBoard 4210 Cable Modem
-	4220  SURFboard SB4220 Cable Modem
-	4500  CG4500 Communications Gateway
-	450b  CG4501 Communications Gateway
-	450e  CG4500E Communications Gateway
-	5100  SurfBoard SB5100 Cable Modem
-	5101  SurfBoard SB5101 Cable Modem
-	5120  SurfBoard SB5120 Cable Modem (RNDIS)
-	5121  Surfboard 5121 Cable Modem
-	7030  WU830G 802.11bg Wireless Adapter [Envara WiND512]
-07b3  Plustek, Inc.
-	0001  OpticPro 1212U Scanner
-	0003  Scanner
-	0010  OpticPro U12 Scanner
-	0011  OpticPro U24 Scanner
-	0013  OpticPro UT12 Scanner
-	0014  Scanner
-	0015  OpticPro U24 Scanner
-	0017  OpticPro UT12/16/24 Scanner
-	0204  Scanner
-	0400  OpticPro 1248U Scanner
-	0401  OpticPro 1248U Scanner #2
-	0403  OpticPro U16B Scanner
-	0404  Scanner
-	0405  A8 Namecard-s Controller
-	0406  A8 Namecard-D Controller
-	0410  Scanner
-	0412  Scanner
-	0413  OpticSlim 1200 Scanner
-	0601  OpticPro ST24 Scanner
-	0800  OpticPro ST48 Scanner
-	0906  OpticBook 3600 Scanner
-	0a06  TVcam VD100
-	0b00  SmartPhoto F50
-	0c03  OpticPro ST64+ Scanner
-	0c04  Optic Film 7200i scanner
-	0c0c  PL806
-	0c26  OpticBook 4600 Scanner
-	0c2b  Mobile Office D428 Scanner
-07b4  Olympus Optical Co., Ltd
-	0100  Camedia C-2100/C-3000 Ultra Zoom Camera
-	0102  Camedia E-10/C-220/C-50 Camera
-	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560/C-3020Z Zoom Camera
-	0109  C-370Z/C-500Z/D-535Z/X-450
-	010a  MAUSB-10 xD and SmartMedia Card Reader
-	0112  MAUSB-100 xD Card Reader
-	0113  Mju 500
-	0114  C-350Z Camera
-	0118  Digital Camera
-	0184  P-S100 port
-	0203  Digital Voice Recorder DW-90
-	0206  Digital Voice Recorder DS-330
-	0207  Digital Voice Recorder & Camera W-10
-	0209  Digital Voice Recorder DM-20
-	020d  Digital Voice Recorder VN-240PC
-	0280  m:robe 100
-07b5  Mega World International, Ltd
-	0017  Joystick
-	0213  Thrustmaster Firestorm Digital 3 Gamepad
-	0312  Gamepad
-	9902  GamePad
-07b6  Marubun Corp.
-07b7  TIME Interconnect, Ltd
-07b8  AboCom Systems Inc
-	110c  XX1
-	1201  IEEE 802.11b Adapter
-	200c  XX2
-	2573  Wireless LAN Card
-	2770  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
-	2870  802.11n/b/g Wireless LAN USB2.0 Adapter
-	3070  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
-	3071  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
-	3072  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
-	4000  DU-E10 Ethernet [klsi]
-	4002  DU-E100 Ethernet [pegasus]
-	4003  1/10/100 Ethernet Adapter
-	4004  XX4
-	4007  XX5
-	400b  XX6
-	400c  XX7
-	401a  RTL8151
-	4102  USB 1.1 10/100M Fast Ethernet Adapter
-	4104  XX9
-	420a  UF200 Ethernet
-	5301  GW-US54ZGL 802.11bg
-	6001  802.11bg
-	a001  WUG2200 802.11g Wireless Adapter [Envara WiND512]
-	abc1  DU-E10 Ethernet [pegasus]
-	b000  BWU613
-	b02a  AboCom Bluetooth Device
-	b02b  Bluetooth dongle
-	b02c  BCM92045DG-Flash with trace filter
-	b02d  BCM92045DG-Flash with trace filter
-	b02e  BCM92045DG-Flash with trace filter
-	b030  BCM92045DG-Flash with trace filter
-	b031  BCM92045DG-Flash with trace filter
-	b032  BCM92045DG-Flash with trace filter
-	b033  BCM92045DG-Flash with trace filter
-	b21a  WUG2400 802.11g Wireless Adapter [Texas Instruments TNETW1450]
-	b21b  HWU54DM
-	b21c  RT2573
-	b21d  RT2573
-	b21e  RT2573
-	b21f  WUG2700
-	d011  MP3 Player
-	e001  Mass Storage Device
-	e002  Mass Storage Device
-	e003  Mass Storage Device
-	e004  Mass Storage Device
-	e005  Mass Storage Device
-	e006  Mass Storage Device
-	e007  Mass Storage Device
-	e008  Mass Storage Device
-	e009  Mass Storage Device
-	e00a  Mass Storage Device
-	e4f0  Card Reader Driver
-	f101  DSB-560 Modem [atlas]
-07bc  Canon Computer Systems, Inc.
-07bd  Webgear, Inc.
-07be  Veridicom
-07c0  Code Mercenaries Hard- und Software GmbH
-	1121  The Claw
-	1500  IO-Warrior 40
-	1501  IO-Warrior 24
-	1502  IO-Warrior 48
-	1503  IO-Warrior 28
-	1511  IO-Warrior 24 Power Vampire
-	1512  IO-Warrior 24 Power Vampire
-07c1  Keisokugiken
-	0068  HKS-0200 USBDAQ
-07c4  Datafab Systems, Inc.
-	0102  USB to LS120
-	0103  USB to IDE
-	1234  USB to ATAPI
-	a000  CompactFlash Card Reader
-	a001  CompactFlash & SmartMedia Card Reader [eusb]
-	a002  Disk Drive
-	a003  Datafab-based Reader
-	a004  USB to MMC Class Drive
-	a005  CompactFlash & SmartMedia Card Reader
-	a006  SmartMedia Card Reader
-	a007  Memory Stick Class Drive
-	a103  MDSM-B reader
-	a107  USB to Memory Stick (LC1) Drive
-	a109  LC1 CompactFlash & SmartMedia Card Reader
-	a10b  USB to CF+MS(LC1)
-	a200  DF-UT-06 Hama MMC/SD Reader
-	a400  CompactFlash & Microdrive Reader
-	a600  Card Reader
-	ad01  Mass Storage Device
-	ae01  Mass Storage Device
-	af01  Mass Storage Device
-	b000  USB to CF(LC1)
-	b001  USB to CF+PCMCIA
-	b004  MMC/SD Reader
-	b006  USB to PCMCIA
-	b00a  USB to CF+SD Drive(LC1)
-	b00b  USB to Memory Stick(LC1)
-07c5  APG Cash Drawer
-07c6  ShareWave, Inc.
-	0002  Bodega Wireless Access Point
-	0003  Bodega Wireless Network Adapter
-07c7  Powertech Industrial Co., Ltd
-07c8  B.U.G., Inc.
-	0202  MN128-SOHO PAL
-07c9  Allied Telesyn International
-	b100  AT-USB100
-07ca  AVerMedia Technologies, Inc.
-	0002  AVerTV PVR USB/EZMaker Pro Device
-	0026  AVerTV
-	0337  A867 DVB-T dongle
-	1228  MPEG-2 Capture Device (M038)
-	1830  AVerTV Volar Video Capture (H830)
-	850a  AverTV Volar Black HD (A850)
-	850b  AverTV Red HD+ (A850T)
-	a309  AVerTV DVB-T (A309)
-	a801  AVerTV DVB-T (A800)
-	a815  AVerTV DVB-T Volar X (A815)
-	a867  AVerTV DVB-T (A867)
-	b800  MR800 FM Radio
-	e880  MPEG-2 Capture Device (E880)
-	e882  MPEG-2 Capture Device (E882)
-07cb  Kingmax Technology, Inc.
-07cc  Carry Computer Eng., Co., Ltd
-	0000  CF Card Reader
-	0001  Reader (UICSE)
-	0002  Reader (UIS)
-	0003  SM Card Reader
-	0004  SM/CF/PCMCIA Card Reader
-	0005  Reader (UISA2SE)
-	0006  SM/CF/PCMCIA Card Reader
-	0007  Reader (UISA6SE)
-	000c  SM/CF Card Reader
-	000d  SM/CF Card Reader
-	000e  Reader (UISDA)
-	000f  Reader (UICLIK)
-	0010  Reader (UISMA)
-	0012  Reader (UISC6SE-FLASH)
-	0014  Litronic Fortezza Reader
-	0030  Mass Storage (UISDMC12S)
-	0040  Mass Storage (UISDMC13S)
-	0100  Reader (UID)
-	0101  Reader (UIM)
-	0102  Reader (UISDMA)
-	0103  Reader (UISDMC)
-	0104  Reader (UISDM)
-	0200  6-in-1 Card Reader
-	0201  Mass Storage (UISDMC1S & UISDMC3S)
-	0202  Mass Storage (UISDMC5S)
-	0203  Mass Storage (UISMC5S)
-	0204  Mass Storage (UIM4/5S & UIM7S)
-	0205  Mass Storage (UIS4/5S & UIS7S)
-	0206  Mass Storage (UISDMC10S & UISDMC11S)
-	0207  Mass Storage (UPIDMA)
-	0208  Mass Storage (UCFC II)
-	0210  Mass Storage (UPIXXA)
-	0213  Mass Storage (UPIDA)
-	0214  Mass Storage (UPIMA)
-	0215  Mass Storage (UPISA)
-	0217  Mass Storage (UPISDMA)
-	0223  Mass Storage (UCIDA)
-	0224  Mass Storage (UCIMA)
-	0225  Mass Storage (UIS7S)
-	0227  Mass Storage (UCIDMA)
-	0234  Mass Storage (UIM7S)
-	0235  Mass Storage (UIS4S-S)
-	0237  Velper (UISDMC4S)
-	0300  6-in-1 Card Reader
-	0301  6-in-1 Card Reader
-	0303  Mass Storage (UID10W)
-	0304  Mass Storage (UIM10W)
-	0305  Mass Storage (UIS10W)
-	0308  Mass Storage (UIC10W)
-	0309  Mass Storage (UISC3W)
-	0310  Mass Storage (UISDMA2W)
-	0311  Mass Storage (UISDMC14W)
-	0320  Mass Storage (UISDMC4W)
-	0321  Mass Storage (UISDMC37W)
-	0330  WINTERREADER Reader
-	0350  9-in-1 Card Reader
-	0500  Mass Storage
-	0501  Mass Storage
-07cd  Elektor
-	0001  USBuart Serial Port
-07cf  Casio Computer Co., Ltd
-	1001  QV-8000SX/5700/3000EX Digicam; Exilim EX-M20
-	1003  Exilim EX-S500
-	1004  Exilim EX-Z120
-	1011  USB-CASIO PC CAMERA
-	1116  EXILIM EX-Z19
-	1133  Exilim EX-Z350 Digital Camera (mass storage mode)
-	1233  Exilim EX-Z350 Digital Camera (PictBridge mode)
-	2002  E-125 Cassiopeia Pocket PC
-	3801  WMP-1 MP3-Watch
-	4001  Label Printer KL-P1000
-	4007  CW50 Device
-	4104  Cw75 Device
-	4107  CW-L300 Device
-	4500  LV-20 Digital Camera
-	6801  PL-40R
-	6802  MIDI Keyboard
-07d0  Dazzle
-	0001  Digital Video Creator I
-	0002  Global Village VideoFX Grabber
-	0003  Fusion Model DVC-50 Rev 1 (NTSC)
-	0004  DVC-800 (PAL) Grabber
-	0005  Fusion Video and Audio Ports
-	0006  DVC 150 Loader Device
-	0007  DVC 150
-	0327  Fusion Digital Media Reader
-	1001  DM-FLEX DFU Adapter
-	1002  DMHS2 DFU Adapter
-	1102  CF Reader/Writer
-	1103  SD Reader/Writer
-	1104  SM Reader/Writer
-	1105  MS Reader/Writer
-	1106  xD/SM Reader/Writer
-	1202  MultiSlot Reader/Writer
-	2000  FX2 DFU Adapter
-	2001  eUSB CompactFlash Reader
-	4100  Kingsun SF-620 Infrared Adapter
-	4101  Connectivity Cable (CA-42 clone)
-	4959  Kingsun KS-959 Infrared Adapter
-07d1  D-Link System
-	13ec  VvBus for Helium 2xx
-	13ed  VvBus for Helium 2xx
-	13f1  DSL-302G Modem
-	13f2  DSL-502G Router
-	3300  DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8192SU]
-	3302  DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8192SU]
-	3303  DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU]
-	3a07  WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523]
-	3a08  WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523]
-	3a09  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A2) [Atheros AR9170+AR9104]
-	3a0d  DWA-120 802.11g Wireless 108G Adapter [Atheros AR5523]
-	3a0f  DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9001U-(2)NG]
-	3a10  DWA-126 802.11n Wireless Adapter [Atheros AR9271]
-	3b01  AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010]
-	3b10  RangeBooster N Adapter
-	3b11  DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell W8360USB]
-	3c03  AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT73]
-	3c04  WUA-1340
-	3c05  EH103 Wireless G Adapter
-	3c07  Wireless G DWA-110 Adapter
-	3c09  DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870]
-	3c0a  DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT2870]
-	3c0b  DWA-110 Wireless G USB Adapter(rev.B)
-	3c0d  DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT3070]
-	3c0e  WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070]
-	3c0f  AirPlus G DWL-G122 Wireless Adapter(rev.E) [Ralink RT2870]
-	3c10  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A1) [Atheros AR9170+AR9104]
-	3c11  DWA-160 Xtreme N Dual Band USB Adapter(rev.B) [Ralink RT2870]
-	3c13  DWA-130 802.11n Wireless N Adapter(rev.B) [Ralink RT2870]
-	3c15  DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT2870]
-	3c16  DWA-125 Wireless N 150 Adapter(rev.A2) [Ralink RT3070]
-	3e02  DWM-156 3.75G HSUPA Adapter
-	5100  Remote NDIS Device
-	a800  DWM-152 3.75G HSUPA Adapter
-	f101  DBT-122 Bluetooth
-	fc01  DBT-120 Bluetooth Adapter
-07d2  Aptio Products, Inc.
-07d3  Cyberdata Corp.
-07d5  Radiant Systems
-07d7  GCC Technologies, Inc.
-07da  Arasan Chip Systems
-07de  Diamond Multimedia
-	2820  VC500 Video Capture Dongle
-07df  David Electronics Co., Ltd
-07e1  Ambient Technologies, Inc.
-	5201  V.90 Modem
-07e2  Elmeg GmbH & Co., Ltd
-07e3  Planex Communications, Inc.
-07e4  Movado Enterprise Co., Ltd
-	0967  SCard R/W CSR-145
-	0968  SCard R/W CSR-145
-07e5  QPS, Inc.
-	05c2  IDE-to-USB2.0 PCA
-	5c01  Que! CDRW
-07e6  Allied Cable Corp.
-07e7  Mirvo Toys, Inc.
-07e8  Labsystems
-07ea  Iwatsu Electric Co., Ltd
-07eb  Double-H Technology Co., Ltd
-07ec  Taiyo Electric Wire & Cable Co., Ltd
-07ee  Torex Retail (formerly Logware)
-	0002  Cash Drawer I/F
-07ef  STSN
-	0001  Internet Access Device
-07f2  Microcomputer Applications, Inc.
-	0001  KEYLOK II
-07f6  Circuit Assembly Corp.
-07f7  Century Corp.
-	0005  ScanLogic/Century Corporation uATA
-	011e  Century USB Disk Enclosure
-07f9  Dotop Technology, Inc.
-07fa  DrayTek Corp.
-	0778  miniVigor 128 ISDN TA
-	1012  BeWAN ADSL USB ST (grey)
-	1196  BWIFI-USB54AR 802.11bg
-	a904  BeWAN ADSL
-	a905  BeWAN ADSL ST
-07fd  Mark of the Unicorn
-	0000  FastLane MIDI Interface
-	0001  FastLane Quad MIDI Interface
-	0002  MOTU Audio for 64 bit
-07ff  Unknown
-	00ff  Portable Hard Drive
-0801  Mag-Tek
-	0001  Mini Swipe Reader (Keyboard Emulation)
-	0002  Mini Swipe Reader
-0802  Mako Technologies, LLC
-0803  Zoom Telephonics, Inc.
-	1300  V92 Faxmodem
-	4310  Wireless-G
-	5241  Cable Modem
-	5551  DSL Modem
-	9700  2986L FaxModem
-	9800  Cable Modem
-	a312  Wireless-G
-0809  Genicom Technology, Inc.
-080a  Evermuch Technology Co., Ltd
-080b  Cross Match Technologies
-	0002  Fingerprint Scanner (After ReNumeration)
-	0010  300LC Series Fingerprint Scanner (Before ReNumeration)
-080c  Datalogic S.p.A.
-	0300  Gryphon D120 Barcode Scanner
-	0400  Gryphon D120 Barcode Scanner
-	0500  Gryphon D120 Barcode Scanner
-	0600  Gryphon M100 Barcode Scanner
-080d  Teco Image Systems Co., Ltd
-	0102  Hercules Scan@home 48
-	0104  3.2Slim
-	0110  UMAX AstraSlim 1200 Scanner
-0810  Personal Communication Systems, Inc.
-	0001  Dual PSX Adaptor
-	0002  Dual PCS Adaptor
-0813  Mattel, Inc.
-	0001  Intel Play QX3 Microscope
-	0002  Dual Mode Camera Plus
-0819  eLicenser
-	0101  License Management and Copy Protection
-081a  MG Logic
-	1000  Duo Pen Tablet
-081b  Indigita Corp.
-	0600  Storage Adapter
-	0601  Storage Adapter
-081c  Mipsys
-081e  AlphaSmart, Inc.
-	df00  Handheld
-0822  Reudo Corp.
-	2001  IRXpress Infrared Device
-0825  GC Protronics
-0826  Data Transit
-0827  BroadLogic, Inc.
-0828  Sato Corp.
-0829  DirecTV Broadband, Inc. (Telocity)
-082d  Handspring
-	0100  Visor
-	0200  Treo
-	0300  Treo 600
-	0400  Handheld
-	0500  Handheld
-	0600  Handheld
-0830  Palm, Inc.
-	0001  m500
-	0002  m505
-	0003  m515
-	0004  Handheld
-	0005  Handheld
-	0006  Handheld
-	0010  Handheld
-	0011  Handheld
-	0012  Handheld
-	0013  Handheld
-	0014  Handheld
-	0020  i705
-	0021  Handheld
-	0022  Handheld
-	0023  Handheld
-	0024  Handheld
-	0030  Handheld
-	0031  Tungsten W
-	0032  Handheld
-	0033  Handheld
-	0034  Handheld
-	0040  m125
-	0041  Handheld
-	0042  Handheld
-	0043  Handheld
-	0044  Handheld
-	0050  m130
-	0051  Handheld
-	0052  Handheld
-	0053  Handheld
-	0054  Handheld
-	0060  Tungsten C/E/T/T2/T3 / Zire 71
-	0061  Lifedrive / Treo 650/680 / Tunsten E2/T5/TX / Centro / Zire 21/31/72 / Z22
-	0062  Handheld
-	0063  Handheld
-	0064  Handheld
-	0070  Zire
-	0071  Handheld
-	0072  Handheld
-	0080  Serial Adapter [for Palm III]
-	0081  Handheld
-	0082  Handheld
-	00a0  Treo 800w
-	0101  Pre
-0832  Kouwell Electronics Corp.
-	5850  Cable
-0833  Sourcenext Corp.
-	012e  KeikaiDenwa 8 with charger
-	039f  KeikaiDenwa 8
-0835  Action Star Enterprise Co., Ltd
-0839  Samsung Techwin Co., Ltd
-	0005  Digimax Camera
-	0008  Digimax 230 Camera
-	0009  Digimax 340
-	000a  Digimax 410
-	000e  Digimax 360
-	0010  Digimax 300
-	1003  Digimax 210SE
-	1005  Digimax 220
-	1009  Digimax V4
-	1012  6500 Document Camera
-	1058  S730 Camera
-	1064  Digimax D830 Camera
-	1542  Digimax 50 Duo
-	3000  Digimax 35 MP3
-083a  Accton Technology Corp.
-	1046  10/100 Ethernet [pegasus]
-	1060  HomeLine Adapter
-	1f4d  SMC8013WG Broadband Remote NDIS Device
-	3046  10/100 Series Adapter
-	3060  1/10/100 Adapter
-	3501  2664W
-	3502  WN3501D Wireless Adapter
-	3503  T-Sinus 111 Wireless Adapter
-	4501  T-Sinus 154data
-	4502  Siemens S30853-S1016-R107 802.11g Wireless Adapter [Intersil ISL3886]
-	4505  SMCWUSB-G 802.11bg
-	4507  SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523]
-	4521  Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887]
-	5046  SpeedStream 10/100 Ethernet [pegasus]
-	5501  Wireless Adapter 11g
-	6500  Cable Modem
-	6618  802.11n Wireless Adapter
-	7511  Arcadyan 802.11N Wireless Adapter
-	7512  Arcadyan 802.11N Wireless Adapter
-	7522  Arcadyan 802.11N Wireless Adapter
-	8522  Arcadyan 802.11N Wireless Adapter
-	8541  WN4501F 802.11g Wireless Adapter [Intersil ISL3887]
-	a512  Arcadyan 802.11N Wireless Adapter
-	a618  SMCWUSBS-N EZ Connect N Draft 11n Wireless Adapter [Ralink RT2870]
-	a701  SMCWUSBS-N3 EZ Connect N Wireless Adapter [Ralink RT3070]
-	b004  CPWUE001 USB/Ethernet Adapter
-	b522  SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870]
-	bb01  BlueExpert Bluetooth Device
-	c003  802.11b Wireless Adapter
-	c501  Zoom Wireless-G
-	c561  802.11a/g Wireless Adapter
-	d522  Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter
-	e501  ZD1211B
-	e503  Arcadyan WN4501 802.11b/g
-	e506  WUS-201 802.11bg
-	f501  802.11g Wireless Adapter
-	f502  802.11g Wireless Adapter
-	f522  Arcadyan WN7512 802.11n
-083f  Global Village
-	b100  TelePort V.90 Fax/Modem
-0840  Argosy Research, Inc.
-	0060  Storage Adapter Bridge Module
-0841  Rioport.com, Inc.
-	0001  Rio 500
-0844  Welland Industrial Co., Ltd
-0846  NetGear, Inc.
-	1001  EA101 10 Mbps 10BASE-T Ethernet [Kawasaki LSI KL5KLUSB101B]
-	1002  Ethernet
-	1020  FA101 Fast Ethernet USB 1.1
-	1040  FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x]
-	4110  MA111(v1) 802.11b Wireless [Intersil Prism 3.0]
-	4200  WG121(v1) 54 Mbps Wireless [Intersil ISL3886]
-	4210  WG121(v2) 54 Mbps Wireless [Intersil ISL3886]
-	4220  WG111(v1) 54 Mbps Wireless [Intersil ISL3886]
-	4230  MA111(v2) 802.11b Wireless [SIS SIS 162]
-	4240  WG111(v1) rev 2 54 Mbps Wireless [Intersil ISL3887]
-	4250  WG111T 802.11g Wireless Adapter [Atheros AR5523]
-	4260  WG111v3 54 Mbps Wireless [realtek RTL8187B]
-	4300  WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX]
-	4301  WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX]
-	5f00  WPN111 802.11g Wireless Adapter [Atheros AR5523]
-	6a00  WG111v2 54 Mbps Wireless [RealTek RTL8187L]
-	7100  WN121T RangeMax Next Wireless-N [Marvell TopDog]
-	9000  WN111(v1) RangeMax Next Wireless [Marvell 88W8362+88W8060]
-	9001  WN111(v2) RangeMax Next Wireless [Atheros AR9170+AR9101]
-	9010  WNDA3100v1 802.11abgn [Atheros AR9170+AR9104]
-	9011  WNDA3100v2 802.11abgn [Broadcom BCM4323]
-	9018  WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
-	9020  WNA3100(v1) Wireless-N 300 [Broadcom BCM43231]
-	9030  WNA1100 Wireless-N 150 [Atheros AR9271]
-	9040  WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]
-	9041  WNA1000M 802.11bgn [Realtek RTL8188CUS]
-	a001  PA101 10 Mbps HPNA Home Phoneline RJ-1
-084d  Minton Optic Industry Co., Inc.
-	0001  Jenoptik JD800i
-	0003  S-Cam F5/D-Link DSC-350 Digital Camera
-	0011  Argus DC3500 Digital Camera
-	0014  Praktica DC 32
-	0019  Praktica DPix3000
-	0025  Praktica DC 60
-	1001  ScanHex SX-35d
-084e  KB Gear
-	0001  JamCam Camera
-	1001  Jam Studio Tablet
-	1002  Pablo Tablet
-084f  Empeg
-	0001  Empeg-Car Mark I/II Player
-0850  Fast Point Technologies, Inc.
-0851  Macronix International Co., Ltd
-	1542  SiPix Blink
-	1543  Maxell WS30 Slim Digital Camera, or Pandigital PI8004W01 digital photo frame
-	a168  MXIC
-0852  CSEM
-0853  Topre Corporation
-	0100  HHKB Professional
-0854  ActiveWire, Inc.
-	0100  I/O Board
-	0101  I/O Board, rev1
-0856  B&B Electronics
-	ac01  uLinks USOTL4 RS422/485 Adapter
-0858  Hitachi Maxell, Ltd
-	3102  Bluetooth Device
-	ffff  Maxell module with BlueCore in DFU mode
-0859  Minolta Systems Laboratory, Inc.
-085a  Xircom
-	0001  Portstation Dual Serial Port
-	0003  Portstation Paraller Port
-	0008  Ethernet
-	0009  Ethernet
-	000b  Portstation Dual PS/2 Port
-	0021  1 port to Serial Converter
-	0022  Parallel Port
-	0023  2 port to Serial Converter
-	0024  Parallel Port
-	0027  1 port to Serial Converter
-	0028  PortGear to SCSI Converter
-	0032  PortStation SCSI Module
-	003c  Bluetooth Adapter
-	0299  Colorvision, Inc. Monitor Spyder
-	8021  1 port to Serial
-	8023  2 port to Serial
-	8027  PGSDB9 Serial Port
-085c  ColorVision, Inc.
-	0200  Monitor Spyder
-0862  Teletrol Systems, Inc.
-0863  Filanet Corp.
-0864  NetGear, Inc.
-	4100  MA101 802.11b Adapter
-	4102  MA101 802.11b Adapter
-0867  Data Translation, Inc.
-	9812  ECON Data acquisition unit
-	9816  DT9816 ECON data acquisition module
-	9836  DT9836 data acquisition card
-086a  Emagic Soft- und Hardware GmbH
-	0001  Unitor8
-	0002  AMT8
-	0003  MT4
-086c  DeTeWe - Deutsche Telephonwerke AG & Co.
-	1001  Eumex 504PC ISDN TA
-	1002  Eumex 504PC (FlashLoad)
-	1003  TA33 ISDN TA
-	1004  TA33 (FlashLoad)
-	1005  Eumex 604PC HomeNet
-	1006  Eumex 604PC HomeNet (FlashLoad)
-	1007  Eumex 704PC DSL
-	1008  Eumex 704PC DSL (FlashLoad)
-	1009  Eumex 724PC DSL
-	100a  Eumex 724PC DSL (FlashLoad)
-	100b  OpenCom 30
-	100c  OpenCom 30 (FlashLoad)
-	100d  BeeTel Home 100
-	100e  BeeTel Home 100 (FlashLoad)
-	1011  USB2DECT
-	1012  USB2DECT (FlashLoad)
-	1013  Eumex 704PC LAN
-	1014  Eumex 704PC LAN (FlashLoad)
-	1019  Eumex 504 SE
-	101a  Eumex 504 SE (Flash-Mode)
-	1021  OpenCom 40
-	1022  OpenCom 40 (FlashLoad)
-	1023  OpenCom 45
-	1024  OpenCom 45 (FlashLoad)
-	1025  Sinus 61 data
-	1029  dect BOX
-	102c  Eumex 604PC HomeNet [FlashLoad]
-	1030  Eumex 704PC DSL [FlashLoad]
-	1032  OpenCom 40 [FlashLoad]
-	1033  OpenCom 30 plus
-	1034  OpenCom 30 plus (FlashLoad)
-	1041  Eumex 220PC
-	1042  Eumex 220PC (FlashMode)
-	1055  Eumex 220 Version 2 ISDN TA
-	1056  Eumex 220 Version 2 ISDN TA (Flash-Mode)
-	2000  OpenCom 1000
-086e  System TALKS, Inc.
-	1920  SGC-X2UL
-086f  MEC IMEX, Inc.
-0870  Metricom
-	0001  Ricochet GS
-0871  SanDisk, Inc.
-	0001  SDDR-01 Compact Flash Reader
-	0002  SDDR-31 Compact Flash Reader
-	0005  SDDR-05 Compact Flash Reader
-0873  Xpeed, Inc.
-0874  A-Tec Subsystem, Inc.
-0879  Comtrol Corp.
-087c  Adesso/Kbtek America, Inc.
-087d  Jaton Corp.
-	5704  Ethernet
-087e  Fujitsu Computer Products of America
-087f  Virtual IP Group, Inc.
-0880  APT Technologies, Inc.
-0883  Recording Industry Association of America (RIAA)
-0885  Boca Research, Inc.
-0886  XAC Automation Corp.
-	0630  Intel PC Camera CS630
-0887  Hannstar Electronics Corp.
-088b  MassWorks, Inc.
-	4944  MassWorks ID-75 TouchScreen
-088c  Swecoin AB
-	2030  Ticket Printer TTP 2030
-088e  iLok
-	5036  Portable secure storage for software licenses
-0892  DioGraphy, Inc.
-	0101  Smartdio Reader/Writer
-0897  Lauterbach
-	0002  Power Debug/Power Debug II
-089c  United Technologies Research Cntr.
-089d  Icron Technologies Corp.
-089e  NST Co., Ltd
-089f  Primex Aerospace Co.
-08a5  e9, Inc.
-08a8  Andrea Electronics
-08ae  Macally (Mace Group, Inc.)
-08b4  Sorenson Vision, Inc.
-08b7  NATSU
-	0001  Playstation adapter
-08b8  J. Gordon Electronic Design, Inc.
-	01f4  USBSIMM1
-08b9  RadioShack Corp. (Tandy)
-08bb  Texas Instruments Japan
-	2702  Speakers
-	2900  PCM2900 Audio Codec
-	2901  PCM2901 Audio Codec
-	2902  PCM2902 Audio Codec
-	2904  PCM2904 Audio Codec
-	2910  PCM2912 Audio Codec
-08bd  Citizen Watch Co., Ltd
-	0208  CLP-521 Label Printer
-	1100  X1-USB Floppy
-08c3  Precise Biometrics
-	0001  100 SC
-	0002  100 A
-	0003  100 SC BioKeyboard
-	0006  100 A BioKeyboard
-	0100  100 MC ISP
-	0101  100 MC FingerPrint and SmartCard Reader
-	0300  100 AX
-	0400  100 SC
-	0401  150 MC
-	0402  200 MC FingerPrint and SmartCard Reader
-	0404  100 SC Upgrade
-	0405  150 MC Upgrade
-	0406  100 MC Upgrade
-08c4  Proxim, Inc.
-	0100  Skyline 802.11b Wireless Adapter
-	02f2  Farallon Home Phoneline Adapter
-08c7  Key Nice Enterprise Co., Ltd
-08c8  2Wire, Inc.
-08c9  Nippon Telegraph and Telephone Corp.
-08ca  Aiptek International, Inc.
-	0001  Tablet
-	0010  Tablet
-	0020  APT-6000U Tablet
-	0021  APT-2 Tablet
-	0022  Tablet
-	0023  Tablet
-	0024  Tablet
-	0100  Pen Drive
-	0102  DualCam
-	0103  Pocket DV Digital Camera
-	0104  Pocket DVII
-	0105  Mega DV(Disk)
-	0106  Pocket DV3100+
-	0107  Pocket DV3100
-	0109  Nisis DV4 Digital Camera
-	010a  Trust 738AV LCD PV Mass Storage
-	0111  PenCam VGA Plus
-	2008  Mini PenCam 2
-	2010  Pocket CAM 3 Mega (webcam)
-	2011  Pocket CAM 3 Mega (storage)
-	2016  PocketCam 2 Mega
-	2018  Pencam SD 2M
-	2020  Slim 3000F
-	2022  Slim 3200
-	2024  Pocket DV3500
-	2028  Pocket Cam4M
-	2040  Pocket DV4100M
-	2042  Pocket DV5100M Composite Device
-	2043  Pocket DV5100M (Disk)
-	2060  Pocket DV5300
-08cd  Jue Hsun Ind. Corp.
-08ce  Long Well Electronics Corp.
-08cf  Productivity Enhancement Products
-08d1  smartBridges, Inc.
-	0001  smartNIC Ethernet [catc]
-	0003  smartNIC 2 PnP Ethernet
-08d3  Virtual Ink
-08d4  Fujitsu Siemens Computers
-	0009  SCR SmartCard Reader
-08d8  IXXAT Automation GmbH
-	0002  USB-to-CAN compact
-	0003  USB-to-CAN II
-	0100  USB-to-CAN
-08d9  Increment P Corp.
-08dd  Billionton Systems, Inc.
-	0112  Wireless LAN Adapter
-	0113  Wireless LAN Adapter
-	0986  USB-100N Ethernet [pegasus]
-	0987  USBLP-100 HomePNA Ethernet [pegasus]
-	0988  USBEL-100 Ethernet [pegasus]
-	1986  10/100 LAN Adapter
-	2103  DVB-T TV-Tuner Card-R
-	8511  USBE-100 Ethernet [pegasus2]
-	90ff  USB2AR Ethernet
-08de  ???
-	7a01  802.11b Adapter
-08df  Spyrus, Inc.
-	0001  Rosetta Token V1
-	0002  Rosetta Token V2
-	0003  Rosetta Token V3
-	0a00  Lynks Interface
-08e3  Olitec, Inc.
-	0002  USB-RS232 Bridge
-	0100  Interface ADSL
-	0101  Interface ADSL
-	0102  ADSL
-	0301  RNIS
-08e4  Pioneer Corp.
-08e5  Litronic
-08e6  Gemplus
-	0001  GemPC-Touch 430
-	0430  GemPC430 SmartCard Reader
-	0432  GemPC432 SmartCard Reader
-	0435  GemPC435 SmartCard Reader
-	0437  GemPC433 SL SmartCard Reader
-	1359  UA SECURE STORAGE TOKEN
-	2202  Gem e-Seal Pro Token
-	3437  GemPC Twin SmartCard Reader
-	3438  GemPC Key SmartCard Reader
-	3478  PinPad Smart Card Reader
-	4433  GemPC433-Swap
-	5501  GemProx-PU Contactless Smart Card Reader
-	ace0  UA HYBRID TOKEN
-08e7  Pan-International Wire & Cable
-08e8  Integrated Memory Logic
-08e9  Extended Systems, Inc.
-	0100  XTNDAccess IrDA Dongle
-08ea  Ericsson, Inc., Blue Ridge Labs
-	00c9  ADSL Modem HM120dp Loader
-	00ca  ADSL WAN Modem HM120dp
-	00ce  HM230d Virtual Bus for Helium
-	abba  USB Driver for Bluetooth Wireless Technology
-	abbb  Bluetooth Device in DFU State
-08ec  M-Systems Flash Disk Pioneers
-	0001  TravelDrive 2C
-	0002  TravelDrive 2C
-	0005  TravelDrive 2C
-	0008  TravelDrive 2C
-	0010  DiskOnKey
-	0011  DiskOnKey
-	0012  TravelDrive 2C
-	0014  TravelDrive 2C
-	0015  Kingston DataTraveler ELITE
-	0016  Kingston DataTraveler U3
-	0020  TravelDrive
-	0021  TravelDrive
-	0022  TravelDrive
-	0023  TravelDrive
-	0024  TravelDrive
-	0025  TravelDrive
-	0026  TravelDrive
-	0027  TravelDrive
-	0028  TravelDrive
-	0029  TravelDrive
-	0030  TravelDrive
-	0822  TravelDrive 2C
-	0832  Hi-Speed Mass Storage Device
-	0834  M-Disk 220
-	0998  Kingston Data Traveler2.0 Disk Driver
-	0999  Kingston Data Traveler2.0 Disk Driver
-	1000  TravelDrive 2C
-	2000  TravelDrive 2C
-	2038  TravelDrive
-	2039  TravelDrive
-	204a  TravelDrive
-	204b  TravelDrive
-08ed  MediaTek Inc.
-	0002  CECT M800 memory card
-08ee  CCSI/Hesso
-08f0  Corex Technologies
-08f1  CTI Electronics Corp.
-08f2  Gotop Information Inc.
-	007f  Super Q2 Tablet
-08f5  SysTec Co., Ltd
-08f6  Logic 3 International, Ltd
-08f7  Vernier
-	0001  LabPro
-	0002  EasyTemp/Go!Temp
-	0003  Go!Link
-	0004  Go!Motion
-08f8  Keen Top International Enterprise Co., Ltd
-08f9  Wipro Technologies
-08fa  Caere
-08fb  Socket Communications
-08fc  Sicon Cable Technology Co., Ltd
-08fd  Digianswer A/S
-	0001  Bluetooth Device
-08ff  AuthenTec, Inc.
-	1600  AES1600
-	1610  AES1600
-	2500  AES2501
-	2501  AES2501
-	2502  AES2501
-	2503  AES2501
-	2504  AES2501
-	2505  AES2501
-	2506  AES2501
-	2507  AES2501
-	2508  AES2501
-	2509  AES2501
-	250a  AES2501
-	250b  AES2501
-	250c  AES2501
-	250d  AES2501
-	250e  AES2501
-	250f  AES2501
-	2510  AES2510
-	2580  AES2501 Fingerprint Sensor
-	2588  AES2501
-	2589  AES2501
-	258a  AES2501
-	258b  AES2501
-	258c  AES2501
-	258d  AES2501
-	258e  AES2501
-	258f  AES2501
-	2810  AES2810
-	3400  AES3400 TruePrint Sensor
-	3401  AES3400 Sensor
-	3402  AES3400 Sensor
-	3403  AES3400 Sensor
-	3404  AES3400 TruePrint Sensor
-	3405  AES3400 TruePrint Sensor
-	3406  AES3400 TruePrint Sensor
-	3407  AES3400 TruePrint Sensor
-	4902  BioMV with TruePrint AES3500
-	4903  BioMV with TruePrint AES3400
-	5500  AES4000
-	5501  AES4000 TruePrint Sensor
-	5503  AES4000 TruePrint Sensor
-	5505  AES4000 TruePrint Sensor
-	5507  AES4000 TruePrint Sensor
-	55ff  AES4000 TruePrint Sensor.
-	5700  AES3500 Fingerprint Reader
-	5701  AES3500 TruePrint Sensor
-	5702  AES3500 TruePrint Sensor
-	5703  AES3500 TruePrint Sensor
-	5704  AES3500-BZ TruePrint Sensor
-	5705  AES3500-BZ TruePrint Sensor
-	5706  AES3500-BZ TruePrint Sensor
-	5707  AES3500-BZ TruePrint Sensor
-	5710  AES3500 TruePrint Sensor
-	5711  AES3500 TruePrint Sensor
-	5712  AES3500 TruePrint Sensor
-	5713  AES3500 TruePrint Sensor
-	5714  AES3500-BZ TruePrint Sensor
-	5715  AES3500-BZ TruePrint Sensor
-	5716  AES3500-BZ TruePrint Sensor
-	5717  AES3500-BZ TruePrint Sensor
-	5730  AES3500 TruePrint Sensor
-	5731  AES3500 TruePrint Sensor
-	5732  AES3500 TruePrint Sensor
-	5733  AES3500 TruePrint Sensor
-	5734  AES3500-BZ TruePrint Sensor
-	5735  AES3500-BZ TruePrint Sensor
-	5736  AES3500-BZ TruePrint Sensor
-	5737  AES3500-BZ TruePrint Sensor
-	afe3  FingerLoc Sensor Module (Anchor)
-	afe4  FingerLoc Sensor Module (Anchor)
-	afe5  FingerLoc Sensor Module (Anchor)
-	afe6  FingerLoc Sensor Module (Anchor)
-	fffd  AES2510 Sensor (USB Emulator)
-	ffff  Sensor (Emulator)
-0900  Pinnacle Systems, Inc.
-0901  VST Technologies
-	0001  Hard Drive Adapter (TPP)
-	0002  SigmaDrive Adapter (TPP)
-0906  Faraday Technology Corp.
-0908  ShenZhen SANZHAI Technology Co.,Ltd
-	2701  Spy Pen VGA
-0909  Audio-Technica Corp.
-090a  Trumpion Microelectronics, Inc.
-	1001  T33520 Flash Card Controller
-	1100  Comotron C3310 MP3 player
-	1200  MP3 player
-	1540  Digitex Container Flash Disk
-090b  Neurosmith
-090c  Silicon Motion, Inc. - Taiwan (formerly Feiya Technology Corp.)
-	0371  Silicon Motion SM371 Camera
-	0373  Silicon Motion Camera
-	037a  Silicon Motion Camera
-	037b  Silicon Motion Camera
-	1000  64MB QDI U2 DISK
-	1132  5-in-1 Card Reader
-	337b  Silicon Motion Camera
-	3710  Silicon Motion Camera
-	3720  Silicon Motion Camera
-	37c0  Silicon Motion Camera
-	6000  SD/SDHC Card Reader (SG365 / FlexiDrive XC+)
-	6200  microSD card reader
-	837b  Silicon Motion Camera
-	937b  Silicon Motion Camera
-	b370  Silicon Motion SM370 Camera
-	b371  Silicon Motion SM371 Camera
-090d  Multiport Computer Vertriebs GmbH
-090e  Shining Technology, Inc.
-090f  Fujitsu Devices, Inc.
-0910  Alation Systems, Inc.
-0911  Philips Speech Processing
-	149a  SpeechMike II Pro Plus LFH5276
-	2512  SpeechMike Pro
-0912  Voquette, Inc.
-0915  GlobeSpan, Inc.
-	0001  DSL Modem
-	0002  ADSL ATM Modem
-	0005  LAN Modem
-	2000  802.11 Adapter
-	2002  802.11 Adapter
-	8000  ADSL LAN Modem
-	8005  DSL-302G Modem
-	8101  ADSL WAN Modem
-	8102  DSL-200 ADSL Modem
-	8103  DSL-200 ADSL Modem
-	8104  DSL-200 Modem
-	8400  DSL Modem
-	8401  DSL Modem
-	8402  DSL Modem
-	8500  DSL Modem
-	8501  DSL Modem
-0917  SmartDisk Corp.
-	0001  eFilm Reader-11 SM/CF
-	0002  eFilm Reader-11 SM
-	0003  eFilm Reader-11 CF
-	0200  FireFly
-	0201  FireLite
-	0202  STORAGE ADAPTER (FirePower)
-	0204  FlashTrax Storage
-	0205  STORAGE ADAPTER (CrossFire)
-	0206  FireFly 20G HDD
-	0207  FireLite
-	020f  STORAGE ADAPTER (FireLite)
-	da01  eFilm Reader-11 Test
-	ffff  eFilm Reader-11 (Class/PDR)
-0919  Tiger Electronics
-	0100  Fast Flicks Digital Camera
-091e  Garmin International
-	0003  GPS (various models)
-	0004  iQue 3600
-	0200  Data Card Programmer (install)
-	1200  Data Card Programmer
-	21a5  etrex Cx (msc)
-	2271  Edge 605/705
-	2295  Colorado 300
-	22b6  eTrex Vista HCx (Mass Storage mode)
-	2353  Nüvi 205T
-	2535  Edge 800
-0920  Echelon Co.
-	7500  Network Interface
-0921  GoHubs, Inc.
-	1001  GoCOM232 Serial
-0922  Dymo-CoStar Corp.
-	0007  LabelWriter 330
-	0009  LabelWriter 310
-	001a  LabelWriter 400 Turbo
-	0020  LabelWriter 450
-0923  IC Media Corp.
-	010f  SIIG MobileCam
-0924  Xerox
-	23dd  DocuPrint M760 (X760_USB)
-	3ce8  Phaser 3428 Printer
-	3d5b  Phaser 6115MFP TWAIN Scanner
-	420f  WorkCentre PE220 Series
-	421f  M20 Scanner
-	423b  Printing Support
-	ffef  WorkCenter M15
-	fffb  DocuPrint M750 (X750_USB)
-0925  Lakeview Research
-	0005  Gamtec.,Ltd SmartJoy PLUS Adapter
-	8101  Phidgets, Inc., 1-Motor PhidgetServo v2.0
-	8104  Phidgets, Inc., 4-Motor PhidgetServo v2.0
-	8800  WiseGroup Ltd, MP-8800 Quad Joypad
-	8866  WiseGroup Ltd, MP-8866 Dual Joypad
-0927  Summus, Ltd
-0928  Oxford Semiconductor, Ltd
-0929  American Biometric Co.
-092a  Toshiba Information & Industrial Sys. And Services
-092b  Sena Technologies, Inc.
-092f  Northern Embedded Science/CAVNEX
-	0004  JTAG-4
-	0005  JTAG-5
-0930  Toshiba Corp.
-	0009  Gigabeat F/X (HDD audio player)
-	000c  Gigabeat F (mtp)
-	0010  Gigabeat S (mtp)
-	0301  PCX1100U Cable Modem (WDM)
-	0302  PCX2000 Cable Modem (WDM)
-	0305  Cable Modem PCX3000
-	0307  Cable Modem PCX2500
-	0308  PCX2200 Cable Modem (WDM)
-	0309  PCX5000 Cable Modem (WDM)
-	030b  Cable Modem PCX2600
-	0501  Bluetooth Controller
-	0502  Integrated Bluetooth
-	0503  Bluetooth Controller
-	0505  Integrated Bluetooth
-	0506  Integrated Bluetooth
-	0507  Bluetooth Adapter
-	0508  Integrated Bluetooth HCI
-	0509  BT EDR Dongle
-	0706  PocketPC e740
-	0707  Pocket PC e330 Series
-	0708  Pocket PC e350 Series
-	0709  Pocket PC e750 Series
-	070a  Pocket PC e400 Series
-	070b  Pocket PC e800 Series
-	0a07  WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]
-	0b05  PX1220E-1G25 External hard drive
-	0b09  PX1396E-3T01 External hard drive
-	1300  Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port
-	1301  Wireless Broadband (CDMA EV-DO) Minicard Status Port
-	1302  Wireless Broadband (3G HSDPA) SM-Bus Minicard Status Port
-	1303  Wireless Broadband (3G HSDPA) Minicard Status Port
-	1308  Broadband (3G HSDPA) SM-Bus Minicard Diagnostics Port
-	130b  F3507g Mobile Broadband Module
-	130c  F3607gw Mobile Broadband Module
-	1311  F3607gw v2 Mobile Broadband Module
-	642f  TravelDrive
-	6506  TravelDrive 2C
-	6507  TravelDrive 2C
-	6508  TravelDrive 2C
-	6509  TravelDrive 2C
-	6510  TravelDrive 2C
-	6517  TravelDrive 2C
-	6518  TravelDrive 2C
-	6519  Kingston DataTraveler 2.0 USB Stick
-	651a  TravelDrive 2C
-	651b  TravelDrive 2C
-	651c  TravelDrive 2C
-	651d  TravelDrive 2C
-	651e  TravelDrive 2C
-	651f  TravelDrive 2C
-	6520  TravelDrive 2C
-	6521  TravelDrive 2C
-	6522  TravelDrive 2C
-	6523  TravelDrive
-	6524  TravelDrive
-	6525  TravelDrive
-	6526  TravelDrive
-	6527  TravelDrive
-	6528  TravelDrive
-	6529  TravelDrive
-	652a  TravelDrive
-	652b  TravelDrive
-	652c  TravelDrive
-	652d  TravelDrive
-	652f  TravelDrive
-	6530  TravelDrive
-	6531  TravelDrive
-	6532  256M Stick
-	6533  512M Stick
-	6534  TravelDrive
-	653c  Kingston DataTraveler 2.0 Stick (512M)
-	653d  Kingston DataTraveler 2.0 Stick (1GB)
-	653e  Flash Memory
-	6540  TransMemory Flash Memory
-	6544  Kingston DataTraveler 2.0 Stick (2GB)
-	6545  Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick
-0931  Harmonic Data Systems, Ltd
-0932  Crescentec Corp.
-	0300  VideoAdvantage
-	0302  Syntek DC-112X
-	0320  VideoAdvantage
-	0482  USB2.0 TVBOX
-	1100  DC-1100 Video Enhamcement Device
-	1112  Veo Web Camera
-	a311  Video Enhancement Device
-0933  Quantum Corp.
-0934  Netcom Systems
-0936  NuTesla
-	0030  Composite Device, Mass Storage Device (Flash Drive) amd HID
-	003c  Rhythmedics HID Bootloader
-0939  Lumberg, Inc.
-093a  Pixart Imaging, Inc.
-	0007  CMOS 100K-R Rev. 1.90
-	010e  Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A
-	010f  Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55
-	020f  Bullet Line Photo Viewer
-	050f  Mars-Semi Pc-Camera
-	2460  Q-TEC WEBCAM 100
-	2468  SoC PC-Camera
-	2470  SoC PC-Camera
-	2471  SoC PC-Camera
-	2500  USB Optical Mouse
-	2510  Optical Mouse
-	2600  Typhoon Easycam USB 330K (newer)/Typhoon Easycam USB 2.0 VGA 1.3M/Sansun SN-508
-	2601  SPC 610NC Laptop Camera
-	2603  PAC7312 Camera
-	2608  PAC7311 Trust WB-3300p
-	260e  PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350
-	260f  PAC7311 SnakeCam
-	2621  PAC731x Trust Webcam
-	2624  Webcam
-093b  Plextor Corp.
-	0010  Storage Adapter
-	0011  PlexWriter 40/12/40U
-	0041  PX-708A DVD RW
-	0042  PX-712UF DVD RW
-	a002  ConvertX M402U XLOADER
-	a003  ConvertX AV100U A/V Capture Audio
-	a004  ConvertX TV402U XLOADER
-	a005  ConvertX TV100U A/V Capture
-	a102  ConvertX M402U A/V Capture
-	a104  ConvertX PX-TV402U/NA
-093c  Intrepid Control Systems, Inc.
-	0601  ValueCAN
-	0701  NeoVI Blue vehicle bus interface
-093d  InnoSync, Inc.
-093e  J.S.T. Mfg. Co., Ltd
-093f  Olympia Telecom Vertriebs GmbH
-0940  Japan Storage Battery Co., Ltd
-0941  Photobit Corp.
-0942  i2Go.com, LLC
-0943  HCL Technologies India Private, Ltd
-0944  KORG, Inc.
-	0001  PXR4 4-Track Digital Recorder
-	0020  KAOSS Pad KP3 Dynamic Effect/Sampler
-	010d  nanoKEY MIDI keyboard
-	010e  nanoPAD pad controller
-	010f  nanoKONTROL studio controller
-	0f03  K-Series K61P MIDI studio controller
-0945  Pasco Scientific
-0948  Kronauer music in digital
-	0301  USB Pro (24/48)
-	0302  USB Pro (24/96 playback)
-	0303  USB Pro (24/96 record)
-	0304  USB Pro (16/48)
-	1105  USB One
-094b  Linkup Systems Corp.
-	0001  neonode N2
-094d  Cable Television Laboratories
-094f  Yano
-	0101  U640MO-03
-	05fc  METALWEAR-HDD
-0951  Kingston Technology
-	0008  Ethernet
-	000a  KNU101TX 100baseTX Ethernet
-	1600  DataTraveler II Pen Drive
-	1601  DataTraveler II+ Pen Drive
-	1602  DataTraveler Mini
-	1603  DataTraveler 1GB/2GB Pen Drive
-	1607  DataTraveler 100
-	1613  DataTraveler DT101C Flash Drive
-	1616  Kingston DataTraveler Locker (4GB)
-	1624  DataTraveler G2 4GB Pen Drive
-	1625  DataTraveler 101 II
-	162a  DataTraveler 112 4GB Pen Drive
-	1643  DataTraveler G3 4GB
-0954  RPM Systems Corp.
-0955  NVidia Corp.
-0956  BSquare Corp.
-0957  Agilent Technologies, Inc.
-	0200  E-Video DC-350 Camera
-	0202  E-Video DC-350 Camera
-0958  CompuLink Research, Inc.
-0959  Cologne Chip AG
-	2bd0  Intelligent ISDN (Ver. 3.60.04)
-095a  Portsmith
-	3003  Express Ethernet
-095b  Medialogic Corp.
-095c  K-Tec Electronics
-095d  Polycom, Inc.
-	0001  Polycom ViaVideo
-0967  Acer (??)
-	0204  WarpLink 802.11b Adapter
-0968  Catalyst Enterprises, Inc.
-096e  Feitian Technologies, Inc.
-	0802  ePass2000 (G&D STARCOS SPK 2.4)
-0971  Gretag-Macbeth AG
-	2003  Eye-One display
-	2005  Huey
-	2007  ColorMunki
-0973  Schlumberger
-	0001  e-gate Smart Card
-0974  Datagraphix, a business unit of Anacomp
-0975  OL'E Communications, Inc.
-0976  Adirondack Wire & Cable
-0977  Lightsurf Technologies
-0978  Beckhoff GmbH
-0979  Jeilin Technology Corp., Ltd
-	0224  JL2005A Toy Camera
-	0226  JL2005A Toy Camera
-	0227  JL2005B/C/D Toy Camera
-097a  Minds At Work LLC
-	0001  Digital Wallet
-097b  Knudsen Engineering, Ltd
-097c  Marunix Co., Ltd
-097d  Rosun Technologies, Inc.
-097f  Barun Electronics Co., Ltd
-0981  Oak Technology, Ltd
-0984  Apricorn
-	0200  Hard Drive Storage (TPP)
-0985  cab Produkttechnik GmbH & Co KG
-	0045  Mach4/200 Label Printer
-	00a3  A3/200 or A3/300 Label Printer
-0986  Matsushita Electric Works, Ltd.
-098c  Vitana Corp.
-098d  INDesign
-098e  Integrated Intellectual Property, Inc.
-098f  Kenwood TMI Corp.
-0993  Gemstar eBook Group, Ltd
-	0001  REB1100 eBook Reader
-	0002  eBook
-0996  Integrated Telecom Express, Inc.
-099a  Zippy Technology Corp.
-	0638  Sanwa Supply Inc. Small Keyboard
-	610c  EL-610 Super Mini Electron luminescent Keyboard
-	7160  Hyper Slim Keyboard
-09a3  PairGain Technologies
-09a4  Contech Research, Inc.
-09a5  VCON Telecommunications
-09a6  Poinchips
-	8001  Mass Storage Device
-09a7  Data Transmission Network Corp.
-09a8  Lin Shiung Enterprise Co., Ltd
-09a9  Smart Card Technologies Co., Ltd
-09aa  Intersil Corp.
-	1000  Prism GT 802.11b/g Adapter
-	3642  Prism 2.x 802.11b Adapter
-09ab  Japan Cash Machine Co., Ltd.
-09ae  Tripp Lite
-09b2  Franklin Electronic Publishers, Inc.
-	0001  eBookman Palm Computer
-09b3  Altius Solutions, Inc.
-09b4  MDS Telephone Systems
-09b5  Celltrix Technology Co., Ltd
-09bc  Grundig
-	0002  MPaxx MP150 MP3 Player
-09be  MySmart.Com
-	0001  MySmartPad
-09bf  Auerswald GmbH & Co. KG
-	00c0  COMpact 2104 ISDN PBX
-	00db  COMpact 4410/2206 ISDN ISDN
-	00f1  COMfort System Telephones
-09c0  Genpix Electronics, LLC
-	0202  8PSK DVB-S tuner
-	0203  Skywalker-1 DVB-S tuner
-	0204  Skywalker-CW3K DVB-S tuner
-	0205  Skywalker-CW3K DVB-S tuner
-	0206  Skywalker-2 DVB-S tuner
-09c1  Arris Interactive LLC
-	1337  TOUCHSTONE DEVICE
-09c2  Nisca Corp.
-09c3  ActivCard, Inc.
-	0007  Reader V2
-	0008  ZFG-9800-AC SmartCard Reader
-	0014  ActivIdentity ActivKey SIM USB Token
-09c4  ACTiSYS Corp.
-	0011  ACT-IR2000U IrDA Dongle
-09c5  Memory Corp.
-09cc  Workbit Corp.
-	0404  BAFO USB-ATA/ATAPI Bridge Controller
-09cd  Psion Dacom Home Networks, Ltd
-	2001  Psion WaveFinder DAB radio receiver
-09ce  City Electronics, Ltd
-09cf  Electronics Testing Center, Taiwan
-09d1  NeoMagic, Inc.
-09d2  Vreelin Engineering, Inc.
-09d3  Com One
-	0001  ISDN TA
-09d7  Novatel Wireless
-	0100  NovAtel FlexPack GPS receiver
-09d9  KRF Tech, Ltd
-09da  A4 Tech Co., Ltd
-	0006  Optical Mouse WOP-35 / Trust 450L Optical Mouse
-	000a  Port Mouse
-	0018  Trust Human Interface Device
-	001a  Wireless Mouse & RXM-15 Receiver
-	002a  Wireless Optical Mouse NB-30
-	022b  Wireless Mouse (Battery Free)
-	024f  RF Receiver and G6-20D Wireless Optical Mouse
-	032b  Wireless Mouse (Battery Free)
-	8090  X-718BK Oscar Optical Gaming Mouse
-	9090  XL-750BK Laser Mouse
-09db  Measurement Computing Corp.
-	0075  MiniLab 1008
-	0076  PMD-1024
-	007a  PMD-1208LS
-	0081  USB-1616FS
-	0082  USB-1208FS
-	0088  USB-1616FS internal hub
-09dc  Aimex Corp.
-09dd  Fellowes, Inc.
-09df  Addonics Technologies Corp.
-09e1  Intellon Corp.
-	5121  MicroLink dLAN
-09e5  Jo-Dan International, Inc.
-09e6  Silutia, Inc.
-09e7  Real 3D, Inc.
-09e8  AKAI  Professional M.I. Corp.
-	0062  MPD16 MIDI Pad Controller Unit
-	006d  EWI electronic wind instrument
-	0071  MPK25 MIDI Keyboard
-	0076  LPK25 MIDI Keyboard
-09e9  Chen-Source, Inc.
-09eb  IM Networks, Inc.
-	4331  iRhythm Tuner Remote
-09ef  Xitel
-	0101  MD-Port DG2 MiniDisc Interface
-09f3  GoFlight, Inc.
-	0018  GF-46 Multi-Mode Display Module
-	0028  RP-48 Combination Pushbutton-Rotary Module
-	0048  LGTII - Landing Gear and Trim Control Module
-	0064  MCPPro - Airliner Mode Control Panel (Autopilot)
-	0300  EFIS - Electronic Flight Information System
-09f5  AresCom
-	0168  Network Adapter
-	0188  LAN Adapter
-	0850  Adapter
-09f6  RocketChips, Inc.
-09f7  Edu-Science (H.K.), Ltd
-09f8  SoftConnex Technologies, Inc.
-09f9  Bay Associates
-09fa  Mtek Vision
-09fb  Altera
-	6001  Blaster
-09ff  Gain Technology Corp.
-0a00  Liquid Audio
-0a01  ViA, Inc.
-0a07  Ontrak Control Systems Inc.
-	0064  ADU100 Data Acquisition Interface
-	0078  ADU120 Data Acquisition Interface
-	0082  ADU130 Data Acquisition Interface
-	00c8  ADU200 Relay I/O Interface
-	00d0  ADU208 Relay I/O Interface
-	00da  ADU218 Solid-State Relay I/O Interface
-0a0b  Cybex Computer Products Co.
-0a11  Xentec, Inc.
-0a12  Cambridge Silicon Radio, Ltd
-	0001  Bluetooth Dongle (HCI mode)
-	0002  Frontline Test Equipment Bluetooth Device
-	0003  Nanosira
-	0004  Nanosira WHQL Reference Radio
-	0005  Nanosira-Multimedia
-	0006  Nanosira-Multimedia WHQL Reference Radio
-	0007  Nanosira3-ROM
-	0008  Nanosira3-ROM
-	0009  Nanosira4-EDR WHQL Reference Radio
-	000a  Nanosira4-EDR-ROM
-	000b  Nanosira5-ROM
-	0043  Bluetooth Device
-	0100  Casira with BlueCore2-External Module
-	0101  Casira with BlueCore2-Flash Module
-	0102  Casira with BlueCore3-Multimedia Module
-	0103  Casira with BlueCore3-Flash Module
-	0104  Casira with BlueCore4-External Module
-	0105  Casira with BlueCore4-Multimedia Module
-	1000  Bluetooth Dongle (HID proxy mode)
-	1010  Bluetooth Device
-	1011  Bluetooth Device
-	1012  Bluetooth Device
-	ffff  USB Bluetooth Device in DFU State
-0a13  Telebyte, Inc.
-0a14  Spacelabs Medical, Inc.
-0a15  Scalar Corp.
-0a16  Trek Technology (S) PTE, Ltd
-	1111  ThumbDrive
-	8888  IBM USB Memory Key
-	9988  Trek2000 TD-G2
-0a17  Pentax Corp.
-	0004  Optio 330
-	0006  Optio S
-	0007  Optio 550
-	0009  Optio 33WR
-	000a  Optio 555
-	000c  Optio 43WR (mass storage mode)
-	000d  Optio 43WR
-	0015  Optio S40/S5i
-	003b  Optio 50 (mass storage mode)
-	003d  Optio S55
-	0043  *ist DL
-	0047  Optio S60
-	0052  Optio 60 Digital Camera
-	006e  K10D
-	0070  K100D
-	0093  K200D
-	00a7  Optio E50
-	1001  EI2000 Camera powered by Digita!
-0a18  Heidelberger Druckmaschinen AG
-0a19  Hua Geng Technologies, Inc.
-0a21  Medtronic Physio Control Corp.
-	8001  MMT-7305WW [Medtronic Minimed CareLink]
-0a22  Century Semiconductor USA, Inc.
-0a27  Datacard Group
-	0102  SP35
-0a2c  AK-Modul-Bus Computer GmbH
-	0008  GPIO Ports
-0a34  TG3 Electronics, Inc.
-	0101  TG82tp
-	0110  Deck 82-key backlit keyboard
-0a35  Radikal Technologies
-	002a  SAC - Software Assigned Controller
-	008a  SAC Hub
-0a39  Gilat Satellite Networks, Ltd
-0a3a  PentaMedia Co., Ltd
-	0163  KN-W510U 1.0 Wireless LAN Adapter
-0a3c  NTT DoCoMo, Inc.
-0a3d  Varo Vision
-0a3f  Swissonic AG
-0a43  Boca Systems, Inc.
-0a46  Davicom Semiconductor, Inc.
-	0268  ST268
-	6688  ZT6688 Fast Ethernet Adapter
-	8515  ADMtek ADM8515 NIC
-	9000  DM9000E Fast Ethernet Adapter
-	9601  DM9601 Fast Ethernet Adapter
-0a47  Hirose Electric
-0a48  I/O Interconnect
-	3233  Multimedia Card Reader
-	3239  Multimedia Card Reader
-	3258  Dane Elec zMate SD Reader
-	3259  Dane Elec zMate CF Reader
-	5000  MediaGear xD-SM
-	500a  Mass Storage Device
-	500f  Mass Storage Device
-	5010  Mass Storage Device
-	5011  Mass Storage Device
-	5014  Mass Storage Device
-	5020  Mass Storage Device
-	5021  Mass Storage Device
-	5022  Mass Storage Device
-	5023  Mass Storage Device
-	5024  Mass Storage Device
-	5025  Mass Storage Device
-0a4b  Fujitsu Media Devices, Ltd
-0a4c  Computex Co., Ltd
-	15d9  OPTICAL MOUSE
-0a4d  Evolution Electronics, Ltd
-	0064  MK-225 Driver
-	0065  MK-225C Driver
-	0066  MK-225C Driver
-	0067  MK-425C Driver
-	0078  MK-37 Driver
-	0079  MK-37C Driver
-	007a  MK-37C Driver
-	008c  TerraTec MIDI MASTER
-	008d  MK-249C Driver
-	008e  MK-249C MIDI Keyboard
-	008f  MK-449C Driver
-	0090  Keystation 49e Driver
-	0091  Keystation 61es Driver
-	00a0  MK-361 Driver
-	00a1  MK-361C Driver
-	00a2  MK-361C Driver
-	00a3  MK-461C MIDI Keyboard
-	00b5  Keystation Pro 88 Driver
-	00d2  E-Keys Driver
-	00f0  UC-16 Driver
-	00f1  X-Session Driver
-	00f5  UC-33e MIDI Controller
-0a4e  Steinberg Soft-und Hardware GmbH
-0a4f  Litton Systems, Inc.
-0a50  Mimaki Engineering Co., Ltd
-0a51  Sony Electronics, Inc.
-0a52  Jebsee Electronics Co., Ltd
-0a53  Portable Peripheral Co., Ltd
-	1000  Scanner
-	2000  Q-Scan A6 Scanner
-	2001  Q-Scan A6 Scanner
-	2013  Media Drive A6 Scanner
-	2014  Media Drive A6 Scanner
-	2015  BizCardReader 600C
-	2016  BizCardReader 600C
-	202a  Scanshell-CSSN
-	3000  Q-Scan A8 Scanner
-	3002  Q-Scan A8 Reader
-	3015  BizCardReader 300G
-	302a  LM9832 - PA570 Mini Business Card Scanner [Targus]
-	5001  BizCardReader 900C
-0a5a  Electronics For Imaging, Inc.
-0a5b  EAsics NV
-0a5c  Broadcom Corp.
-	0201  iLine10(tm) Network Adapter
-	2000  Bluetooth Device
-	2001  Bluetooth Device
-	2009  Bluetooth Controller
-	200a  BCM2035 Bluetooth dongle
-	200f  Bluetooth Controller
-	201d  Bluetooth Device
-	201e  IBM Integrated Bluetooth IV
-	2020  Bluetooth dongle
-	2033  BCM2033 Bluetooth
-	2035  BCM2035 Bluetooth
-	2038  Blutonium Device
-	2039  Bluetooth Device
-	2045  Bluetooth Controller
-	2046  Bluetooth Device
-	2047  Bluetooth Device
-	205e  Bluetooth Device
-	2100  Bluetooth 2.0+eDR dongle
-	2101  Bluetooth Controller
-	2102  ANYCOM Blue USB-200/250
-	2110  Bluetooth Controller
-	2111  ANYCOM Blue USB-UHE 200/250
-	2120  2045 Bluetooth 2.0 USB-UHE Device with trace filter
-	2121  BCM2210 Bluetooth
-	2122  Bluetooth 2.0+EDR dongle
-	2123  Bluetooth dongle
-	2130  2045 Bluetooth 2.0 USB-UHE Device with trace filter
-	2131  2045 Bluetooth 2.0 Device with trace filter
-	2145  Bluetooth with Enhanced Data Rate II
-	2148  BCM92046DG-CL1ROM Bluetooth 2.1 Adapter
-	2150  BCM2046 Bluetooth Device
-	2151  Bluetooth
-	217f  Bluetooth Controller
-	219b  Bluetooth 2.1 Device
-	21b1  HP Bluetooth Module
-	21b4  BCM2070 Bluetooth 2.1 + EDR
-	21b9  BCM2070 Bluetooth 2.1 + EDR
-	21ba  BCM2070 Bluetooth 2.1 + EDR
-	21bb  BCM2070 Bluetooth 2.1 + EDR
-	21bc  BCM2070 Bluetooth 2.1 + EDR
-	21bd  BCM2070 Bluetooth 2.1 + EDR
-	22be  BCM2070 Bluetooth 3.0 + HS
-	4500  BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth)
-	4502  Keyboard (Boot Interface Subclass)
-	4503  Mouse (Boot Interface Subclass)
-	5800  BCM5880 Secure Applications Processor
-	5801  BCM5880 Secure Applications Processor with fingerprint swipe sensor
-	5802  BCM5880 Secure Applications Processor with fingerprint touch sensor
-	5803  BCM5880 Secure Applications Processor with secure keyboard
-	6300  Pirelli Remote NDIS Device
-	bd13  Arcadyan WN8522B [Broadcom BCM4323]
-	d11b  Eminent EM4045 [Broadcom 4320 USB]
-0a5d  Diatrend Corp.
-0a5f  Zebra
-	0009  LP2844 Printer
-	0081  GK420t Label Printer
-	008b  HC100 wristbands Printer
-	930a  Printer
-0a62  MPMan
-	0010  MPMan MP-F40 MP3 Player
-0a66  ClearCube Technology
-0a67  Medeli Electronics Co., Ltd
-0a68  Comaide Corp.
-0a69  Chroma ate, Inc.
-0a6b  Green House Co., Ltd
-	0001  Compact Flash R/W with MP3 player
-	000f  FlashDisk
-0a6c  Integrated Circuit Systems, Inc.
-0a6d  UPS Manufacturing
-0a6e  Benwin
-0a6f  Core Technology, Inc.
-	0400  Xanboo
-0a70  International Game Technology
-0a71  VIPColor Technologies USA, Inc.
-	0001  VP485 Printer
-0a72  Sanwa Denshi
-0a7d  NSTL, Inc.
-0a7e  Octagon Systems Corp.
-0a80  Rexon Technology Corp., Ltd
-0a81  Chesen Electronics Corp.
-	0101  Keyboard
-	0103  Keyboard
-	0203  Mouse
-	0205  PS/2 Keyboard+Mouse Adapter
-	0701  USB Missile Launcher
-0a82  Syscan
-	4600  TravelScan 460/464
-0a83  NextComm, Inc.
-0a84  Maui Innovative Peripherals
-0a85  Idexx Labs
-0a86  NITGen Co., Ltd
-0a8d  Picturetel
-0a8e  Japan Aviation Electronics Industry, Ltd
-	2011  Filter Driver For JAE XMC R/W
-0a90  Candy Technology Co., Ltd
-0a91  Globlink Technology, Inc.
-	3801  Targus PAKP003 Mouse
-0a92  EGO SYStems, Inc.
-	0011  SYS WaveTerminal U2A
-	0021  GIGAPort
-	0031  GIGAPortAG
-	0053  AudioTrak Optoplay
-	0061  Waveterminal U24
-	0071  MAYA EX7
-	0091  Maya 44
-	00b1  MAYA EX5
-	1000  MIDI Mate
-	1010  RoMI/O
-	1020  M4U
-	1030  M8U
-	1090  KeyControl49
-	10a0  KeyControl25
-0a93  C Technologies AB
-	0002  C-Pen 10
-	0005  MyPen Light
-	000d  Input Pen
-	0010  C-Pen 20
-	0a93  PayPen
-0a94  Intersense
-0aa3  Lava Computer Mfg., Inc.
-0aa4  Develco Elektronik
-0aa5  First International Digital
-	0002  irock! 500 Series
-	0801  MP3 Player
-0aa6  Perception Digital, Ltd
-	0101  Hercules Jukebox
-	1501  Store 'n' Go HD Drive
-0aa7  Wincor Nixdorf International GmbH
-	0100  POS Keyboard, TA58P-USB
-	0101  POS Keyboard, TA85P-USB
-	0102  POS Keyboard, TA59-USB
-	0103  POS Keyboard, TA60-USB
-	0104  SNIkey Keyboard, SNIKey-KB-USB
-	0200  Operator Display, BA63-USB
-	0201  Operator Display, BA66-USB
-	0202  Operator Display & Scanner, XiCheck-BA63
-	0203  Operator Display & Scanner, XiCheck-BA66
-	0204  Graphics Operator Display, BA63GV
-	0300  POS Printer (printer class mode), TH210
-	0301  POS Printer (native mode), TH210
-	0302  POS Printer (printer class mode), TH220
-	0303  POS Printer (native mode), TH220
-	0304  POS Printer, TH230
-	0305  Lottery Printer, XiPrintPlus
-	0306  POS Printer (printer class mode), TH320
-	0307  POS Printer (native mode), TH320
-	0308  POS Printer (printer class mode), TH420
-	0309  POS Printer (native mode), TH420
-	030a  POS Printer, TH200B
-	0400  Lottery Scanner, Xiscan S
-	0401  Lottery Scanner, Xiscan 3
-	0402  Programmable Magnetic Swipe Card Reader, MSRP-USB
-	0500  IDE Adapter
-	0501  Hub Printer Interface
-	0502  Hub SNIKey Keyboard
-	4304  Banking Printer TP07
-	4305  Banking Printer TP07c
-	4500  WN Central Special Electronics
-0aa8  TriGem Computer, Inc.
-	0060  TG 11Mbps WLAN Mini Adapter
-	1001  DreamComboM4100
-	3002  InkJet Color Printer
-	8001  TG_iMON
-	8002  TG_KLOSS
-	a001  TG_X2
-	a002  TGVFD_KLOSS
-	ffda  iMON_VFD
-0aa9  Baromtec Co.
-	f01b  Medion MD 6242 MP3 Player
-0aaa  Japan CBM Corp.
-0aab  Vision Shape Europe SA
-0aac  iCompression, Inc.
-0aad  Rohde & Schwarz GmbH & Co. KG
-0aae  NEC infrontia Corp. (Nitsuko)
-0aaf  Digitalway Co., Ltd
-0ab0  Arrow Strong Electronics Co., Ltd
-0ab1  FEIG ELECTRONIC GmbH
-	0002  OBID RFID-Reader
-0aba  Ellisys
-	8001  Tracker 110 Protocol Analyzer
-	8002  Explorer 200 Protocol Analyzer
-0abe  Stereo-Link
-	0101  SL1200 DAC
-0abf  Diolan
-	3370  I2C/SPI Adapter - U2C-12
-0ac3  Sanyo Semiconductor Company Micro
-0ac4  Leco Corp.
-0ac5  I & C Corp.
-0ac6  Singing Electrons, Inc.
-0ac7  Panwest Corp.
-0ac8  Z-Star Microelectronics Corp.
-	0301  Web Camera
-	0302  ZC0302 Webcam
-	0321  Vimicro generic vc0321 Camera
-	0323  Luxya WC-1200 USB 2.0 Webcam
-	0328  A4Tech PK-130MG
-	0336  Elecom UCAM-DLQ30
-	301b  ZC0301 Webcam
-	303b  ZC0303 Webcam
-	305b  ZC0305 Webcam
-	307b  USB 1.1 Webcam
-	332d  Vega USB 2.0 Camera
-	3343  Sirius USB 2.0 Camera
-	3420  Venus USB2.0 Camera
-	c001  Sony embedded vimicro Camera
-	c002  Visual Communication Camera VGP-VCC1
-	c302  Vega USB 2.0 Camera
-	c303  Saturn USB 2.0 Camera
-	c326  Namuga 1.3M Webcam
-	c33f  Webcam
-0ac9  Micro Solutions, Inc.
-	0000  Backpack CD-ReWriter
-	0001  BACKPACK  2 Cable
-	0010  BACKPACK
-	0011  Backpack 40GB Hard Drive
-	0110  BACKPACK
-	0111  BackPack
-	1234  BACKPACK
-0aca  OPEN Networks Ltd
-	1060  OPEN NT1 Plus II
-0acc  Koga Electronics Co.
-0acd  ID Tech
-	0401  ID TECH Spectrum III Hybrid Smartcard Reader
-	0630  ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC
-0ace  ZyDAS
-	1201  ZD1201 802.11b
-	1211  ZD1211 802.11g
-	1215  ZD1211B 802.11g
-	1221  ZD1221 802.11n
-	1602  ZyXEL Omni FaxModem 56K
-	1608  ZyXEL Omni FaxModem 56K UNO
-	1611  ZyXEL Omni FaxModem 56K Plus
-	2011  Virtual media for 802.11bg
-	20ff  Virtual media for 802.11bg
-	a211  ZD1211 802.11b/g Wireless Adapter
-	b215  802.11bg
-0acf  Intoto, Inc.
-0ad0  Intellix Corp.
-0ad1  Remotec Technology, Ltd
-0ad2  Service & Quality Technology Co., Ltd
-0ada  Data Encryption Systems Ltd.
-	0005  DK2
-0ae3  Allion Computer, Inc.
-0ae4  Taito Corp.
-0ae7  Neodym Systems, Inc.
-0ae8  System Support Co., Ltd
-0ae9  North Shore Circuit Design L.L.P.
-0aea  SciEssence, LLC
-0aeb  TTP Communications, Ltd
-0aec  Neodio Technologies Corp.
-	2101  SmartMedia Card Reader
-	2102  CompactFlash Card Reader
-	2103  MMC/SD Card Reader
-	2104  MemoryStick Card Reader
-	2201  SmartMedia+CompactFlash Card Reader
-	2202  SmartMedia+MMC/SD Card Reader
-	2203  SmartMedia+MemoryStick Card Reader
-	2204  CompactFlash+MMC/SD Card Reader
-	2205  CompactFlash+MemoryStick Card Reader
-	2206  MMC/SD+MemoryStick Card Reader
-	2301  SmartMedia+CompactFlash+MMC/SD Card Reader
-	2302  SmartMedia+CompactFlash+MemoryStick Card Reader
-	2303  SmartMedia+MMC/SD+MemoryStick Card Reader
-	2304  CompactFlash+MMC/SD+MemoryStick Card Reader
-	3016  MMC/SD+Memory Stick Card Reader
-	3050  ND3050 8-in-1 Card Reader
-	3060  1.1 FS Card Reader
-	3101  MMC/SD Card Reader
-	3102  MemoryStick Card Reader
-	3201  MMC/SD+MemoryStick Card Reader
-	3216  HS Card Reader
-	3260  7-in-1 Card Reader
-	5010  ND5010 Card Reader
-0af0  Option
-	5000  UMTS Card
-	6000  GlobeTrotter 3G datacard
-	6300  GT 3G Quad UMTS/GPRS Card
-	6600  GlobeTrotter 3G+ datacard
-	6711  GlobeTrotter Express 7.2 v2
-	6971  Globetrotter HSDPA Modem
-	7251  Globetrotter HSUPA Modem (aka iCON HSUPA E)
-	7501  Globetrotter HSUPA Modem (icon 411 aka "Vodafone K3760")
-	7601  Globetrotter MO40x 3G Modem (GTM 382)
-	7701  Globetrotter HSUPA Modem (aka icon 451)
-0af6  Silver I Co., Ltd
-0af7  B2C2, Inc.
-	0101  Digital TV USB Receiver (DVB-S/T/C / ATSC)
-0af9  Hama, Inc.
-	0010  USB SightCam 100
-	0011  Micro Innovations IC50C Webcam
-0afc  Zaptronix Ltd
-0afd  Tateno Dennou, Inc.
-0afe  Cummins Engine Co.
-0aff  Jump Zone Network Products, Inc.
-0b00  INGENICO
-0b05  ASUSTek Computer, Inc.
-	1101  Mass Storage (UISDMC4S)
-	1706  WL-167G v1 802.11g Adapter [Ralink RT2571]
-	1707  WL-167G v1 802.11g Adapter [Ralink RT2571]
-	1708  Mass Storage Device
-	170b  Mass Storage Device
-	170c  WL-159g 802.11bg
-	170d  802.11b/g Wireless Network Adapter
-	1712  BT-183 Bluetooth 2.0+EDR adapter
-	1715  2045 Bluetooth 2.0 Device with trace filter
-	1716  Bluetooth Device
-	1717  WL169gE 802.11g Adapter [Broadcom 4320 USB]
-	171b  A9T wireless 802.11bg
-	171c  802.11b/g Wireless Network Adapter
-	171f  My Cinema U3000 Mini [DiBcom DiB7700P]
-	1723  WL-167G v2 802.11g Adapter [Ralink RT2571W]
-	1724  RT2573
-	1726  Laptop OLED Display
-	172a  ASUS 802.11n Network Adapter
-	172b  802.11n Network Adapter
-	1731  802.11n Network Adapter
-	1732  802.11n Network Adapter
-	1734  ASUS AF-200
-	173c  BT-183 Bluetooth 2.0
-	173f  My Cinema U3100 Mini
-	1742  802.11n Network Adapter
-	1743  Xonar U1 Audio Station
-	1751  BT-253 Bluetooth Adapter
-	175b  Laptop OLED Display
-	1760  802.11n Network Adapter
-	1761  802.11n Network Adapter
-	1774  Gobi Wireless Modem (QDL mode)
-	1776  Gobi Wireless Modem
-	1779  My Cinema U3100 Mini Plus [AF9035A]
-	1784  USB-N13 802.11n Network Adapter [Ralink RT3072]
-	1786  USB-N10 802.11n Network Adapter [Realtek RTL8192SU]
-	1791  WL-167G v3 802.11n Adapter [Realtek RTL8188SU]
-	6101  Cable Modem
-	620a  Remote NDIS Device
-	b700  Broadcom Bluetooth 2.1
-0b0b  Datamax-O'Neil
-	106e  Datamax E-4304
-0b0c  Todos AB
-	0009  Todos Argos Mini II Smart Card Reader
-	001e  e.dentifier2 (ABN AMRO electronic banking card reader NL)
-	002e  C200 smartcard controller (Nordea card reader)
-	003f  Todos C400 smartcard controller (Handelsbanken card reader)
-	0050  Argos Mini II Smart Card Reader (CCID)
-0b0d  ProjectLab
-	0000  CenturyCD
-0b0e  GN Netcom
-0b0f  AVID Technology
-0b10  Pcally
-0b11  I Tech Solutions Co., Ltd
-0b1e  Electronic Warfare Assoc., Inc. (EWA)
-	8007  Blackhawk USB560-BP JTAG Emulator
-0b1f  Insyde Software Corp.
-0b20  TransDimension, Inc.
-0b21  Yokogawa Electric Corp.
-0b22  Japan System Development Co., Ltd
-0b23  Pan-Asia Electronics Co., Ltd
-0b24  Link Evolution Corp.
-0b27  Ritek Corp.
-0b28  Kenwood Corp.
-0b2c  Village Center, Inc.
-0b30  PNY Technologies, Inc.
-	0006  SM Media-Shuttle Card Reader
-0b33  Contour Design, Inc.
-	0020  ShuttleXpress
-0b37  Hitachi ULSI Systems Co., Ltd
-0b38  Gear Head
-	0003  Keyboard
-	0010  107-Key Keyboard
-0b39  Omnidirectional Control Technology, Inc.
-	0001  Composite USB PS2 Converter
-	0109  USB TO Ethernet
-	0421  Serial
-	0801  USB-Parallel Bridge
-	0901  OCT To Fast Ethernet Converter
-	0c03  LAN DOCK Serial Converter
-0b3a  IPaxess
-0b3b  Tekram Technology Co., Ltd
-	0163  TL-WN320G 1.0 WLAN Adapter
-	1601  Allnet 0193 802.11b Adapter
-	1602  ZyXEL ZyAIR B200 802.11b Adapter
-	1612  AIR.Mate 2@net 802.11b Adapter
-	1613  802.11b Wireless LAN Adapter
-	1620  Allnet USB 2.0 Wireless Network Adapter
-	1630  QuickWLAN 802.11bg
-	5630  802.11bg
-	6630  ZD1211
-0b3c  Olivetti Techcenter
-	a010  Simple_Way Printer/Scanner/Copier
-	c000  Olicard 100
-	c700  Olicard 100 (Mass Storage mode)
-0b3e  Kikusui Electronics Corp.
-0b41  Hal Corp.
-	0011  Crossam2+USB IR commander
-0b43  Play.com, Inc.
-	0003  PS2 Controller Converter
-0b47  Sportbug.com, Inc.
-0b48  TechnoTrend AG
-	1003  Technotrend/Hauppauge USB-Nova
-	1004  TT-PCline
-	1005  Technotrend/Hauppauge USB-Nova
-	1006  Technotrend/Hauppauge DEC3000-s
-	1007  TT-micro plus Device
-	1008  Technotrend/Hauppauge DEC2000-t
-	1009  Technotrend/Hauppauge DEC2540-t
-	3001  DVB-S receiver
-	3002  DVB-C receiver
-	3003  DVB-T receiver
-	3004  TT TV-Stick
-	3005  TT TV-Stick (8kB EEPROM)
-	3006  TT-connect S-2400 DVB-S receiver
-	3007  TT-connect S2-3600
-	3008  TT-connect
-	3009  TT-connect S-2400 DVB-S receiver (8kB EEPROM)
-	300a  TT-connect S2-3650 CI
-	300b  TT-connect C-3650 CI
-	300c  TT-connect T-3650 CI
-	300d  TT-connect CT-3650 CI
-	300e  TT-connect C-2400
-0b49  ASCII Corp.
-	064f  Trance Vibrator
-0b4b  Pine Corp. Ltd.
-	0100  D'music MP3 Player
-0b4d  Graphtec America, Inc.
-	110a  Graphtec CC200-20
-0b4e  Musical Electronics, Ltd
-	6500  MP3 Player
-	8028  MP3 Player
-	8920  MP3 Player
-0b50  Dumpries Co., Ltd
-0b51  Comfort Keyboard Co.
-	0020  Comfort Keyboard
-0b52  Colorado MicroDisplay, Inc.
-0b54  Sinbon Electronics Co., Ltd
-0b56  TYI Systems, Ltd
-0b57  Beijing HanwangTechnology Co., Ltd
-0b59  Lake Communications, Ltd
-0b5a  Corel Corp.
-0b5f  Green Electronics Co., Ltd
-0b60  Nsine, Ltd
-0b61  NEC Viewtechnology, Ltd
-0b62  Orange Micro, Inc.
-	000b  Bluetooth Device
-	0059  iBOT2 Webcam
-0b63  ADLink Technology, Inc.
-0b64  Wonderful Wire Cable Co., Ltd
-0b65  Expert Magnetics Corp.
-0b69  CacheVision
-0b6a  Maxim Integrated Products
-0b6f  Nagano Japan Radio Co., Ltd
-0b70  PortalPlayer, Inc.
-	00ba  iRiver H10 20GB
-0b71  SHIN-EI Sangyo Co., Ltd
-0b72  Embedded Wireless Technology Co., Ltd
-0b73  Computone Corp.
-0b75  Roland DG Corp.
-0b79  Sunrise Telecom, Inc.
-0b7a  Zeevo, Inc.
-	07d0  Bluetooth Dongle
-0b7b  Taiko Denki Co., Ltd
-0b7c  ITRAN Communications, Ltd
-0b7d  Astrodesign, Inc.
-0b81  id3 Semiconductors
-	0001  Biothentic II smartcard reader with fingerprint sensor
-	0002  DFU-Enabled Devices (DFU)
-	0012  BioPAD biometric module (DFU + CDC)
-	0102  Certis V1 fingerprint reader
-	0103  Certis V2 fingerprint reader
-	0200  CL1356T / CL1356T5 / CL1356A smartcard readers (CCID)
-	0201  CL1356T / CL1356T5 / CL1356A smartcard readers (DFU + CCID)
-	0220  CL1356A FFPJP smartcard reader (CCID + HID)
-	0221  CL1356A smartcard reader (DFU + CCID + HID)
-0b84  Rextron Technology, Inc.
-0b85  Elkat Electronics, Sdn., Bhd.
-0b86  Exputer Systems, Inc.
-	5100  XMC5100 Zippy Drive
-	5110  XMC5110 Flash Drive
-	5200  XMC5200 Zippy Drive
-	5201  XMC5200 Zippy Drive
-	5202  XMC5200 Zippy Drive
-	5280  XMC5280 Storage Drive
-	fff0  ISP5200 Debugger
-0b87  Plus-One I & T, Inc.
-0b88  Sigma Koki Co., Ltd, Technology Center
-0b89  Advanced Digital Broadcast, Ltd
-0b8c  SMART Technologies Inc.
-	00c3  Sympodium ID350
-0b95  ASIX Electronics Corp.
-	1720  10/100 Ethernet
-	1780  AX88178
-	7720  AX88772
-0b96  Sewon Telecom
-0b97  O2 Micro, Inc.
-	7732  Smart Card Reader
-	7761  Oz776 1.1 Hub
-	7762  Oz776 SmartCard Reader
-	7772  OZ776 CCID Smartcard Reader
-0b98  Playmates Toys, Inc.
-0b99  Audio International, Inc.
-0b9b  Dipl.-Ing. Stefan Kunde
-	4012  Reflex RC-controller Interface
-0b9d  Softprotec Co.
-0b9f  Chippo Technologies
-0baf  U.S. Robotics
-	00e5  USR6000
-	00eb  USR1120 802.11b Adapter
-	00ec  56K Faxmodem
-	00f1  SureConnect ADSL ATM Adapter
-	00f2  SureConnect ADSL Loader
-	00f5  SureConnect ADSL ATM Adapter
-	00f6  SureConnect ADSL Loader
-	00f7  SureConnect ADSL ATM Adapter
-	00f8  SureConnect ADSL Loader
-	00f9  SureConnect ADSL ATM Adapter
-	00fa  SureConnect ADSL Loader
-	00fb  SureConnect ADSL Ethernet/USB Router
-	0111  USR5420 802.11g Adapter [Broadcom 4320 USB]
-	0118  U5 802.11g Adapter
-	011b  Wireless MAXg Adapter [Broadcom 4320]
-	0121  USR5423 802.11bg
-	6112  FaxModem Model 5633
-0bb0  Concord Camera Corp.
-	0100  Sound Vision Stream
-	5007  3340z/Rollei DC3100
-0bb1  Infinilink Corp.
-0bb2  Ambit Microsystems Corp.
-	0302  U10H010 802.11b Wireless Adapter [Intersil PRISM 3]
-	6098  USB Cable Modem
-0bb3  Ofuji Technology
-0bb4  High Tech Computer Corp.
-	00ce  mmO2 XDA GSM/GPRS Pocket PC
-	00cf  SPV C500 Smart Phone
-	0a01  PocketPC Sync
-	0a02  Himalaya GSM/GPRS Pocket PC
-	0a03  PocketPC Sync
-	0a04  PocketPC Sync
-	0a05  PocketPC Sync
-	0a06  PocketPC Sync
-	0a07  Magician PocketPC SmartPhone / O2 XDA
-	0a08  PocketPC Sync
-	0a09  PocketPC Sync
-	0a0a  PocketPC Sync
-	0a0b  PocketPC Sync
-	0a0c  PocketPC Sync
-	0a0d  PocketPC Sync
-	0a0e  PocketPC Sync
-	0a0f  PocketPC Sync
-	0a10  PocketPC Sync
-	0a11  PocketPC Sync
-	0a12  PocketPC Sync
-	0a13  PocketPC Sync
-	0a14  PocketPC Sync
-	0a15  PocketPC Sync
-	0a16  PocketPC Sync
-	0a17  PocketPC Sync
-	0a18  PocketPC Sync
-	0a19  PocketPC Sync
-	0a1a  PocketPC Sync
-	0a1b  PocketPC Sync
-	0a1c  PocketPC Sync
-	0a1d  PocketPC Sync
-	0a1e  PocketPC Sync
-	0a1f  PocketPC Sync
-	0a20  PocketPC Sync
-	0a21  PocketPC Sync
-	0a22  PocketPC Sync
-	0a23  PocketPC Sync
-	0a24  PocketPC Sync
-	0a25  PocketPC Sync
-	0a26  PocketPC Sync
-	0a27  PocketPC Sync
-	0a28  PocketPC Sync
-	0a29  PocketPC Sync
-	0a2a  PocketPC Sync
-	0a2b  PocketPC Sync
-	0a2c  PocketPC Sync
-	0a2d  PocketPC Sync
-	0a2e  PocketPC Sync
-	0a2f  PocketPC Sync
-	0a30  PocketPC Sync
-	0a31  PocketPC Sync
-	0a32  PocketPC Sync
-	0a33  PocketPC Sync
-	0a34  PocketPC Sync
-	0a35  PocketPC Sync
-	0a36  PocketPC Sync
-	0a37  PocketPC Sync
-	0a38  PocketPC Sync
-	0a39  PocketPC Sync
-	0a3a  PocketPC Sync
-	0a3b  PocketPC Sync
-	0a3c  PocketPC Sync
-	0a3d  PocketPC Sync
-	0a3e  PocketPC Sync
-	0a3f  PocketPC Sync
-	0a40  PocketPC Sync
-	0a41  PocketPC Sync
-	0a42  PocketPC Sync
-	0a43  PocketPC Sync
-	0a44  PocketPC Sync
-	0a45  PocketPC Sync
-	0a46  PocketPC Sync
-	0a47  PocketPC Sync
-	0a48  PocketPC Sync
-	0a49  PocketPC Sync
-	0a4a  PocketPC Sync
-	0a4b  PocketPC Sync
-	0a4c  PocketPC Sync
-	0a4d  PocketPC Sync
-	0a4e  PocketPC Sync
-	0a4f  PocketPC Sync
-	0a50  HTC SmartPhone Sync
-	0a51  SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC
-	0a52  SmartPhone Sync
-	0a53  SmartPhone Sync
-	0a54  SmartPhone Sync
-	0a55  SmartPhone Sync
-	0a56  SmartPhone Sync
-	0a57  SmartPhone Sync
-	0a58  SmartPhone Sync
-	0a59  SmartPhone Sync
-	0a5a  SmartPhone Sync
-	0a5b  SmartPhone Sync
-	0a5c  SmartPhone Sync
-	0a5d  SmartPhone Sync
-	0a5e  SmartPhone Sync
-	0a5f  SmartPhone Sync
-	0a60  SmartPhone Sync
-	0a61  SmartPhone Sync
-	0a62  SmartPhone Sync
-	0a63  SmartPhone Sync
-	0a64  SmartPhone Sync
-	0a65  SmartPhone Sync
-	0a66  SmartPhone Sync
-	0a67  SmartPhone Sync
-	0a68  SmartPhone Sync
-	0a69  SmartPhone Sync
-	0a6a  SmartPhone Sync
-	0a6b  SmartPhone Sync
-	0a6c  SmartPhone Sync
-	0a6d  SmartPhone Sync
-	0a6e  SmartPhone Sync
-	0a6f  SmartPhone Sync
-	0a70  SmartPhone Sync
-	0a71  SmartPhone Sync
-	0a72  SmartPhone Sync
-	0a73  SmartPhone Sync
-	0a74  SmartPhone Sync
-	0a75  SmartPhone Sync
-	0a76  SmartPhone Sync
-	0a77  SmartPhone Sync
-	0a78  SmartPhone Sync
-	0a79  SmartPhone Sync
-	0a7a  SmartPhone Sync
-	0a7b  SmartPhone Sync
-	0a7c  SmartPhone Sync
-	0a7d  SmartPhone Sync
-	0a7e  SmartPhone Sync
-	0a7f  SmartPhone Sync
-	0a80  SmartPhone Sync
-	0a81  SmartPhone Sync
-	0a82  SmartPhone Sync
-	0a83  SmartPhone Sync
-	0a84  SmartPhone Sync
-	0a85  SmartPhone Sync
-	0a86  SmartPhone Sync
-	0a87  SmartPhone Sync
-	0a88  SmartPhone Sync
-	0a89  SmartPhone Sync
-	0a8a  SmartPhone Sync
-	0a8b  SmartPhone Sync
-	0a8c  SmartPhone Sync
-	0a8d  SmartPhone Sync
-	0a8e  SmartPhone Sync
-	0a8f  SmartPhone Sync
-	0a90  SmartPhone Sync
-	0a91  SmartPhone Sync
-	0a92  SmartPhone Sync
-	0a93  SmartPhone Sync
-	0a94  SmartPhone Sync
-	0a95  SmartPhone Sync
-	0a96  SmartPhone Sync
-	0a97  SmartPhone Sync
-	0a98  SmartPhone Sync
-	0a99  SmartPhone Sync
-	0a9a  SmartPhone Sync
-	0a9b  SmartPhone Sync
-	0a9c  SmartPhone Sync
-	0a9d  SmartPhone Sync
-	0a9e  SmartPhone Sync
-	0a9f  SmartPhone Sync
-	0b03  Ozone Mobile Broadband
-	0b04  Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion
-	0b05  P3600
-	0b06  Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO
-	0b0c  Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1
-	0b1f  Sony Ericsson XPERIA X1
-	0b2f  Rhodium
-	0b51  Qtek 8310 mobile phone [Tornado Noble]
-	0bce  Vario MDA
-	0c01  Dream / ADP1 / G1 / Magic / Tattoo
-	0c02  Dream / ADP1 / G1 / Magic / Tattoo (Debug)
-	0c13  Diamond
-	0c1f  Sony Ericsson XPERIA X1
-	0c5f  Snap
-	0c87  Desire (debug)
-	0c8d  EVO 4G (debug)
-	0c91  Vision
-	0c94  Vision
-	0c97  Legend
-	0c99  Desire (debug)
-	0c9e  Incredible
-	0ca2  Desire HD (debug mode)
-	0ff8  Desire HD (Tethering Mode)
-	0ff9  Desire / Desire HD / Hero (Charge Mode)
-	0ffe  Desire HD (modem mode)
-	0fff  Android Fastboot Bootloader
-0bb5  Murata Manufacturing Co., Ltd
-0bb6  Network Alchemy
-0bb7  Joytech Computer Co., Ltd
-0bb8  Hitachi Semiconductor and Devices Sales Co., Ltd
-0bb9  Eiger M&C Co., Ltd
-0bba  ZAccess Systems
-0bbb  General Meters Corp.
-0bbc  Assistive Technology, Inc.
-0bbd  System Connection, Inc.
-0bc0  Knilink Technology, Inc.
-0bc1  Fuw Yng Electronics Co., Ltd
-0bc2  Seagate RSS LLC
-	2000  Storage Adapter V3 (TPP)
-	2200  FreeAgent Go FW
-	5021  FreeAgent GoFlex USB 2.0
-	5031  FreeAgent GoFlex USB 3.0
-0bc3  IPWireless, Inc.
-	0001  UMTS-TDD (TD-CDMA) modem
-0bc4  Microcube Corp.
-0bc5  JCN Co., Ltd
-0bc6  ExWAY, Inc.
-0bc7  X10 Wireless Technology, Inc.
-	0001  ActiveHome (ACPI-compliant)
-	0002  Firecracker Interface (ACPI-compliant)
-	0003  VGA Video Sender (ACPI-compliant)
-	0004  X10 Receiver
-	0005  Wireless Transceiver (ACPI-compliant)
-	0006  Wireless Transceiver (ACPI-compliant)
-	0007  Wireless Transceiver (ACPI-compliant)
-	0008  Wireless Transceiver (ACPI-compliant)
-	0009  Wireless Transceiver (ACPI-compliant)
-	000a  Wireless Transceiver (ACPI-compliant)
-	000b  Transceiver (ACPI-compliant)
-	000c  Transceiver (ACPI-compliant)
-	000d  Transceiver (ACPI-compliant)
-	000e  Transceiver (ACPI-compliant)
-	000f  Transceiver (ACPI-compliant)
-0bc8  Telmax Communications
-0bc9  ECI Telecom, Ltd
-0bca  Startek Engineering, Inc.
-0bcb  Perfect Technic Enterprise Co., Ltd
-0bd7  Andrew Pargeter & Associates
-	a021  Amptek DP4 multichannel signal analyzer
-0bda  Realtek Semiconductor Corp.
-	0103  USB 2.0 Card Reader
-	0104  Mass Storage Device
-	0106  Mass Storage Device
-	0107  Mass Storage Device
-	0108  Mass Storage Device
-	0111  Card Reader
-	0113  Mass Storage Device
-	0115  Mass Storage Device (Multicard Reader)
-	0116  Mass Storage Device
-	0117  Mass Storage Device
-	0118  Mass Storage Device
-	0138  Card reader
-	0151  Mass Storage Device (Multicard Reader)
-	0152  Mass Storage Device
-	0153  Mass Storage Device
-	0156  Mass Storage Device
-	0157  Mass Storage Device
-	0158  USB 2.0 multicard reader
-	0159  Digital Media Card Reader
-	0161  Mass Storage Device
-	0168  Mass Storage Device
-	0169  Mass Storage Device
-	0171  Mass Storage Device
-	0176  Mass Storage Device
-	0178  Mass Storage Device
-	2831  RTL2831U DVB-T
-	2832  RTL2832U DVB-T
-	8150  RTL8150 Fast Ethernet Adapter
-	8151  RTL8151 Adapteon Business Mobile Networks BV
-	8171  RTL8188SU 802.11n WLAN Adapter
-	8172  RTL8191SU 802.11n WLAN Adapter
-	8176  RTL8188CUS 802.11n WLAN
-	8187  RTL8187 Wireless Adapter
-	8189  RTL8187B Wireless 802.11g 54Mbps Network Adapter
-	8192  RTL8192U 802.11n Wireless Adapter
-	8197  RTL8187B Wireless Adapter
-	8198  RTL8187B Wireless Adapter
-0bdb  Ericsson Business Mobile Networks BV
-	1000  BV Bluetooth Device
-	1002  Bluetooth Device 1.2
-	1049  C3607w Mobile Broadband Module
-	1900  F3507g Mobile Broadband Module
-	1902  F3507g v2 Mobile Broadband Module
-	1904  F3607gw Mobile Broadband Module
-	1905  F3607gw v2 Mobile Broadband Module
-	1906  F3607gw v3 Mobile Broadband Module
-	1909  F3307 v2 Mobile Broadband Module
-	190a  F3307 Mobile Broadband Module
-	190b  C3607w v2 Mobile Broadband Module
-0bdc  Y Media Corp.
-0bdd  Orange PCS
-0be2  Kanda Tsushin Kogyo Co., Ltd
-0be3  TOYO Corp.
-0be4  Elka International, Ltd
-0be5  DOME imaging systems, Inc.
-0be6  Dong Guan Humen Wonderful Wire Cable Factory
-0bed  Silicon Labs
-	1100  MEI (TM) Cashflow-SC Bill/Voucher Acceptor
-0bee  LTK Industries, Ltd
-0bef  Way2Call Communications
-0bf0  Pace Micro Technology PLC
-0bf1  Intracom S.A.
-	0001  netMod Driver Ver 2.4.17 (CAPI)
-	0002  netMod Driver Ver 2.4 (CAPI)
-	0003  netMod Driver Ver 2.4 (CAPI)
-0bf2  Konexx
-0bf6  Addonics Technologies, Inc.
-	0103  Storage Device
-	1234  Storage Device
-	a000  Cable 205 (TPP)
-	a001  Cable 205
-	a002  IDE Bridge
-0bf7  Sunny Giken, Inc.
-0bf8  Fujitsu Siemens Computers
-	1001  Fujitsu Pocket Loox 600 PDA
-	1006  SmartCard Reader 2A
-	1007  Connect2Air E-5400 802.11g Wireless Adapter
-	1009  Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887]
-	100f  miniCard D2301 802.11bg Wireless Module [SiS 163U]
-0bfd  Kvaser AB
-	0004  USBcan II
-	000b  Leaf Light HS
-	000e  Leaf SemiPro HS
-0c04  MOTO Development Group, Inc.
-0c05  Appian Graphics
-0c06  Hasbro Games, Inc.
-0c07  Infinite Data Storage, Ltd
-0c08  Agate
-	0378  Q 16MB Storage Device
-0c09  Comjet Information System
-	a5a5  Litto Version USB2.0
-0c0a  Highpoint Technologies, Inc.
-0c0b  Dura Micro, Inc. (Acomdata)
-	27cb  6-in-1 Flash Reader and Writer
-	27d7  Multi Memory reader/writer MD-005
-	27da  Multi Memory reader/writer MD-005
-	27dc  Multi Memory reader/writer MD-005
-	27e7  3,5'' HDD case MD-231
-	27ee  3,5'' HDD case MD-231
-	2814  3,5'' HDD case MD-231
-	2815  3,5'' HDD case MD-231
-	281d  3,5'' HDD case MD-231
-	5fab  Storage Adaptor
-	a109  CF/SM Reader and Writer
-	a10c  SD/MS Reader and Writer
-	b001  USB 2.0 Mass Storage IDE adapter
-	b004  MMC/SD Reader and Writer
-0c12  Zeroplus
-	0005  PSX Vibration Feedback Converter
-	0030  PSX Vibration Feedback Converter
-	700e  Logic Analyzer (LAP-C-16032)
-	8801  Xbox Controller
-	8802  Xbox Controller
-	8809  Red Octane Ignition Xbox DDR Pad
-	880a  Pelican Eclipse PL-2023
-	8810  Xbox Controller
-	9902  VibraX
-0c15  Iris Graphics
-0c16  Gyration, Inc.
-	0002  RF Technology Receiver
-	0003  RF Technology Receiver
-	0008  RF Technology Receiver
-	0080  eHome Infrared Receiver
-	0081  eHome Infrared Receiver
-0c17  Cyberboard A/S
-0c18  SynerTek Korea, Inc.
-0c19  cyberPIXIE, Inc.
-0c1a  Silicon Motion, Inc.
-0c1b  MIPS Technologies
-0c1c  Hang Zhou Silan Electronics Co., Ltd
-0c22  Tally Printer Corp.
-0c23  Lernout + Hauspie
-0c24  Taiyo Yuden
-	0001  Bluetooth Adaptor
-	0002  Bluetooth Device2
-	0005  Bluetooth Device(BC04-External)
-	000b  Bluetooth Device(BC04-External)
-	000c  Bluetooth Adaptor
-	000e  Bluetooth Device(BC04-External)
-	000f  Bluetooth Device (V2.0+EDR)
-	0010  Bluetooth Device(BC04-External)
-	0012  Bluetooth Device(BC04-External)
-	0018  Bluetooth Device(BC04-External)
-	0019  Bluetooth Device
-	0c24  Bluetooth Device(SAMPLE)
-	ffff  Bluetooth module with BlueCore in DFU mode
-0c25  Sampo Corp.
-	0310  Scream Cam
-0c26  Prolific Technology Inc.
-	0018  USB-Serial Controller [Icom Inc. OPC-478UC]
-0c27  RFIDeas, Inc
-	3bfa  pcProx Card Reader
-0c2e  Metro
-	0007  Metrologic MS7120 Barcode Scanner (IBM SurePOS mode)
-	0200  Metrologic Scanner
-	0204  Metrologic MS7120 Barcode Scanner (keyboard mode)
-	0700  Metrologic MS7120 Barcode Scanner (uni-directional serial mode)
-	0720  Metrologic MS7120 Barcode Scanner (bi-directional serial mode)
-0c35  Eagletron, Inc.
-0c36  E Ink Corp.
-0c37  e.Digital
-0c38  Der An Electric Wire & Cable Co., Ltd
-0c39  IFR
-0c3a  Furui Precise Component (Kunshan) Co., Ltd
-0c3b  Komatsu, Ltd
-0c3c  Radius Co., Ltd
-0c3d  Innocom, Inc.
-0c3e  Nextcell, Inc.
-0c44  Motorola iDEN
-	0021  iDEN P2k0 Device
-	0022  iDEN P2k1 Device
-	03a2  iDEN Smartphone
-	41d9  i1 phone
-0c45  Microdia
-	0011  EBUDDY
-	1020  Mass Storage Reader
-	1028  Mass Storage Reader
-	1030  Mass Storage Reader
-	1031  Sonix Mass Storage Device
-	1032  Mass Storage Reader
-	1033  Sonix Mass Storage Device
-	1034  Mass Storage Reader
-	1035  Mass Storage Reader
-	1036  Mass Storage Reader
-	1037  Sonix Mass Storage Device
-	1050  CF Card Reader
-	1058  HDD Reader
-	1060  iFlash SM-Direct Card Reader
-	1061  Mass Storage Reader
-	1062  Mass Storage Reader
-	1063  Sonix Mass Storage Device
-	1064  Mass Storage Reader
-	1065  Mass Storage Reader
-	1066  Mass Storage Reader
-	1067  Mass Storage Reader
-	1158  A56AK
-	184c  VoIP Phone
-	6001  Genius VideoCAM NB
-	6005  Sweex Mini Webcam
-	6007  VideoCAM Eye
-	6009  VideoCAM ExpressII
-	600d  TwinkleCam USB camera
-	6011  PC Camera (SN9C102)
-	6019  PC Camera (SN9C102)
-	6024  VideoCAM ExpressII
-	6025  VideoCAM ExpressII
-	6028  Typhoon Easycam USB 330K (older)
-	6029  Triplex i-mini PC Camera
-	602a  Meade ETX-105EC Camera
-	602b  VideoCAM NB 300
-	602c  Clas Ohlson TWC-30XOP Webcam
-	602d  VideoCAM ExpressII
-	602e  VideoCAM Messenger
-	6030  VideoCAM ExpressII
-	603f  VideoCAM ExpressII
-	6040  CCD PC Camera (PC390A)
-	606a  CCD PC Camera (PC390A)
-	607a  CCD PC Camera (PC390A)
-	607b  Win2 PC Camera
-	607c  CCD PC Camera (PC390A)
-	607e  CCD PC Camera (PC390A)
-	6080  Audio (Microphone)
-	6082  VideoCAM Look
-	6083  VideoCAM Look
-	608c  VideoCAM Look
-	608e  VideoCAM Look
-	608f  PC Camera (SN9C103 + OV7630)
-	60a8  VideoCAM Look
-	60aa  VideoCAM Look
-	60ab  PC Camera
-	60af  VideoCAM Look
-	60b0  Genius VideoCam Look
-	60c0  PC Camera with Mic (SN9C105)
-	60c8  Win2 PC Camera
-	60cc  PC Camera with Mic (SN9C105)
-	60ec  PC Camera with Mic (SN9C105)
-	60ef  Win2 PC Camera
-	60fa  PC Camera with Mic (SN9C105)
-	60fb  Composite Device
-	60fc  PC Camera with Mic (SN9C105)
-	60fe  Audio (Microphone)
-	6108  Win2 PC Camera
-	6122  PC Camera (SN9C110)
-	6123  PC Camera (SN9C110)
-	6128  PC Camera (SN9C325 + OM6802)
-	612a  PC Camera (SN9C325)
-	612c  PC Camera (SN9C110)
-	612e  PC Camera (SN9C110)
-	612f  PC Camera (SN9C110)
-	6130  PC Camera (SN9C120)
-	6138  Win2 PC Camera
-	613a  PC Camera (SN9C120)
-	613b  Win2 PC Camera
-	613c  PC Camera (SN9C120)
-	613e  PC Camera (SN9C120)
-	6143  PC Camera (SN9C120 + SP80708)
-	6240  PC Camera (SN9C201 + MI1300)
-	6242  PC Camera (SN9C201 + MI1310)
-	6243  PC Camera (SN9C201 + S5K4AAFX)
-	6248  PC Camera (SN9C201 + OV9655)
-	624b  PC Camera (SN9C201 + CX1332)
-	624c  PC Camera (SN9C201 + MI1320)
-	624e  PC Camera (SN9C201 + SOI968)
-	624f  PC Camera (SN9C201 + OV9650)
-	6251  PC Camera (SN9C201 + OV9650)
-	6253  PC Camera (SN9C201 + OV9650)
-	6260  PC Camera (SN9C201 + OV7670ISP)
-	6262  PC Camera (SN9C201 + OM6802)
-	6270  PC Camera (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111) U-CAM PC Camera NE878, Whitcom WHC017, ...
-	627a  PC Camera (SN9C201 + S5K53BEB)
-	627b  PC Camera (SN9C201 + OV7660)
-	627c  PC Camera (SN9C201 + HV7131R)
-	627f  PC Camera (SN9C201 + OV965x + EEPROM)
-	6280  PC Camera with Microphone (SN9C202 + MI1300)
-	6282  PC Camera with Microphone (SN9C202 + MI1310)
-	6283  PC Camera with Microphone (SN9C202 + S5K4AAFX)
-	6288  PC Camera with Microphone (SN9C202 + OV9655)
-	628a  PC Camera with Microphone (SN9C202 + ICM107)
-	628b  PC Camera with Microphone (SN9C202 + CX1332)
-	628c  PC Camera with Microphone (SN9C202 + MI1320)
-	628e  PC Camera with Microphone (SN9C202 + SOI968)
-	628f  PC Camera with Microphone (SN9C202 + OV9650)
-	62a0  PC Camera with Microphone (SN9C202 + OV7670ISP)
-	62a2  PC Camera with Microphone (SN9C202 + OM6802)
-	62b0  PC Camera with Microphone (SN9C202 + MI0360/MT9V011 or MI0360SOC/MT9V111)
-	62b3  PC Camera with Microphone (SN9C202 + OV9655)
-	62ba  PC Camera with Microphone (SN9C202 + S5K53BEB)
-	62bb  PC Camera with Microphone (SN9C202 + OV7660)
-	62bc  PC Camera with Microphone (SN9C202 + HV7131R)
-	62be  PC Camera with Microphone (SN9C202 + OV7663)
-	62c0  Sonix USB 2.0 Camera
-	62e0  MSI Starcam Racer
-	6310  Sonix USB 2.0 Camera
-	63e0  Sonix Integrated Webcam
-	63f1  Integrated Webcam
-	63f8  Sonix Integrated Webcam
-	6409  Webcam
-	6417  Integrated Webcam
-	641d  1.3 MPixel Integrated Webcam
-	6480  Sonix 1.3 MP Laptop Integrated Webcam
-	8000  DC31VC
-	8006  Dual Mode Camera (8006 VGA)
-	800a  Vivitar Vivicam3350B
-0c46  WaveRider Communications, Inc.
-0c4b  Reiner SCT Kartensysteme GmbH
-	0100  cyberJack e-com/pinpad
-	0300  cyberJack pinpad(a)
-	9102  cyberJack RFID basis contactless smartcard reader
-0c52  Sealevel Systems, Inc.
-	2101  Serial Converter
-0c53  ViewPLUS, Inc.
-0c54  Glory, Ltd
-0c55  Spectrum Digital, Inc.
-	0510  Spectrum Digital XDS510 JTAG Debugger
-	0540  SPI540
-	5416  TMS320C5416 DSK
-	6416  TMS320C6416 DDB
-0c56  Billion Bright, Ltd
-0c57  Imaginative Design Operation Co., Ltd
-0c58  Vidar Systems Corp.
-0c59  Dong Guan Shinko Wire Co., Ltd
-0c5a  TRS International Mfg., Inc.
-0c5e  Xytronix Research & Design
-0c60  Apogee Electronics Corp.
-0c62  Chant Sincere Co., Ltd
-0c63  Toko, Inc.
-0c64  Signality System Engineering Co., Ltd
-0c65  Eminence Enterprise Co., Ltd
-0c66  Rexon Electronics Corp.
-0c67  Concept Telecom, Ltd
-0c70  MCT Elektronikladen
-	0000  USB08 Development board
-0c72  PEAK System
-	000c  PCAN-USB
-0c74  Optronic Laboratories Inc.
-	0002  OL 700-30 Goniometer
-0c76  JMTek, LLC.
-	0001  Mass Storage Controller
-	0002  Mass Storage Controller
-	0003  USBdisk
-	0004  Mass Storage Controller
-	0005  Transcend Flash disk
-	0006  Transcend JetFlash
-	0007  Mass Storage Device
-	1605  SSS Headphone Set
-	1607  audio controller
-0c77  Sipix Group, Ltd
-	1001  SiPix Web2
-	1002  SiPix SC2100
-	1010  SiPix Snap
-	1011  SiPix Blink 2
-	1015  SiPix CAMeleon
-0c78  Detto Corp.
-0c79  NuConnex Technologies Pte., Ltd
-0c7a  Wing-Span Enterprise Co., Ltd
-0c86  NDA Technologies, Inc.
-0c88  Kyocera Wireless Corp.
-	0021  Handheld
-	17da  Qualcomm Kyocera CDMA Technologies MSM
-0c89  Honda Tsushin Kogyo Co., Ltd
-0c8a  Pathway Connectivity, Inc.
-0c8b  Wavefly Corp.
-0c8c  Coactive Networks
-0c8d  Tempo
-0c8e  Cesscom Co., Ltd
-	6000  Luxian Series
-0c8f  Applied Microsystems
-0c98  Berkshire Products, Inc.
-	1140  USB PC Watchdog
-0c99  Innochips Co., Ltd
-0c9a  Hanwool Robotics Corp.
-0c9b  Jobin Yvon, Inc.
-0c9d  SemTek
-	0170  3873 Manual Insert card reader
-0ca2  Zyfer
-0ca3  Sega Corp.
-0ca4  ST&T Instrument Corp.
-0ca5  BAE Systems Canada, Inc.
-0ca6  Castles Technology Co., Ltd
-	0010  EZUSB PC/SC Smart Card Reader
-	0050  EZ220PU Reader Controller
-	1077  Bludrive Family Smart Card Reader
-	107e  Reader Controller
-	2010  myPad110 PC/SC Smart Card Reader
-	3050  EZ710 Smart Card Reader
-0ca7  Information Systems Laboratories
-0cad  Motorola CGISS
-	9001  PowerPad Pocket PC Device
-0cae  Ascom Business Systems, Ltd
-0caf  Buslink
-	2507  Hi-Speed USB-to-IDE Bridge Controller
-	2515  Flash Disk Embedded Hub
-	2516  Flash Disk Security Device
-	2517  Flash Disk Mass Storage Device
-	25c7  Hi-Speed USB-to-IDE Bridge Controller
-	3a00  Hard Drive
-	3a20  Mass Storage Device
-	3acd  Mass Storage Device
-0cb0  Flying Pig Systems
-0cb1  Innovonics, Inc.
-0cb6  Celestix Networks, Pte., Ltd
-0cb7  Singatron Enterprise Co., Ltd
-0cb8  Opticis Co., Ltd
-0cba  Trust Electronic (Shanghai) Co., Ltd
-0cbb  Shanghai Darong Electronics Co., Ltd
-0cbc  Palmax Technology Co., Ltd
-	0101  Pocket PC P6C
-	0201  Personal Digital Assistant
-	0301  Personal Digital Assistant P6M+
-	0401  Pocket PC
-0cbd  Pentel Co., Ltd (Electronics Equipment Div.)
-0cbe  Keryx Technologies, Inc.
-0cbf  Union Genius Computer Co., Ltd
-0cc0  Kuon Yi Industrial Corp.
-0cc1  Given Imaging, Ltd
-0cc2  Timex Corp.
-0cc3  Rimage Corp.
-0cc4  emsys GmbH
-0cc5  Sendo
-0cc6  Intermagic Corp.
-0cc7  Kontron Medical AG
-0cc8  Technotools Corp.
-0cc9  BroadMAX Technologies, Inc.
-0cca  Amphenol
-0ccb  SKNet Co., Ltd
-0ccc  Domex Technology Corp.
-0ccd  TerraTec Electronic GmbH
-	0012  PHASE 26
-	0013  PHASE 26
-	0014  PHASE 26
-	0015  Flash Update for TerraTec PHASE 26
-	0021  Cameo Grabster 200
-	0023  Mystify Claw
-	0028  Aureon 5.1 MkII
-	0032  MIDI HUBBLE
-	0035  Miditech Play'n Roll
-	0036  Cinergy 250 Audio
-	0037  Cinergy 250 Audio
-	0038  Cinergy T² DVB-T Receiver
-	0039  Grabster AV 400
-	003b  Cinergy 400
-	003c  Grabster AV 250
-	0042  Cinergy Hybrid T XS
-	0043  Cinergy T XS
-	004e  Cinergy T XS
-	004f  Cinergy Analog XS
-	0055  Cinergy T XE (Version 1, AF9005)
-	005c  Cinergy T²
-	0069  Cinergy T XE (Version 2, AF9015)
-	006b  Cinergy HT PVR (EU)
-	0072  Cinergy Hybrid T
-	0077  Aureon Dual USB
-	0078  Cinergy T XXS
-	0086  Cinergy Hybrid XE
-	0097  Cinergy T RC MKII
-	00a5  Cinergy Hybrid Stick
-	00a9  RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black]
-0cd4  Bang Olufsen
-	0101  BeolinkPC2
-0cd5  LabJack Corporation
-	0003  U3
-	0009  UE9
-0cd7  NewChip S.r.l.
-0cd8  JS Digitech, Inc.
-	2007  Smart Card Reader/JSTU-9700
-0cd9  Hitachi Shin Din Cable, Ltd
-0cde  Z-Com
-	0001  XI-750 802.11b Wireless Adapter [Atmel AT76C503A]
-	0002  XI-725/726 Prism2.5 802.11b Adapter
-	0003  Sagem 802.11b Dongle
-	0004  Sagem 802.11b Dongle
-	0005  XI-735 Prism3 802.11b Adapter
-	0006  XG-300 802.11b Adapter
-	0008  XG-703A 802.11g Wireless Adapter [Intersil ISL3887]
-	0009  (ZD1211)IEEE 802.11b+g Adapter
-	0011  ZD1211
-	0012  AR5523
-	0013  AR5523 driver (no firmware)
-	0014  NB 802.11g Wireless LAN Adapter(3887A)
-	0015  XG-705A 802.11g Wireless Adapter [Intersil ISL3887]
-	0016  NB 802.11g Wireless LAN Adapter(3887A)
-	0018  NB 802.11a/b/g Wireless LAN Adapter(3887A)
-	001a  802.11bg
-	001c  802.11b/g Wireless Network Adapter
-	0020  AG-760A 802.11abg Wireless Adapter [ZyDAS ZD1211B]
-	0022  802.11b/g/n Wireless Network Adapter
-	0023  UB81 802.11bgn
-	0025  802.11b/g/n USB Wireless Network Adapter
-	0026  UB82 802.11abgn
-0ce5  Validation Technologies International
-	0003  Matrix
-0ce9  pico Technology
-	1001  PicoScope3204
-0cf1  e-Conn Electronic Co., Ltd
-0cf2  ENE Technology, Inc.
-	6220  SD Card Reader (SG361)
-	6225  SD card reader (UB6225)
-	6250  SD card reader (UB6250)
-0cf3  Atheros Communications, Inc.
-	0001  AR5523
-	0002  AR5523 (no firmware)
-	0003  AR5523
-	0004  AR5523 (no firmware)
-	0005  AR5523
-	0006  AR5523 (no firmware)
-	1001  Thomson TG121N [Atheros AR9001U-(2)NG]
-	1002  TP-Link TL-WN821N v2 802.11n [Atheros AR9170]
-	1006  TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]
-	1010  3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170]
-	20ff  Virtual CD-ROM
-	3000  AR3011 Bluetooth (no firmware)
-	3005  AR3011 Bluetooth
-	7015  TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287]
-	9170  AR9170 802.11n
-	9271  AR9271 802.11n
-	b002  Ubiquiti WiFiStation 802.11n [Atheros AR9271]
-	b003  Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271]
-0cf4  Fomtex Corp.
-0cf5  Cellink Co., Ltd
-0cf6  Compucable Corp.
-0cf7  ishoni Networks
-0cf8  Clarisys, Inc.
-	0750  Claritel-i750 - vp
-0cf9  Central System Research Co., Ltd
-0cfa  Inviso, Inc.
-0cfc  Minolta-QMS, Inc.
-	2301  Magicolor 2300 DL
-	2350  Magicolor 2350EN/3300
-	3100  Magicolor 3100
-	7300  Magicolor 5450/5550
-0cff  SAFA MEDIA Co., Ltd.
-	0320  SR-380N
-0d06  telos EDV Systementwicklung GmbH
-0d08  UTStarcom
-	0602  DV007 [serial]
-	0603  DV007 [storage]
-0d0b  Contemporary Controls
-0d0c  Astron Electronics Co., Ltd
-0d0d  MKNet Corp.
-0d0e  Hybrid Networks, Inc.
-0d0f  Feng Shin Cable Co., Ltd
-0d10  Elastic Networks
-	0001  StormPort (WDM)
-0d11  Maspro Denkoh Corp.
-0d12  Hansol Electronics, Inc.
-0d13  BMF Corp.
-0d14  Array Comm, Inc.
-0d15  OnStream b.v.
-0d16  Hi-Touch Imaging Technologies Co., Ltd
-	0001  PhotoShuttle
-	0002  Photo Printer 730 series
-	0004  Photo Printer 63xPL/PS
-	0100  Photo Printer 63xPL/PS
-	0102  Photo Printer 64xPS
-	0103  Photo Printer 730 series
-	0104  Photo Printer 63xPL/PS
-	0105  Photo Printer 64xPS
-	0200  Photo Printer 64xDL
-0d17  NALTEC, Inc.
-0d18  coaXmedia
-0d19  Hank Connection Industrial Co., Ltd
-0d28  NXP
-	0204  LPC1768
-0d32  Leo Hui Electric Wire & Cable Co., Ltd
-0d33  AirSpeak, Inc.
-0d34  Rearden Steel Technologies
-0d35  Dah Kun Co., Ltd
-0d3a  Posiflex Technologies, Inc.
-0d3c  Sri Cable Technology, Ltd
-0d3d  Tangtop Technology Co., Ltd
-	0001  HID Keyboard
-0d3e  Fitcom, inc.
-0d3f  MTS Systems Corp.
-0d40  Ascor, Inc.
-0d41  Ta Yun Terminals Industrial Co., Ltd
-0d42  Full Der Co., Ltd
-0d46  Kobil Systems GmbH
-	2012  KAAN Standard Plus (Smartcard reader)
-	3003  mIDentity Light / KAAN SIM III
-	4000  mIDentity (mass storage)
-	4001  mIDentity Basic/Classic (composite device)
-	4081  mIDentity Basic/Classic (installationless)
-0d49  Maxtor
-	3000  Drive
-	3010  3000LE Drive
-	3100  Hi-Speed USB-IDE Bridge Controller
-	3200  Personal Storage 3200
-	5000  5000XT Drive
-	5010  5000LE Drive
-	5020  Mobile Hard Disk Drive
-	7000  OneTouch
-	7010  OneTouch
-	7410  Mobile Hard Disk Drive (1TB)
-	7450  Basics Portable USB Device
-0d4a  NF Corp.
-0d4b  Grape Systems, Inc.
-0d4c  Tedas AG
-0d4d  Coherent, Inc.
-0d4e  Agere Systems Netherland BV
-	047a  WLAN Card
-	1000  Wireless Card Model 0801
-	1001  Wireless Card Model 0802
-0d4f  EADS Airbus France
-0d50  Cleware GmbH
-	0011  USB-Temp2 Thermometer
-0d51  Volex (Asia) Pte., Ltd
-0d53  HMI Co., Ltd
-0d54  Holon Corp.
-0d55  ASKA Technologies, Inc.
-0d56  AVLAB Technology, Inc.
-0d57  Solomon Microtech, Ltd
-0d5c  SMC Networks, Inc.
-	a001  SMC2662W (v1) EZ Connect 802.11b Wireless Adapter [Atmel AT76C503A]
-	a002  SMC2662W v2 / SMC2662W-AR / Belkin F5D6050 [Atmel at76c503a]
-0d5e  Myacom, Ltd
-	2346  BT Digital Access adapter
-0d5f  CSI, Inc.
-0d60  IVL Technologies, Ltd
-0d61  Meilu Electronics (Shenzhen) Co., Ltd
-0d62  Darfon Electronics Corp.
-	0003  Smartcard Reader
-	0004  Filter Driver
-	001c  Benq X120 Internet Keyboard Pro
-	0306  M530 Mouse
-	0800  Magic Wheel
-	2021  AM805 Keyboard
-	2026  TECOM Bluetooth Device
-	2050  Mouse
-	2106  Dell L20U Multimedia Keyboard
-	a100  Optical Mouse
-0d63  Fritz Gegauf AG
-0d64  DXG Technology Corp.
-	0105  Dual Mode Digital Camera 1.3M
-	0107  Horus MT-409 Camera
-	0108  Dual Mode Digital Camera
-	0202  Dual Mode Video Camera Device
-	0303  DXG-305V Camera
-	1001  SiPix Stylecam/UMAX AstraPix 320s
-	1002  Fashion Cam 01 Dual-Mode DSC (Video Camera)
-	1003  Fashion Cam Dual-Mode DSC (Controller)
-	1021  D-Link DSC 350F
-	1208  Dual Mode Still Camera Device
-	2208  Mass Storage
-	3105  Dual Mode Digital Camera Disk
-	3108  Digicam Mass Storage Device
-0d65  KMJP Co., Ltd
-0d66  TMT
-0d67  Advanet, Inc.
-0d68  Super Link Electronics Co., Ltd
-0d69  NSI
-0d6a  Megapower International Corp.
-0d6b  And-Or Logic
-0d70  Try Computer Co., Ltd
-0d71  Hirakawa Hewtech Corp.
-0d72  Winmate Communication, Inc.
-0d73  Hit's Communications, Inc.
-0d76  MFP Korea, Inc.
-0d77  Power Sentry/Newpoint
-0d78  Japan Distributor Corp.
-0d7a  MARX Datentechnik GmbH
-0d7b  Wellco Technology Co., Ltd
-0d7c  Taiwan Line Tek Electronic Co., Ltd
-0d7d  Phison Electronics Corp.
-	0100  PS1001/1011/1006/1026 Flash Disk
-	0110  Gigabyte FlexDrive
-	0120  Disk Pro 64MB
-	0124  GIGABYTE Disk
-	0240  I/O-Magic/Transcend 6-in-1 Card Reader
-	110e  NEC uPD720121/130 USB-ATA/ATAPI Bridge
-	1240  Apacer 6-in-1 Card Reader 2.0
-	1270  Wolverine SixPac 6000
-	1300  Flash Disk
-	1320  PS2031 Flash Disk
-	1400  Attache 256MB USB 2.0 Flash Drive
-	1420  PS2044 Pen Drive
-	1470  Vosonic X's-Drive II+ VP2160
-	1620  USB Disk Pro
-	1900  USB Thumb Drive
-0d7e  American Computer & Digital Components
-	2507  Hi-Speed USB-to-IDE Bridge Controller
-	2517  Hi-Speed Mass Storage Device
-	25c7  Hi-Speed USB-to-IDE Bridge Controller
-0d7f  Essential Reality LLC
-	0100  P5 Glove glove controller
-0d80  H.R. Silvine Electronics, Inc.
-0d81  TechnoVision
-0d83  Think Outside, Inc.
-0d87  Dolby Laboratories Inc.
-0d89  Oz Software
-0d8a  King Jim Co., Ltd
-	0101  TEPRA PRO
-0d8b  Ascom Telecommunications, Ltd
-0d8c  C-Media Electronics, Inc.
-	0001  Audio Device
-	0002  Composite Device
-	0003  Sound Device
-	0006  Storm HP-USB500 5.1 Headset
-	000c  Audio Adapter
-	000d  Composite Device
-	000e  Audio Adapter (Planet UP-100, Genius G-Talk)
-	001f  CM108 Audio Controller
-	0102  CM106 Like Sound Device
-	0103  CM102-A+/102S+ Audio Controller
-	0104  CM103+ Audio Controller
-	0105  CM108 Audio Controller
-	0107  CM108 Audio Controller
-	010f  CM108 Audio Controller
-	0115  CM108 Audio Controller
-	0201  CM6501
-	5000  Mass Storage Controller
-	5200  Mass Storage Controller(0D8C,5200)
-	b213  USB Phone CM109 (aka CT2000,VPT1000)
-0d8d  Promotion & Display Technology, Ltd
-	0234  V-234 Composite Device
-	0550  V-550 Composite Device
-	0551  V-551 Composite Device
-	0552  V-552 Composite Device
-	0651  V-651 Composite Device
-	0652  V-652 Composite Device
-	0653  V-653 Composite Device
-	0654  V-654 Composite Device
-	0655  V-655 Composite Device
-	0656  V-656 Composite Device
-	0657  V-657 Composite Device
-	0658  V-658 Composite Device
-	0659  V-659 Composite Device
-	0660  V-660 Composite Device
-	0661  V-661 Composite Device
-	0662  V-662 Composite Device
-	0850  V-850 Composite Device
-	0851  V-851 Composite Device
-	0852  V-852 Composite Device
-	0901  V-901 Composite Device
-	0902  V-902 Composite Device
-	0903  V-903 Composite Device
-	4754  Voyager DMP Composite Device
-	bb00  Bloomberg Composite Device
-	bb01  Bloomberg Composite Device
-	bb02  Bloomberg Composite Device
-	bb03  Bloomberg Composite Device
-	bb04  Bloomberg Composite Device
-	bb05  Bloomberg Composite Device
-	fffe  Global Tuner Composite Device
-	ffff  Voyager DMP Composite Device
-0d8e  Global Sun Technology, Inc.
-	0163  802.11g 54 Mbps Wireless Dongle
-	1621  802.11b Wireless Adapter
-	3762  Cohiba 802.11g Wireless Mini adapter [Intersil ISL3887]
-	3763  802.11g Wireless dongle
-	7100  802.11b Adapter
-	7110  WL-210 / WU210P 802.11b Wireless Adapter [Atmel AT76C503A]
-	7605  TRENDnet TEW-224UB 802.11b Wireless Adapter [Atmel AT76C503A]
-	7801  AR5523
-	7802  AR5523 (no firmware)
-	7811  AR5523
-	7812  AR5523 (no firmware)
-	7a01  PRISM25 802.11b Adapter
-0d8f  Pitney Bowes
-0d90  Sure-Fire Electrical Corp.
-0d96  Skanhex Technology, Inc.
-	0000  Jenoptik JD350 video
-	3300  SX330z Camera
-	4100  SX410z Camera
-	4102  MD 9700 Camera
-	4104  Jenoptik JD-4100z3s
-	410a  Medion 9801/Novatech SX-410z
-	5200  SX-520z Camera
-0d97  Santa Barbara Instrument Group
-	0001  SBIG Astronomy Camera (without firmware)
-	0101  SBIG Astronomy Camera (with firmware)
-0d98  Mars Semiconductor Corp.
-	0300  Avaya Wireless Card
-0d99  Trazer Technologies, Inc.
-0d9a  RTX Telecom AS
-	0001  Bluetooth Device
-0d9b  Tat Shing Electrical Co.
-0d9c  Chee Chen Hi-Technology Co., Ltd
-0d9d  Sanwa Supply, Inc.
-0d9e  Avaya
-	0300  Wireless Card
-0d9f  Powercom Co., Ltd
-	0001  Uninterruptible Power Supply
-	0002  Black Knight PRO / WOW Uninterruptible Power Supply (Cypress HID->COM RS232)
-	00a2  Imperial Uninterruptible Power Supply (HID PDC)
-	00a3  Smart King PRO Uninterruptible Power Supply (HID PDC)
-	00a4  WOW Uninterruptible Power Supply (HID PDC)
-	00a5  Vanguard Uninterruptible Power Supply (HID PDC)
-	00a6  Black Knight PRO Uninterruptible Power Supply (HID PDC)
-0da0  Danger Research
-0da1  Suzhou Peter's Precise Industrial Co., Ltd
-0da2  Land Instruments International, Ltd
-0da3  Nippon Electro-Sensory Devices Corp.
-0da4  Polar Electro OY
-	0001  Interface
-0da7  IOGear, Inc.
-0da8  softDSP Co., Ltd
-	0001  SDS 200A Oscilloscope
-0dab  Cubig Group
-	0100  DVR/CVR-M140 MP3 Player
-0dad  Westover Scientific
-0db0  Micro Star International
-	1020  PC2PC WLAN Card
-	1967  Bluetooth Dongle
-	3801  Motorola Bluetooth 2.1+EDR Device
-	4011  Medion Flash XL V2.0 Card Reader
-	4600  802.11b/g Turbo Wireless Adapter
-	5501  Mass Storage Device
-	5502  Mass Storage Device
-	5513  MP3 Player
-	5515  MP3 Player
-	5516  MP3 Player
-	5580  Mega Sky 580 DVB-T Tuner [M902x]
-	5581  Mega Sky 580 DVB-T Tuner [GL861]
-	6823  UB11B/MS-6823 802.11b Wi-Fi adapter
-	6826  IEEE 802.11g Wireless Network Adapter
-	6855  Bluetooth Device
-	6861  MSI-6861 802.11g WiFi adapter
-	6865  RT2570
-	6869  RT2570
-	6874  RT2573
-	6877  RT2573
-	6881  Bluetooth Class I EDR Device
-	688a  Bluetooth Class I EDR Device
-	6899  802.11bgn 1T1R Mini Card Wireless Adapter
-	6970  MS-6970 BToes Bluetooth adapter
-	697a  Bluetooth Dongle
-	6982  Medion Flash XL Card Reader
-	a861  RT2573
-	a874  RT2573
-	a970  Bluetooth dongle
-	a97a  Bluetooth EDR Device
-	b970  Bluetooth EDR Device
-	b97a  Bluetooth EDR Device
-0db1  Wen Te Electronics Co., Ltd
-0db2  Shian Hwi Plug Parts, Plastic Factory
-0db3  Tekram Technology Co., Ltd
-0db4  Chung Fu Chen Yeh Enterprise Corp.
-0db7  ELCON Systemtechnik
-	0002  Goldpfeil P-LAN
-0dbc  A&D Medical
-	0003  AND Serial Cable [AND Smart Cable]
-0dbe  Jiuh Shiuh Precision Industry Co., Ltd
-0dbf  Jess-Link International
-	0002  SmartDongle Security Key
-	0200  HDD Storage Solution
-	021b  USB-2.0 IDE Adapter
-	0300  Storage Adapter
-	0333  Storage Adapter
-	0707  ZIV Drive
-0dc0  G7 Solutions (formerly Great Notions)
-0dc1  Tamagawa Seiki Co., Ltd
-0dc3  Athena Smartcard Solutions, Inc.
-	0801  ASEDrive III
-	0802  ASEDrive IIIe
-	1104  ASEDrive IIIe KB
-	1701  ASEKey
-	1702  ASEKey
-0dc4  Macpower Peripherals, Ltd
-	0040  Mass Storage Device
-	0041  Mass Storage Device
-	0042  Mass Storage Device
-	0101  Hi-Speed Mass Storage Device
-0dc5  SDK Co., Ltd
-0dc6  Precision Squared Technology Corp.
-	2301  Wireless Touchpad Keyboard
-0dc7  First Cable Line, Inc.
-0dcd  NetworkFab Corp.
-	0001  Remote Interface Adapter
-	0002  High Bandwidth Codec
-0dd0  Access Solutions
-	1002  Triple Talk Speech Synthesizer
-0dd1  Contek Electronics Co., Ltd
-0dd2  Power Quotient International Co., Ltd
-	0003  Mass Storage (P)
-0dd3  MediaQ
-0dd4  Custom Engineering SPA
-0dd5  California Micro Devices
-0dd7  Kocom Co., Ltd
-0dd8  Netac Technology Co., Ltd
-	1060  USB-CF-Card
-	e007  OnlyDisk U222 Pendrive
-	f607  OnlyDisk U208 1G flash drive [U-SAFE]
-0dd9  HighSpeed Surfing
-0dda  Integrated Circuit Solution, Inc.
-	0001  Multi-Card Reader 6in1
-	0002  Multi-Card Reader 7in1
-	0003  Flash Disk
-	0005  Internal Multi-Card Reader 6in1
-	0008  SD single card reader
-	0009  MS single card reader
-	000a  MS+SD Dual Card Reader
-	000b  SM single card reader
-	0101  All-In-One Card Reader
-	0102  All-In-One Card Reader
-	0301  MP3 Player
-	0302  Multi-Card MP3 Player
-	1001  Multi-Flash Disk
-	2001  Multi-Card Reader
-	2002  Q018 default PID
-	2003  Multi-Card Reader
-	2005  Datalux DLX-1611 16in1 Card Reader
-	2006  All-In-One Card Reader
-	2007  USB to ATAPI bridge
-	2008  All-In-One Card Reader
-	2013  SD/MS Combo Card Reader
-	2014  SD/MS Single Card Reader
-	2023  card reader SD/MS DEMO board with ICSI brand name (MaskROM version)
-	2024  card reader SD/MS DEMO board with Generic brand name (MaskROM version)
-	2026  USB2.0 Card Reader
-	2027  USB 2.0 Card Reader
-	2315  UFD MP3 player (model 2)
-	2318  UFD MP3 player (model 1)
-	2321  UFD MP3 player
-0ddb  Tamarack, Inc.
-0ddd  Datelink Technology Co., Ltd
-0dde  Ubicom, Inc.
-0de0  BD Consumer Healthcare
-0dea  UTECH Electronic (D.G.) Co., Ltd.
-0ded  Novasonics
-0dee  Lifetime Memory Products
-	4010  Storage Adapter
-0def  Full Rise Electronic Co., Ltd
-0df4  NET&SYS
-	0201  MNG-2005
-0df6  Sitecom Europe B.V.
-	0001  C-Media VOIP Device
-	0004  Bluetooth 2.0 Adapter 100m
-	0007  Bluetooth 2.0 Adapter 10m
-	000b  Bluetooth 2.0 Adapter DFU
-	000d  WL-168 Wireless Network Adapter 54g
-	0017  WL-182 Wireless-N Network USB Card
-	0019  Bluetooth 2.0 adapter 10m CN-512v2 001
-	001a  Bluetooth 2.0 adapter 100m CN-521v2 001 
-	002b  WL-188 Wireless Network 300N USB Adapter
-	002c  WL-301 Wireless Network 300N USB Adapter
-	002d  WL-302 Wireless Network 300N USB dongle 
-	0036  WL-603 Wireless Adapter
-	0039  WL-315 Wireless-N USB Adapter
-	003b  WL-321 Wireless USB Gaming Adapter 300N
-	003c  WL-323 Wireless-N USB Adapter
-	003d  WL-324 Wireless USB Adapter 300N
-	003e  WL-343 Wireless USB Adapter 150N X1
-	003f  WL-608 Wireless USB Adapter 54g
-	0040  WL-344 Wireless Adapter 300N X2 [Ralink RT3071]
-	0041  WL-329 Wireless Dualband USB adapter 300N
-	0042  WL-345 Wireless USB adapter 300N X3
-	0045  WL-353 Wireless USB Adapter 150N Nano
-	0047  WL-352v1 Wireless USB Adapter 300N 002
-	0048  WL-349v1 Wireless Adapter 150N 002 [Ralink RT3070]
-	004a  WL-358v1 Wireless Micro USB Adapter 300N X3 002
-	004b  WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU]
-	004c  WL-352 802.11n Adapter [Realtek RTL8191SU]
-	0050  WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370]
-	061c  LN-028 Network USB 2.0 Adapter
-	21f4  44 St Bluetooth Device
-	2200  Sitecom bluetooth2.0 class 2 dongle CN-512
-	2208  Sitecom bluetooth2.0 class 2 dongle CN-520
-	2209  Sitecom bluetooth2.0 class 1 dongle CN-521
-	9071  WL-113 rev 1 Wireless Network USB Adapter
-	9075  WL-117 Hi-Speed USB Adapter
-	90ac  WL-172 Wireless Network USB Adapter 54g Turbo
-	9712  WL-113 rev 2 Wireless Network USB Adapter
-0df7  Mobile Action Technology, Inc.
-	0620  MA-620 Infrared Adapter
-	0700  MA-700 Bluetooth Adapter
-	0720  MA-720 Bluetooth Adapter
-	0722  Bluetooth Dongle
-	0730  MA-730/MA-730G Bluetooth Adapter
-	0800  Data Cable
-	0820  Data Cable
-	0900  MA i-gotU Travel Logger GPS
-	1800  Generic Card Reader
-	1802  Card Reader
-0dfa  Toyo Communication Equipment Co., Ltd
-0dfc  GeneralTouch Technology Co., Ltd
-	0001  Touchscreen
-0e03  Nippon Systemware Co., Ltd
-0e08  Winbest Technology Co., Ltd
-0e0b  Amigo Technology Inc.
-	9031  802.11n Wireless USB Card
-	9041  802.11n Wireless USB Card
-0e0c  Gesytec
-	0101  LonUSB LonTalk Network Adapter
-0e0f  VMware, Inc.
-	0001  Device
-	0002  Virtual USB Hub
-	0003  Virtual Mouse
-	0004  Virtual CCID
-	0005  Virtual Mass Storage
-	0006  Virtual Keyboard
-	f80a  Smoker FX2
-0e16  JMTek, LLC
-0e17  Walex Electronic, Ltd
-0e1b  Crewave
-0e20  Pegasus Technologies Ltd.
-	0101  NoteTaker
-0e21  Cowon Systems, Inc.
-	0300  iAudio CW200
-	0400  MP3 Player
-	0500  iAudio M3
-	0510  iAudio X5, subpack USB port
-	0513  iAudio X5, side USB port
-	0520  iAudio M5, side USB port
-	0601  iAudio G3
-	0700  iAudio U3
-	0751  iAudio 7
-	0760  iAUDIO U5 / iAUDIO G2
-	0800  Cowon D2 (UMS mode)
-	0801  Cowon D2 (MTP mode)
-	0910  iAUDIO 9
-	0920  J3
-0e22  Symbian Ltd.
-0e23  Liou Yuane Enterprise Co., Ltd
-0e25  VinChip Systems, Inc.
-0e26  J-Phone East Co., Ltd
-0e30  HeartMath LLC
-0e34  Micro Computer Control Corp.
-0e35  3Pea Technologies, Inc.
-0e36  TiePie engineering
-	0008  Handyscope HS3
-	0009  Handyscope HS3 (br)
-	000a  Handyscope HS4
-	000b  Handyscope HS4 (br)
-	000e  Handyscope HS4-DIFF
-	000f  Handyscope HS4-DIFF (br)
-	0010  Handyscope HS2
-	0011  TiePieSCOPE HS805 (br)
-	0012  TiePieSCOPE HS805
-	0018  Handyprobe HP2
-	0042  TiePieSCOPE HS801
-	00fd  USB To Parallel adapter
-	00fe  USB To Parallel adapter
-0e38  Stratitec, Inc.
-0e39  Smart Modular Technologies, Inc.
-	0137  Bluetooth Device
-0e3a  Neostar Technology Co., Ltd
-	1100  CW-1100 Wireless Network Adapter
-0e3b  Mansella, Ltd
-0e41  Line6, Inc.
-	4147  TonePort GX
-	4250  BassPODxt
-	4252  BassPODxt Pro
-	4642  BassPODxt Live
-	4650  PODxt Live
-	4750  GuitarPort
-	5044  PODxt
-	5050  PODxt Pro
-	534d  SeaMonkey
-0e44  Sun-Riseful Technology Co., Ltd.
-0e48  Julia Corp., Ltd
-	0100  CardPro SmartCard Reader
-0e4a  Shenzhen Bao Hing Electric Wire & Cable Mfr. Co.
-0e4c  Radica Games, Ltd
-	1097  Gamester Controller
-	2390  Games Jtech Controller
-	7288  funkey reader
-0e55  Speed Dragon Multimedia, Ltd
-	110a  Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter]
-	110b  MS3303H USB-to-Serial Bridge
-0e56  Kingston Technology Company, Inc.
-	6021  K-PEX 100
-0e5a  Active Co., Ltd
-0e5b  Union Power Information Industrial Co., Ltd
-0e5c  Bitland Information Technology Co., Ltd
-	6118  LCD Device
-	6119  remote receive and control device
-	6441  C-Media Sound Device
-0e5d  Neltron Industrial Co., Ltd
-0e5e  Conwise Technology Co., Ltd.
-	6622  CW6622
-0e66  Hawking Technologies
-	0001  HWUN1 Hi-Gain Wireless-300N Adapter w/ Upgradable Antenna [Ralink RT2870]
-	0003  HWDN1 Hi-Gain Wireless-300N Dish Adapter [Ralink RT2870]
-	0009  HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770]
-	000b  HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770]
-	0013  HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070]
-	0017  HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070]
-	0018  Wireless-N Network Adapter [Ralink RT2870]
-	400b  UF100 10/100 Network Adapter
-	400c  UF100 Ethernet [pegasus2]
-0e67  Fossil, Inc.
-	0002  Wrist PDA
-0e6a  Megawin Technology Co., Ltd
-	0101  MA100 [USB-UART Bridge IC]
-	6001  GEMBIRD Flexible keyboard KB-109F-B-DE
-0e6f  Logic3
-	0003  Freebird wireless Controller
-	0005  Eclipse wireless Controller
-	0006  Edge wireless Controller
-0e70  Tokyo Electronic Industry Co., Ltd
-0e72  Hsi-Chin Electronics Co., Ltd
-0e75  TVS Electronics, Ltd
-0e79  Archos, Inc.
-	1106  Pocket Media Assistant - PMA400
-	1204  Gmini XS 200
-	1306  504 Portable Multimedia Player
-	1330  5 Tablet
-	1332  5 IMT
-	1416  32 IT
-0e7b  On-Tech Industry Co., Ltd
-0e7e  Gmate, Inc.
-	0001  Yopy 3000 PDA
-	1001  YP3X00 PDA
-0e82  Ching Tai Electric Wire & Cable Co., Ltd
-0e83  Shin An Wire & Cable Co.
-0e8c  Well Force Electronic Co., Ltd
-0e8d  MediaTek Inc.
-	0003  MT6227 phone
-	0004  MT6227 phone
-0e8f  GreenAsia Inc.
-	0003  MaxFire Blaze2
-	0012  USB Wireless 2.4GHz Gamepad
-	0016  4 port USB 1.1 hub UH-174
-	0020  USB to PS/2 Adapter
-	0021  Multimedia Keyboard Controller
-	0201  SmartJoy Frag Xpad/PS2 adaptor
-0e90  WiebeTech, LLC
-	0100  Storage Adapter V1
-0e91  VTech Engineering Canada, Ltd
-0e92  C's Glory Enterprise Co., Ltd
-0e93  eM Technics Co., Ltd
-0e95  Future Technology Co., Ltd
-0e96  Aplux Communications, Ltd
-	c001  TRUST 380 USB2 SPACEC@M
-0e97  Fingerworks, Inc.
-	0908  Composite HID (Keyboard and Mouse)
-0e98  Advanced Analogic Technologies, Inc.
-0e99  Parallel Dice Co., Ltd
-0e9a  TA HSING Industries, Ltd
-0e9b  ADTEC Corp.
-0e9c  Streamzap, Inc.
-	0000  Streamzap Remote Control
-0e9f  Tamura Corp.
-0ea0  Ours Technology, Inc.
-	2126  7-in-1 Card Reader
-	2153  SD Card Reader Key
-	2168  Transcend JetFlash 2.0 / Astone USB Drive
-	6803  OTI-6803 Flash Disk
-	6808  OTI-6808 Flash Disk
-	6828  OTI-6828 Flash Disk
-0ea6  Nihon Computer Co., Ltd
-0ea7  MSL Enterprises Corp.
-0ea8  CenDyne, Inc.
-0ead  Humax Co., Ltd
-0eb0  NovaTech
-	9020  NovaTech NV-902W
-	9021  RT2573
-0eb1  WIS Technologies, Inc.
-	6666  WinFast WalkieTV TV Loader
-	6668  WinFast WalkieTV TV Loader
-	7007  WinFast WalkieTV WDM Capture
-0eb2  Y-S Electronic Co., Ltd
-0eb3  Saint Technology Corp.
-0eb7  Endor AG
-0ebe  VWeb Corp.
-0ebf  Omega Technology of Taiwan, Inc.
-0ec0  LHI Technology (China) Co., Ltd
-0ec1  Abit Computer Corp.
-0ec2  Sweetray Industrial, Ltd
-0ec3  Axell Co., Ltd
-0ec4  Ballracing Developments, Ltd
-0ec5  GT Information System Co., Ltd
-0ec6  InnoVISION Multimedia, Ltd
-0ec7  Theta Link Corp.
-	1008  So., Show 301 Digital Camera
-0ecd  Lite-On IT Corp.
-	1400  CD\RW 40X
-	a100  LDW-411SX DVD/CD Rewritable Drive
-0ece  TaiSol Electronics Co., Ltd
-0ecf  Phogenix Imaging, LLC
-0ed1  WinMaxGroup
-	6660  Flash Disk 64M-C
-	6680  Flash Disk 64M-B
-	7634  MP3 Player
-0ed2  Kyoto Micro Computer Co., Ltd
-0ed3  Wing-Tech Enterprise Co., Ltd
-0ed5  Fiberbyte
-	e000  USB-inSync Device
-	f000  Fiberbyte USB-inSync Device
-	f201  Fiberbyte USB-inSync DAQ-2500X
-0eda  Noriake Itron Corp.
-0edf  e-MDT Co., Ltd
-	2060  FID irock! 100 Series
-0ee0  Shima Seiki Mfg., Ltd
-0ee1  Sarotech Co., Ltd
-0ee2  AMI Semiconductor, Inc.
-0ee3  ComTrue Technology Corp.
-	1000  Image Tank 1.5
-0ee4  Sunrich Technology, Ltd
-0eee  Digital Stream Technology, Inc.
-	8810  Mass Storage Drive
-0eef  D-WAV Scientific Co., Ltd
-	0001  eGalax TouchScreen
-	0002  Touchscreen Controller(Professional)
-0ef0  Hitachi Cable, Ltd
-0ef1  Aichi Micro Intelligent Corp.
-0ef2  I/O Magic Corp.
-0ef3  Lynn Products, Inc.
-0ef4  DSI Datotech
-0ef5  PointChips
-	2202  Flash Disk
-	2366  Flash Disk
-0ef6  Yield Microelectronics Corp.
-0ef7  SM Tech Co., Ltd (Tulip)
-0efd  Oasis Semiconductor
-0efe  Wem Technology, Inc.
-0f06  Visual Frontier Enterprise Co., Ltd
-0f08  CSL Wire & Plug (Shen Zhen) Co.
-0f0c  CAS Corp.
-0f0d  Hori Co., Ltd
-	0011  Real Arcade Pro 3
-0f0e  Energy Full Corp.
-0f11  LD Didactic GmbH
-	1000  CASSY-S
-	1010  Pocket-CASSY
-	1020  Mobile-CASSY
-	1080  Joule and Wattmeter
-	1081  Digital Multimeter P
-	1090  UMI P
-	1100  X-Ray Apparatus
-	1101  X-Ray Apparatus
-	1200  VideoCom
-	2000  COM3LAB
-	2010  Terminal Adapter
-	2020  Network Analyser
-	2030  Converter Control Unit
-	2040  Machine Test System
-0f12  Mars Engineering Corp.
-0f13  Acetek Technology Co., Ltd
-0f18  Finger Lakes Instrumentation
-	0002  CCD
-	0006  Focuser
-	0007  Filter Wheel
-	000a  ProLine CCD
-	000b  Color Filter Wheel 4
-	000c  PDF2
-	000d  Guider
-0f19  Oracom Co., Ltd
-0f1b  Onset Computer Corp.
-0f1c  Funai Electric Co., Ltd
-0f1d  Iwill Corp.
-0f21  IOI Technology Corp.
-0f22  Senior Industries, Inc.
-0f23  Leader Tech Manufacturer Co., Ltd
-0f24  Flex-P Industries, Snd., Bhd.
-0f2d  ViPower, Inc.
-0f2e  Geniality Maple Technology Co., Ltd
-0f2f  Priva Design Services
-0f30  Jess Technology Co., Ltd
-	001c  PS3 Guitar Controller Dongle
-	0110  Dual Analog Rumble Pad
-	0111  Colour Rumble Pad
-	0208  Xbox & PC Gamepad
-0f31  Chrysalis Development
-0f32  YFC-BonEagle Electric Co., Ltd
-0f37  Kokuyo Co., Ltd
-0f38  Nien-Yi Industrial Corp.
-0f3d  Airprime, Incorporated
-	0112  CDMA 1xEVDO PC Card, PC 5220
-0f41  RDC Semiconductor Co., Ltd
-0f42  Nital Consulting Services, Inc.
-0f44  Polhemus
-	ef11  Patriot (firmware not loaded)
-	ef12  Patriot
-	ff11  Liberty (firmware not loaded)
-	ff12  Liberty
-0f4b  St. John Technology Co., Ltd
-0f4c  WorldWide Cable Opto Corp.
-0f4d  Microtune, Inc.
-	1000  Bluetooth Dongle
-0f4e  Freedom Scientific
-0f52  Wing Key Electrical Co., Ltd
-0f53  Dongguan White Horse Cable Factory, Ltd
-0f54  Kawai Musical Instruments Mfg. Co., Ltd
-0f55  AmbiCom, Inc.
-0f5c  Prairiecomm, Inc.
-0f5d  NewAge International, LLC
-	9455  Compact Drive
-0f5f  Key Technology Corp.
-0f60  NTK, Ltd
-0f61  Varian, Inc.
-0f62  Acrox Technologies Co., Ltd
-	1001  Targus Mini Trackball Optical Mouse
-0f63  LeapFrog Enterprises
-	0010  Leapster Explorer
-	0500  Fly Fusion
-	0600  Leap Port Turbo
-	0700  POGO
-	0800  Didj
-	0900  TAGSchool
-	0a00  Leapster 2
-	0b00  Crammer
-	0c00  Tag Jr
-	0d00  My Pal Scout
-	0e00  Tag32
-	0f00  Tag64
-	1000  Kiwi16
-	1100  Leapster L2x
-	1111  Fly Fusion
-	1300  Didj UK/France (Leapster Advance)
-0f68  Kobe Steel, Ltd
-0f69  Dionex Corp.
-0f6a  Vibren Technologies, Inc.
-0f6e  INTELLIGENT SYSTEMS
-	0100  GameBoy Color Emulator
-	0201  GameBoy Advance Flash Gang Writer
-	0202  GameBoy Advance Capture
-	0300  Gamecube DOL Viewer
-	0400  NDS Emulator
-	0401  NDS UIC
-	0402  NDS Writer
-	0403  NDS Capture
-	0404  NDS Emulator (Lite)
-0f73  DFI
-0f7c  DQ Technology, Inc.
-0f7d  NetBotz, Inc.
-0f7e  Fluke Corp.
-0f88  VTech Holdings, Ltd
-	3012  RT2570
-	3014  ZD1211B
-0f8b  Yazaki Corp.
-0f8c  Young Generation International Corp.
-0f8d  Uniwill Computer Corp.
-0f8e  Kingnet Technology Co., Ltd
-0f8f  Soma Networks
-0f97  CviLux Corp.
-0f98  CyberBank Corp.
-0f9c  Hyun Won, Inc.
-	0301  M-Any Premium DAH-610 MP3/WMA Player
-	0332  mobiBLU DAH-1200 MP3/Ogg Player
-0f9e  Lucent Technologies
-0fa3  Starconn Electronic Co., Ltd
-0fa4  ATL Technology
-0fa5  Sotec Co., Ltd
-0fa7  Epox Computer Co., Ltd
-0fa8  Logic Controls, Inc.
-0faf  Winpoint Electronic Corp.
-0fb0  Haurtian Wire & Cable Co., Ltd
-0fb1  Inclose Design, Inc.
-0fb2  Juan-Chern Industrial Co., Ltd
-0fb8  Wistron Corp.
-	0002  eHome Infrared Receiver
-0fb9  AACom Corp.
-0fba  San Shing Electronics Co., Ltd
-0fbb  Bitwise Systems, Inc.
-0fc1  Mitac Internatinal Corp.
-0fc2  Plug and Jack Industrial, Inc.
-0fc5  Delcom Engineering
-	1222  I/O Development Board
-0fc6  Dataplus Supplies, Inc.
-0fca  Research In Motion, Ltd.
-	0001  Blackberry Handheld
-	0004  Blackberry Handheld
-	0006  Blackberry Pearl
-	0008  Blackberry Pearl
-	8001  Blackberry Handheld
-	8004  Blackberry Handheld
-	8007  Blackberry Handheld
-0fce  Sony Ericsson Mobile Communications AB
-	0076  W910i (Multimedia mode)
-	00af  V640i Phone [PTP Camera]
-	00d4  C902 [MTP]
-	00d9  C702 Phone
-	0112  W995 Walkman Phone
-	1010  WMC Modem
-	10af  V640i Phone [PictBridge]
-	10d4  C902 Phone [PictBridge]
-	2105  W715 Phone
-	2137  Xperia X10 mini (USB debug)
-	2138  Xperia X10 mini pro (Debug)
-	2149  Xperia X8 (debug)
-	3137  Xperia X10 mini
-	3138  Xperia X10 mini pro
-	3149  Xperia X8
-	8004  9000 Phone [Mass Storage]
-	d008  V800-Vodafone 802SE Phone
-	d016  K750i Phone
-	d017  K608i Phone
-	d019  VDC EGPRS Modem
-	d025  520 WMC Data Modem
-	d028  W800i
-	d038  W850i Phone
-	d039  K800i (phone mode)
-	d041  K510i Phone
-	d042  W810i Phone
-	d043  V630i Phone
-	d046  K610i Phone
-	d065  W960i Phone (PC Suite)
-	d076  W910i (Phone mode)
-	d089  W580i Phone (mass storage)
-	d0af  V640i Phone
-	d0cf  MD300 Mobile Broadband Modem
-	d0d4  C902 Phone [Modem]
-	d0e1  MD400 Mobile Broadband Modem
-	d12e  Xperia X10
-	e039  K800i (msc mode)
-	e042  W810i Phone
-	e043  V630i Phone [Mass Storage]
-	e075  K850i
-	e076  W910i (Mass storage)
-	e089  W580i Phone
-	e090  W200 Phone (Mass Storage)
-	e0a3  W660i
-	e0af  V640i Phone [Mass Storage]
-	e0d4  C902 Phone [Mass Storage] 
-	e0ef  C905 Phone [Mass Storage]
-	e0f3  W595
-	e112  W995 Phone (Mass Storage)
-	e12e  X10i Phone
-	e14f  Xperia Arc
-0fcf  Dynastream Innovations, Inc.
-0fd0  Tulip Computers B.V.
-0fd1  Giant Electronics Ltd.
-0fd4  Tenovis GmbH & Co., KG
-0fd5  Direct Access Technology, Inc.
-0fd9  Elgato Systems GmbH
-	0011  EyeTV Diversity
-	0018  EyeTV Hybrid
-	0020  EyeTV DTT Deluxe
-	0021  EyeTV DTT
-	002a  EyeTV Sat
-	002c  EyeTV DTT Deluxe v2
-	0033  Video Capture
-	0037  Video Capture v2
-0fdc  Micro Plus
-0fe4  IN-Tech Electronics, Ltd
-0fe5  Greenconn (U.S.A.), Inc.
-0fe6  Kontron (Industrial Computer Source / ICS Advent)
-	8101  DM9601 Fast Ethernet Adapter
-	811e  Parallel Adapter
-	9700  DM9601 Fast Ethernet Adapter
-0fe9  DVICO
-	4020  TViX M-6500
-	db00  FusionHDTV DVB-T (MT352+LgZ201) (uninitialized)
-	db01  FusionHDTV DVB-T (MT352+LgZ201) (initialized)
-	db10  FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized)
-	db11  FusionHDTV DVB-T (MT352+Thomson7579) (initialized)
-	db78  FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized)
-0fea  United Computer Accessories
-0feb  CRS Electronic Co., Ltd
-0fec  UMC Electronics Co., Ltd
-0fed  Access Co., Ltd
-0fee  Xsido Corp.
-0fef  MJ Research, Inc.
-0ff6  Core Valley Co., Ltd
-0ff7  CHI SHING Computer Accessories Co., Ltd
-0fff  Aopen, Inc.
-1000  Speed Tech Corp.
-1001  Ritronics Components (S) Pte., Ltd
-1003  Sigma Corp.
-	0003  SD14
-	0100  Sigma SD10
-1004  LG Electronics, Inc.
-	1fae  U8120 3G Cellphone
-	6000  KU330/KU990/VX4400/VX6000
-	6005  T5100
-	6018  GM360/GD510/GW520/KP501
-	618e  Ally/Optimus One/Vortex (debug mode)
-	618f  Ally/Optimus One
-	61c6  Vortex (msc)
-	6800  CDMA Modem
-	7000  LG LDP-7024D(LD)USB
-	a400  Renoir (KC910)
-1005  Apacer Technology, Inc.
-	1001  MP3 Player
-	1004  MP3 Player
-	1006  MP3 Player
-	b113  Handy Steno 2.0/HT203
-	b223  CD-RW + 6in1 Card Reader Digital Storage / Converter
-1006  iRiver, Ltd.
-	3001  iHP-100
-	3002  iHP-120/140 MP3 Player
-	3003  H320/H340
-	3004  H340 (mtp)
-1009  Emuzed, Inc.
-	000e  eHome Infrared Receiver
-	0013  Angel MPEG Device
-	0015  Lumanate Wave PAL SECAM DVBT Device
-	0016  Lumanate Wave NTSC/ATSC Combo Device
-100a  AV Chaseway, Ltd
-	2402  MP3 Player
-	2404  MP3 Player
-	2405  MP3 Player
-	2406  MP3 Player
-	a0c0  MP3 Player
-100b  Chou Chin Industrial Co., Ltd
-100d  Netopia, Inc.
-	3342  Cayman 3352 DSL Modem
-	3382  3380 Series Network Interface
-	6072  DSL Modem
-	9031  Motorola 802.11n Dualband USB Wireless Adapter
-	9032  Motorola 802.11n 5G USB Wireless Adapter
-	cb01  Cayman 3341 Ethernet DSL Router
-1010  Fukuda Denshi Co., Ltd
-1011  Mobile Media Tech.
-	0001  AccFast Mp3
-1012  SDKM Fibres, Wires & Cables Berhad
-1013  TST-Touchless Sensor Technology AG
-1014  Densitron Technologies PLC
-1015  Softronics Pty., Ltd
-1016  Xiamen Hung's Enterprise Co., Ltd
-1017  Speedy Industrial Supplies, Pte., Ltd
-1019  Elitegroup Computer Systems (ECS)
-	0c55  Flash Reader, Desknote UCR-61S2B
-	0f38  Infrared Receiver
-1020  Labtec
-	0006  Wireless Keyboard
-	000a  Wireless Optical Mouse
-	0106  Wireless Optical Mouse
-1022  Shinko Shoji Co., Ltd
-1025  Hyper-Paltek
-	005e  USB DVB-T device
-	005f  USB DVB-T device
-	0300  MP3 Player
-	0350  MP3 Player
-1026  Newly Corp.
-1027  Time Domain
-1028  Inovys Corp.
-1029  Atlantic Coast Telesys
-102a  Ramos Technology Co., Ltd
-102b  Infotronic America, Inc.
-102c  Etoms Electronics Corp.
-	6151  Q-Cam Sangha CIF
-	6251  Q-Cam VGA
-102d  Winic Corp.
-1031  Comax Technology, Inc.
-1032  C-One Technology Corp.
-1033  Nucam Corp.
-	0068  3,5'' HDD case MD-231
-1038  Ideazon, Inc.
-	0100  Zboard
-1039  devolo AG
-	2140  dsl+ 1100 duo
-103d  Stanton
-	0100  ScratchAmp
-	0101  ScratchAmp
-1043  iCreate Technologies Corp.
-	160f  Wireless Network Adapter
-	4901  AV-836 Video Capture Device
-	8006  Flash Disk 32-256 MB
-	8012  Flash Disk 256 MB
-1044  Chu Yuen Enterprise Co., Ltd
-	7001  Gigabyte U7000 DVB-T tuner
-	7002  Gigabyte U8000 DVB-T tuner
-	7004  Gigabyte U7100 DVB-T tuner
-	7005  Gigabyte U7200 DVB-T tuner [AF9035]
-	7006  Gigabyte U6000 DVB-T tuner [em2863]
-	8001  GN-54G
-	8002  GN-BR402W
-	8003  GN-WLBM101
-	8004  GN-WLBZ101 802.11b Adapter
-	8005  GN-WLBZ201 802.11b Adapter
-	8006  GN-WBZB-M 802.11b Adapter
-	8007  GN-WBKG
-	8008  GN-WB01GS
-	800a  GN-WI05GS
-	800b  GN-WB30N 802.11n WLAN Card
-	800c  GN-WB31N 802.11n USB WLAN Card
-	800d  GN-WB32L 802.11n USB WLAN Card
-1046  Winbond Electronics Corp. [hex]
-	6694  Generic W6694 USB
-	8901  Bluetooth Device
-	9967  W9967CF/W9968CF Webcam IC
-1048  Targus Group International
-104b  Mylex / Buslogic
-104c  AMCO TEC International, Inc.
-104d  Newport Corporation
-	1003  Model-52 LED Light Source Power Supply and Driver
-104f  WB Electronics
-	0001  Infinity Phoenix
-	0002  Smartmouse
-	0003  FunProgrammer
-	0004  Infinity Unlimited
-	0006  Infinity Smart
-	0007  Infinity Smart module
-	0008  Infinity CryptoKey
-	0009  RE-BL PlayStation 3 IR-to-Bluetooth converter
-1050  Yubico.com
-	0010  Yubikey
-1053  Immanuel Electronics Co., Ltd
-1054  BMS International Beheer N.V.
-	5004  DSL 7420 Loader
-	5005  DSL 7420 LAN Modem
-1055  Complex Micro Interconnection Co., Ltd
-1056  Hsin Chen Ent Co., Ltd
-1057  ON Semiconductor
-1058  Western Digital Technologies, Inc.
-	0200  Firewire USB Combo
-	0400  External HDD
-	0500  hub
-	0702  Passport External HDD
-	0704  Passport External HDD
-	070a  My Passport Essential SE
-	071a  My Passport 1TB
-	0900  MyBook Essential External HDD
-	0901  MyBook External HDD
-	0903  My Book Premium Edition
-	0910  MyBook Essential External HDD
-	1001  External Hard Disk [Elements]
-	1021  Elements 2TB
-	1104  MyBook Mirror Edition External HDD
-	1123  My Book 3.0
-1059  Giesecke & Devrient GmbH
-	000b  StarSign Bio Token 3.0
-105c  Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd
-105d  Delkin Devices, Inc.
-105e  Valence Semiconductor Design, Ltd
-105f  Chin Shong Enterprise Co., Ltd
-1060  Easthome Industrial Co., Ltd
-1063  Motorola Electronics Taiwan, Ltd [hex]
-	1555  MC141555 Hub
-	4100  SB4100 USB Cable Modem
-1065  CCYU Technology
-	0020  USB-DVR2 Dev Board
-	2136  EasyDisk ED1064
-106a  Loyal Legend, Ltd
-106c  Curitel Communications, Inc.
-	1101  CDMA 2000 1xRTT USB modem (HX-550C)
-	1102  Packet Service
-	1103  Packet Service Diagnostic Serial Port (WDM)
-	1104  Packet Service Diagnostic Serial Port (WDM)
-	1105  Composite Device
-	1106  Packet Service Diagnostic Serial Port (WDM)
-	1301  Composite Device
-	1302  Packet Service Diagnostic Serial Port (WDM)
-	1303  Packet Service
-	1304  Packet Service
-	1401  Composite Device
-	1402  Packet Service
-	1403  Packet Service Diagnostic Serial Port (WDM)
-	1501  Packet Service
-	1502  Packet Service Diagnostic Serial Port (WDM)
-	1503  Packet Service
-	1601  Packet Service
-	1602  Packet Service Diagnostic Serial Port (WDM)
-	1603  Packet Service
-	2101  AudioVox 8900 Cell Phone
-	2102  Packet Service
-	2103  Packet Service Diagnostic Serial Port (WDM)
-	2301  Packet Service
-	2302  Packet Service Diagnostic Serial Port (WDM)
-	2303  Packet Service
-	2401  Packet Service Diagnostic Serial Port (WDM)
-	2402  Packet Service
-	2403  Packet Service Diagnostic Serial Port (WDM)
-	2501  Packet Service
-	2502  Packet Service Diagnostic Serial Port (WDM)
-	2503  Packet Service
-	2601  Packet Service
-	2602  Packet Service Diagnostic Serial Port (WDM)
-	2603  Packet Service
-	3701  Broadband Wireless modem
-	3702  Pantech PX-500
-	3714  PANTECH USB MODEM [UM175]
-	3eb4  Packet Service Diagnostic Serial Port (WDM)
-	4101  Packet Service Diagnostic Serial Port (WDM)
-	4102  Packet Service
-	4301  Composite Device
-	4302  Packet Service Diagnostic Serial Port (WDM)
-	4401  Composite Device
-	4402  Packet Service
-	4501  Packet Service
-	4502  Packet Service Diagnostic Serial Port (WDM)
-	4601  Composite Device
-	4602  Packet Service Diagnostic Serial Port (WDM)
-	5101  Packet Service
-	5102  Packet Service Diagnostic Serial Port (WDM)
-	5301  Packet Service Diagnostic Serial Port (WDM)
-	5302  Packet Service
-	5401  Packet Service
-	5402  Packet Service Diagnostic Serial Port (WDM)
-	5501  Packet Service Diagnostic Serial Port (WDM)
-	5502  Packet Service
-	5601  Packet Service Diagnostic Serial Port (WDM)
-	5602  Packet Service
-	7101  Composite Device
-	7102  Packet Service
-	a000  Packet Service
-	a001  Packet Service Diagnostic Serial Port (WDM)
-	c100  Packet Service
-	c200  Packet Service
-	c500  Packet Service Diagnostic Serial Port (WDM)
-	e200  Packet Service
-106d  San Chieh Manufacturing, Ltd
-106e  ConectL
-106f  Money Controls
-1076  GCT Semiconductor, Inc.
-	0031  Bluetooth Device
-	0032  Bluetooth Device
-107b  Gateway, Inc.
-	3009  eHome Infrared Transceiver
-	55b2  WBU-110 802.11b Wireless Adapter [Intersil PRISM 3]
-	55f2  WGU-210 802.11g Adapter [Intersil ISL3886]
-107d  Arlec Australia, Ltd
-107e  Midoriya Electric Co., Ltd
-107f  KidzMouse, Inc.
-1082  Shin-Etsukaken Co., Ltd
-1083  Canon Electronics, Inc.
-	162c  P-150 Scanner
-1084  Pantech Co., Ltd
-108a  Chloride Power Protection
-108b  Grand-tek Technology Co., Ltd
-108c  Robert Bosch GmbH
-108e  Lotes Co., Ltd.
-1099  Surface Optics Corp.
-109a  DATASOFT Systems GmbH
-109f  eSOL Co., Ltd
-	3163  Trigem Mobile SmartDisplay84
-	3164  Trigem Mobile SmartDisplay121
-10a0  Hirotech, Inc.
-10a3  Mitsubishi Materials Corp.
-10a9  SK Teletech Co., Ltd
-	1102  Sky Love Actually IM-U460K
-	1104  Sky Vega IM-A650S
-	6021  SIRIUS alpha
-10aa  Cables To Go
-10ab  USI Co., Ltd
-	1002  Bluetooth Device
-	1003  BC02-EXT in DFU
-	1005  Bluetooth Adptr
-	1006  BC04-EXT in DFU
-	10c5  Sony-Ericsson / Samsung DataCable
-10ac  Honeywell, Inc.
-10ae  Princeton Technology Corp.
-10af  Liebert Corp.
-	0000  UPS
-	0001  PowerSure PSA UPS
-	0002  PowerSure PST UPS
-	0003  PowerSure PSP UPS
-	0004  PowerSure PSI UPS
-	0005  UPStation GXT 2U UPS
-	0006  UPStation GXT UPS
-	0007  Nfinity Power Systems UPS
-	0008  PowerSure Interactive UPS
-10b5  Comodo (PLX?)
-	9060  Test Board
-10b8  DiBcom
-	0bb8  DiBcom USB DVB-T reference design (MOD300) (cold)
-	0bb9  DiBcom USB DVB-T reference design (MOD300) (warm)
-	0bc6  DiBcom USB2.0 DVB-T reference design (MOD3000P) (cold)
-	0bc7  DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm)
-10bb  TM Technology, Inc.
-10bc  Dinging Technology Co., Ltd
-10bd  TMT Technology, Inc.
-	1427  Ethernet
-10bf  SmartHome
-	0001  SmartHome PowerLinc
-10c4  Cygnal Integrated Products, Inc.
-	0002  F32x USBXpress Device
-	0003  CommandIR
-	8044  USB Debug Adapter
-	804e  Software Bisque Paramount ME
-	80a9  CP210x to UART Bridge Controller
-	80ca  ATM2400 Sensor Device
-	818a  Silicon Labs FM Radio Reference Design
-	8461  Sangoma U100
-	ea60  CP210x Composite Device
-10c5  Sanei Electric, Inc.
-	819a  FM Radio
-10c6  Intec, Inc.
-10cb  Eratech
-10cc  GBM Connector Co., Ltd
-	1101  MP3 Player
-10cd  Kycon, Inc.
-10ce  Silicon Labs
-	ea6a  MobiData EDGE USB Modem
-10cf  Velleman Components, Inc.
-	2011  R-Engine MPEG2 encoder/decoder
-	5500  8055 Experiment Interface Board (address=0)
-	5501  8055 Experiment Interface Board (address=1)
-	5502  8055 Experiment Interface Board (address=2)
-	5503  8055 Experiment Interface Board (address=3)
-10d1  Hottinger Baldwin Measurement
-	0101  USB-Module for Spider8, CP32
-	0202  CP22 - Communication Processor
-	0301  CP42 - Communication Processor
-10d4  Man Boon Manufactory, Ltd
-10d5  Uni Class Technology Co., Ltd
-	5552  KVM Human Interface Composite Device (Keyboard/Mouse ports)
-	55a2  2Port KVMSwitcher
-10d6  Actions Semiconductor Co., Ltd
-	1000  MP3 Player
-	1100  MPMan MP-Ki 128 MP3 Player/Recorder
-	1101  D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player
-	2200  Acer MP-120 MP3 player
-	8888  ADFU Device
-	ff51  ADFU Device
-	ff61  MP4 Player
-	ff66  Craig 2GB MP3/Video Player
-10de  Authenex, Inc.
-10df  In-Win Development, Inc.
-	0500  iAPP CR-e500 Card reader
-10e0  Post-Op Video, Inc.
-10e1  CablePlus, Ltd
-10e2  Nada Electronics, Ltd
-10ec  Vast Technologies, Inc.
-10f0  Nexio Co., Ltd
-	2002  iNexio Touchscreen controller
-10f1  Importek
-	1a08  Internal Webcam
-	1a1e  Laptop Integrated Webcam 1.3M
-10f5  Turtle Beach
-	0200  Audio Advantage Roadie
-10fb  Pictos Technologies, Inc.
-10fd  Anubis Electronics, Ltd
-	7e50  FlyCam Usb 100
-	804d  Typhoon Webshot II Webcam [zc0301]
-	8050  FlyCAM-USB 300 XP2
-	de00  WinFast WalkieTV WDM Capture Driver.
-1100  VirTouch, Ltd
-	0001  VTPlayer VTP-1 Braille Mouse
-1101  EasyPass Industrial Co., Ltd
-	0001  FSK Electronics Super GSM Reader
-1108  Brightcom Technologies, Ltd
-110a  Moxa Technologies Co., Ltd.
-	1250  UPort 1250 2-Port RS-232/422/485
-	1251  UPort 1250I 2-Port RS-232/422/485 with Isolation
-	1410  UPort 1410 4-Port RS-232
-	1450  UPort 1450 4-Port RS-232/422/485
-	1451  UPort 1450I 4-Port RS-232/422/485 with Isolation
-	1613  UPort 1610-16 16-Port RS-232
-	1618  UPort 1610-8 8-Port RS-232
-	1653  UPort 1650-16 16-Port RS-232/422/485
-	1658  UPort 1650-8 8-Port RS-232/422/485
-1110  Analog Devices Canada, Ltd (Allied Telesyn)
-	5c01  Huawei MT-882 Remote NDIS Network Device
-	6489  ADSL ETH/USB RTR
-	9000  ADSL LAN Adapter
-	9001  ADSL Loader
-	900f  AT-AR215 DSL Modem
-	9010  AT-AR215 DSL Modem
-	9021  ADSL WAN Adapter
-	9022  ADSL Loader
-	9023  ADSL WAN Adapter
-	9024  ADSL Loader
-	9031  ADSL LAN Adapter
-	9032  ADSL Loader
-1111  Pandora International Ltd.
-	8888  Evolution Device
-1112  YM ELECTRIC CO., Ltd
-1113  Medion AG
-	a0a2  Active Sync device
-111e  VSO Electric Co., Ltd
-112a  RedRat
-	0001  RedRat3 IR Transceiver
-	0005  RedRat3II IR Transceiver
-112e  Master Hill Electric Wire and Cable Co., Ltd
-112f  Cellon International, Inc.
-1130  Tenx Technology, Inc.
-	0002  iBuddy
-	6604  MCE IR-Receiver
-	660c  Foot Pedal/Thermometer
-	6806  Keychain photo frame
-	f211  TP6911 Audio Headset
-1131  Integrated System Solution Corp.
-	1001  KY-BT100 Bluetooth Adapter
-	1002  Bluetooth Device
-	1003  Bluetooth Device
-	1004  Bluetooth Device
-1132  Toshiba Corp., Digital Media Equipment [hex]
-	4331  PDR-M4/M5/M70 Digital Camera
-	4332  PDR-M60 Digital Camera
-	4333  PDR-M2300/PDR-M700
-	4334  PDR-M65
-	4335  PDR-M61
-	4337  PDR-M11
-	4338  PDR-M25
-1136  CTS Electronincs
-	3131  CTS LS515
-113c  Arin Tech Co., Ltd
-113d  Mapower Electronics Co., Ltd
-1141  V One Multimedia, Pte., Ltd
-1142  CyberScan Technologies, Inc.
-1145  Japan Radio Company
-	0001  AirH PHONE AH-J3001V/J3002V
-1146  Shimane SANYO Electric Co., Ltd.
-1147  Ever Great Electric Wire and Cable Co., Ltd
-114b  Sphairon Access Systems GmbH
-	0110  Turbolink UB801R WLAN Adapter
-	0150  Turbolink UB801RE Wireless 802.11g 54Mbps Network Adapter [RTL8187]
-114c  Tinius Olsen Testing Machine Co., Inc.
-114d  Alpha Imaging Technology Corp.
-114f  Wavecom
-115b  Salix Technology Co., Ltd.
-1162  Secugen Corp.
-1163  DeLorme Publishing, Inc.
-	0100  Earthmate GPS (orig)
-	0200  Earthmate GPS (LT-20, LT-40)
-	2020  Earthmate GPS (PN-40)
-1164  YUAN High-Tech Development Co., Ltd
-	0300  ELSAVISION 460D
-	0601  Analog TV Tuner
-	0900  TigerBird BMP837 USB2.0 WDM Encoder
-	0bc7  Digital TV Tuner
-	521b  MC521A mini Card ATSC Tuner
-	6601  Digital TV Tuner Card [RTL2832U]
-1165  Telson Electronics Co., Ltd
-1166  Bantam Interactive Technologies
-1167  Salient Systems Corp.
-1168  BizConn International Corp.
-116e  Gigastorage Corp.
-116f  Silicon 10 Technology Corp.
-	0005  Flash Card Reader
-	c108  Flash Card Reader
-	c109  Flash Card Reader
-1175  Shengyih Steel Mold Co., Ltd
-117d  Santa Electronic, Inc.
-117e  JNC, Inc.
-1182  Venture Corp., Ltd
-1183  Compaq Computer Corp. [hex] (Digital Dream ??)
-	0001  DigitalDream l'espion XS
-	19c7  ISDN TA
-	4008  56k FaxModem
-	504a  PJB-100 Personal Jukebox
-1184  Kyocera Elco Corp.
-1188  Bloomberg L.P.
-1189  Acer Communications & Multimedia
-	0893  EP-1427X-2 Ethernet Adapter
-118f  You Yang Technology Co., Ltd
-1190  Tripace
-1191  Loyalty Founder Enterprise Co., Ltd
-1196  Yankee Robotics, LLC
-	0010  Trifid Camera without code
-	0011  Trifid Camera
-1197  Technoimagia Co., Ltd
-1198  StarShine Technology Corp.
-1199  Sierra Wireless, Inc.
-	0019  AC595U
-	0021  AC597E
-	0024  MC5727 CDMA modem
-	0110  Composite Device
-	0112  CDMA 1xEVDO PC Card, AirCard 580
-	0120  AC595U
-	0218  MC5720 Wireless Modem
-	6467  MP Series Network Adapter
-	6468  MP Series Network Adapter
-	6469  MP Series Network Adapter
-	6802  MC8755 Device
-	6803  MC8765 Device
-	6804  MC8755 Device
-	6805  MC8765 Device
-	6812  MC8775 Device
-	6820  AC875 Device
-	6832  MC8780 Device
-	6833  MC8781 Device
-	683a  MC8785 Device
-	6850  AirCard 880 Device
-	6851  AirCard 881 Device
-	6852  AirCard 880E Device
-	6853  AirCard 881E Device
-	6854  AirCard 885 Device
-	6856  ATT "USB Connect 881"
-	6870  MC8780 Device
-	6871  MC8781 Device
-	6893  MC8777 Device
-	9000  Gobi 2000 Wireless Modem (QDL mode)
-	9001  Gobi 2000 Wireless Modem
-	9002  Gobi 2000 Wireless Modem
-	9003  Gobi 2000 Wireless Modem
-	9004  Gobi 2000 Wireless Modem
-	9005  Gobi 2000 Wireless Modem
-	9006  Gobi 2000 Wireless Modem
-	9007  Gobi 2000 Wireless Modem
-	9008  Gobi 2000 Wireless Modem
-	9009  Gobi 2000 Wireless Modem
-	900a  Gobi 2000 Wireless Modem
-119a  ZHAN QI Technology Co., Ltd
-119b  ruwido austria GmbH
-	0400  Infrared Keyboard V2.01
-11a0  Chipcon AS
-	eb11  CC2400EB 2.0 ZigBee Sniffer
-11a3  Technovas Co., Ltd
-	8031  MP3 Player
-	8032  MP3 Player
-11aa  GlobalMedia Group, LLC
-	1518  iREZ K2
-11ab  Exito Electronics Co., Ltd
-11b0  ATECH FLASH TECHNOLOGY
-11c5  Inmax
-	0521  IMT-0521 Smartcard Reader
-11db  Topfield Co., Ltd.
-	1000  PVR
-	1100  PVR
-11e6  K.I. Technology Co. Ltd.
-11f5  Siemens AG
-	0001  SX1
-	0003  Mobile phone USB cable
-	0004  X75
-	0005  SXG75/EF81
-	0008  UMTS/HSDPA Data Card
-11f6  Prolific
-	2001  Willcom WSIM
-11f7  Alcatel (?)
-	02df  TD10 Mobile phone USB cable
-1203  TSC Auto ID Technology Co., Ltd
-	0140  TTP-245C
-1209  InterBiometrics
-	1001  USB Hub
-	1002  USB Relais
-	1003  IBSecureCam-P
-	1004  IBSecureCam-O
-	1005  IBSecureCam-N
-120e  Hudson Soft Co., Ltd
-120f  Magellan
-	5260  Triton Handheld GPS Receiver (300/400/500/1500/2000)
-1210  DigiTech
-	001b  RP155 Guitar Multi-Effects Processor
-	001c  RP255 Guitar Multi-Effects Processor
-121e  Jungsoft Co., Ltd
-	3403  Muzio JM250 Audio Player
-1223  SKYCABLE ENTERPRISE. CO., LTD.
-1230  Chipidea-Microelectronica, S.A.
-1233  Denver Electronics
-	5677  FUSB200 mp3 player
-1234  Unknown
-	ed02  Emotiv EPOC Developer Headset Wireless Dongle
-1235  Novation EMS
-	0001  ReMOTE Audio/XStation
-	0002  Speedio
-	0003  ReMOTE ZeRO SL
-	4661  ReMOTE25
-1241  Belkin
-	1111  Mouse
-	1122  Typhoon Stream Optical Mouse USB+PS/2
-	1155  PS2/USB Browser Combo Mouse
-	1166  MI-2150 Trust Mouse
-	1177  F8E842-DL Mouse
-	1503  Keyboard
-	1603  Keyboard
-124a  AirVast
-	168b  PRISM3 WLAN Adapter
-	4017  PC-Chips 802.11b Adapter
-124b  Nyko (Honey Bee)
-	4d01  Airflo EX Joystick
-124c  MXI - Memory Experts International, Inc.
-	3200  Stealth MXP 1GB
-125c  Apogee Inc.
-	0010  Alta series CCD
-125f  A-DATA Technology Co., Ltd.
-	312a  Superior S102
-	a91a  Portable HDD CH91
-	c81a  Flash drive
-	c93a  Flash drive
-1260  Standard Microsystems Corp.
-	ee22  SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887]
-1264  Covidien Energy-based Devices
-1266  Pirelli Broadband Solutions
-	6302  Fastweb DRG A226M ADSL Router
-1267  Logic3 / SpectraVideo plc
-	0103  G-720 Keyboard
-	0201  A4Tech SWOP-3 Mouse
-	a001  JP260 PC Game Pad
-	c002  Wireless Optical Mouse
-126c  Aristocrat Technologies
-126d  Bel Stewart
-126e  Strobe Data, Inc.
-126f  TwinMOS
-	1325  Mobile Disk
-	2168  Mobile Disk III
-	a006  G240 802.11bg
-1274  Ensoniq
-1275  Xaxero Marine Software Engineering, Ltd.
-	0002  WeatherFax 2000 Demodulator
-	0080  SkyEye Weather Satellite Receiver
-1278  Starlight Xpress
-	0105  SXV-M5
-	0107  SXV-M7
-	0109  SXV-M9
-	0110  SXVF-H16
-	0115  SXVF-H5
-	0119  SXV-H9
-	0135  SXVF-H35
-	0136  SXVF-H36
-	0200  SXV interface for paraller MX cameras
-	0305  SXV-M5C
-	0307  SXV-M7C
-	0319  SXV-H9C
-	0325  SXV-M25C
-	0326  SXVR-M26C
-	0507  Lodestar autoguider
-	0517  CoStar
-1283  zebris Medical GmbH
-	0100  USB-RS232 Adaptor
-	0110  CMS20
-	0111  CMS 10
-	0112  CMS 05
-	0114  ARCUS digma PC-Interface
-	0115  SAM Axioquick recorder
-	0116  SAM Axioquick recorder
-	0120  emed-X
-	0121  emed-AT
-	0130  PDM
-	0150  CMS10GI (Golf)
-1286  Marvell Semiconductor, Inc.
-	1fab  88W8338 [Libertas] 802.11g
-	2001  88W8388 802.11a/b/g WLAN
-	2006  88W8360 802.11n WLAN
-	8001  BLOB boot loader firmware
-1291  Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc.
-	0010  FDM 2xxx Flash-OFDM modem
-	0011  LR7F06/LR7F14 Flash-OFDM modem
-1292  Innomedia
-	0258  Creative Labs VoIP Blaster
-1293  Belkin Components [hex]
-	0002  F5U002 Parallel Port [uss720]
-	2101  104-key keyboard
-1294  RISO KAGAKU CORP.
-129b  CyberTAN Technology
-	160b  Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523]
-	160c  Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523]
-	1666  TG54USB 802.11bg
-	1667  802.11bg
-	1828  Gigaset USB Adapter 300
-12a7  Trendchip Technologies Corp.
-12ab  Honey Bee Electronic International Ltd.
-12b8  Zhejiang Xinya Electronic Technology Co., Ltd.
-12ba  Licensed by Sony Computer Entertainment America
-	0100  RedOctane Guitar for PlayStation(R)3
-	0120  RedOctane Drum Kit for PlayStation(R)3
-	0200  Harmonix Guitar for PlayStation(R)3
-	0210  Harmonix Drum Kit for PlayStation(R)3
-12c4  Autocue Group Ltd
-	0006  Teleprompter Two-button Hand Control (v1)
-	0008  Teleprompter Foot Control (v1)
-12d1  Huawei Technologies Co., Ltd.
-	1001  E169/E620/E800 HSDPA Modem
-	1003  E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem
-	1009  U120
-	1010  ETS2252+ CDMA Fixed Wireless Terminal
-	1037  Ideos
-	1038  Ideos (debug mode)
-	1406  E1750
-	140b  EC1260 Wireless Data Modem HSD USB Card
-	1446  E1552 (HSPA modem)
-	1501  Pulse
-	1505  E398 LTE/UMTS/GSM Modem/Networkcard
-	1506  E398 LTE/UMTS/GSM Modem/Networkcard
-	1520  K3765 HSPA
-	1521  K4505 HSPA+
-	380b  WiMAX USB modem(s)
-12d2  LINE TECH INDUSTRIAL CO., LTD.
-12d6  EMS Dr. Thomas Wuensche
-	0444  CPC-USB/ARM7
-	0888  CPC-USB/M16C
-12d7  BETTER WIRE FACTORY CO., LTD.
-12e6  Waldorf Music GmbH
-	0013  Blofeld
-12ef  Tapwave, Inc.
-	0100  Tapwave Handheld [Tapwave Zodiac]
-12f5  Dynamic System Electronics Corp.
-12f7  Memorex Products, Inc.
-	1a00  TD Classic 003B
-	1e23  TravelDrive 2007 Flash Drive
-12fd  AIN Comm. Technology Co., Ltd
-	1001  AWU2000b 802.11b Stick
-12ff  Fascinating Electronics, Inc.
-	0101  Advanced RC Servo Controller
-1307  Transcend Information, Inc.
-	0163  256MB/512MB/1GB Flash Drive
-	0165  2GB/4GB Flash Drive
-	0330  63-in-1 Multi-Card Reader/Writer
-	0361  CR-75: 51-in-1 Card Reader/Writer
-	1169  TS2GJF210 JetFlash 210 2GB
-	1171  Fingerprint Reader
-1308  Shuttle, Inc.
-	0003  VFD Module
-	c001  eHome Infrared Transceiver
-1310  Roper
-	0001  Class 1 Bluetooth Dongle
-1312  ICS Electronics
-131d  Natural Point
-	0155  TrackIR 3 Pro Head Tracker
-	0156  TrackIR 4 Pro Head Tracker
-132a  Envara Inc.
-	1502  WiND 802.11abg / 802.11bg WLAN
-132b  Konica Minolta
-	0000  Dimage A2 Camera
-	0001  Minolta DiMAGE A2 (ptp)
-	0003  Dimage Xg Camera
-	0006  Dimage Z2 Camera
-	0007  Minolta DiMAGE Z2 (PictBridge mode)
-	0008  Dimage X21 Camera
-	000a  Dimage Scan Dual IV
-	000b  Dimage Z10 Camera
-	000d  Dimage X50 Camera [storage?]
-	000f  Dimage X50 Camera [p2p?]
-	0010  Dimage G600 Camera
-	0012  Dimage Scan Elite5400 2
-	0013  Dimage X31 Camera
-	0015  Dimage G530 Camera
-	0017  Dimage Z3 Camera
-	0018  Minolta DiMAGE Z3 (PictBridge mode)
-	0019  Dimage A200 Camera
-	0021  Dimage Z5 Camera
-	0022  Minolta DiMAGE Z5 (PictBridge mode)
-	002c  Dynax 5D camera
-	2001  Magicolor 2400w
-	2004  Magicolor 5430DL
-	2005  Magicolor 2430 DL
-	2029  Magicolor 5440DL
-	2030  PagePro 1350E(N)
-	2033  PagePro 1400W
-	2043  Magicolor 2530DL
-	2045  Magicolor 2500W
-	2049  Magicolor 2490MF
-1342  Mobility
-	0200  EasiDock 200 Hub
-	0201  EasiDock 200 Keyboard and Mouse Port
-	0202  EasiDock 200 Serial Port
-	0203  EasiDock 200 Printer Port
-	0204  Ethernet
-	0304  EasiDock Ethernet
-1345  Sino Lite Technology Corp.
-	001c  Xbox Controller Hub
-1347  Moravian Instruments
-	0400  G2CCD USB 1.1 obsolete
-	0401  G2CCD-S with Sony ICX285 CCD
-	0402  G2CCD2
-	0403  G2/G3CCD-I KAI CCD
-	0404  G2/G3CCD-F KAF CCD
-	0410  G1-0400 CCD
-	0411  G1-0800 CCD
-	0412  G1-0300 CCD
-	0413  G1-2000 CCD
-	0414  G1-1400 CCD
-1348  Katsuragawa Electric Co., Ltd.
-134c  PanJit International Inc.
-	0001  Touch Panel Controller
-	0002  Touch Panel Controller
-	0003  Touch Panel Controller
-	0004  Touch Panel Controller
-134e  Digby's Bitpile, Inc. DBA D Bit
-1357  P&E Microcomputer Systems
-	0503  USB-ML-12 HCS08/HCS12 Multilink
-	0504  DEMOJM
-1366  SEGGER
-	0101  J-Link ARM
-136b  STEC
-1370  Swissbit
-	0323  Swissmemory cirrusWHITE
-	6828  Victorinox Flash Drive
-1371  CNet Technology Inc.
-	0001  CNUSB-611AR Wireless Adapter-G [AT76C503]
-	0002  CNUSB-611AR Wireless Adapter-G [AT76C503] (FiberLine WL-240U)
-	0013  CNUSB-611 Wireless Adapter [AT76C505]
-	0014  CNUSB-611 Wireless Adapter [AT76C505] (FiberLine WL-240U)
-	5743  CNUSB-611 (D) Wireless Adapter [AT76C503]
-	9022  CWD-854 [RT2573]
-	9032  CWD-854 rev F
-	9401  CWD-854 Wireless 802.11g 54Mbps Network Adapter [RTL8187]
-1376  Vimtron Electronics Co., Ltd.
-137b  SCAPS GmbH
-	0002  SCAPS USC-2 Scanner Controller
-1385  Netgear, Inc
-	4250  WG111T
-	4251  WG111T (no firmware)
-	5f00  WPN111 RangeMax(TM) Wireless USB 2.0 Adapter
-	5f01  WPN111 (no firmware)
-	6e00  WPNT121 802.11g 240Mbps Wireless Adapter [Airgo AGN300]
-138a  Validity Sensors, Inc.
-	0001  VFS101 Fingerprint Reader
-	0005  VFS301 Fingerprint Reader
-	0007  VFS451 Fingerprint Reader
-	0008  VFS300 Fingerprint Reader
-	0011  VFS5011 Fingerprint Reader
-138e  Jungo LTD
-	9000  Raisonance S.A. STM32 ARM evaluation board
-1390  TOMTOM B.V.
-	0001  GO 520 T
-1391  IdealTEK, Inc.
-	1000  URTC-1000
-1395  Sennheiser Communications
-	3556  USB Headset
-1397  BEHRINGER International GmbH
-	00bc  BCF2000
-1398  Q-tec
-	2103  USB 2.0 Storage Device
-13ad  Baltech
-	9999  Card reader
-13b0  PerkinElmer Optoelectronics
-	000a  Alesis Photon X25 MIDI Controller
-13b1  Linksys
-	000a  WUSB54G v2 802.11g Adapter [Intersil ISL3887]
-	000b  WUSB11 v4.0 802.11b Adapter [ALi M4301]
-	000c  WUSB54AG 802.11a/g Adapter [Intersil ISL3887]
-	000d  WUSB54G v4 802.11g Adapter [Ralink RT2500USB]
-	000e  WUSB54GS v1 802.11g Adapter [Broadcom 4320 USB]
-	0011  WUSB54GP v4.0 802.11g Adapter [Ralink RT2500USB]
-	0014  WUSB54GS v2 802.11g Adapter [Broadcom 4320 USB]
-	0018  USB200M 10/100 Ethernet Adapter
-	001a  HU200TS Wireless Adapter
-	001e  WUSBF54G 802.11bg
-	0020  WUSB54GC v1 802.11g Adapter [Ralink RT73]
-	0022  WUSB54GX4 802.11g 240Mbps Wireless Adapter [Airgo AGN300]
-	0023  WUSB54GR
-	0024  WUSBF54G v1.1 802.11bg
-	0026  WUSB54GSC v1 802.11g Adapter [Broadcom 4320 USB]
-	002f  AE1000 v1 802.11n [Ralink RT3572]
-	0031  AM10 v1 802.11n [Ralink RT3072]
-	13b1  WUSB200: Wireless-G Business Network Adapter with Rangebooster
-13b2  Alesis
-	0030  Multimix 8
-13b3  Nippon Dics Co., Ltd.
-13ba  Unknown
-	0017  PS/2 Keyboard+Mouse Adapter
-13be  Ricoh Printing Systems, Ltd.
-13ca  JyeTai Precision Industrial Co., Ltd.
-13cf  Wisair Ltd.
-	1200  Olidata Wireless Multimedia Adapter
-13d0  Techsan Electronics Co., Ltd.
-	2282  TechniSat DVB-PC TV Star 2
-13d1  A-Max Technology Macao Commercial Offshore Co. Ltd.
-	7019  MD 82288
-	abe6  Wireless 802.11g 54Mbps Network Adapter [RTL8187]
-13d2  Shark Multimedia
-	0400  Pocket Ethernet [klsi]
-13d3  IMC Networks
-	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
-	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
-	3203  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
-	3204  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
-	3205  DNTV Live! Tiny USB2 BDA (No Remote)
-	3206  DNTV Live! Tiny USB2 BDA (No Remote)
-	3207  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
-	3208  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
-	3209  DTV-DVB UDST7022BDA DVB-S Box(Without HID)
-	3211  DTV-DVB Hybrid Analog/Capture / Pinnacle PCTV 310e
-	3212  DTV-DVB UDTT704C - DVBT/NTSC/PAL Driver(PCM4)
-	3213  DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver (PCM4)
-	3214  DTV-DVB UDTT704F -(MiniCard) DVBT/NTSC/PAL Driver(Without HID)
-	3215  DTV-DVB UDAT7240 - ATSC/NTSC/PAL Driver(PCM4)
-	3216  DTV-DVB UDTT 7047-USB 2.0 DVB-T Driver
-	3217  Digital-TV Receiver.
-	3219  DTV-DVB UDTT7049 - DVB-T Driver(Without HID)
-	3220  DTV-DVB UDTT 7047M-USB 2.0 DVB-T Driver
-	3223  DNTV Live! Tiny USB2 BDA (No Remote)
-	3224  DNTV Live! Tiny USB2 BDA (No Remote)
-	3226  DigitalNow TinyTwin DVB-T Receiver
-	3234  DVB-T FTA Half Minicard [RTL2832U]
-	3236  DTV-DVB UDTT 7047A-USB 2.0 DVB-T Driver
-	3237  DTV-DVB UDTT 704J - dual DVB-T Driver
-	3239  DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver(Without HID)
-	3240  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
-	3241  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
-	3242  DTV-DVB UDAT7240LP - ATSC/NTSC/PAL Driver(Without HID)
-	3243  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
-	3244  DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver
-	3247  802.11 n/g/b Wireless LAN Adapter
-	3249  Internal Bluetooth
-	3262  802.11 n/g/b Wireless LAN USB Adapter
-	3273  802.11 n/g/b Wireless LAN USB Mini-Card
-	3274  DVB-T Dongle [RTL2832U]
-	3282  DVB-T + GPS Minicard [RTL2832U]
-	3284  Wireless LAN USB Mini-Card
-	3306  Mediao 802.11n WLAN [Realtek RTL8191SU]
-	3315  Bluetooth module
-	5070  Webcam
-	5111  Integrated Webcam
-	5115  Integrated Webcam
-	5116  Integrated Webcam
-	5702  UVC VGA Webcam
-	7020  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
-	7022  DTV-DVB UDST7022BDA DVB-S Box(Without HID)
-13dc  ALEREON, INC.
-13dd  i.Tech Dynamic Limited
-13e1  Kaibo Wire & Cable (Shenzhen) Co., Ltd.
-13e5  Rane
-	0001  SL-1
-13e6  TechnoScope Co., Ltd.
-13ec  Zydacron
-	0006  HID Remote Control
-13ee  MosArt
-	0003  Optical Mouse
-13fd  Initio Corporation
-	0841  Samsung SE-T084M DVD-RW
-	1340  Hi-Speed USB to SATA Bridge
-	160f  RocketFish SATA Bridge [INIC-1611]
-	1640  ASUS SDRW-08D1S-U DVD-RW
-	1840  Shintaro SH23SDOCK Hard Drive Docker [INIC-1608L]
-13fe  Kingston Technology Company Inc.
-	1a00  512MB/1GB Flash Drive
-	1a23  512MB Flash Drive
-	1d00  DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive
-	1e00  Flash Drive 2 GB [ICIDU 2 GB]
-	1f00  DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive
-	2240  microSD card reader
-	3100  2/4 GB stick
-1400  Axxion Group Corp.
-1402  Bowe Bell & Howell
-1403  Sitronix
-	0001  Digital Photo Frame
-140e  Telechips, Inc.
-	b011  TCC780X-based player (USB Boot mode)
-	b021  TCC77X-based players (USB Boot mode)
-1410  Novatel Wireless
-	1110  Merlin S620
-	1120  Merlin EX720
-	1130  Merlin S720
-	1400  Merlin U730/U740 (Vodafone)
-	1410  Merlin U740 (non-Vodafone)
-	1430  Merlin XU870
-	1450  Merlin X950D
-	2110  Ovation U720/MCD3000
-	2410  Expedite EU740
-	2420  Expedite EU850D/EU860D/EU870D
-	4100  U727
-	4400  Ovation MC930D/MC950D
-	a001  Gobi Wireless Modem
-	a008  Gobi Wireless Modem (QDL mode)
-1415  Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc.
-	0000  Sony SingStar USBMIC
-	0020  Sony Wireless SingStar
-	2000  Sony Playstation Eye
-1419  ABILITY ENTERPRISE CO., LTD.
-1429  Vega Technologies Industrial (Austria) Co.
-142a  Thales E-Transactions
-	0003  Artema Hybrid
-	0005  Artema Modular
-	0043  medCompact
-142b  Arbiter Systems, Inc.
-	03a5  933A Portable Power Sentinel
-1430  RedOctane
-	4734  Guitar Hero4 hub
-	474b  Guitar Hero MIDI interface
-1431  Pertech Resources, Inc.
-1435  Wistron NeWeb
-	0427  UR054g 802.11g Wireless Adapter [Intersil ISL3887]
-	0711  UR055G 802.11bg
-	0804  AR9170+AR9104 802.11abgn Wireless Adapter
-	0826  AR5523
-	0827  AR5523 (no firmware)
-	0828  AR5523
-	0829  AR5523 (no firmware)
-1436  Denali Software, Inc.
-143c  Altek Corporation
-1443  Digilent
-	0007  CoolRunner-II CPLD Starter Kit
-1453  Radio Shack
-	4026  26-183 Serial Cable
-1456  Extending Wire & Cable Co., Ltd.
-1457  First International Computer, Inc.
-	5117  OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode
-	5118  OpenMoko Neo1973 Debug board (V2+)
-	5119  OpenMoko Neo1973 u-boot cdc_acm serial port
-	5120  OpenMoko Neo1973 u-boot usbtty generic serial
-	5121  OpenMoko Neo1973 kernel mass storage (g_storage) mode
-	5122  OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network
-	5123  OpenMoko Neo1973 internal USB CSR4 module
-	5124  OpenMoko Neo1973 Bluetooth Device ID service
-145f  Trust
-	0106  Trust K56 V92 USB Modem
-	013d  PC Camera (SN9C201 + OV7660)
-	013f  Megapixel Auto Focus Webcam
-	0142  WB-6250X Webcam
-	015a  WB-8300X 2MP Webcam
-1460  Tatung Co.
-	9150  eHome Infrared Transceiver
-1461  Staccato Communications
-1462  Micro Star International
-	5512  MegaStick-1 Flash Stick
-	8807  DIGIVOX mini III [af9015]
-1472  Huawei-3Com
-	0007  Aolynk WUB300g [ZyDAS ZD1211]
-	0009  Aolynk WUB320g
-147a  Formosa Industrial Computing, Inc.
-	e015  eHome Infrared Receiver
-	e016  eHome Infrared Receiver
-	e017  eHome Infrared Receiver
-	e018  eHome Infrared Receiver
-	e03a  eHome Infrared Receiver
-	e03c  eHome Infrared Receiver
-	e03e  Infrared Receiver [IR605A/Q]
-147e  Upek
-	1000  Biometric Touchchip/Touchstrip Fingerprint Sensor
-	2016  Biometric Touchchip/Touchstrip Fingerprint Sensor
-147f  Hama GmbH & Co., KG
-1482  Vaillant
-	1005  VRD PC-Interface
-1484  Elsa AG [hex]
-	1746  Ecomo 19H99 Monitor
-	7616  Elsa Hub
-1485  Silicom
-	0001  U2E
-	0002  Psion Gold Port Ethernet
-1487  DSP Group, Ltd.
-148e  EVATRONIX SA
-148f  Ralink Technology, Corp.
-	1706  RT2500USB Wireless Adapter
-	2070  RT2070 Wireless Adapter
-	2570  RT2570 Wireless Adapter
-	2573  RT2501/RT2573 Wireless Adapter
-	2671  RT2601/RT2671 Wireless Adapter
-	2770  RT2770 Wireless Adapter
-	2870  RT2870 Wireless Adapter
-	3070  RT2870/RT3070 Wireless Adapter
-	3071  RT3071 Wireless Adapter
-	3072  RT3072 Wireless Adapter
-	3572  RT3572 Wireless Adapter
-	5370  RT5370 Wireless Adapter
-	9020  RT2500USB Wireless Adapter
-	9021  RT2501USB Wireless Adapter
-1497  Panstrong Company Ltd.
-1498  Microtek International Inc.
-	a090  DVB-T Tuner
-149a  Imagination Technologies
-	2107  DBX1 DSP core
-14aa  WideView Technology Inc.
-	0001  Avermedia AverTV DVBT USB1.1 (cold)
-	0002  Avermedia AverTV DVBT USB1.1 (warm)
-	0201  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (cold)
-	0221  WT-220U DVB-T dongle
-	022b  WT-220U DVB-T dongle
-	0301  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (warm)
-14ad  CTK Corporation
-14ae  Printronix Inc.
-14af  ATP Electronics Inc.
-14b0  StarTech.com Ltd.
-14b2  Ralink Technology, Corp.
-	3a95  Toshiba WUS-G06G-JT 802.11bg Wireless Adapter
-	3a98  Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523]
-	3c02  rt2500 802.11g WLAN
-	3c05  rt2570 802.11g WLAN
-	3c06  Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870]
-	3c07  802.11n adapter
-	3c09  802.11n adapter
-	3c22  Conceptronic C54RU 802.11bg Wireless Adapter [Ralink RT73]
-	3c23  Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870]
-	3c25  DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870]
-	3c27  Airlink101 AWLL6070 802.11bgn Wireless Adapter [Ralink RT2770]
-	3c28  Conceptronic C300RU v2 802.11bgn Wireless Adapter [Ralink RT2770]
-	3c2c  Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070]
-14c0  Rockwell Automation, Inc.
-14c2  Gemlight Computer, Ltd
-	0250  Storage Adapter V2
-	0350  Storage Adapter V2
-14cd  Super Top
-	121c  microSD card reader
-	123a  SD/MMC/RS-MMC Card Reader
-	127b  SDXC Reader
-	6116  M6116 SATA Bridge
-	6600  USB 2.0 IDE DEVICE
-	6700  Card Reader
-	6900  Card Reader
-	8123  SD MMC Reader
-	8125  SD MMC Reader
-14d8  JAMER INDUSTRIES CO., LTD.
-14dd  Raritan Computer, Inc.
-14e1  Dialogue Technology Corp.
-	5000  PenMount 5000 Touch Controller
-14e5  SAIN Information & Communications Co., Ltd.
-14ea  Planex Communications
-	ab10  GW-US54GZ
-	ab11  GU-1000T
-	ab13  GW-US54Mini 802.11bg
-14ed  Shure Inc.
-14f7  TechniSat Digital GmbH
-	0001  SkyStar 2 HD CI
-	0002  SkyStar 2 HD CI
-	0003  CableStar Combo HD CI
-	0004  AirStar TeleStick 2
-	0500  DVB-PC TV Star HD
-1500  Ellisys
-1501  Pine-Tum Enterprise Co., Ltd.
-1509  First International Computer, Inc.
-	9242  eHome Infrared Transceiver
-1513  medMobile
-	0444  medMobile
-1514  Actel
-	2003  FlashPro3 Programmer
-	2004  FlashPro3 Programmer
-	2005  FlashPro3 Programmer
-1516  CompUSA
-	1603  Flash Drive
-	8628  Pen Drive
-1518  Cheshire Engineering Corp.
-	0001  HDReye High Dynamic Range Camera
-	0002  HDReye (before firmware loads)
-1520  Bitwire Corp.
-1524  ENE Technology Inc
-	6680  UTS 6680
-1527  Silicon Portals
-	0200  YAP Phone (no firmware)
-	0201  YAP Phone
-1529  UBIQUAM Co., Ltd.
-	3100  CDMA 1xRTT USB Modem (U-100/105/200/300/520)
-152d  JMicron Technology Corp. / JMicron USA Technology Corp.
-	2329  JM20329 SATA Bridge
-	2335  ATA/ATAPI Bridge
-	2336  Hard Disk Drive
-	2337  ATA/ATAPI Bridge
-	2338  JM20337 Hi-Speed USB to SATA & PATA Combo Bridge
-	2339  JM20339 SATA Bridge
-	2352  ATA/ATAPI Bridge
-	2509  JMS539 SuperSpeed SATA II 3.0G Bridge
-152e  LG (HLDS)
-	2507  PL-2507 IDE Controller
-	e001  GSA-5120D DVD-RW
-1532  Razer USA, Ltd
-	0001  RZ01-020300 Optical Mouse [Diamondback]
-	0003  Krait Mouse
-	0007  DeathAdder Mouse
-	0017  Imperator Mouse
-	001c  RZ01-0036 Optical Gaming Mouse [Abyssus]
-	0101  Copperhead Mouse
-	0102  Tarantula Keyboard
-	0109  Lycosa Keyboard
-1546  U-Blox AG
-154a  Celectronic GmbH
-	8180  CARD STAR/medic2
-154b  PNY
-	0010  USB 2.0 Flash Drive
-	6545  FD Device
-154d  ConnectCounty Holdings Berhad
-154e  D&M Holdings, Inc. (Denon/Marantz)
-	3000  Marantz RC9001 Remote Control
-1554  Prolink Microsystems Corp.
-1557  OQO
-	0002  model 01 WiFi interface
-	0003  model 01 Bluetooth interface
-	0a80  Gobi Wireless Modem (QDL mode)
-	7720  model 01+ Ethernet
-	8150  model 01 Ethernet interface
-1568  Sunf Pu Technology Co., Ltd
-156f  Quantum Corporation
-1570  ALLTOP TECHNOLOGY CO., LTD.
-157b  Ketron SRL
-157e  TRENDnet
-	3006  TEW-444UB EU
-	3007  TEW-444UB EU (no firmware)
-	300a  TEW-429UB 802.11bg
-	300b  TEW-429UB 802.11bg
-	300d  TEW-429UB C1 802.11bg
-	3204  Allnet ALL0298 v2 802.11bg
-	3205  Allnet ALL0283 [AR5523]
-	3206  Allnet ALL0283 [AR5523](no firmware)
-1582  Fiberline
-	6003  WL-430U 802.11bg
-1587  SMA Technologie AG
-158d  Oakley Inc.
-158e  JDS Uniphase Corporation (JDSU)
-	0820  SmartPocket Class Device
-1598  Kunshan Guoji Electronics Co., Ltd.
-15a2  Freescale Semiconductor, Inc.
-15a4  Afatech Technologies, Inc.
-	1000  AF9015/AF9035 DVB-T stick
-	1001  AF9015/AF9035 DVB-T stick
-	1336  SDHC/MicroSD/MMC/MS/M2/CF/XD Flash Card Reader
-	9015  AF9015 DVB-T USB2.0 stick
-	9016  AF9015 DVB-T USB2.0 stick
-15a8  Teams Power Limited
-15a9  Gemtek
-	0004  WUBR177G
-	0006  Wireless 11n USB Adapter
-	0010  802.11n USB Wireless Card
-	0012  WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870]
-15aa  Gearway Electronics (Dong Guan) Co., Ltd.
-15ad  VMware Inc.
-15ba  Olimex Ltd.
-	0003  OpenOCD JTAG
-	0004  OpenOCD JTAG TINY
-15c0  XL Imaging
-	0001  2M pixel Microscope Camera
-	0002  3M pixel Microscope Camera
-	0003  1.3M pixel Microscope Camera (mono)
-	0004  1.3M pixel Microscope Camera (colour)
-	0005  3M pixel Microscope Camera (Mk 2)
-	0006  2M pixel Microscope Camera (with capture button)
-	0007  3M pixel Microscope Camera (with capture button)
-	0008  1.3M pixel Microscope Camera (colour, with capture button)
-	0009  1.3M pixel Microscope Camera (colour, with capture button)
-	000a  2M pixel Microscope Camera (Mk 2)
-	0010  1.3M pixel "Tinycam"
-	0101  3M pixel Microscope Camera
-15c2  SoundGraph Inc.
-	0036  LC16M VFD Display/IR Receiver
-	0038  GD01 MX VFD Display/IR Receiver
-	ffda  iMON PAD Remote Controller
-	ffdc  iMON PAD Remote Controller
-15c5  Advance Multimedia Internet Technology Inc. (AMIT)
-	0008  WL532U 802.11g Adapter
-15c6  Laboratoires MXM
-	1000  DigistimSP (cold)
-	1001  DigistimSP (warm)
-	1002  DigimapSP USB (cold)
-	1003  DigimapSP USB (warm)
-15c8  KTF Technologies
-	3201  EVER EV-W100/EV-W250
-15c9  D-Box Technologies
-15ca  Textech International Ltd.
-	00c3  Mini Optical Mouse
-	0101  MIDI Interface cable
-	1806  MIDI Interface cable
-15d5  Coulomb Electronics Ltd.
-15d9  Trust International B.V.
-	0a33  Optical Mouse
-	0a37  Mouse
-	0a41  MI-2540D [Optical mouse]
-	0a4c  USB+PS/2 Optical Mouse
-15dc  Hynix Semiconductor Inc.
-15e0  Seong Ji Industrial Co., Ltd.
-15e1  RSA
-	2007  RSA SecurID (R) Authenticator
-15e4  Numark
-	0024  Mixtrack
-15e8  SohoWare
-	9100  NUB100 Ethernet [pegasus]
-	9110  10/100 USB Ethernet
-15e9  Pacific Digital Corp.
-	04ce  MemoryFrame MF-570
-	1968  MemoryFrame MF-570
-	1969  Digital Frame
-15ec  Belcarra Technologies Corp.
-15f4  HanfTek
-	0001  HanfTek UMT-010 USB2.0 DVB-T (cold)
-	0025  HanfTek UMT-010 USB2.0 DVB-T (warm)
-1604  Tascam
-	8000  US-428 Audio/Midi Controller (without fw)
-	8001  US-428 Audio/Midi Controller
-	8004  US-224 Audio/Midi Controller (without fw)
-	8005  US-224 Audio/Midi Controller
-	8006  US-122 Audio/Midi Interface (without fw)
-	8007  US-122 Audio/Midi Interface
-1606  Umax
-	0002  Astra 1236U Scanner
-	0010  Astra 1220U
-	0030  Astra 1600U/2000U
-	0050  Scanner
-	0060  Astra 3400/3450
-	0070  Astra 4400/4450
-	0130  Astra 2100U
-	0160  Astra 5400U
-	0170  Uniscan D50
-	0230  Astra 2200/2200SU
-	0350  Astra 4800/4850 Scanner
-	1030  Astra 4000U
-	1220  Genesys Logic Scanner Controller NT5.0
-	2010  AstraCam Digital Camera
-	2020  AstraCam 1000
-	2030  AstraCam 1800 Digital Camera
-1608  Inside Out Networks [hex]
-	0001  EdgePort/4 Serial Port
-	0002  Edgeport/8
-	0003  Rapidport/4
-	0004  Edgeport/4
-	0005  Edgeport/2
-	0006  Edgeport/4i
-	0007  Edgeport/2i
-	0008  Edgeport/8
-	000c  Edgeport/421
-	000d  Edgeport/21
-	000e  Edgeport/4
-	000f  Edgeport/8
-	0010  Edgeport/2
-	0011  Edgeport/4
-	0012  Edgeport/416
-	0014  Edgeport/8i
-	0018  Edgeport/412
-	0019  Edgeport/412
-	001a  Edgeport/2+2i
-	0101  Edgeport/4
-	0105  Edgeport/2
-	0106  Edgeport/4i
-	0107  Edgeport/2i
-	010c  Edgeport/421
-	010d  Edgeport/21
-	0110  Edgeport/2
-	0111  Edgeport/4
-	0112  Edgeport/416
-	0114  Edgeport/8i
-	0201  Edgeport/4
-	0203  Rapidport/4
-	0204  Edgeport/4
-	0205  Edgeport/2
-	0206  Edgeport/4i
-	0207  Edgeport/2i
-	020c  Edgeport/421
-	020d  Edgeport/21
-	020e  Edgeport/4
-	020f  Edgeport/8
-	0210  Edgeport/2
-	0211  Edgeport/4
-	0212  Edgeport/416
-	0214  Edgeport/8i
-	0215  Edgeport/1
-	0216  EPOS/44
-	0217  Edgeport/42
-	021a  Edgeport/2+2i
-	021b  Edgeport/2c
-	021c  Edgeport/221c
-	021d  Edgeport/22c
-	021e  Edgeport/21c
-	021f  Edgeport/62
-	0240  Edgeport/1
-	0241  Edgeport/1i
-	0242  Edgeport/4s
-	0243  Edgeport/8s
-	0244  Edgeport/8
-	0245  Edgeport/22c
-	0301  Watchport/P
-	0302  Watchport/M
-	0303  Watchport/W
-	0304  Watchport/T
-	0305  Watchport/H
-	0306  Watchport/E
-	0307  Watchport/L
-	0308  Watchport/R
-	0309  Watchport/A
-	030a  Watchport/D
-	030b  Watchport/D
-	030c  Power Management Port
-	030e  Power Management Port
-	030f  Watchport/G
-	0310  Watchport/Tc
-	0311  Watchport/Hc
-	1403  MultiTech Systems MT4X56 Modem
-	1a17  Agilent Technologies (E6473)
-160a  VIA Technologies, Inc.
-	3184  VIA VNT-6656 [WiFi 802.11b/g USB Dongle]
-1614  Amoi Electronics
-	0404  WMA9109 UMTS Phone
-	0600  Vodafone VDA GPS / Toschiba Protege G710
-	0804  WP-S1 Phone
-1619  L & K Precision Technology Co., Ltd.
-1621  Wionics Research
-1628  Stonestreet One, Inc.
-162a  Airgo Networks Inc.
-162f  WiQuest Communications, Inc.
-1630  2Wire, Inc.
-	0005  802.11g Wireless Adapter [Intersil ISL3886]
-	ff81  802.11b Wireless Adapter [Lucent/Agere Hermes I]
-1631  Good Way Technology
-	6200  GWUSB2E
-	c019  RT2573
-1645  Cross Match Technologies GmbH
-	0001  1S Serial Port
-	0002  2S Serial Port
-	0003  1S25 Serial Port
-	0004  4S Serial Port
-	0005  E45 Ethernet [klsi]
-	0006  Parallel Port
-	0007  U1-SC25 SCSI
-	0008  Ethernet
-	0016  Bi-directional to Parallel Printer Converter
-	0080  1 port to Serial Converter
-	0081  1 port to Serial Converter
-	0093  1S9 Serial Port
-	8000  EZ-USB
-	8001  1 port to Serial
-	8002  2x Serial Port
-	8003  1 port to Serial
-	8004  2U4S serial/usb hub
-	8005  Ethernet
-	8080  1 port to Serial
-	8081  1 port to Serial
-	8093  PortGear Serial Port
-1649  SofTec Microsystems
-	0102  uDART In-Circuit Debugger
-	0200  SpYder USBSPYDER08
-164a  ChipX
-164c  Matrix Vision GmbH
-	0101  mvBlueFOX camera (no firmware)
-	0103  mvBlueFOX camera
-	0201  mvBlueLYNX-X intelligent camera (bootloader)
-	0203  mvBlueLYNX-X intelligent camera
-1657  Struck Innovative Systeme GmbH
-	3150  SIS3150 USB2.0 to VME interface
-165b  Frontier Design Group
-	8101  Tranzport Control Surface
-	fad1  Alphatrack Control Surface
-1660  Creatix Polymedia GmbH
-1668  Actiontec Electronics, Inc. [hex]
-	0009  Gateway
-	0333  Modem
-	0358  InternetPhoneWizard
-	0405  Gateway
-	0408  Prism2.5 802.11b Adapter
-	0413  Gateway
-	0421  Prism2.5 802.11b Adapter
-	0441  IBM Integrated Bluetooth II
-	0500  BTM200B BlueTooth Adapter
-	1050  802UIG-1 802.11g Wireless Mini Adapter [Intersil ISL3887]
-	1200  802AIN Wireless N Network Adapter [Atheros AR9170+AR9101]
-	1441  IBM Integrated Bluetooth II
-	2441  BMDC-2 IBM Bluetooth III w.56k
-	3441  IBM Integrated Bluetooth III
-	6010  Gateway
-	6097  802.11b Wireless Adapter
-	6106  ROPEX FreeLan 802.11b
-	7605  UAT1 Wireless Ethernet Adapter
-1669  PiKRON Ltd. [hex]
-	1001  uLan2USB Converter - PS1 protocol
-1677  China Huada Integrated Circuit Design (Group) Co., Ltd. (CIDC Group)
-	0103  Token
-1679  Total Phase
-	2001  Beagle Protocol Analyzer
-	2002  Cheetah SPI Host Adapter
-1680  Golden Bridge Electech Inc.
-	a332  DVB-T Dongle [RTL2832U]
-1681  Prevo Technologies, Inc.
-	0001  Tuner's Dashboard
-	0002  Tubachron
-1682  Maxwise Production Enterprise Ltd.
-1684  Godspeed Computer Corp.
-1685  Delock
-	0200  Infrared adapter
-1686  ZOOM Corporation
-	0045  H4 Digital Recorder
-1687  Kingmax Digital Inc.
-	5289  FlashDisk
-	6211  FlashDisk
-1688  Saab AB
-168c  Atheros Communications
-	0001  AR5523
-	0002  AR5523 (no firmware)
-1690  Askey Computer Corp. [hex]
-	0101  Creative Modem Blaster DE5670
-	0102  V1456 VQE-R2 Modem [conexant]
-	0103  1456 VQE-R3 Modem [conexant]
-	0104  HCF V90 Data Fax RTAD Modem
-	0107  HCF V.90 Data,Fax,RTAD Modem
-	0109  MagicXpress V.90 Pocket Modem [conexant]
-	0203  Voyager ADSL Modem Loader
-	0204  Voyager ADSL Modem
-	0205  DSL Modem
-	0206  GlobeSpan ADSL WAN Modem
-	0208  DSL Modem
-	0209  Voyager 100 ADSL Modem
-	0211  Globespan Virata ADSL LAN Modem
-	0212  DSL Modem
-	0213  HM121d DSL Modem
-	0214  HM121d DSL Modem
-	0215  Voyager 105 ADSL Modem
-	0701  WLAN
-	0710  SMCWUSBT-G
-	0711  SMCWUSBT-G (no firmware)
-	0712  AR5523
-	0713  AR5523 (no firmware)
-	0715  Name: Voyager 1055 Laptop 802.11g Adapter [Broadcom 4320]
-	0722  RT2573
-	0726  Wi-Fi Wireless LAN Adapter
-	0740  802.11n Wireless LAN Card
-	0901  Voyager 205 ADSL Router
-1696  Hitachi Video and Information System, Inc.
-1697  VTec Test, Inc.
-16a5  Shenzhen Zhengerya Cable Co., Ltd.
-16a6  Unigraf
-	3000  VTG-3xxx Video Test Generator family
-	4000  VTG-4xxx Video Test Generator family
-	5000  VTG-5xxx Video Test Generator family
-	5001  VTG-5xxx Special (update) mode of VTG-5xxx family
-16ab  Global Sun Technology
-	7801  AR5523
-	7802  AR5523 (no firmware)
-	7811  AR5523
-	7812  AR5523 (no firmware)
-16ac  Dongguan ChingLung Wire & Cable Co., Ltd.
-16b4  iStation
-	0801  U43
-16b5  Persentec, Inc.
-	0002  Otto driving companion
-16c0  VOTI
-	03e8  free for internal lab use 1000
-	03e9  free for internal lab use 1001
-	03ea  free for internal lab use 1002
-	03eb  free for internal lab use 1003
-	03ec  free for internal lab use 1004
-	03ed  free for internal lab use 1005
-	03ee  free for internal lab use 1006
-	03ef  free for internal lab use 1007
-	03f0  free for internal lab use 1008
-	03f1  free for internal lab use 1009
-	0477  Teensy Rebootor
-	0478  Teensy Halfkay Bootloader
-	05dc  shared ID for use with libusb
-	05dd  BlackcatUSB2
-	05e1  CDC-ACM class devices (modems)
-	05e4  MIDI class devices
-	076b  OpenPCD 13.56MHz RFID Reader
-	076c  OpenPICC 13.56MHz RFID Simulator (native)
-	08ac  OpenBeacon USB stick
-	08ca  Alpermann+Velte Universal Display
-	08cb  Alpermann+Velte Studio Clock
-	08cc  Alpermann+Velte SAM7S MT Boot Loader
-	08cd  Alpermann+Velte SAM7X MT Boot Loader
-	27da  Mouse
-	27db  Keyboard
-	27dc  Joystick
-	27dd  CDC-ACM class devices (modems)
-	27de  MIDI class devices
-16ca  Wireless Cables, Inc.
-	1502  Bluetooth Dongle
-16cc  silex technology, Inc.
-16d0  GrauTec
-	054b  ReelBox OLED Display (external)
-16d3  Frontline Test Equipment, Inc.
-16d5  AnyDATA Corporation
-	6202  CDMA/UMTS/GPRS modem
-	6501  CDMA 2000 1xRTT/EV-DO Modem
-	6502  CDMA/UMTS/GPRS modem
-16d6  JABLOCOM s.r.o.
-	8000  GDP-04 desktop phone
-	8001  EYE-02
-	8003  GDP-04 modem
-	8004  Bootloader
-	8005  GDP-04i
-	8007  BTP-06 modem
-16d8  CMOTECH Co., Ltd.
-	5141  CMOTECH CDMA Technologies modem
-	5533  CCU-550 CDMA EV-DO modem
-	5543  CDMA 2000 1xRTT/1xEVDO modem
-	6280  CMOTECH CDMA Technologies modem
-	6803  CNU-680 CDMA EV-DO modem
-	8001  Gobi 2000 Wireless Modem (QDL mode)
-	8002  Gobi 2000 Wireless Modem
-16dc  Wiener, Plein & Baus
-	0001  CC
-	000b  VM
-16df  King Billion Electronics Co., Ltd.
-16f0  GN ReSound A/S
-	0003  Airlink Wireless Programming Interface
-16f5  Futurelogic Inc.
-1706  BlueView Technologies, Inc.
-1707  ARTIMI
-170b  Swissonic
-	0011  MIDI-USB 1x1
-170d  Avnera
-1725  Vitesse Semiconductor
-1726  Axesstel, Inc.
-	1000  wireless modem
-	2000  wireless modem
-	3000  wireless modem
-172f  Waltop International Corp.
-	0022  Tablet
-	0024  Tablet
-	0025  Tablet
-	0026  Tablet
-	0031  Slim Tablet 12.1"
-	0032  Slim Tablet 5.8"
-	0034  Slim Tablet 12.1"
-	0038  Genius G-Pen F509
-	0500  Media Tablet 14.1"
-	0501  Media Tablet 10.6"
-	0502  Sirius Battery Free Tablet
-1733  Cellink Technology Co., Ltd
-	0101  RF Wireless Optical Mouse OP-701
-1736  CANON IMAGING SYSTEM TECHNOLOGIES INC.
-1737  Linksys
-	0039  USB1000
-	0070  WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870]
-	0071  WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870]
-	0073  WUSB54GC v2 802.11g Adapter [Realtek RTL8187B]
-	0075  WUSB54GSC v2 802.11g Adapter
-	0077  WUSB54GC v3 802.11g Adapter [Ralink RT2070L]
-	0078  WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070]
-	0079  WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572]
-1740  Senao
-	0605  LevelOne WUA-0605 N_Max Wireless USB Adapter
-	0615  LevelOne WUA-0615 N_Max Wireless USB Adapter
-	2000  NUB-8301 802.11bg
-	3701  EUB-3701 EXT 802.11g Wireless Adapter [Ralink RT2571W]
-	9701  EnGenius 802.11n Wireless USB Adapter
-	9702  EnGenius 802.11n Wireless USB Adapter
-	9703  EnGenius 802.11n Wireless USB Adapter
-	9705  EnGenius 802.11n Wireless USB Adapter
-	9706  EUB9706 802.11n Wireless Adapter [Ralink RT3072]
-	9801  EUB9801 802.11abgn Wireless Adapter [Ralink RT3572]
-1743  General Atomics
-174c  ASMedia Technology Inc.
-174f  Syntek
-	1105  SM-MS/Pro-MMC-XD Card Reader
-	1403  Integrated Webcam
-	1404  USB Camera device, 1.3 MPixel Web Cam
-	5212  USB 2.0 UVC PC Camera
-	5a11  PC Camera
-	5a31  Sonix USB 2.0 Camera
-	5a35  Sonix 1.3MPixel USB 2.0 Camera
-	6a31  Web Cam - Asus A8J, F3S, F5R, VX2S, V1S
-	6a33  Web Cam - Asus F3SA, F9J, F9S
-	6a51  2.0MPixel Web Cam - Asus Z96J, Z96S, S96S
-	6a54  Web Cam
-	6d51  2.0Mpixel Web Cam - Eurocom D900C
-	8a12  Syntek 0.3MPixel USB 2.0 UVC PC Camera
-	8a33  Syntek USB 2.0 UVC PC Camera
-	a311  1.3MPixel Web Cam - Asus A3A, A6J, A6K, A6M, A6R, A6T, A6V, A7T, A7sv, A7U
-	a312  1.3MPixel Web Cam
-	a821  Web Cam - Packard Bell BU45, PB Easynote MX66-208W
-	aa11  Web Cam
-1753  GERTEC Telecomunicacoes Ltda.
-	c901  PPC900 Pinpad Terminal
-1759  LucidPort Technology, Inc.
-1761  ASUSTek Computer, Inc. (wrong ID)
-	0b05  802.11n Network Adapter (wrong ID - swapped vendor and device)
-1772  System Level Solutions, Inc.
-1776  Arowana
-	501c  300K CMOS Camera
-177f  Sweex
-	0153  LW153 802.11n Adapter [ralink rt3070]
-	0313  LW313 802.11n Adapter [ralink rt2770 + rt2720]
-1781  Multiple Vendors
-	083e  MetaGeek Wi-Spy
-	083f  MetaGeek Wi-Spy 2.4x
-	0938  Iguanaworks USB IR Transceiver
-	0c9f  USBtiny
-1782  Spreadtrum Communications Inc.
-1784  TopSeed Technology Corp.
-	0001  eHome Infrared Transceiver
-	0004  RF Combo Device
-	0006  eHome Infrared Transceiver
-	0007  eHome Infrared Transceiver
-	0008  eHome Infrared Transceiver
-	000a  eHome Infrared Transceiver
-1787  ATI AIB
-1788  ShenZhen Litkconn Technology Co., Ltd.
-1796  Printrex, Inc.
-1797  JALCO CO., LTD.
-1799  Belkin Components
-	7051  F5D7051 802.11g Adapter v1000 [Broadcom 4320]
-179d  Ricavision International, Inc.
-	0010  Internal Infrared Transceiver
-17a0  Samson Technologies Corp.
-	0001  C01U condenser microphone
-	0002  Q1U dynamic microphone
-	0100  C03U multi-pattern microphone
-	0101  UB1 boundary microphone
-	0200  StudioDock monitors (internal hub)
-	0201  StudioDock monitors (audio)
-	0301  Q2U handheld microphone with XLR
-	0302  GoMic compact condenser microphone
-17a4  Concept2
-	0001  Performance Monitor 3
-	0002  Performance Monitor 4
-17a5  Advanced Connection Technology Inc.
-17a7  MICOMSOFT CO., LTD.
-17b3  Grey Innovation
-	0004  Linux-USB Midi Gadget
-17c3  Singim International Corp.
-17cc  Native Instruments
-	041c  Audio 2 DJ
-	0808  Maschine Controller
-	0815  Audio Kontrol 1
-	0839  Audio 4 DJ
-	0d8d  Guitarrig Mobile
-	1915  Session I/O
-	1940  RigKontrol3
-	1969  RigKontrol2
-	1978  Audio 8 DJ
-	2305  Traktor Kontrol X1
-	4711  Kore Controller
-	4712  Kore Controller 2
-	baff  Traktor Kontrol S4
-17cf  Hip Hing Cable & Plug Mfy. Ltd.
-17d0  Sanford L.P.
-17d3  Korea Techtron Co., Ltd.
-17e9  Newnham Research
-	0051  USB VGA Adaptor
-17eb  Cornice, Inc.
-17ef  Lenovo
-	1003  Integrated Smart Card Reader
-	1004  Integrated Webcam
-	100a  ThinkPad Mini Dock Plus Series 3
-	3815  ChipsBnk 2GB USB Stick
-	4802  Lenovo Vc0323+MI1310_SOC Camera
-	4807  UVC Camera
-	480c  Integrated Webcam
-	480d  Integrated Webcam [R5U877]
-	480e  Integrated Webcam [R5U877]
-	480f  Integrated Webcam [R5U877]
-	4810  Integrated Webcam [R5U877]
-	4811  Integrated Webcam [R5U877]
-	4812  Integrated Webcam [R5U877]
-	4813  Integrated Webcam [R5U877]
-	4814  Integrated Webcam [R5U877]
-	4815  Integrated Webcam [R5U877]
-	481c  Integrated Webcam
-	6009  ThinkPad Keyboard with TrackPoint
-17f5  K.K. Rocky
-17f6  Unicomp, Inc
-	0709  Model M Keyboard
-1809  Advantech
-	4761  USB-4761 Portable Data Acquisition Module
-1822  Twinhan
-	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
-	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
-1831  Gwo Jinn Industries Co., Ltd.
-1832  Huizhou Shenghua Industrial Co., Ltd.
-183d  VIVOphone
-	0010  VoiceKey
-1843  Vaisala
-1849  ASRock Incorporation
-1852  GYROCOM C&C Co., LTD
-	7922  Audiotrak DR.DAC2 DX
-1854  Memory Devices Ltd.
-185b  Compro
-	3020  K100 Infrared Receiver
-	3082  K100 Infrared Receiver v2
-	d000  Compro Videomate DVB-U2000 - DVB-T USB cold
-	d001  Compro Videomate DVB-U2000 - DVB-T USB warm
-1861  Tech Technology Industrial Company
-1862  Teridian Semiconductor Corp.
-1870  Nexio Co., Ltd
-	0001  iNexio Touchscreen controller
-1871  Aveo Technology Corp.
-	0d01  USB2.0 Camera
-187c  Alienware Corporation
-	0600  Dual Compatible Game Pad
-187f  Siano Mobile Silicon
-	0010  Stallar Board
-	0100  Stallar Board
-	0200  Nova A
-	0201  Nova B
-	0202  Nice
-	0300  Vega
-	0301  VeNice
-1892  Vast Technologies, Inc.
-1894  Topseed
-	5632  Atek Tote Remote
-	5641  TSAM-004 Presentation Remote
-1897  Evertop Wire Cable Co.
-18a5  Verbatim, Ltd
-	0214  Portable Hard Drive
-	0216  External Hard Drive
-	0218  External Hard Drive
-18b1  Petalynx
-	0037  Maxter Remote Control
-18b4  e3C Technologies
-	1001  DUTV007
-	1002  EC168 (v5) based USB DVB-T receiver
-	1689  DUTV009
-	fffa  EC168 (v2) based USB DVB-T receiver
-	fffb  EC168 (v3) based USB DVB-T receiver
-18b6  Mikkon Technology Limited
-18b7  Zotek Electronic Co., Ltd.
-18c5  AMIT Technology, Inc.
-	0002  CG-WLUSB2GO
-	0008  CG-WLUSB2GNR Corega Wireless USB Adapter
-	0012  CG-WLUSB10 Corega Wireless USB Adapter
-18cd  Ecamm
-	cafe  Pico iMage
-18d1  Google Inc.
-	4e11  Nexus One
-	4e12  Nexus One (debug)
-	4e13  Nexus One (tether)
-	4e21  Nexus S
-	4e22  Nexus S (debug)
-18d5  Starline International Group Limited
-18d9  Kaba
-	01a0  B-Net 91 07
-18dd  Planon System Solutions Inc.
-	1000  DocuPen RC800
-18e3  Fitipower Integrated Technology Inc
-	7102  Multi Card Reader (Internal)
-	9101  All-in-1 Card Reader
-	9102  Multi Card Reader
-	9512  Webcam
-18e8  Qcom
-	6196  RT2573
-	6229  RT2573
-	6232  Wireless 802.11g 54Mbps Network Adapter [RTL8187]
-18ea  Matrox Graphics, Inc.
-	0002  DualHead2Go [Analog Edition]
-	0004  TripleHead2Go [Digital Edition]
-18ec  Arkmicro Technologies Inc.
-	3118  USB to IrDA adapter [ARK3116T]
-	3188  ARK3188 UVC Webcam
-18fd  FineArch Inc.
-1908  GEMBIRD
-	1320  PhotoFrame PF-15-1
-190d  Motorola GSG
-1914  Alco Digital Devices Limited
-1915  Nordic Semiconductor ASA
-	2233  Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505]
-	2234  Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886]
-	2235  Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886]
-	2236  Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3]
-1926  NextWindow
-	0003  1900 HID Touchscreen
-	0006  1950 HID Touchscreen
-	0064  1950 HID Touchscreen
-	0065  1950 HID Touchscreen
-	0066  1950 HID Touchscreen
-	0067  1950 HID Touchscreen
-	0068  1950 HID Touchscreen
-	0069  1950 HID Touchscreen
-	0071  1950 HID Touchscreen
-	0072  1950 HID Touchscreen
-	0073  1950 HID Touchscreen
-	0074  1950 HID Touchscreen
-	0075  1950 HID Touchscreen
-	0076  1950 HID Touchscreen
-	0077  1950 HID Touchscreen
-	0078  1950 HID Touchscreen
-	0079  1950 HID Touchscreen
-	007a  1950 HID Touchscreen
-	007e  1950 HID Touchscreen
-	007f  1950 HID Touchscreen
-	0080  1950 HID Touchscreen
-	0081  1950 HID Touchscreen
-	0082  1950 HID Touchscreen
-	0083  1950 HID Touchscreen
-	0084  1950 HID Touchscreen
-	0085  1950 HID Touchscreen
-	0086  1950 HID Touchscreen
-	0087  1950 HID Touchscreen
-192f  Avago Technologies, Pte.
-	0000  Mouse
-1930  Shenzhen Xianhe Technology Co., Ltd.
-1931  Ningbo Broad Telecommunication Co., Ltd.
-1934  Feature Integration Technology Inc. (Fintek)
-	0602  F71610 or F71612 Consumer Infrared Receiver/Transceiver
-	0702  Integrated Consumer Infrared Receiver/Transceiver
-	5168  F71610A or F71612A Consumer Infrared Receiver/Transceiver
-1941  Dream Link
-	8021  WH1080 Weather Station / USB Missile Launcher
-1943  Sensoray Co., Inc.
-	2250  Model 2250 MPEG and JPEG Capture Card
-	2253  Model 2253 Audio/Video Codec Card
-	2255  Model 2255 4 Channel Capture Card
-	2257  Model 2257 4 Channel Capture Card
-	a250  Model 2250 MPEG and JPEG Capture Card (cold)
-	a253  Model 2253 Audio/Video Codec Card (cold)
-1949  Lab126
-	0002  Amazon Kindle
-	0004  Amazon Kindle 3
-1951  Hyperstone AG
-1953  Ironkey Inc.
-1954  Radiient Technologies
-195d  Itron Technology iONE
-	7002  Libra-Q11 IR remote
-	7006  Libra-Q26 / 1.0 Remote
-	7777  Scorpius wireless keyboard
-	7779  Scorpius-P20MT
-1967  CASIO HITACHI Mobile Communications Co., Ltd.
-196b  Wispro Technology Inc.
-1970  Dane-Elec Corp. USA
-1975  Dongguan Guneetal Wire & Cable Co., Ltd.
-1976  Chipsbrand Microelectronics (HK) Co., Ltd.
-1977  T-Logic
-	0111  TL203 MP3 Player and Voice Recorder
-1989  Nuconn Technology Corp.
-198f  Beceem Communications Inc.
-	0210  BCS200 WiMAX Adapter
-1990  Acron Precision Industrial Co., Ltd.
-1995  Trillium Technology Pty. Ltd.
-	3202  REC-ADPT-USB (recorder)
-	3203  REC-A-ADPT-USB (recorder)
-199e  The Imaging Source Europe GmbH
-	8101  DFx 21BU04 Camera
-199f  Benica Corporation
-19a8  Biforst Technology Inc.
-19ab  Bodelin
-	1000  ProScope HR
-19af  S Life
-	6611  Celestia VoIP Phone
-19b2  Batronix
-	0010  BX32 Batupo
-	0011  BX32P Barlino
-	0012  BX40 Bagero
-	0013  BX48 Batego
-19b4  Celestron
-	0002  SkyScout Personal Planetarium
-	0101  Handheld Digital Microscope 44302
-19b5  B & W Group
-19b6  Infotech Logistic, LLC
-19b9  Data Robotics
-	8d20  Drobo Elite
-19ca  Mindtribe
-	0001  Sandio 3D HID Mouse
-19cf  Parrot SA
-19d2  ONDA Communication S.p.A.
-	0002  ET502HS/MT505UP ZTE MF632
-	0007  ZTE TU25 WiMAX Adapter [Beceem BCS200]
-	0031  ZTE MF110/MF636
-	0063  ZTE K3565-Z HSDPA
-	0064  ZTE MF627 AU
-	0083  ZTE MF190
-	0103  ZTE MF112
-	2000  ZTE MF627/MF628/MF628+/MF636+ HSDPA/HSUPA
-	fff2  Gobi Wireless Modem (QDL mode)
-	fff3  Gobi Wireless Modem
-19e1  WeiDuan Electronic Accessory (S.Z.) Co., Ltd.
-19e8  Industrial Technology Research Institute
-19ef  Pak Heng Technology (Shenzhen) Co., Ltd.
-19f7  RODE Microphones
-	0001  Podcaster
-19fa  Gampaq Co.Ltd
-	0703  Steering Wheel
-19ff  Dynex
-	0102  1.3MP Webcam
-	0201  Rocketfish Wireless 2.4G Laser Mouse
-1a08  Bellwood International, Inc.
-1a0a  USB-IF non-workshop
-	badd  USB OTG Compliance test device
-1a12  KES Co., Ltd.
-1a25  Amphenol East Asia Ltd.
-1a2a  Seagate Branded Solutions
-1a32  Quanta Microsystems, Inc.
-	0304  802.11n Wireless LAN Card
-1a36  Biwin Technology Ltd.
-1a40  TERMINUS TECHNOLOGY INC.
-	0101  USB-2.0 4-Port HUB
-1a41  Action Electronics Co., Ltd.
-1a44  VASCO Data Security International
-	0001  Digipass 905 SmartCard Reader
-1a4a  Silicon Image
-1a4b  SafeBoot International B.V.
-1a61  Abbott Diabetes Care
-1a6a  Spansion Inc.
-1a6d  SamYoung Electronics Co., Ltd
-1a6e  Global Unichip Corp.
-1a6f  Sagem Orga GmbH
-1a79  Bayer Health Care LLC
-1a7b  Lumberg Connect  GmbH & Co. KG
-1a7c  Evoluent
-	0068  VerticalMouse 3
-	0168  VerticalMouse 3 Wireless
-	0191  VerticalMouse 4
-1a86  QinHeng Electronics
-	5523  CH341 in serial mode, usb to serial port converter
-	5584  CH341 in parallel mode, usb to printer port converter
-	7523  HL-340 USB-Serial adapter
-	752d  CH345 MIDI adapter
-	7584  CH340S
-	e008  HID-based USB-serial converter, full-speed, similar to HE2325U
-1a89  Dynalith Systems Co., Ltd.
-1a8b  SGS Taiwan Ltd.
-1a8d  BandRich, Inc.
-	1002  BandLuxe 3.5G HSDPA Adapter
-	1009  BandLuxe 3.5G HSPA Adapter
-1a90  Corsair Voyager GT 16GB
-1a98  Leica Camera AG
-1aa4  Data Drive Thru, Inc.
-1aa5  UBeacon Technologies, Inc.
-1aa6  eFortune Technology Corp.
-1acb  Salcomp Plc
-1ad1  Desay Wire Co., Ltd.
-1ae4  ic-design Reinhard Gottinger GmbH
-1ae7  X-TENSIONS
-	0381  VS-DVB-T 380U (af9015 based)
-	2001  SpeedLink SL-6825
-1aed  High Top Precision Electronic Co., Ltd.
-1aef  Conntech Electronic (Suzhou) Corporation
-1b04  Meilhaus Electronic GmBH
-	0630  ME-630
-	0940  ME-94
-	0950  ME-95
-	0960  ME-96
-	1000  ME-1000
-	100a  ME-1000
-	100b  ME-1000
-	1400  ME-1400
-	140a  ME-1400A
-	140b  ME-1400B
-	140c  ME-1400C
-	140d  ME-1400D
-	140e  ME-1400E
-	14ea  ME-1400EA
-	14eb  ME-1400EB
-	1604  ME-1600/4U
-	1608  ME-1600/8U
-	160c  ME-1600/12U
-	160f  ME-1600/16U
-	168f  ME-1600/16U8I
-	4610  ME-4610
-	4650  ME-4650
-	4660  ME-4660
-	4661  ME-4660I
-	4662  ME-4660
-	4663  ME-4660I
-	4670  ME-4670
-	4671  ME-4670I
-	4672  ME-4670S
-	4673  ME-4670IS
-	4680  ME-4680
-	4681  ME-4680I
-	4682  ME-4680S
-	4683  ME-4680IS
-	6004  ME-6000/4
-	6008  ME-6000/8
-	600f  ME-6000/16
-	6014  ME-6000I/4
-	6018  ME-6000I/8
-	601f  ME-6000I/16
-	6034  ME-6000ISLE/4
-	6038  ME-6000ISLE/8
-	603f  ME-6000ISLE/16
-	6044  ME-6000/4/DIO
-	6048  ME-6000/8/DIO
-	604f  ME-6000/16/DIO
-	6054  ME-6000I/4/DIO
-	6058  ME-6000I/8/DIO
-	605f  ME-6000I/16/DIO
-	6074  ME-6000ISLE/4/DIO
-	6078  ME-6000ISLE/8/DIO
-	607f  ME-6000ISLE/16/DIO
-	6104  ME-6100/4
-	6108  ME-6100/8
-	610f  ME-6100/16
-	6114  ME-6100I/4
-	6118  ME-6100I/8
-	611f  ME-6100I/16
-	6134  ME-6100ISLE/4
-	6138  ME-6100ISLE/8
-	613f  ME-6100ISLE/16
-	6144  ME-6100/4/DIO
-	6148  ME-6100/8/DIO
-	614f  ME-6100/16/DIO
-	6154  ME-6100I/4/DIO
-	6158  ME-6100I/8/DIO
-	615f  ME-6100I/16/DIO
-	6174  ME-6100ISLE/4/DIO
-	6178  ME-6100ISLE/8/DIO
-	617f  ME-6100ISLE/16/DIO
-	6259  ME-6200I/9/DIO
-	6359  ME-6300I/9/DIO
-	810a  ME-8100A
-	810b  ME-8100B
-	820a  ME-8200A
-	820b  ME-8200B
-1b20  MStar Semiconductor, Inc.
-1b22  WiLinx Corp.
-1b26  Cellex Power Products, Inc.
-1b27  Current Electronics Inc.
-1b28  NAVIsis Inc.
-1b32  Ugobe Life Forms, Inc.
-	0064  Pleo robotic dinosaur
-1b36  ViXS Systems, Inc.
-1b3b  iPassion Technology Inc.
-	2933  PC Camera/Webcam controller
-	2935  PC Camera/Webcam controller
-	2936  PC Camera/Webcam controller
-	2937  PC Camera/Webcam controller
-	2938  PC Camera/Webcam controller
-	2939  PC Camera/Webcam controller
-	2950  PC Camera/Webcam controller
-	2951  PC Camera/Webcam controller
-	2952  PC Camera/Webcam controller
-	2953  PC Camera/Webcam controller
-	2955  PC Camera/Webcam controller
-	2956  PC Camera/Webcam controller
-	2957  PC Camera/Webcam controller
-	2958  PC Camera/Webcam controller
-	2959  PC Camera/Webcam controller
-	2960  PC Camera/Webcam controller
-	2961  PC Camera/Webcam controller
-	2962  PC Camera/Webcam controller
-	2963  PC Camera/Webcam controller
-	2965  PC Camera/Webcam controller
-	2966  PC Camera/Webcam controller
-	2967  PC Camera/Webcam controller
-	2968  PC Camera/Webcam controller
-	2969  PC Camera/Webcam controller
-1b3f  Generalplus Technology Inc.
-1b47  Energizer Holdings, Inc.
-	0001  CHUSB Duo Charger (NiMH AA/AAA USB smart charger)
-1b48  Plastron Precision Co., Ltd.
-1b59  K.S. Terminals Inc.
-1b5a  Chao Zhou Kai Yuan Electric Co., Ltd.
-1b65  The Hong Kong Standards and Testing Centre Ltd.
-1b72  ATERGI TECHNOLOGY CO., LTD.
-1b73  Fresco Logic
-	1000  xHC1 Controller
-1b75  Ovislink Corp.
-	3072  AirLive WN-360USB adapter
-1b76  Legend Silicon Corp.
-1b80  Afatech
-	c810  MC810 [af9015]
-	d393  DVB-T receiver [RTL2832U]
-	d396  UB396-T [RTL2832U]
-	d397  DVB-T receiver [RTL2832U]
-	d398  DVB-T receiver [RTL2832U]
-	d700  FM Radio SnapMusic Mobile 700 (FM700)
-	e383  DVB-T UB383-T [af9015]
-	e385  DVB-T UB385-T [af9015]
-	e386  DVB-T UB385-T [af9015]
-	e39a  DVB-T395U [af9015]
-	e39b  DVB-T395U [af9015]
-	e409  IT9137FN Dual DVB-T [KWorld UB499-2T]
-1b86  Dongguan Guanshang Electronics Co., Ltd.
-1b88  ShenMing Electron (Dong Guan) Co., Ltd.
-1b8c  Altium Limited
-1b8d  e-MOVE Technology Co., Ltd.
-1b8e  Amlogic, Inc.
-1b8f  MA LABS, Inc.
-1b96  N-Trig
-	0001  Duosense Transparent Electromagnetic Digitizer
-1b98  YMax Communications Corp.
-1b99  Shenzhen Yuanchuan Electronic
-1ba1  JINQ CHERN ENTERPRISE CO., LTD.
-1ba2  Lite Metals & Plastic (Shenzhen) Co., Ltd.
-1ba4  Ember Corporation
-	0001  InSight USB Link
-1ba6  Abilis Systems
-1ba8  China Telecommunication Technology Labs
-1bad  Harmonix Music
-	0002  Guitar for Xbox 360
-	0003  Drum Kit for Xbox 360
-1bae  Vuzix Corporation
-	0002  VR920 Immersive Eyewear
-1bbb  T & A Mobile Phones
-1bc4  Ford Motor Co.
-1bc5  AVIXE Technology (China) Ltd.
-1bce  Contac Cable Industrial Limited
-1bcf  Sunplus Innovation Technology Inc.
-	0007  Optical Mouse
-	05c5  SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]
-	05cf  Micro keyboard & mouse receiver
-1bd0  Hangzhou Riyue Electronic Co., Ltd.
-1bde  P-TWO INDUSTRIES, INC.
-1bef  Shenzhen Tongyuan Network-Communication Cables Co., Ltd
-1bf0  RealVision Inc.
-1bf5  Extranet Systems Inc.
-1bf6  Orient Semiconductor Electronics, Ltd.
-1bfd  TouchPack
-	1268  Touch Screen
-	1368  Touch Screen
-	1568  Capacitive Touch Screen
-	1668  IR Touch Screen
-	1688  Resistive Touch Screen
-	2968  Touch Screen
-	5968  Touch Screen
-	6968  Touch Screen
-1c02  Kreton Corporation
-1c04  QNAP System Inc.
-1c0d  Relm Wireless
-1c10  Lanterra Industrial Co., Ltd.
-1c13  ALECTRONIC LIMITED
-1c1a  Datel Electronics Ltd.
-1c1b  Volkswagen of America, Inc.
-1c1f  Goldvish S.A.
-1c20  Fuji Electric Device Technology Co., Ltd.
-1c21  ADDMM LLC
-1c22  ZHONGSHAN CHIANG YU ELECTRIC CO., LTD.
-1c26  Shanghai Haiying Electronics Co., Ltd.
-1c27  HuiYang D & S Cable Co., Ltd.
-1c31  LS Cable Ltd.
-1c34  SpringCard
-	7241  Prox'N'Roll RFID Scanner
-1c37  Authorizer Technologies, Inc.
-1c3d  NONIN MEDICAL INC.
-1c3e  Wep Peripherals
-1c49  Cherng Weei Technology Corp.
-1c4f  SiGma Micro
-	0003  HID controller
-	3000  Micro USB Web Camera
-1c6b  Philips & Lite-ON Digital Solutions Corporation
-1c6c  Skydigital Inc.
-1c73  AMT
-	861f  Anysee E30 USB 2.0 DVB-T Receiver
-1c77  Kaetat Industrial Co., Ltd.
-1c78  Datascope Corp.
-1c79  Unigen Corporation
-1c7a  LighTuning Technology Inc.
-1c7b  LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD.
-1c87  2N TELEKOMUNIKACE a.s.
-1c88  Somagic, Inc.
-1c89  HONGKONG WEIDIDA ELECTRON LIMITED
-1c8e  ASTRON INTERNATIONAL CORP.
-1c98  ALPINE ELECTRONICS, INC.
-1ca0  ACCARIO Inc.
-1cac  Kinstone
-	a332  C8 Webcam
-	b288  C18 Webcam
-1cb3  Aces Electronic Co., Ltd.
-1cb4  OPEX CORPORATION
-1cbe  Luminary Micro Inc.
-1cbf  FORTAT SKYMARK INDUSTRIAL COMPANY
-1cc0  PlantSense
-1cca  NextWave Broadband Inc.
-1ccd  Bodatong Technology (Shenzhen) Co., Ltd.
-1cd4  adp corporation
-1cd5  Firecomms Ltd.
-1cd6  Antonio Precise Products Manufactory Ltd.
-1cde  Telecommunications Technology Association (TTA)
-1cdf  WonTen Technology Co., Ltd.
-1ce0  EDIMAX TECHNOLOGY CO., LTD.
-1ce1  Amphenol KAE
-1cfc  ANDES TECHNOLOGY CORPORATION
-1cfd  Flextronics Digital Design Japan, LTD.
-1d07  Solid-Motion
-1d08  NINGBO HENTEK DRAGON ELECTRONICS CO., LTD.
-1d09  TechFaith Wireless Technology Limited
-	1026  HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel]
-1d0a  Johnson Controls, Inc. The Automotive Business Unit
-1d0b  HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD.
-1d14  ALPHA-SAT TECHNOLOGY LIMITED
-1d17  C-Thru Music Ltd.
-	0001  AXiS-49 Harmonic Table MIDI Keyboard
-1d19  Dexatek Technology Ltd.
-	1101  DK DVB-T Dongle
-	1102  DK mini DVB-T Dongle
-	1103  DK 5217 DVB-T Dongle
-	6105  Video grabber
-	8202  DK DVBC/T DONGLE
-1d1f  Diostech Co., Ltd.
-1d20  SAMTACK INC.
-1d4d  PEGATRON CORPORATION
-	0002  Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device
-	000c  Ralink RT3070 802.11b/g/n Wireless Lan USB Device
-	000e  Ralink RT3070 802.11b/g/n Wireless Lan USB Device
-1d50  OpenMoko, Inc.
-	5119  GTA01/GTA02 U-Boot Bootloader
-1d5b  Smartronix, Inc.
-1d6b  Linux Foundation
-	0001  1.1 root hub
-	0002  2.0 root hub
-	0003  3.0 root hub
-	0100  PTP Gadget
-	0101  Audio Gadget
-	0102  EEM Gadget
-	0103  NCM (Ethernet) Gadget
-	0104  Multifunction Composite Gadget
-	0105  FunctionFS Gadget
-	0200  Qemu Audio Device
-1e0e  Qualcomm / Option
-1e10  Point Grey Research, Inc.
-	2004  Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon]
-1e1d  Lumension Security
-	0165  Secure Pen drive
-1e1f  INVIA
-1e29  Festo AG & Co. KG
-	0101  CPX Adapter
-	0102  CPX Adapter >=HW10.09 [CP2102]
-	0401  iL3-TP [AT90USB646]
-	0402  FTDI232 [EasyPort]
-	0403  FTDI232 [EasyPort Mini]
-	0404  FTDI232 [Netzteil-GL]
-	0405  FTDI232 [MotorPrüfstand]
-	0406  STM32F103 [EasyKit]
-	0407  LPC2378 [Robotino]
-	0408  LPC2378 [Robotino-Arm]
-	0409  LPC2378 [Robotino-Arm Bootloader]
-	040a  LPC2378 [Robotino Bootloader]
-	0501  CP2102 [CMSP]
-	0601  CMMP-AS
-1e41  Cleverscope
-	0001  CS328A PC Oscilloscope
-1e54  TypeMatrix
-	2030  2030 USB Keyboard
-1e68  TrekStor GmbH & Co. KG
-	001b  DataStation maxi g.u
-1e71  NZXT
-	0001  Avatar Optical Mouse
-1e74  Coby Electronics Corporation
-	6511  MP705-8G MP3 player
-	6512  MP705-4G
-1e7d  ROCCAT
-	2c24  Pyra Mouse (wired)
-	2ced  Kone Mouse
-	2d51  Kone+ Mouse
-	30d4  Arvo Keyboard
-1ebb  NuCORE Technology, Inc.
-1eda  AirTies Wireless Networks
-	2310  802.11n USB Wireless LAN Card
-1ef6  EADS Deutschland GmbH
-1f28  Cal-Comp
-	0020  CDMA USB Modem A600
-	0021  CD INSTALLER USB Device
-1f4d  G-Tek Electronics Group
-	b803  Lifeview LV5TDLX DVB-T [RTL2832U]
-1f82  TANDBERG
-	0001  PrecisionHD Camera
-1f84  Alere, Inc.
-1f87  Stantum
-	0002  Multi-touch HID Controller
-1fbd  Delphin Technology AG
-	0001  Expert Key - Data aquisition system
-1fc9  NXP Semiconductors
-1fe7  Vertex Wireless Co., Ltd.
-	1000  VW100 series CDMA EV-DO Rev.A modem
-2001  D-Link Corp.
-	0001  DWL-120 WIRELESS ADAPTER
-	0201  DHN-120 10Mb Home Phoneline Adapter
-	1a00  10/100 Ethernet
-	200c  10/100 Ethernet
-	3200  DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a]
-	3301  DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U]
-	3500  Elitegroup Computer Systems WLAN card WL-162
-	3700  DWL-122 802.11b [Intersil Prism 3]
-	3701  DWL-G120 Spinnaker 802.11g [Intersil ISL3886]
-	3702  DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871]
-	3703  AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886]
-	3704  AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887]
-	3705  AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887]
-	3761  IEEE 802.11g USB2.0 Wireless Network Adapter-PN
-	3a00  DWL-AG132 [Atheros AR5523]
-	3a01  DWL-AG132 (no firmware) [Atheros AR5523]
-	3a02  DWL-G132 [Atheros AR5523]
-	3a03  DWL-G132 (no firmware) [Atheros AR5523]
-	3a04  DWL-AG122 [Atheros AR5523]
-	3a05  DWL-AG122 (no firmware) [Atheros AR5523]
-	3a80  AirPlus Xtreme G DWL-G132 Wireless Adapter
-	3a81  predator Bootloader Download
-	3a82  AirPremier AG DWL-AG132 Wireless Adapter
-	3a83  predator Bootloader Download
-	3b00  AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB]
-	3b01  WLAN Boot Device
-	3c00  AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB]
-	3c01  AirPlus AG DWL-AG122 Wireless Adapter
-	3c02  AirPlus G DWL-G122 Wireless Adapter
-	3c05  DUB-E100 Fast Ethernet [asix]
-	4000  DSB-650C Ethernet [klsi]
-	4001  DSB-650TX Ethernet [pegasus]
-	4002  DSB-650TX Ethernet [pegasus]
-	4003  DSB-650TX-PNA Ethernet [pegasus]
-	400b  10/100 Ethernet
-	4102  10/100 Ethernet
-	5100  DSL-200 ADSL ATM Modem
-	5102  DSL-200 ADSL Loader
-	5b00  Remote NDIS Network Device
-	9414  Cable Modem
-	9b00  Broadband Cable Modem Remote NDIS Device
-	abc1  DSB-650 Ethernet [pegasus]
-	f013  DLink 7 port USB2.0 Hub
-	f103  DUB-H7 7-port USB 2.0 hub
-	f10d  Accent Communications Modem
-	f110  DUB-AV300 A/V Capture
-	f111  DBT-122 Bluetooth adapter
-	f112  DUB-T210 Audio Device
-	f116  Formosa 2
-	f117  Formosa 3
-	f118  Formosa 4
-2013  Unknown (Pinnacle?)
-	0245  PCTV 73ESE
-	0246  PCTV 74E
-	0248  PCTV 282E
-2019  PLANEX
-	3220  GW-US11S WLAN [Atmel AT76C503A]
-	5303  GW-US54GXS 802.11bg
-	5304  GWUS300 802.11n
-	ab01  GW-US54HP
-	ab24  GW-US300MiniS
-	ab25  GW-USMini2N 802.11n Wireless Adapter [Ralink RT2870]
-	ab28  GW-USNano
-	ab29  GW-USMicro300
-	ab50  GW-US54Mini2
-	c002  GW-US54SG
-	c007  GW-US54GZL
-	ed02  GW-USMM
-	ed06  802.11n Wireless LAN Adapter
-	ed10  GW-US300Mini2
-	ed14  GW-USMicroN
-	ed17  GW-USValue-EZ
-2040  Hauppauge
-	0c80  Windham
-	0c90  Windham
-	1700  CataMount
-	1800  Okemo A
-	1801  Okemo B
-	2000  Tiger Minicard
-	2009  Tiger Minicard R2
-	200a  Tiger Minicard
-	2010  Tiger Minicard
-	2011  WinTV MiniCard [Dell Digital TV Receiver]
-	2019  Tiger Minicard
-	2400  WinTV PVR USB2 (Model 24019)
-	4700  WinTV Nova-S-USB2
-	4902  HD PVR
-	4982  HD PVR
-	5500  Windham
-	5510  Windham
-	5520  Windham
-	5530  Windham
-	5580  Windham
-	5590  Windham
-	6500  WinTV HVR-900
-	6502  WinTV HVR-900
-	6503  WinTV HVR-930
-	6513  WinTV HVR-980
-	7050  Nova-T Stick
-	7060  Nova-T Stick 2
-	7070  Nova-T Stick 3
-	7240  WinTV HVR-850
-	8400  WinTV Nova-T-500
-	9300  WinTV NOVA-T USB2 (cold)
-	9301  WinTV NOVA-T USB2 (warm)
-	9941  WinTV Nova-T-500
-	9950  WinTV Nova-T-500
-	b910  Windham
-	b980  Windham
-	b990  Windham
-	c000  Windham
-	c010  Windham
-2047  Texas Instruments
-	0200  MSP430 USB HID Bootstrap Loader
-2080  Barnes & Noble
-	0001  nook
-	0002  NOOKcolor
-2087  Cando
-	0a01  Multi Touch Panel
-	0a02  Multi Touch Panel
-	0b03  Multi Touch Panel
-20a0  Clay Logic
-	414a  MDE SPI Interface
-20b1  XMOS Ltd
-	10ad  XUSB Loader
-	f7d1  XTAG2 - JTAG Adapter
-20b3  Hanvon
-	0a18  10.1 Touch screen overlay
-20b7  Qi Hardware
-	0713  Milkymist JTAG/serial
-	1540  ben-wpan, AT86RF230-based
-	1db5  IDBG in DFU mode
-	1db6  IDBG in normal mode
-	c25b  C2 Dongle
-	cb72  ben-wpan, cntr
-20df  Simtec Electronics
-	0001  Entropy Key [UDEKEY01]
-2101  ActionStar
-	0201  SIIG 4-to-2 Printer Switch
-2162  Creative (?)
-	2031  Network Blaster Wireless Adapter
-	500c  DE5771 Modem Blaster
-	8001  Broadxent BritePort DSL Bridge 8010U
-2184  GW Instek
-	0005  GDS-3000 Oscilloscope
-	0006  GDS-3000 Oscilloscope
-	0011  AFG Function Generator (CDC)
-21a1  Emotiv Systems Pty. Ltd.
-	0001  EPOC Consumer Headset Wireless Dongle
-21d6  Agecodagis SARL
-	0002  Seismic recorder [Tellus]
-2222  MacAlly
-	0004  iWebKey Keyboard
-	2520  Mini Tablet
-	4050  AirStick joystick
-2227  SAMWOO Enterprise
-	3105  SKYDATA SKD-U100
-2233  RadioShack Corporation
-	6323  USB Electronic Scale
-2237  Kobo Inc.
-	4161  eReader White
-22a6  Pie Digital, Inc.
-	ffff  PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB)
-22b8  Motorola PCS
-	0001  Wally 2.2 chipset
-	0002  Wally 2.4 chipset
-	0005  V.60c/V.60i GSM Phone
-	0830  2386C-HT820
-	0833  2386C-HT820 [Flash Mode]
-	0850  Bluetooth Device
-	1001  Patriot 1.0 (GSM) chipset
-	1002  Patriot 2.0 chipset
-	1005  T280e GSM/GPRS Phone
-	1101  Patriot 1.0 (TDMA) chipset
-	1801  Rainbow chipset flash
-	2035  Bluetooth Device
-	2805  GSM Modem
-	2821  T720 GSM Phone
-	2822  V.120e GSM Phone
-	2823  Flash Interface
-	2a01  MSM6050 chipset
-	2a02  CDMA modem
-	2a03  MSM6050 chipset flash
-	2a21  V710 GSM Phone (P2K)
-	2a22  V710 GSM Phone (AT)
-	2a23  MSM6100 chipset flash
-	2a41  MSM6300 chipset
-	2a42  Usb Modem
-	2a43  MSM6300 chipset flash
-	2a61  E815 GSM Phone (P2K)
-	2a62  E815 GSM Phone (AT)
-	2a63  MSM6500 chipset flash
-	2a81  MSM6025 chipset
-	2a83  MSM6025 chipset flash
-	2ac1  MSM6100 chipset
-	2ac3  MSM6100 chipset flash
-	2d78  XT300[SPICE]
-	3001  A835/E1000 GSM Phone (P2K)
-	3002  A835/E1000 GSM Phone (AT)
-	3801  C350L/C450 (P2K)
-	3802  C330/C350L/C450/EZX GSM Phone (AT)
-	3803  Neptune LT chipset flash
-	4001  OMAP 1.0 chipset
-	4002  A920/A925 UMTS Phone
-	4003  OMAP 1.0 chipset flash
-	4008  OMAP 1.0 chipset RDL
-	41d6  Droid X (Windows media mode)
-	41d9  Droid/Milestone
-	41db  Droid/Milestone (Debug mode)
-	41de  Droid X (PC mode)
-	4204  MPx200 Smartphone
-	4214  MPc GSM
-	4224  MPx220 Smartphone
-	4234  MPc CDMA
-	4244  MPx100 Smartphone
-	4285  Droid X (Mass storage)
-	4801  Neptune LTS chipset
-	4803  Neptune LTS chipset flash
-	4810  Triplet GSM Phone (storage)
-	4901  Triplet GSM Phone (P2K)
-	4902  Triplet GSM Phone (AT)
-	4903  Neptune LTE chipset flash
-	4a01  Neptune LTX chipset
-	4a03  Neptune LTX chipset flash
-	4a32  L6-imode Phone
-	5801  Neptune ULS chipset
-	5803  Neptune ULS chipset flash
-	5901  Neptune VLT chipset
-	5903  Neptune VLT chipset flash
-	6001  Dalhart EZX
-	6003  Dalhart flash
-	6004  EZX GSM Phone (CDC Net)
-	6006  MOTOROKR E6
-	6008  Dalhart RDL
-	6009  EZX GSM Phone (P2K)
-	600a  Dalhart EZX config 17
-	600b  Dalhart EZX config 18
-	600c  EZX GSM Phone (USBLAN)
-	6021  JUIX chipset
-	6023  JUIX chipset flash
-	6026  Flash RAM Downloader/miniOS
-	6027  USBLAN
-	604c  EZX GSM Phone (Storage)
-	6101  Talon integrated chipset
-	6401  Argon chipset
-	6403  Argon chipset flash
-	6415  ROKR Z6 (MTP mode)
-	6604  Washington CDMA Phone
-	6631  CDC Modem
-	7001  Q Smartphone
-	fe01  StarTAC III MS900
-22b9  eTurboTouch Technology, Inc.
-	0006  Touch Screen
-22ba  Technology Innovation Holdings, Ltd
-2304  Pinnacle Systems, Inc.
-	0109  Studio PCTV USB (SECAM)
-	0110  Studio PCTV USB (PAL)
-	0111  Miro PCTV USB
-	0112  Studio PCTV USB (NTSC) with FM radio
-	0201  Systems MovieBox Device
-	0204  MovieBox USB_B
-	0205  DVC 150B
-	0206  Systems MovieBox Deluxe Device
-	0207  Dazzle DVC90 Video Device
-	0208  Studio PCTV USB2
-	020e  PCTV 200e
-	020f  PCTV 400e BDA Device
-	0210  Studio PCTV USB (PAL) with FM radio
-	0212  Studio PCTV USB (NTSC)
-	0213  500-USB Device
-	0214  Studio PCTV USB (PAL) with FM radio
-	0216  PCTV 60e
-	0219  PCTV 260e
-	021a  Dazzle DVC100 Audio Device
-	021b  Dazzle DVC130/DVC170
-	021d  Dazzle DVC130
-	021e  Dazzle DVC170
-	021f  PCTV Sat HDTV Pro BDA Device
-	0222  PCTV Sat Pro BDA Device
-	0223  DazzleTV Sat BDA Device
-	0225  Remote Kit Infrared Transceiver
-	0226  PCTV 330e
-	0227  PCTV for Mac, HD Stick
-	0228  PCTV DVB-T Flash Stick
-	0229  PCTV Dual DVB-T 2001e
-	022a  PCTV 160e
-	022b  PCTV 71e [Afatech AF9015]
-	0232  PCTV 170e
-	0236  PCTV 72e [DiBcom DiB7000PC]
-	0237  PCTV 73e [DiBcom DiB7000PC]
-	023a  PCTV 801e
-	023b  PCTV 801e SE
-	023d  PCTV 340e
-	023e  PCTV 340e SE
-	0300  Studio Linx Video input cable (NTSC)
-	0301  Studio Linx Video input cable (PAL)
-	0302  Dazzle DVC120
-	0419  PCTV Bungee USB (PAL) with FM radio
-	061d  PCTV Deluxe (NTSC) Device
-	061e  PCTV Deluxe (PAL) Device
-2318  Shining Technologies, Inc. [hex]
-	0011  CitiDISK Jr. IDE Enclosure
-2373  Pumatronix Ltda
-	0001  5 MegaPixel Digital Still Camera [DSC5M]
-2375  Digit@lway, Inc.
-	0001  Digital Audio Player
-2406  SANHO Digital Electronics Co., Ltd.
-	6688  PD7X Portable Storage
-2478  Tripp-Lite
-	2008  U209-000-R Serial Port
-2632  TwinMOS
-	3209  7-in-1 Card Reader
-2650  Electronics For Imaging, Inc. [hex]
-2730  Citizen
-	200f  CT-S310 Label printer
-2735  DigitalWay
-	0003  MPIO HS100
-	1001  MPIO FY200
-	1002  MPIO FL100
-	1003  MPIO FD100
-	1004  MPIO HD200
-	1005  MPIO HD300
-	1006  MPIO FG100
-	1007  MPIO FG130
-	1008  MPIO FY300
-	1009  MPIO FY400
-	100a  MPIO FL300
-	100b  MPIO HS200
-	100c  MPIO FL350
-	100d  MPIO FY500
-	100e  MPIO FY500
-	100f  MPIO FY600
-	1012  MPIO FL400
-	1013  MPIO HD400
-	1014  MPIO HD400
-	1016  MPIO FY700
-	1017  MPIO FY700
-	1018  MPIO FY800
-	1019  MPIO FY800
-	101a  MPIO FY900
-	101b  MPIO FY900
-	102b  MPIO FL500
-	102c  MPIO FL500
-	103f  MPIO FY570
-	1040  MPIO FY570
-	1041  MPIO FY670
-	1042  MPIO FY670
-	1043  HCT HMD-180A
-	1044  HCT HMD-180A
-2770  NHJ, Ltd
-	0a01  ScanJet 4600 series
-	905c  Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35
-	9060  A130
-	9120  Che-ez! Snap / iClick Tiny VGA Digital Camera
-	9130  TCG 501
-	913c  Argus DC-1730
-	9150  Mini Cam
-	9153  iClick 5X
-	915d  Cyberpix S-210S / Little Tikes My Real Digital Camera
-	930b  CCD Webcam(PC370R)
-	930c  CCD Webcam(PC370R)
-2821  ASUSTek Computer Inc.
-	0161  WL-161 802.11b Wireless Adapter [SiS 162U]
-	160f  WL-160g 802.11g Wireless Adapter [Envara WiND512]
-	3300  WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]
-2899  Toptronic Industrial Co., Ltd
-	012c  Camera Device
-2c02  Planex Communications
-	14ea  GW-US11H WLAN
-2c1a  Dolphin Peripherals
-	0000  Wireless Optical Mouse
-2fb2  Fujitsu, Ltd
-3125  Eagletron
-	0001  TrackerPod Camera Stand
-3176  Whanam Electronics Co., Ltd
-3275  VidzMedia Pte Ltd
-	4fb1  MonsterTV P2H
-3334  AEI
-	1701  Fast Ethernet
-3340  Yakumo
-	043a  Mio A701 DigiWalker PPCPhone
-	0e3a  Pocket PC 300 GPS SL / Typhoon MyGuide 3500
-	a0a3  deltaX 5 BT (D) PDA
-3504  Micro Star
-	f110  Security Key
-3538  Power Quotient International Co., Ltd
-	0001  Travel Flash
-	0015  Mass Storge Device
-	0022  Hi-Speed Mass Storage Device
-	0042  Cool Drive U339 Flash Disk
-	0054  Flash Drive (2GB)
-3579  DIVA
-	6901  Media Reader
-3636  InVibro
-3838  WEM
-	0001  5-in-1 Card Reader
-3923  National Instruments Corp.
-	12c0  DAQPad-6020E
-	12d0  DAQPad-6507
-	12e0  NI 4350
-	12f0  NI 5102
-	1750  DAQPad-6508
-	17b0  USB-ISA-Bridge
-	1820  DAQPad-6020E (68 pin I/O)
-	1830  DAQPad-6020E (BNC)
-	1f00  DAQPad-6024E
-	1f10  DAQPad-6024E
-	1f20  DAQPad-6025E
-	1f30  DAQPad-6025E
-	1f40  DAQPad-6036E
-	1f50  DAQPad-6036E
-	2f80  DAQPad-6052E
-	2f90  DAQPad-6052E
-	702b  GPIB-USB-B
-	703c  USB-485 RS485 Cable
-	709b  GPIB-USB-HS
-	7254  NI MIO (data acquisition card) firmware updater
-	729e  USB-6251 (OEM) data acquisition card
-40bb  I-O Data
-	0a09  USB2.0-SCSI Bridge USB2-SC
-4101  i-rocks
-	1301  IR-2510 usb phone
-4102  iRiver, Ltd.
-	1001  iFP-100 series mp3 player
-	1003  iFP-300 series mp3 player
-	1005  iFP-500 series mp3 player
-	1007  iFP-700 series mp3/ogg vorbis player
-	1008  iFP-800 series mp3/ogg vorbis player
-	100a  iFP-1000 series mp3/ogg vorbis player
-	1014  T20 series mp3/ogg vorbis player (ums firmware)
-	1019  T30
-	1034  T60
-	1040  M1Player
-	1041  E100 (ums)
-	1101  iFP-100 series mp3 player (ums firmware)
-	1103  iFP-300 series mp3 player (ums firmware)
-	1105  iFP-500 series mp3 player (ums firmware)
-	1113  T10 (alternate)
-	1117  T10
-	1119  T30 series mp3/ogg/wma player
-	1141  E100 (mtp)
-	2002  H10 6GB
-	2101  H10 20GB (mtp)
-	2102  H10 5GB (mtp)
-	2105  H10 5/6GB (mtp)
-413c  Dell Computer Corp.
-	0000  DRAC 5 Virtual Keyboard and Mouse
-	0001  DRAC 5 Virtual Media
-	0058  Port Replicator
-	1001  Keyboard Hub
-	1002  Keyboard Hub
-	1003  Keyboard Hub
-	1005  Multimedia Pro Keyboard Hub
-	2001  Keyboard HID Support
-	2002  SK-8125 Keyboard
-	2003  Keyboard
-	2005  RT7D50 Keyboard
-	2010  Keyboard
-	2011  Multimedia Pro Keyboard
-	2100  SK-3106 Keyboard
-	2101  SmartCard Reader Keyboard
-	2105  Model L100 Keyboard
-	2106  Dell QuietKey Keyboard
-	2500  DRAC4 Remote Access Card
-	2513  internal USB Hub of E-Port Replicator
-	3010  Optical Wheel Mouse
-	3012  Optical Wheel Mouse
-	3016  Optical 5-Button Wheel Mouse
-	3200  Mouse
-	4001  Axim X5
-	4002  Axim X3
-	4003  Axim X30
-	4004  Axim Sync
-	4005  Axim Sync
-	4006  Axim Sync
-	4007  Axim Sync
-	4008  Axim Sync
-	4009  Axim Sync
-	4011  Axim X51v
-	5103  AIO Printer A940
-	5105  AIO Printer A920
-	5107  AIO Printer A960
-	5109  Photo AIO Printer 922
-	5110  Photo AIO Printer 962
-	5111  Photo AIO Printer 942
-	5112  Photo AIO Printer 924
-	5113  Photo AIO Printer 944
-	5114  Photo AIO Printer 964
-	5115  Photo AIO Printer 926
-	5116  AIO Printer 946
-	5117  Photo AIO Printer 966
-	5118  AIO 810
-	5124  Laser MFP 1815
-	5128  Photo AIO 928
-	5200  Laser Printer
-	5202  Printing Support
-	5203  Printing Support
-	5210  Printing Support
-	5211  1110 Laser Printer
-	5220  Laser MFP 1600n
-	5225  Printing Support
-	5226  Printing Support
-	5300  Laser Printer
-	5400  Laser Printer
-	5401  Laser Printer
-	5513  WLA3310 Wireless Adapter [Intersil ISL3887]
-	5601  Laser Printer 3100cn
-	5602  Laser Printer 3000cn
-	5631  Laser Printer 5100cn
-	5905  Printing Support
-	8000  BC02 Bluetooth Adapter
-	8010  TrueMobile Bluetooth Module in
-	8100  TrueMobile 1180 802.11b Adapter [Intersil PRISM 3]
-	8102  TrueMobile 1300 802.11g Wireless Adapter [Intersil ISL3880]
-	8103  Wireless 350 Bluetooth
-	8104  Wireless 1450 Dual-band (802.11a/b/g) Adapter [Intersil ISL3887]
-	8105  U2 in HID - Driver
-	8106  Wireless 350 Bluetooth Internal Card in
-	8110  Wireless 3xx Bluetooth Internal Card
-	8111  Wireless 3xx Bluetooth Internal Card in
-	8114  Wireless 5700 Mobile Broadband (CDMA EV-DO) Minicard Modem
-	8115  Wireless 5500 Mobile Broadband (3G HSDPA) Minicard Modem
-	8116  Wireless 5505 Mobile Broadband (3G HSDPA) Minicard Modem
-	8117  Wireless 5700 Mobile Broadband (CDMA EV-DO) Expresscard Modem
-	8118  Wireless 5510 Mobile Broadband (3G HSDPA) Expresscard Status Port
-	8120  Bluetooth adapter
-	8121  Eastfold in HID
-	8122  Eastfold in DFU
-	8123  eHome Infrared Receiver
-	8124  eHome Infrared Receiver
-	8126  Wireless 355 Bluetooth
-	8127  Wireless 355 Module with Bluetooth 2.0 + EDR Technology.
-	8128  Wireless 5700-Sprint Mobile Broadband (CDMA EV-DO) Mini-Card Status Port
-	8129  Wireless 5700-Telus Mobile Broadband (CDMA EV-DO) Mini-Card Status Port
-	8131  Wireless 360 Bluetooth 2.0 + EDR module.
-	8133  Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port
-	8134  Wireless 5720 Sprint Mobile Broadband (EVDO Rev-A) Minicard Status Port
-	8135  Wireless 5720 TELUS Mobile Broadband (EVDO Rev-A) Minicard Diagnostics Port
-	8136  Wireless 5520 Cingular Mobile Broadband (3G HSDPA) Minicard Diagnostics Port
-	8137  Wireless 5520 Voda L Mobile Broadband (3G HSDPA) Minicard Status Port
-	8138  Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard EAP-SIM Port
-	8140  Wireless 360 Bluetooth
-	8142  Mobile 360 in DFU
-	8147  F3507g Mobile Broadband Module
-	8156  Wireless 370 Bluetooth Mini-card
-	8157  Integrated Keyboard
-	8158  Integrated Touchpad / Trackstick
-	8160  Wireless 365 Bluetooth
-	8161  Integrated Keyboard
-	8162  Integrated Touchpad [Synaptics]
-	8171  Gobi Wireless Modem (QDL mode)
-	8172  Gobi Wireless Modem
-	8183  F3607gw Mobile Broadband Module
-	8184  F3607gw v2 Mobile Broadband Module
-	8185  Gobi 2000 Wireless Modem (QDL mode)
-	8186  Gobi 2000 Wireless Modem
-	8187  DW375 Bluetooth Module
-	8501  Bluetooth Adapter
-	9500  USB CP210x UART Bridge Controller [DW700]
-	a001  Hub
-	a005  Internal 2.0 Hub
-	a700  Hub (in 1905FP LCD Monitor)
-4146  USBest Technology
-	9281  Iomega Micro Mini 128MB Flash Drive
-	ba01  Intuix Flash Drive
-4242  USB Design by Example
-	4201  Buttons and Lights HID device
-	4220  Echo 1 Camera
-4317  Broadcom Corp.
-	0700  U.S. Robotics USR5426 802.11g Adapter
-	0701  U.S. Robotics USR5425 Wireless MAXg Adapter
-	0711  Belkin F5D7051 v3000 802.11g
-	0720  Dynex DX-BUSB
-4348  WinChipHead
-	5523  USB->RS 232 adapter with Prolifec PL 2303 chipset
-	5537  13.56Mhz RFID Card Reader and Writer
-	5584  CH34x printer adapter cable
-4572  Shuttle, Inc.
-	4572  Shuttle PN31 Remote
-4586  Panram
-	1026  Crystal Bar Flash Drive
-4670  EMS Production
-	9394  Game Cube USB Memory Adaptor 64M
-4752  Miditech
-	0011  Midistart-2
-4757  GW Instek
-	2009  PEL-2000 Series Electronic Load (CDC)
-	2010  PEL-2000 Series Electronic Load (CDC)
-4766  Aceeca
-	0001  MEZ1000 RDA
-4855  Memorex
-	7288  Ultra Traveldrive 160G 2.5" HDD
-4971  SimpleTech
-	cb01  SP-U25/120G
-	ce17  1TB SimpleDrive II USB External Hard Drive
-5032  Grandtec
-	0bb8  Grandtec USB1.1 DVB-T (cold)
-	0bb9  Grandtec USB1.1 DVB-T (warm)
-	0fa0  Grandtec USB1.1 DVB-T (cold)
-	0fa1  Grandtec USB1.1 DVB-T (warm)
-5041  Linksys (?)
-	2234  WUSB54G v1 802.11g Adapter [Intersil ISL3886]
-	2235  WUSB54GP v1 802.11g Adapter [Intersil ISL3886]
-50c2  Averatec (?)
-	4013  WLAN Adapter
-5173  Sweex
-	1809  ZD1211
-5219  I-Tetra
-	1001  Cetus CDC Device
-5345  Owon
-	1234  PDS6062T Oscilloscope
-544d  Transmeta Corp.
-5543  UC-Logic Technology Corp.
-	0002  SuperPen WP3325U Tablet
-	0003  Tablet WP4030U
-	0004  Tablet WP5540U
-	0005  Tablet WP8060U
-	0041  Genius PenSketch 6x8 Tablet
-	0042  Tablet PF1209
-	0064  Aiptek HyperPen 10000U
-5555  Epiphan Systems Inc.
-	1110  VGA2USB
-	1120  KVM2USB
-	2222  DVI2USB
-	3333  VGA2USB Pro
-	3337  KVM2USB Pro
-	3340  VGA2USB LR
-	3344  KVM2USB LR
-	3411  DVI2USB Solo
-	3422  DVI2USB Duo
-55aa  OnSpec Electronic, Inc.
-	0015  Hard Drive
-	0102  SuperDisk
-	0103  IDE Hard Drive
-	0201  DDI to Reader-19
-	1234  ATAPI Bridge
-	a103  Sandisk SDDR-55 SmartMedia Card Reader
-	b000  USB to CompactFlash Card Reader
-	b004  OnSpec MMC/SD Reader/Writer
-	b00b  USB to Memory Stick Card Reader
-	b00c  USB to SmartMedia Card Reader
-	b012  Mitsumi FA402M 8-in-2 Card Reader
-	b200  Compact Flash Reader
-	b204  MMC/ SD Reader
-	b207  Memory Stick Reader
-5656  Uni-Trend Group Limited
-	0832  UT2000/UT3000 Digital Storage Oscilloscope
-595a  IRTOUCHSYSTEMS Co. Ltd.
-	0001  Touchscreen
-5986  Acer, Inc
-	0100  Orbicam
-	0101  USB2.0 Camera
-	0102  Crystal Eye Webcam
-	01a6  Lenovo Integrated Webcam
-	01a7  Lenovo Integrated Webcam
-	01a9  Lenovo Integrated Webcam
-	0200  OrbiCam
-	0203  BisonCam NB Pro 1300
-	0241  BisonCam, NB Pro
-	02d0  Lenovo Integrated Webcam [R5U877]
-	03d0  Lenovo Integrated Webcam [R5U877]
-5a57  Zinwell
-	0260  RT2570
-	0280  802.11a/b/g/n USB Wireless LAN Card
-	0282  802.11b/g/n USB Wireless LAN Card
-	0283  802.11b/g/n USB Wireless LAN Card
-	0284  802.11a/b/g/n USB Wireless LAN Card
-	0290  ZW-N290 802.11n [Realtek RTL8192SU]
-	5257  Metronic 495257 wifi 802.11ng
-6000  Beholder International Ltd.
-	dec0  TV Wander
-	dec1  TV Voyage
-601a  Ingenic Semiconductor Ltd.
-	4740  XBurst Jz4740 boot mode
-6189  Sitecom
-	182d  USB 2.0 Ethernet
-	2068  USB to serial cable (v2)
-6253  TwinHan Technology Co., Ltd
-	0100  Ir reciver f. remote control
-636c  CoreLogic, Inc.
-6472  Unknown (Sony?)
-	01c8  PlayStation Portable [Mass Storage]
-6547  Arkmicro Technologies Inc.
-	0232  ARK3116 Serial
-6615  IRTOUCHSYSTEMS Co. Ltd.
-	0001  Touchscreen
-6666  Prototype product Vendor ID
-	0667  WiseGroup Smart Joy PSX, PS-PC Smart JoyPad
-	2667  JCOP BlueZ Smartcard reader
-	8802  SmartJoy Dual Plus PS2 converter
-	8804  WiseGroup SuperJoy Box 5
-6677  WiseGroup, Ltd.
-	8802  SmartJoy Dual Plus PS2 converter
-	8811  Deluxe Dance Mat
-6891  3Com
-	a727  3CRUSB10075 802.11bg [ZyDAS ZD1211]
-695c  Opera1
-	3829  Opera1 DVB-S (warm state)
-6993  Yealink Network Technology Co., Ltd.
-	b001  VoIP Phone
-6a75  Shanghai Jujo Electronics Co., Ltd
-7104  CME (Central Music Co.)
-	2202  UF5/UF6/UF7/UF8 MIDI Master Keyboard
-726c  StackFoundry LLC
-	2149  EntropyKing Random Number Generator
-734c  TBS Technologies China
-	5920  Q-Box II DVB-S2 HD
-	5928  Q-Box II DVB-S2 HD
-7392  Edimax Technology Co., Ltd
-	7711  EW-7711UTn nLite Wireless Adapter [Ralink RT2870]
-	7717  EW-7717UN 802.11n Wireless Adapter [Ralink RT2870]
-	7718  EW-7718UN 802.11n Wireless Adapter [Ralink RT2870]
-	7722  EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x]
-	7811  EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS]
-8086  Intel Corp.
-	0001  AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter
-	0044  CPU DRAM Controller
-	0046  HD Graphics
-	0100  Personal Audio Player 3000
-	0101  Personal Audio Player 3000
-	0110  Easy PC Camera
-	0120  PC Camera CS120
-	0180  WiMAX Connection 2400m
-	0181  WiMAX Connection 2400m
-	0182  WiMAX Connection 2400m
-	0186  WiMAX Connection 2400m
-	0188  WiMAX Connection 2400m
-	0200  AnyPoint(TM) Wireless II Network 11Mbps Adapter [Atmel AT76C503A]
-	0431  Intel Pro Video PC Camera
-	0510  Digital Movie Creator
-	0630  Pocket PC Camera
-	0780  CS780 Microphone Input
-	07d3  BLOB boot loader firmware
-	0dad  Cherry MiniatureCard Keyboard
-	1010  AnyPoint(TM) Home Network 10 Mbps Phoneline Adapter
-	110a  Bluetooth Controller from (Ericsson P4A)
-	110b  Bluetooth Controller from (Intel/CSR)
-	1110  PRO/Wireless LAN Module
-	1111  PRO/Wireless 2011B 802.11b Adapter [Intersil PRISM 2.5]
-	1134  Hollister Mobile Monitor
-	1139  In-Target Probe (ITP)
-	1234  Prototype Reader/Writer
-	1403  WiMAX Connection 2400m
-	1405  WiMAX Connection 2400m
-	1406  WiMAX Connection 2400m
-	2448  82801 PCI Bridge
-	3100  PRO/DSL 3220 Modem - WAN
-	3101  PRO/DSL 3220 Modem
-	3240  AnyPoint® 3240 Modem - WAN
-	3241  AnyPoint® 3240 Modem
-	8602  Miniature Card Slot
-	9303  Intel 8x930Hx Hub
-	9500  CE 9500 DVB-T
-	9890  82930 Test Board
-	beef  SCM Miniature Card Reader/Writer
-	c013  Wireless HID Station
-	f001  XScale PXA27x Bulverde flash
-	f1a5  Z-U130 [Value Solid State Drive]
-8087  Intel Corp.
-	0020  Integrated Rate Matching Hub
-	0024  Integrated Rate Matching Hub
-80ee  VirtualBox
-	0021  USB Tablet
-8282  Keio
-	3201  Retro Adapter
-	3301  Retro Adapter Mouse
-8341  EGO Systems, Inc.
-	2000  Flashdisk
-9016  Sitecom
-	182d  WL-022 802.11b Adapter
-9022  TeVii Technology Ltd.
-	d630  DVB-S S630
-	d650  DVB-S2 S650
-	d660  DVB-S2 S660
-9148  GeoLab, Ltd
-# All of GeoLab's devices share the same ID 0004.
-	0004  R3 Compatible Device
-9710  MosChip Semiconductor
-	7703  MCS7703 Serial Port Adapter
-	7705  MCS7705 Parallel port adapter
-	7715  MCS7715 Parallel and serial port adapter
-	7717  MCS7717 3-port hub with serial and parallel adapter
-	7720  MCS7720 Dual serial port adapter
-	7730  MCS7730 10/100 Mbps Ethernet adapter
-	7780  MCS7780 4Mbps Fast IrDA Adapter
-	7830  MCS7830 10/100 Mbps Ethernet adapter
-	7832  MCS7832 10/100 Mbps Ethernet adapter
-	7840  MCS7820/MCS7840 2/4 port serial adapter
-99fa  Grandtec
-	8988  V.cap Camera Device
-9ac4  J. Westhues
-	4b8f  ProxMark-3 RFID Instrument
-a128  AnMo Electronics Corp. / Dino-Lite (?)
-	0610  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
-	0611  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
-	0612  Dino-Lite Digital Microscope (SN9C120 + HV7131R)
-	0613  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
-	0614  Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111)
-	0615  Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111)
-	0616  Dino-Lite Digital Microscope (SN9C120 + HV7131R)
-	0617  Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111)
-	0618  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
-a168  AnMo Electronics Corporation
-	0610  Dino-Lite Digital Microscope
-	0611  Dino-Lite Digital Microscope
-	0613  Dino-Lite Digital Microscope
-	0614  Dino-Lite Pro Digital Microscope
-	0615  Dino-Lite Pro Digital Microscope
-	0617  Dino-Lite Pro Digital Microscope
-	0618  Dino-Lite Digital Microscope
-a600  Asix
-	e110  OK1ZIA Davac 4.x
-a727  3Com
-	6893  3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523]
-	6895  AR5523
-	6897  AR5523
-abcd  Unknown
-	cdee  Petcam
-c251  Keil Software, Inc.
-	2710  ULink
-cace  CACE Technologies Inc.
-	0002  AirPCAP Classic 802.11 packet capture adapter
-	0300  AirPcap NX [Atheros AR9001U-(2)NG]
-d209  Ultimarc
-	0301  I-PAC Arcade Control Interface
-	0501  Ultra-Stik Ultimarc Ultra-Stik Player 1
-e4e4  Xorcom Ltd.
-	1130  Astribank series
-	1131  Astribank series
-	1132  Astribank series
-	1140  Astribank series
-	1141  Astribank series
-	1142  Astribank series
-	1150  Astribank series
-	1151  Astribank series
-	1152  Astribank series
-	1160  Astribank 2 series
-	1161  Astribank 2 series
-	1162  Astribank 2 series
-eb03  MakingThings
-	0920  Make Controller Kit
-eb1a  eMPIA Technology, Inc.
-	17de  KWorld V-Stream XPERT DTV - DVB-T USB cold
-	17df  KWorld V-Stream XPERT DTV - DVB-T USB warm
-	2571  M035 Compact Web Cam
-	2710  SilverCrest Webcam
-	2750  ECS Elitegroup G220 integrated Webcam
-	2761  EeePC 701 integrated Webcam
-	2776  Combined audio and video input device
-	2800  Terratec Cinergy 200
-	2801  GrabBeeX+ Video Encoder
-	2863  Video Grabber
-	2870  Pinnacle PCTV Stick
-	2881  EM2881 Video Controller
-	50a3  Gadmei UTV380 TV Box
-	50a6  Gadmei UTV330 TV Box
-	e355  KWorld DVB-T 355U Digital TV Dongle
-eb2a  KWorld
-f003  Hewlett Packard
-	6002  PhotoSmart C500
-f4ec  Atten Electronics / Siglent Technologies
-	ee38  Digital Storage Oscilloscope
-
-# List of known device classes, subclasses and protocols
-
-# Syntax:
-# C class  class_name
-#	subclass  subclass_name			<-- single tab
-#		protocol  protocol_name		<-- two tabs
-
-C 00  (Defined at Interface level)
-C 01  Audio
-	01  Control Device
-	02  Streaming
-	03  MIDI Streaming
-C 02  Communications
-	01  Direct Line
-	02  Abstract (modem)
-		00  None
-		01  AT-commands (v.25ter)
-		02  AT-commands (PCCA101)
-		03  AT-commands (PCCA101 + wakeup)
-		04  AT-commands (GSM)
-		05  AT-commands (3G)
-		06  AT-commands (CDMA)
-		fe  Defined by command set descriptor
-		ff  Vendor Specific (MSFT RNDIS?)
-	03  Telephone
-	04  Multi-Channel
-	05  CAPI Control
-	06  Ethernet Networking
-	07  ATM Networking
-	08  Wireless Handset Control
-	09  Device Management
-	0a  Mobile Direct Line
-	0b  OBEX
-	0c  Ethernet Emulation
-		07  Ethernet Emulation (EEM)
-C 03  Human Interface Device
-	00  No Subclass
-		00  None
-		01  Keyboard
-		02  Mouse
-	01  Boot Interface Subclass
-		00  None
-		01  Keyboard
-		02  Mouse
-C 05  Physical Interface Device
-C 06  Imaging
-	01  Still Image Capture
-		01  Picture Transfer Protocol (PIMA 15470)
-C 07  Printer
-	01  Printer
-		00  Reserved/Undefined
-		01  Unidirectional
-		02  Bidirectional
-		03  IEEE 1284.4 compatible bidirectional
-		ff  Vendor Specific
-C 08  Mass Storage
-	01  RBC (typically Flash)
-		00  Control/Bulk/Interrupt
-		01  Control/Bulk
-		50  Bulk (Zip)
-	02  SFF-8020i, MMC-2 (ATAPI)
-	03  QIC-157
-	04  Floppy (UFI)
-		00  Control/Bulk/Interrupt
-		01  Control/Bulk
-		50  Bulk (Zip)
-	05  SFF-8070i
-	06  SCSI
-		00  Control/Bulk/Interrupt
-		01  Control/Bulk
-		50  Bulk (Zip)
-C 09  Hub
-	00  Unused
-		00  Full speed (or root) hub
-		01  Single TT
-		02  TT per port
-C 0a  CDC Data
-	00  Unused
-		30  I.430 ISDN BRI
-		31  HDLC
-		32  Transparent
-		50  Q.921M
-		51  Q.921
-		52  Q.921TM
-		90  V.42bis
-		91  Q.932 EuroISDN
-		92  V.120 V.24 rate ISDN
-		93  CAPI 2.0
-		fd  Host Based Driver
-		fe  CDC PUF
-		ff  Vendor specific
-C 0b  Chip/SmartCard
-C 0d  Content Security
-C 0e  Video
-	00  Undefined
-	01  Video Control
-	02  Video Streaming
-	03  Video Interface Collection
-C 58  Xbox
-	42  Controller
-C dc  Diagnostic
-	01  Reprogrammable Diagnostics
-		01  USB2 Compliance
-C e0  Wireless
-	01  Radio Frequency
-		01  Bluetooth
-		02  Ultra WideBand Radio Control
-		03  RNDIS
-	02  Wireless USB Wire Adapter
-		01  Host Wire Adapter Control/Data Streaming
-		02  Device Wire Adapter Control/Data Streaming
-		03  Device Wire Adapter Isochronous Streaming
-C ef  Miscellaneous Device
-	01  ?
-		01  Microsoft ActiveSync
-		02  Palm Sync
-	02  ?
-		01  Interface Association
-		02  Wire Adapter Multifunction Peripheral
-	03  ?
-		01  Cable Based Association
-C fe  Application Specific Interface
-	01  Device Firmware Update
-	02  IRDA Bridge
-	03  Test and Measurement
-		01  TMC
-		02  USB488
-C ff  Vendor Specific Class
-	ff  Vendor Specific Subclass
-		ff  Vendor Specific Protocol
-
-# List of Audio Class Terminal Types
-
-# Syntax:
-# AT terminal_type  terminal_type_name
-
-AT 0100  USB Undefined
-AT 0101  USB Streaming
-AT 01ff  USB Vendor Specific
-AT 0200  Input Undefined
-AT 0201  Microphone
-AT 0202  Desktop Microphone
-AT 0203  Personal Microphone
-AT 0204  Omni-directional Microphone
-AT 0205  Microphone Array
-AT 0206  Processing Microphone Array
-AT 0300  Output Undefined
-AT 0301  Speaker
-AT 0302  Headphones
-AT 0303  Head Mounted Display Audio
-AT 0304  Desktop Speaker
-AT 0305  Room Speaker
-AT 0306  Communication Speaker
-AT 0307  Low Frequency Effects Speaker
-AT 0400  Bidirectional Undefined
-AT 0401  Handset
-AT 0402  Headset
-AT 0403  Speakerphone, no echo reduction
-AT 0404  Echo-suppressing speakerphone
-AT 0405  Echo-canceling speakerphone
-AT 0500  Telephony Undefined
-AT 0501  Phone line
-AT 0502  Telephone
-AT 0503  Down Line Phone
-AT 0600  External Undefined
-AT 0601  Analog Connector
-AT 0602  Digital Audio Interface
-AT 0603  Line Connector
-AT 0604  Legacy Audio Connector
-AT 0605  SPDIF interface
-AT 0606  1394 DA stream
-AT 0607  1394 DV stream soundtrack
-AT 0700  Embedded Undefined
-AT 0701  Level Calibration Noise Source
-AT 0702  Equalization Noise
-AT 0703  CD Player
-AT 0704  DAT
-AT 0705  DCC
-AT 0706  MiniDisc
-AT 0707  Analog Tape
-AT 0708  Phonograph
-AT 0709  VCR Audio
-AT 070a  Video Disc Audio
-AT 070b  DVD Audio
-AT 070c  TV Tuner Audio
-AT 070d  Satellite Receiver Audio
-AT 070e  Cable Tuner Audio
-AT 070f  DSS Audio
-AT 0710  Radio Receiver
-AT 0711  Radio Transmitter
-AT 0712  Multitrack Recorder
-AT 0713  Synthesizer
-
-# List of HID Descriptor Types
-
-# Syntax:
-# HID descriptor_type  descriptor_type_name
-
-HID 21  HID
-HID 22  Report
-HID 23  Physical
-
-# List of HID Descriptor Item Types
-# Note: 2 bits LSB encode data length following
-
-# Syntax:
-# R item_type  item_type_name
-
-R 04  Usage Page
-R 08  Usage
-R 14  Logical Minimum
-R 18  Usage Minimum
-R 24  Logical Maximum
-R 28  Usage Maximum
-R 34  Physical Minimum
-R 38  Designator Index
-R 44  Physical Maximum
-R 48  Designator Minimum
-R 54  Unit Exponent
-R 58  Designator Maximum
-R 64  Unit
-R 74  Report Size
-R 78  String Index
-R 80  Input
-R 84  Report ID
-R 88  String Minimum
-R 90  Output
-R 94  Report Count
-R 98  String Maximum
-R a0  Collection
-R a4  Push
-R a8  Delimiter
-R b0  Feature
-R b4  Pop
-R c0  End Collection
-
-# List of Physical Descriptor Bias Types
-
-# Syntax:
-# BIAS item_type  item_type_name
-
-BIAS 0  Not Applicable
-BIAS 1  Right Hand
-BIAS 2  Left Hand
-BIAS 3  Both Hands
-BIAS 4  Either Hand
-
-# List of Physical Descriptor Item Types
-
-# Syntax:
-# PHY item_type  item_type_name
-
-PHY 00  None
-PHY 01  Hand
-PHY 02  Eyeball
-PHY 03  Eyebrow
-PHY 04  Eyelid
-PHY 05  Ear
-PHY 06  Nose
-PHY 07  Mouth
-PHY 08  Upper Lip
-PHY 09  Lower Lip
-PHY 0a  Jaw
-PHY 0b  Neck
-PHY 0c  Upper Arm
-PHY 0d  Elbow
-PHY 0e  Forearm
-PHY 0f  Wrist
-PHY 10  Palm
-PHY 11  Thumb
-PHY 12  Index Finger
-PHY 13  Middle Finger
-PHY 14  Ring Finger
-PHY 15  Little Finger
-PHY 16  Head
-PHY 17  Shoulder
-PHY 18  Hip
-PHY 19  Waist
-PHY 1a  Thigh
-PHY 1b  Knee
-PHY 1c  calf
-PHY 1d  Ankle
-PHY 1e  Foot
-PHY 1f  Heel
-PHY 20  Ball of Foot
-PHY 21  Big Toe
-PHY 22  Second Toe
-PHY 23  Third Toe
-PHY 24  Fourth Toe
-PHY 25  Fifth Toe
-PHY 26  Brow
-PHY 27  Cheek
-
-# List of HID Usages
-
-# Syntax:
-# HUT hi  _usage_page  hid_usage_page_name
-#	hid_usage  hid_usage_name
-
-HUT 00  Undefined
-HUT 01  Generic Desktop Controls
-	000  Undefined
-	001  Pointer
-	002  Mouse
-	004  Joystick
-	005  Gamepad
-	006  Keyboard
-	007  Keypad
-	008  Multi-Axis Controller
-	030  Direction-X
-	031  Direction-Y
-	032  Direction-Z
-	033  Rotate-X
-	034  Rotate-Y
-	035  Rotate-Z
-	036  Slider
-	037  Dial
-	038  Wheel
-	039  Hat Switch
-	03a  Counted Buffer
-	03b  Byte Count
-	03c  Motion Wakeup
-	03d  Start
-	03e  Select
-	040  Vector-X
-	041  Vector-Y
-	042  Vector-Z
-	043  Vector-X relative Body
-	044  Vector-Y relative Body
-	045  Vector-Z relative Body
-	046  Vector
-	080  System Control
-	081  System Power Down
-	082  System Sleep
-	083  System Wake Up
-	084  System Context Menu
-	085  System Main Menu
-	086  System App Menu
-	087  System Menu Help
-	088  System Menu Exit
-	089  System Menu Select
-	08a  System Menu Right
-	08b  System Menu Left
-	08c  System Menu Up
-	08d  System Menu Down
-	090  Direction Pad Up
-	091  Direction Pad Down
-	092  Direction Pad Right
-	093  Direction Pad Left
-HUT 02  Simulation Controls
-	000  Undefined
-	001  Flight Simulation Device
-	002  Automobile Simulation Device
-	003  Tank Simulation Device
-	004  Spaceship Simulation Device
-	005  Submarine Simulation Device
-	006  Sailing Simulation Device
-	007  Motorcycle Simulation Device
-	008  Sports Simulation Device
-	009  Airplane Simualtion Device
-	00a  Helicopter Simulation Device
-	00b  Magic Carpet Simulation Device
-	00c  Bicycle Simulation Device
-	020  Flight Control Stick
-	021  Flight Stick
-	022  Cyclic Control
-	023  Cyclic Trim
-	024  Flight Yoke
-	025  Track Control
-	0b0  Aileron
-	0b1  Aileron Trim
-	0b2  Anti-Torque Control
-	0b3  Autopilot Enable
-	0b4  Chaff Release
-	0b5  Collective Control
-	0b6  Dive Break
-	0b7  Electronic Countermeasures
-	0b8  Elevator
-	0b9  Elevator Trim
-	0ba  Rudder
-	0bb  Throttle
-	0bc  Flight COmmunications
-	0bd  Flare Release
-	0be  Landing Gear
-	0bf  Toe Break
-	0c0  Trigger
-	0c1  Weapon Arm
-	0c2  Weapons Select
-	0c3  Wing Flaps
-	0c4  Accelerator
-	0c5  Brake
-	0c6  Clutch
-	0c7  Shifter
-	0c8  Steering
-	0c9  Turret Direction
-	0ca  Barrel Elevation
-	0cb  Drive Plane
-	0cc  Ballast
-	0cd  Bicylce Crank
-	0ce  Handle Bars
-	0cf  Front Brake
-	0d0  Rear Brake
-HUT 03  VR Controls
-	000  Unidentified
-	001  Belt
-	002  Body Suit
-	003  Flexor
-	004  Glove
-	005  Head Tracker
-	006  Head Mounted Display
-	007  Hand Tracker
-	008  Oculometer
-	009  Vest
-	00a  Animatronic Device
-	020  Stereo Enable
-	021  Display Enable
-HUT 04  Sport Controls
-	000  Unidentified
-	001  Baseball Bat
-	002  Golf Club
-	003  Rowing Machine
-	004  Treadmill
-	030  Oar
-	031  Slope
-	032  Rate
-	033  Stick Speed
-	034  Stick Face Angle
-	035  Stick Heel/Toe
-	036  Stick Follow Through
-	038  Stick Type
-	039  Stick Height
-	047  Stick Temp
-	050  Putter
-	051  1 Iron
-	052  2 Iron
-	053  3 Iron
-	054  4 Iron
-	055  5 Iron
-	056  6 Iron
-	057  7 Iron
-	058  8 Iron
-	059  9 Iron
-	05a  10 Iron
-	05b  11 Iron
-	05c  Sand Wedge
-	05d  Loft Wedge
-	05e  Power Wedge
-	05f  1 Wood
-	060  3 Wood
-	061  5 Wood
-	062  7 Wood
-	063  9 Wood
-HUT 05  Game Controls
-	000  Undefined
-	001  3D Game Controller
-	002  Pinball Device
-	003  Gun Device
-	020  Point Of View
-	021  Turn Right/Left
-	022  Pitch Right/Left
-	023  Roll Forward/Backward
-	024  Move Right/Left
-	025  Move Forward/Backward
-	026  Move Up/Down
-	027  Lean Right/Left
-	028  Lean Forward/Backward
-	029  Height of POV
-	02a  Flipper
-	02b  Secondary Flipper
-	02c  Bump
-	02d  New Game
-	02e  Shoot Ball
-	02f  Player
-	030  Gun Bolt
-	031  Gun Clip
-	032  Gun Selector
-	033  Gun Single Shot
-	034  Gun Burst
-	035  Gun Automatic
-	036  Gun Safety
-	037  Gamepad Fire/Jump
-	038  Gamepad Fun
-	039  Gamepad Trigger
-HUT 07  Keyboard
-	000  No Event
-	001  Keyboard ErrorRollOver
-	002  Keyboard POSTfail
-	003  Keyboard Error Undefined
-	004  A
-	005  B
-	006  C
-	007  D
-	008  E
-	009  F
-	00a  G
-	00b  H
-	00c  I
-	00d  J
-	00e  K
-	00f  L
-	010  M
-	011  N
-	012  O
-	013  P
-	014  Q
-	015  R
-	016  S
-	017  T
-	018  U
-	019  V
-	01a  W
-	01b  X
-	01c  Y
-	01d  Z
-	01e  1 and ! (One and Exclamation)
-	01f  2 and @ (2 and at)
-	020  3 and # (3 and Hash)
-	021  4 and $ (4 and Dollar Sign)
-	022  5 and % (5 and Percent Sign)
-	023  6 and ^ (6 and circumflex)
-	024  7 and & (Seven and Ampersand)
-	025  8 and * (Eight and asterisk)
-	026  9 and ( (Nine and Parenthesis Left)
-	027  0 and ) (Zero and Parenthesis Right)
-	028  Return (Enter)
-	029  Escape
-	02a  Delete (Backspace)
-	02b  Tab
-	02c  Space Bar
-	02d  - and _ (Minus and underscore)
-	02e  = and + (Equal and Plus)
-	02f  [ and { (Bracket and Braces Left)
-	030  ] and } (Bracket and Braces Right)
-	031  \ and | (Backslash and Bar)
-	032  # and ~ (Hash and Tilde, Non-US Keyboard near right shift)
-	033  ; and : (Semicolon and Colon)
-	034  � and " (Accent Acute and Double Quotes)
-	035  ` and ~ (Accent Grace and Tilde)
-	036  , and < (Comma and Less)
-	037  . and > (Period and Greater)
-	038  / and ? (Slash and Question Mark)
-	039  Caps Lock
-	03a  F1
-	03b  F2
-	03c  F3
-	03d  F4
-	03e  F5
-	03f  F6
-	040  F7
-	041  F8
-	042  F9
-	043  F10
-	044  F11
-	045  F12
-	046  Print Screen
-	047  Scroll Lock
-	048  Pause
-	049  Insert
-	04a  Home
-	04b  Page Up
-	04c  Delete Forward (without Changing Position)
-	04d  End
-	04e  Page Down
-	04f  Right Arrow
-	050  Left Arrow
-	051  Down Arrow
-	052  Up Arrow
-	053  Num Lock and Clear
-	054  Keypad / (Division Sign)
-	055  Keypad * (Multiplication Sign)
-	056  Keypad - (Subtraction Sign)
-	057  Keypad + (Addition Sign)
-	058  Keypad Enter
-	059  Keypad 1 and END
-	05a  Keypad 2 and Down Arrow
-	05b  Keypad 3 and Page Down
-	05c  Keypad 4 and Left Arrow
-	05d  Keypad 5 (Tactilei Raised)
-	05f  Keypad 6 and Right Arrow
-	060  Keypad 7 and Home
-	061  Keypad 8 and Up Arrow
-	062  Keypad 8 and Page Up
-	063  Keypad . (decimal delimiter) and Delete
-	064  \ and | (Backslash and Bar, UK and Non-US Keyboard near left shift)
-	065  Keyboard Application (Windows Key for Win95 or Compose)
-	066  Power (not a key)
-	067  Keypad = (Equal Sign)
-	068  F13
-	069  F14
-	06a  F15
-	06b  F16
-	06c  F17
-	06d  F18
-	06e  F19
-	06f  F20
-	070  F21
-	071  F22
-	072  F23
-	073  F24
-	074  Execute
-	075  Help
-	076  Menu
-	077  Select
-	078  Stop
-	079  Again
-	07a  Undo
-	07b  Cut
-	07c  Copy
-	07d  Paste
-	07e  Find
-	07f  Mute
-	080  Volume Up
-	081  Volume Down
-	082  Locking Caps Lock
-	083  Locking Num Lock
-	084  Locking Scroll Lock
-	085  Keypad Comma
-	086  Keypad Equal Sign (AS/400)
-	087  International 1 (PC98)
-	088  International 2 (PC98)
-	089  International 3 (PC98)
-	08a  International 4 (PC98)
-	08b  International 5 (PC98)
-	08c  International 6 (PC98)
-	08d  International 7 (Toggle Single/Double Byte Mode)
-	08e  International 8
-	08f  International 9
-	090  LANG 1 (Hangul/English Toggle, Korea)
-	091  LANG 2 (Hanja Conversion, Korea)
-	092  LANG 3 (Katakana, Japan)
-	093  LANG 4 (Hiragana, Japan)
-	094  LANG 5 (Zenkaku/Hankaku, Japan)
-	095  LANG 6
-	096  LANG 7
-	097  LANG 8
-	098  LANG 9
-	099  Alternate Erase
-	09a  SysReq/Attention
-	09b  Cancel
-	09c  Clear
-	09d  Prior
-	09e  Return
-	09f  Separator
-	0a0  Out
-	0a1  Open
-	0a2  Clear/Again
-	0a3  CrSel/Props
-	0a4  ExSel
-	0e0  Control Left
-	0e1  Shift Left
-	0e2  Alt Left
-	0e3  GUI Left
-	0e4  Control Right
-	0e5  Shift Right
-	0e6  Alt Rigth
-	0e7  GUI Right
-HUT 08  LEDs
-	000  Undefined
-	001  NumLock
-	002  CapsLock
-	003  Scroll Lock
-	004  Compose
-	005  Kana
-	006  Power
-	007  Shift
-	008  Do not disturb
-	009  Mute
-	00a  Tone Enabke
-	00b  High Cut Filter
-	00c  Low Cut Filter
-	00d  Equalizer Enable
-	00e  Sound Field ON
-	00f  Surround On
-	010  Repeat
-	011  Stereo
-	012  Sampling Rate Detect
-	013  Spinning
-	014  CAV
-	015  CLV
-	016  Recording Format Detect
-	017  Off-Hook
-	018  Ring
-	019  Message Waiting
-	01a  Data Mode
-	01b  Battery Operation
-	01c  Battery OK
-	01d  Battery Low
-	01e  Speaker
-	01f  Head Set
-	020  Hold
-	021  Microphone
-	022  Coverage
-	023  Night Mode
-	024  Send Calls
-	025  Call Pickup
-	026  Conference
-	027  Stand-by
-	028  Camera On
-	029  Camera Off
-	02a  On-Line
-	02b  Off-Line
-	02c  Busy
-	02d  Ready
-	02e  Paper-Out
-	02f  Paper-Jam
-	030  Remote
-	031  Forward
-	032  Reverse
-	033  Stop
-	034  Rewind
-	035  Fast Forward
-	036  Play
-	037  Pause
-	038  Record
-	039  Error
-	03a  Usage Selected Indicator
-	03b  Usage In Use Indicator
-	03c  Usage Multi Indicator
-	03d  Indicator On
-	03e  Indicator Flash
-	03f  Indicator Slow Blink
-	040  Indicator Fast Blink
-	041  Indicator Off
-	042  Flash On Time
-	043  Slow Blink On Time
-	044  Slow Blink Off Time
-	045  Fast Blink On Time
-	046  Fast Blink Off Time
-	047  Usage Color Indicator
-	048  Indicator Red
-	049  Indicator Green
-	04a  Indicator Amber
-	04b  Generic Indicator
-	04c  System Suspend
-	04d  External Power Connected
-HUT 09  Buttons
-	000  No Button Pressed
-	001  Button 1 (Primary)
-	002  Button 2 (Secondary)
-	003  Button 3 (Tertiary)
-	004  Button 4
-	005  Button 5
-HUT 0a  Ordinal
-	001  Instance 1
-	002  Instance 2
-	003  Instance 3
-HUT 0b  Telephony
-	000  Unassigned
-	001  Phone
-	002  Answering Machine
-	003  Message Controls
-	004  Handset
-	005  Headset
-	006  Telephony Key Pad
-	007  Programmable Button
-	020  Hook Switch
-	021  Flash
-	022  Feature
-	023  Hold
-	024  Redial
-	025  Transfer
-	026  Drop
-	027  Park
-	028  Forward Calls
-	029  Alternate Function
-	02a  Line
-	02b  Speaker Phone
-	02c  Conference
-	02d  Ring Enable
-	02e  Ring Select
-	02f  Phone Mute
-	030  Caller ID
-	050  Speed Dial
-	051  Store Number
-	052  Recall Number
-	053  Phone Directory
-	070  Voice Mail
-	071  Screen Calls
-	072  Do Not Disturb
-	073  Message
-	074  Answer On/Offf
-	090  Inside Dial Tone
-	091  Outside Dial Tone
-	092  Inside Ring Tone
-	093  Outside Ring Tone
-	094  Priority Ring Tone
-	095  Inside Ringback
-	096  Priority Ringback
-	097  Line Busy Tone
-	098  Recorder Tone
-	099  Call Waiting Tone
-	09a  Confirmation Tone 1
-	09b  Confirmation Tone 2
-	09c  Tones Off
-	09d  Outside Ringback
-	0b0  Key 1
-	0b1  Key 2
-	0b3  Key 3
-	0b4  Key 4
-	0b5  Key 5
-	0b6  Key 6
-	0b7  Key 7
-	0b8  Key 8
-	0b9  Key 9
-	0ba  Key Star
-	0bb  Key Pound
-	0bc  Key A
-	0bd  Key B
-	0be  Key C
-	0bf  Key D
-HUT 0c  Consumer
-	000  Unassigned
-	001  Consumer Control
-	002  Numeric Key Pad
-	003  Programmable Buttons
-	020  +10
-	021  +100
-	022  AM/PM
-	030  Power
-	031  Reset
-	032  Sleep
-	033  Sleep After
-	034  Sleep Mode
-	035  Illumination
-	036  Function Buttons
-	040  Menu
-	041  Menu Pick
-	042  Menu Up
-	043  Menu Down
-	044  Menu Left
-	045  Menu Right
-	046  Menu Escape
-	047  Menu Value Increase
-	048  Menu Value Decrease
-	060  Data on Screen
-	061  Closed Caption
-	062  Closed Caption Select
-	063  VCR/TV
-	064  Broadcast Mode
-	065  Snapshot
-	066  Still
-	080  Selection
-	081  Assign Selection
-	082  Mode Step
-	083  Recall Last
-	084  Enter Channel
-	085  Order Movie
-	086  Channel
-	087  Media Selection
-	088  Media Select Computer
-	089  Media Select TV
-	08a  Media Select WWW
-	08b  Media Select DVD
-	08c  Media Select Telephone
-	08d  Media Select Program Guide
-	08e  Media Select Video Phone
-	08f  Media Select Games
-	090  Media Select Messages
-	091  Media Select CD
-	092  Media Select VCR
-	093  Media Select Tuner
-	094  Quit
-	095  Help
-	096  Media Select Tape
-	097  Media Select Cable
-	098  Media Select Satellite
-	099  Media Select Security
-	09a  Media Select Home
-	09b  Media Select Call
-	09c  Channel Increment
-	09d  Channel Decrement
-	09e  Media Select SAP
-	0a0  VCR Plus
-	0a1  Once
-	0a2  Daily
-	0a3  Weekly
-	0a4  Monthly
-	0b0  Play
-	0b1  Pause
-	0b2  Record
-	0b3  Fast Forward
-	0b4  Rewind
-	0b5  Scan Next Track
-	0b6  Scan Previous Track
-	0b7  Stop
-	0b8  Eject
-	0b9  Random Play
-	0ba  Select Disc
-	0bb  Enter Disc
-	0bc  Repeat
-	0bd  Tracking
-	0be  Track Normal
-	0bf  Slow Tracking
-	0c0  Frame Forward
-	0c1  Frame Back
-	0c2  Mark
-	0c3  Clear Mark
-	0c4  Repeat from Mark
-	0c5  Return to Mark
-	0c6  Search Mark Forward
-	0c7  Search Mark Backward
-	0c8  Counter Reset
-	0c9  Show Counter
-	0ca  Tracking Increment
-	0cb  Tracking Decrement
-	0cc  Stop/Eject
-	0cd  Play/Pause
-	0ce  Play/Skip
-	0e0  Volume
-	0e1  Balance
-	0e2  Mute
-	0e3  Bass
-	0e4  Treble
-	0e5  Bass Boost
-	0e6  Surround Mode
-	0e7  Loudness
-	0e8  MPX
-	0e9  Volume Increment
-	0ea  Volume Decrement
-	0f0  Speed Select
-	0f1  Playback Speed
-	0f2  Standard Play
-	0f3  Long Play
-	0f4  Extended Play
-	0f5  Slow
-	100  Fan Enable
-	101  Fan Speed
-	102  Light Enable
-	103  Light Illumination Level
-	104  Climate Control Enable
-	105  Room Temperature
-	106  Security Enable
-	107  Fire Alarm
-	108  Police Alarm
-	150  Balance Right
-	151  Balance Left
-	152  Bass Increment
-	153  Bass Decrement
-	154  Treble Increment
-	155  Treble Decrement
-	160  Speaker System
-	161  Channel Left
-	162  Channel Right
-	163  Channel Center
-	164  Channel Front
-	165  Channel Center Front
-	166  Channel Side
-	167  Channel Surround
-	168  Channel Low Frequency Enhancement
-	169  Channel Top
-	16a  Channel Unknown
-	170  Sub-Channel
-	171  Sub-Channel Increment
-	172  Sub-Channel Decrement
-	173  Alternative Audio Increment
-	174  Alternative Audio Decrement
-	180  Application Launch Buttons
-	181  AL Launch Button Configuration Tool
-	182  AL Launch Button Configuration
-	183  AL Consumer Control Configuration
-	184  AL Word Processor
-	185  AL Text Editor
-	186  AL Spreadsheet
-	187  AL Graphics Editor
-	188  AL Presentation App
-	189  AL Database App
-	18a  AL Email Reader
-	18b  AL Newsreader
-	18c  AL Voicemail
-	18d  AL Contacts/Address Book
-	18e  AL Calendar/Schedule
-	18f  AL Task/Project Manager
-	190  AL Log/Jounal/Timecard
-	191  AL Checkbook/Finance
-	192  AL Calculator
-	193  AL A/V Capture/Playback
-	194  AL Local Machine Browser
-	195  AL LAN/Wan Browser
-	196  AL Internet Browser
-	197  AL Remote Networking/ISP Connect
-	198  AL Network Conference
-	199  AL Network Chat
-	19a  AL Telephony/Dialer
-	19b  AL Logon
-	19c  AL Logoff
-	19d  AL Logon/Logoff
-	19e  AL Terminal Local/Screensaver
-	19f  AL Control Panel
-	1a0  AL Command Line Processor/Run
-	1a1  AL Process/Task Manager
-	1a2  AL Select Task/Application
-	1a3  AL Next Task/Application
-	1a4  AL Previous Task/Application
-	1a5  AL Preemptive Halt Task/Application
-	200  Generic GUI Application Controls
-	201  AC New
-	202  AC Open
-	203  AC CLose
-	204  AC Exit
-	205  AC Maximize
-	206  AC Minimize
-	207  AC Save
-	208  AC Print
-	209  AC Properties
-	21a  AC Undo
-	21b  AC Copy
-	21c  AC Cut
-	21d  AC Paste
-	21e  AC Select All
-	21f  AC Find
-	220  AC Find and Replace
-	221  AC Search
-	222  AC Go To
-	223  AC Home
-	224  AC Back
-	225  AC Forward
-	226  AC Stop
-	227  AC Refresh
-	228  AC Previous Link
-	229  AC Next Link
-	22b  AC History
-	22c  AC Subscriptions
-	22d  AC Zoom In
-	22e  AC Zoom Out
-	22f  AC Zoom
-	230  AC Full Screen View
-	231  AC Normal View
-	232  AC View Toggle
-	233  AC Scroll Up
-	234  AC Scroll Down
-	235  AC Scroll
-	236  AC Pan Left
-	237  AC Pan Right
-	238  AC Pan
-	239  AC New Window
-	23a  AC Tile Horizontally
-	23b  AC Tile Vertically
-	23c  AC Format
-HUT 0d  Digitizer
-	000  Undefined
-	001  Digitizer
-	002  Pen
-	003  Light Pen
-	004  Touch Screen
-	005  Touch Pad
-	006  White Board
-	007  Coordinate Measuring Machine
-	008  3D Digitizer
-	009  Stereo Plotter
-	00a  Articulated Arm
-	00b  Armature
-	00c  Multiple Point Digitizer
-	00d  Free Space Wand
-	020  Stylus
-	021  Puck
-	022  Finger
-	030  Tip Pressure
-	031  Barrel Pressure
-	032  In Range
-	033  Touch
-	034  Untouch
-	035  Tap
-	036  Quality
-	037  Data Valid
-	038  Transducer Index
-	039  Tablet Function Keys
-	03a  Program Change Keys
-	03b  Battery Strength
-	03c  Invert
-	03d  X Tilt
-	03e  Y Tilt
-	03f  Azimuth
-	040  Altitude
-	041  Twist
-	042  Tip Switch
-	043  Secondary Tip Switch
-	044  Barrel Switch
-	045  Eraser
-	046  Tablet Pick
-	047  Confidence
-	048  Width
-	049  Height
-	051  Contact ID
-	052  Input Mode
-	053  Device Index
-	054  Contact Count
-	055  Maximum Contact Number
-HUT 0f  PID Page
-	000  Undefined
-	001  Physical Interface Device
-	020  Normal
-	021  Set Effect Report
-	022  Effect Block Index
-	023  Parameter Block Offset
-	024  ROM Flag
-	025  Effect Type
-	026  ET Constant Force
-	027  ET Ramp
-	028  ET Custom Force Data
-	030  ET Square
-	031  ET Sine
-	032  ET Triangle
-	033  ET Sawtooth Up
-	034  ET Sawtooth Down
-	040  ET Spring
-	041  ET Damper
-	042  ET Inertia
-	043  ET Friction
-	050  Duration
-	051  Sample Period
-	052  Gain
-	053  Trigger Button
-	054  Trigger Repeat Interval
-	055  Axes Enable
-	056  Direction Enable
-	057  Direction
-	058  Type Specific Block Offset
-	059  Block Type
-	05A  Set Envelope Report
-	05B  Attack Level
-	05C  Attack Time
-	05D  Fade Level
-	05E  Fade Time
-	05F  Set Condition Report
-	060  CP Offset
-	061  Positive Coefficient
-	062  Negative Coefficient
-	063  Positive Saturation
-	064  Negative Saturation
-	065  Dead Band
-	066  Download Force Sample
-	067  Isoch Custom Force Enable
-	068  Custom Force Data Report
-	069  Custom Force Data
-	06A  Custom Force Vendor Defined Data
-	06B  Set Custom Force Report
-	06C  Custom Force Data Offset
-	06D  Sample Count
-	06E  Set Periodic Report
-	06F  Offset
-	070  Magnitude
-	071  Phase
-	072  Period
-	073  Set Constant Force Report
-	074  Set Ramp Force Report
-	075  Ramp Start
-	076  Ramp End
-	077  Effect Operation Report
-	078  Effect Operation
-	079  Op Effect Start
-	07A  Op Effect Start Solo
-	07B  Op Effect Stop
-	07C  Loop Count
-	07D  Device Gain Report
-	07E  Device Gain
-	07F  PID Pool Report
-	080  RAM Pool Size
-	081  ROM Pool Size
-	082  ROM Effect Block Count
-	083  Simultaneous Effects Max
-	084  Pool Alignment
-	085  PID Pool Move Report
-	086  Move Source
-	087  Move Destination
-	088  Move Length
-	089  PID Block Load Report
-	08B  Block Load Status
-	08C  Block Load Success
-	08D  Block Load Full
-	08E  Block Load Error
-	08F  Block Handle
-	090  PID Block Free Report
-	091  Type Specific Block Handle
-	092  PID State Report
-	094  Effect Playing
-	095  PID Device Control Report
-	096  PID Device Control
-	097  DC Enable Actuators
-	098  DC Disable Actuators
-	099  DC Stop All Effects
-	09A  DC Device Reset
-	09B  DC Device Pause
-	09C  DC Device Continue
-	09F  Device Paused
-	0A0  Actuators Enabled
-	0A4  Safety Switch
-	0A5  Actuator Override Switch
-	0A6  Actuator Power
-	0A7  Start Delay
-	0A8  Parameter Block Size
-	0A9  Device Managed Pool
-	0AA  Shared Parameter Blocks
-	0AB  Create New Effect Report
-	0AC  RAM Pool Available
-HUT 10  Unicode
-HUT 14  Alphanumeric Display
-	000  Undefined
-	001  Alphanumeric Display
-	020  Display Attributes Report
-	021  ASCII Character Set
-	022  Data Read Back
-	023  Font Read Back
-	024  Display Control Report
-	025  Clear Display
-	026  Display Enable
-	027  Screen Saver Delay
-	028  Screen Saver Enable
-	029  Vertical Scroll
-	02a  Horizontal Scroll
-	02b  Character Report
-	02c  Display Data
-	02d  Display Status
-	02e  Stat Not Ready
-	02f  Stat Ready
-	030  Err Not a loadable Character
-	031  Err Font Data Cannot Be Read
-	032  Cursur Position Report
-	033  Row
-	034  Column
-	035  Rows
-	036  Columns
-	037  Cursor Pixel Positioning
-	038  Cursor Mode
-	039  Cursor Enable
-	03a  Cursor Blink
-	03b  Font Report
-	03c  Font Data
-	03d  Character Width
-	03e  Character Height
-	03f  Character Spacing Horizontal
-	040  Character Spacing Vertical
-	041  Unicode Character Set
-HUT 80  USB Monitor
-	001  Monitor Control
-	002  EDID Information
-	003  VDIF Information
-	004  VESA Version
-HUT 81  USB Monitor Enumerated Values
-HUT 82  Monitor VESA Virtual Controls
-	001  Degauss
-	010  Brightness
-	012  Contrast
-	016  Red Video Gain
-	018  Green Video Gain
-	01a  Blue Video Gain
-	01c  Focus
-	020  Horizontal Position
-	022  Horizontal Size
-	024  Horizontal Pincushion
-	026  Horizontal Pincushion Balance
-	028  Horizontal Misconvergence
-	02a  Horizontal Linearity
-	02c  Horizontal Linearity Balance
-	030  Vertical Position
-	032  Vertical Size
-	034  Vertical Pincushion
-	036  Vertical Pincushion Balance
-	038  Vertical Misconvergence
-	03a  Vertical Linearity
-	03c  Vertical Linearity Balance
-	040  Parallelogram Balance (Key Distortion)
-	042  Trapezoidal Distortion (Key)
-	044  Tilt (Rotation)
-	046  Top Corner Distortion Control
-	048  Top Corner Distortion Balance
-	04a  Bottom Corner Distortion Control
-	04c  Bottom Corner Distortion Balance
-	056  Horizontal Moire
-	058  Vertical Moire
-	05e  Input Level Select
-	060  Input Source Select
-	06c  Red Video Black Level
-	06e  Green Video Black Level
-	070  Blue Video Black Level
-	0a2  Auto Size Center
-	0a4  Polarity Horizontal Sychronization
-	0a6  Polarity Vertical Synchronization
-	0aa  Screen Orientation
-	0ac  Horizontal Frequency in Hz
-	0ae  Vertical Frequency in 0.1 Hz
-	0b0  Settings
-	0ca  On Screen Display (OSD)
-	0d4  Stereo Mode
-HUT 84  Power Device Page
-	000  Undefined
-	001  iName
-	002  Present Status
-	003  Changed Status
-	004  UPS
-	005  Power Supply
-	010  Battery System
-	011  Battery System ID
-	012  Battery
-	013  Battery ID
-	014  Charger
-	015  Charger ID
-	016  Power Converter
-	017  Power Converter ID
-	018  Outlet System
-	019  Outlet System ID
-	01a  Input
-	01b  Input ID
-	01c  Output
-	01d  Output ID
-	01e  Flow
-	01f  Flow ID
-	020  Outlet
-	021  Outlet ID
-	022  Gang
-	023  Gang ID
-	024  Power Summary
-	025  Power Summary ID
-	030  Voltage
-	031  Current
-	032  Frequency
-	033  Apparent Power
-	034  Active Power
-	035  Percent Load
-	036  Temperature
-	037  Humidity
-	038  Bad Count
-	040  Config Voltage
-	041  Config Current
-	042  Config Frequency
-	043  Config Apparent Power
-	044  Config Active Power
-	045  Config Percent Load
-	046  Config Temperature
-	047  Config Humidity
-	050  Switch On Control
-	051  Switch Off Control
-	052  Toggle Control
-	053  Low Voltage Transfer
-	054  High Voltage Transfer
-	055  Delay Before Reboot
-	056  Delay Before Startup
-	057  Delay Before Shutdown
-	058  Test
-	059  Module Reset
-	05a  Audible Alarm Control
-	060  Present
-	061  Good
-	062  Internal Failure
-	063  Voltage out of range
-	064  Frequency out of range
-	065  Overload
-	066  Over Charged
-	067  Over Temperature
-	068  Shutdown Requested
-	069  Shutdown  Imminent
-	06a  Reserved
-	06b  Switch On/Off
-	06c  Switchable
-	06d  Used
-	06e  Boost
-	06f  Buck
-	070  Initialized
-	071  Tested
-	072  Awaiting Power
-	073  Communication Lost
-	0fd  iManufacturer
-	0fe  iProduct
-	0ff  iSerialNumber
-HUT 85  Battery System Page
-	000  Undefined
-	001  SMB Battery Mode
-	002  SMB Battery Status
-	003  SMB Alarm Warning
-	004  SMB Charger Mode
-	005  SMB Charger Status
-	006  SMB Charger Spec Info
-	007  SMB Selector State
-	008  SMB Selector Presets
-	009  SMB Selector Info
-	010  Optional Mfg. Function 1
-	011  Optional Mfg. Function 2
-	012  Optional Mfg. Function 3
-	013  Optional Mfg. Function 4
-	014  Optional Mfg. Function 5
-	015  Connection to SMBus
-	016  Output Connection
-	017  Charger Connection
-	018  Battery Insertion
-	019  Use Next
-	01a  OK to use
-	01b  Battery  Supported
-	01c  SelectorRevision
-	01d  Charging Indicator
-	028  Manufacturer Access
-	029  Remaining Capacity Limit
-	02a  Remaining Time Limit
-	02b  At Rate
-	02c  Capacity Mode
-	02d  Broadcast To Charger
-	02e  Primary Battery
-	02f  Charge Controller
-	040  Terminate Charge
-	041  Terminate Discharge
-	042  Below Remaining Capacity Limit
-	043  Remaining Time Limit Expired
-	044  Charging
-	045  Discharging
-	046  Fully Charged
-	047  Fully Discharged
-	048  Conditioning Flag
-	049  At Rate OK
-	04a  SMB Error Code
-	04b  Need Replacement
-	060  At Rate Time To Full
-	061  At Rate Time To Empty
-	062  Average Current
-	063  Max Error
-	064  Relative State Of Charge
-	065  Absolute State Of Charge
-	066  Remaining Capacity
-	067  Full Charge Capacity
-	068  Run Time To Empty
-	069  Average Time To Empty
-	06a  Average Time To Full
-	06b  Cycle Count
-	080  Batt. Pack Model Level
-	081  Internal Charge Controller
-	082  Primary Battery Support
-	083  Design Capacity
-	084  Specification Info
-	085  Manufacturer Date
-	086  Serial Number
-	087  iManufacturerName
-	088  iDeviceName
-	089  iDeviceChemistry
-	08a  Manufacturer Data
-	08b  Rechargeable
-	08c  Warning Capacity Limit
-	08d  Capacity Granularity 1
-	08e  Capacity Granularity 2
-	08f  iOEMInformation
-	0c0  Inhibit Charge
-	0c1  Enable Polling
-	0c2  Reset To Zero
-	0d0  AC Present
-	0d1  Battery Present
-	0d2  Power Fail
-	0d3  Alarm Inhibited
-	0d4  Thermistor Under Range
-	0d5  Thermistor Hot
-	0d6  Thermistor Cold
-	0d7  Thermistor Over Range
-	0d8  Voltage Out Of Range
-	0d9  Current Out Of Range
-	0da  Current Not Regulated
-	0db  Voltage Not Regulated
-	0dc  Master Mode
-	0f0  Charger Selector Support
-	0f1  Charger Spec
-	0f2  Level 2
-	0f3  Level 3
-HUT 86  Power Pages
-HUT 87  Power Pages
-HUT 8c  Bar Code Scanner Page (POS)
-HUT 8d  Scale Page (POS)
-HUT 90  Camera Control Page
-HUT 91  Arcade Control Page
-HUT f0  Cash Device
-	0f1  Cash Drawer
-	0f2  Cash Drawer Number
-	0f3  Cash Drawer Set
-	0f4  Cash Drawer Status
-HUT ff  Vendor Specific
-
-# List of Languages
-
-# Syntax:
-# L language_id  language_name
-#	dialect_id  dialect_name
-
-L 0001  Arabic
-	01  Saudi Arabia
-	02  Iraq
-	03  Egypt
-	04  Libya
-	05  Algeria
-	06  Morocco
-	07  Tunesia
-	08  Oman
-	09  Yemen
-	0a  Syria
-	0b  Jordan
-	0c  Lebanon
-	0d  Kuwait
-	0e  U.A.E
-	0f  Bahrain
-	10  Qatar
-L 0002  Bulgarian
-L 0003  Catalan
-L 0004  Chinese
-	01  Traditional
-	02  Simplified
-	03  Hongkong SAR, PRC
-	04  Singapore
-	05  Macau SAR
-L 0005  Czech
-L 0006  Danish
-L 0007  German
-	01  German
-	02  Swiss
-	03  Austrian
-	04  Luxembourg
-	05  Liechtenstein
-L 0008  Greek
-L 0009  English
-	01  US
-	02  UK
-	03  Australian
-	04  Canadian
-	05  New Zealand
-	06  Ireland
-	07  South Africa
-	08  Jamaica
-	09  Carribean
-	0a  Belize
-	0b  Trinidad
-	0c  Zimbabwe
-	0d  Philippines
-L 000a  Spanish
-	01  Castilian
-	02  Mexican
-	03  Modern
-	04  Guatemala
-	05  Costa Rica
-	06  Panama
-	07  Dominican Republic
-	08  Venzuela
-	09  Colombia
-	0a  Peru
-	0b  Argentina
-	0c  Ecuador
-	0d  Chile
-	0e  Uruguay
-	0f  Paraguay
-	10  Bolivia
-	11  El Salvador
-	12  Honduras
-	13  Nicaragua
-	14  Puerto Rico
-L 000b  Finnish
-L 000c  French
-	01  French
-	02  Belgian
-	03  Canadian
-	04  Swiss
-	05  Luxembourg
-	06  Monaco
-L 000d  Hebrew
-L 000e  Hungarian
-L 000f  Idelandic
-L 0010  Italian
-	01  Italian
-	02  Swiss
-L 0011  Japanese
-L 0012  Korean
-	01  Korean
-L 0013  Dutch
-	01  Dutch
-	02  Belgian
-L 0014  Norwegian
-	01  Bokmal
-	02  Nynorsk
-L 0015  Polish
-L 0016  Portuguese
-	01  Portuguese
-	02  Brazilian
-L 0017  forgotten
-L 0018  Romanian
-L 0019  Russian
-L 001a  Serbian
-	01  Croatian
-	02  Latin
-	03  Cyrillic
-L 001b  Slovak
-L 001c  Albanian
-L 001d  Swedish
-	01  Swedish
-	02  Finland
-L 001e  Thai
-L 001f  Turkish
-L 0020  Urdu
-	01  Pakistan
-	02  India
-L 0021  Indonesian
-L 0022  Ukrainian
-L 0023  Belarusian
-L 0024  Slovenian
-L 0025  Estonian
-L 0026  Latvian
-L 0027  Lithuanian
-	01  Lithuanian
-L 0028  forgotten
-L 0029  Farsi
-L 002a  Vietnamese
-L 002b  Armenian
-L 002c  Azeri
-	01  Cyrillic
-	02  Latin
-L 002d  Basque
-L 002e  forgotten
-L 002f  Macedonian
-L 0036  Afrikaans
-L 0037  Georgian
-L 0038  Faeroese
-L 0039  Hindi
-L 003e  Malay
-	01  Malaysia
-	02  Brunei Darassalam
-L 003f  Kazak
-L 0041  Awahili
-L 0043  Uzbek
-	01  Latin
-	02  Cyrillic
-L 0044  Tatar
-L 0045  Bengali
-L 0046  Punjabi
-L 0047  Gujarati
-L 0048  Oriya
-L 0049  Tamil
-L 004a  Telugu
-L 004b  Kannada
-L 004c  Malayalam
-L 004d  Assamese
-L 004e  Marathi
-L 004f  Sanskrit
-L 0057  Konkani
-L 0058  Manipuri
-L 0059  Sindhi
-L 0060  Kashmiri
-	02  India
-L 0061  Nepali
-	02  India
-
-# HID Descriptor bCountryCode
-# HID Specification 1.11 (2001-06-27) page 23
-#
-# Syntax:
-# HCC country_code keymap_type
-
-HCC 00  Not supported
-HCC 01  Arabic
-HCC 02  Belgian
-HCC 03  Canadian-Bilingual
-HCC 04  Canadian-French
-HCC 05  Czech Republic
-HCC 06  Danish
-HCC 07  Finnish
-HCC 08  French
-HCC 09  German
-HCC 10  Greek
-HCC 11  Hebrew
-HCC 12  Hungary
-HCC 13  International (ISO)
-HCC 14  Italian
-HCC 15  Japan (Katakana)
-HCC 16  Korean
-HCC 17  Latin American
-HCC 18  Netherlands/Dutch
-HCC 19  Norwegian
-HCC 20  Persian (Farsi)
-HCC 21  Poland
-HCC 22  Portuguese
-HCC 23  Russia
-HCC 24  Slovakia
-HCC 25  Spanish
-HCC 26  Swedish
-HCC 27  Swiss/French
-HCC 28  Swiss/German
-HCC 29  Switzerland
-HCC 30  Taiwan
-HCC 31  Turkish-Q
-HCC 32  UK
-HCC 33  US
-HCC 34  Yugoslavia
-HCC 35  Turkish-F
-
-# List of Video Class Terminal Types
-
-# Syntax:
-# VT terminal_type  terminal_type_name
-
-VT 0100  USB Vendor Specific
-VT 0101  USB Streaming
-VT 0200  Input Vendor Specific
-VT 0201  Camera Sensor
-VT 0202  Sequential Media
-VT 0300  Output Vendor Specific
-VT 0301  Generic Display
-VT 0302  Sequential Media
-VT 0400  External Vendor Specific
-VT 0401  Composite Video
-VT 0402  S-Video
-VT 0403  Component Video
diff --git a/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch b/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch
deleted file mode 100644
index 993650b2c..000000000
--- a/core/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <d@falconindy.com>
-Date: Sun, 11 Dec 2011 13:58:05 -0500
-Subject: [PATCH] findmnt: support alternative location of fstab
-
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- misc-utils/findmnt.8 |    6 ++++--
- misc-utils/findmnt.c |    9 +++++----
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
-index 24e3a52..7f3dc6c 100644
---- a/misc-utils/findmnt.8
-+++ b/misc-utils/findmnt.8
-@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default.
- .SH OPTIONS
- .IP "\fB\-h, \-\-help\fP"
- Print help and exit.
--.IP "\fB\-s, \-\-fstab\fP"
-+.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP"
- Search in
- .IR /etc/fstab
- and
- .IR /etc/fstab.d .
--The output is in the list format (see --list).
-+The output is in the list format (see --list). Optionally, search the file
-+specified by
-+.IR fstab .
- .IP "\fB\-m, \-\-mtab\fP"
- Search in
- .IR /etc/mtab .
-diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
-index 4577dc6..5502a87 100644
---- a/misc-utils/findmnt.c
-+++ b/misc-utils/findmnt.c
-@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
- 
- 	fprintf(out, _(
- 	"\nOptions:\n"
--	" -s, --fstab            search in static table of filesystems\n"
-+	" -s, --fstab[=<fstab>]  search in static table of filesystems\n"
- 	" -m, --mtab             search in table of mounted filesystems\n"
- 	" -k, --kernel           search in kernel table of mounted\n"
-         "                          filesystems (default)\n\n"));
-@@ -839,7 +839,7 @@ int main(int argc, char *argv[])
- 	    { "direction",    1, 0, 'd' },
- 	    { "evaluate",     0, 0, 'e' },
- 	    { "first-only",   0, 0, 'f' },
--	    { "fstab",        0, 0, 's' },
-+	    { "fstab",        2, 0, 's' },
- 	    { "help",         0, 0, 'h' },
- 	    { "invert",       0, 0, 'i' },
- 	    { "kernel",       0, 0, 'k' },
-@@ -872,7 +872,8 @@ int main(int argc, char *argv[])
- 	tt_flags |= TT_FL_TREE;
- 
- 	while ((c = getopt_long(argc, argv,
--				"acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) {
-+				"acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:",
-+				longopts, NULL)) != -1) {
- 		switch(c) {
- 		case 'a':
- 			tt_flags |= TT_FL_ASCII;
-@@ -938,7 +939,7 @@ int main(int argc, char *argv[])
- 		case 's':		/* fstab */
- 			if (tabfile)
- 				errx_mutually_exclusive("--{fstab,mtab,kernel}");
--			tabfile = _PATH_MNTTAB;
-+			tabfile = optarg ? optarg : _PATH_MNTTAB;
- 			tt_flags &= ~TT_FL_TREE;
- 			break;
- 		case 'k':		/* kernel (mountinfo) */
--- 
-1.7.8.1
-
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
deleted file mode 100644
index b02d1bc68..000000000
--- a/extra/abiword/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 148668 2012-02-05 11:46:18Z 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/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch
deleted file mode 100644
index 7eded4c83..000000000
--- a/extra/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/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/extra/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/extra/abiword/abiword.install b/extra/abiword/abiword.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/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/extra/abiword/compat_libwpg_0_9.patch b/extra/abiword/compat_libwpg_0_9.patch
deleted file mode 100644
index cf36e188e..000000000
--- a/extra/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/extra/acpi/PKGBUILD b/extra/acpi/PKGBUILD
deleted file mode 100644
index f967c9530..000000000
--- a/extra/acpi/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 148028 2012-01-30 03:41:59Z dan $
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=acpi
-pkgver=1.6
-pkgrel=1
-pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/acpiclient"
-depends=('glibc')
-source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz)
-license=('GPL2')
-sha256sums=('ed61d20400c4fd3965dde9b49ab3ac74da02f8eca1a55454f7a1ac3fa1fd5c31')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
deleted file mode 100644
index ae5cfc9e0..000000000
--- a/extra/acpid/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 145167 2011-12-18 19:59:26Z eric $
-# Maintainer:
-# Contributor: xduugu
-# Contributor: Manolis Tzanidakis
-# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
-
-pkgname=acpid
-pkgver=2.0.14
-pkgrel=1
-pkgdesc="A daemon for delivering ACPI power management events with netlink support"
-arch=('i686' 'x86_64')
-url="http://tedfelix.com/linux/acpid-netlink.html"
-license=('GPL')
-depends=('bash')
-replaces=('acpid2')
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
-        'acpid'
-        'anything'
-        'handler.sh'
-        'acpid.conf.d')
-md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
-         'd69203a032c4583f9abaafcf21a7ed84'
-         '2d37b98d6e74bab815604b8b48c6cfd4'
-         'd411b758e8531adee191b66bcbc2892d'
-         '929c6d2e91295c22ed9ec6212d7eabef')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid"
-  install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything"
-  install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh"
-  install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid"
-
-  chmod 755 "${pkgdir}"/usr/sbin/acpid
-}
diff --git a/extra/acpid/acpid b/extra/acpid/acpid
deleted file mode 100644
index 288ac078d..000000000
--- a/extra/acpid/acpid
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid
-
-PID=`pidof -o %PPID /usr/sbin/acpid`
-case "$1" in
-  start)
-    stat_busy "Starting acpid"
-    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon acpid
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping acpid"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon acpid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/acpid/acpid.conf.d b/extra/acpid/acpid.conf.d
deleted file mode 100644
index b60103a2d..000000000
--- a/extra/acpid/acpid.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
diff --git a/extra/acpid/anything b/extra/acpid/anything
deleted file mode 100644
index d1828989b..000000000
--- a/extra/acpid/anything
+++ /dev/null
@@ -1,3 +0,0 @@
-# Pass all events to our one handler script
-event=.*
-action=/etc/acpi/handler.sh %e
diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh
deleted file mode 100644
index 505ed7c11..000000000
--- a/extra/acpid/handler.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# Default acpi script that takes an entry for all actions
-
-minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
-maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
-setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
-
-set $*
-
-case "$1" in
-    button/power)
-        #echo "PowerButton pressed!">/dev/tty5
-        case "$2" in
-            PBTN|PWRF)  logger "PowerButton pressed: $2" ;;
-            *)          logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    button/sleep)
-        case "$2" in
-            SLPB)   echo -n mem >/sys/power/state ;;
-            *)      logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    ac_adapter)
-        case "$2" in
-            AC|ACAD|ADP0)
-                case "$4" in
-                    00000000)
-                        echo -n $minspeed >$setspeed
-                        #/etc/laptop-mode/laptop-mode start
-                    ;;
-                    00000001)
-                        echo -n $maxspeed >$setspeed
-                        #/etc/laptop-mode/laptop-mode stop
-                    ;;
-                esac
-                ;;
-            *)  logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    battery)
-        case "$2" in
-            BAT0)
-                case "$4" in
-                    00000000)   #echo "offline" >/dev/tty5
-                    ;;
-                    00000001)   #echo "online"  >/dev/tty5
-                    ;;
-                esac
-                ;;
-            CPU0)	
-                ;;
-            *)  logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    button/lid)
-       	case "$3" in
-	    close)
-		#echo "LID closed!">/dev/tty5
-		;;
-	    open)
-		#echo "LID opened!">/dev/tty5
-        	;;
-	esac
-	;;
-
-    *)
-        logger "ACPI group/action undefined: $1 / $2"
-        ;;
-esac
diff --git a/extra/alex/PKGBUILD b/extra/alex/PKGBUILD
deleted file mode 100644
index 32b9ebb2f..000000000
--- a/extra/alex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151870 2012-03-03 16:05:52Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Philip Nilsson <pnilsson@nullref.se>
-
-pkgname=alex
-pkgver=3.0.1
-pkgrel=1
-pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/alex/'
-license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('5dec239c89165d159faa2154bc0724cd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
-  runghc Setup.lhs build
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs copy --destdir=$pkgdir
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
-
-  # doc/ contains only license which already installed into proper place
-  rm -rf $pkgdir/usr/share/doc
-}
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
deleted file mode 100644
index ed8cbd042..000000000
--- a/extra/allegro/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148670 2012-02-05 11:46:21Z 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/extra/alsa-utils/alsaconf.patch b/extra/alsa-utils/alsaconf.patch
deleted file mode 100644
index 48037fd3e..000000000
--- a/extra/alsa-utils/alsaconf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in
---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2005-03-24 00:24:52.000000000 -0800
-+++ alsa-utils-1.0.9a/alsaconf/alsaconf.in	2005-07-18 09:25:02.000000000 -0700
-@@ -58,6 +58,8 @@
-   distribution="redhat"
- elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then
-   distribution="fedora"
-+elif test -f /etc/arch-release; then
-+  distribution="arch"
- elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then
-   distribution="slackware"
- else
-@@ -382,6 +384,8 @@
-     rcalsasound=/etc/rc.d/init.d/alsasound
- elif [ -x /etc/init.d/alsa ]; then
-     rcalsasound=/etc/init.d/alsa
-+elif [ -x /etc/rc.d/alsa ]; then
-+    rcalsasound=/etc/rc.d/alsa
- else
-     rcalsasound=rcalsasound
- fi
---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2010-01-03 19:44:08.000000000 +0100
-+++ alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2010-01-03 19:44:08.000000000 +0100
-@@ -315,7 +315,7 @@
- 	3.[789]*)
- 	  ;;
- 	*)
--	  cfgout="/etc/modprobe.d/sound"
-+	  cfgout="/etc/modprobe.d/sound.conf"
- 	  cfgoldout=""
- 	  ;;
- 	esac
diff --git a/extra/audacity/audacity-1.3.13-ffmpeg.patch b/extra/audacity/audacity-1.3.13-ffmpeg.patch
deleted file mode 100644
index e76d2422b..000000000
--- a/extra/audacity/audacity-1.3.13-ffmpeg.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-Index: src/FFmpeg.h

-===================================================================

---- src/FFmpeg.h	(revision 11286)

-+++ src/FFmpeg.h	(working copy)

-@@ -47,6 +47,21 @@

-    #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)

-    #define AVSampleFormat SampleFormat

-    #endif

-+

-+   #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 120, 0)

-+   #define CodecType AVMediaType

-+   #define CODEC_TYPE_UNKNOWN    AVMEDIA_TYPE_UNKNOWN

-+   #define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO

-+   #define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO

-+   #define CODEC_TYPE_DATA       AVMEDIA_TYPE_DATA

-+   #define CODEC_TYPE_SUBTITLE   AVMEDIA_TYPE_SUBTITLE

-+   #define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT

-+   #define CODEC_TYPE_NB         AVMEDIA_TYPE_NB

-+   #endif

-+

-+   #ifndef PKT_FLAG_KEY

-+   #define PKT_FLAG_KEY          AV_PKT_FLAG_KEY

-+   #endif  

- }

- #endif

- 

-@@ -505,20 +520,23 @@

-       (AVCodecContext *avctx, AVCodec *codec),

-       (avctx, codec);

-    );

-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)

-    FFMPEG_FUNCTION_WITH_RETURN(

-       int,

-+      avcodec_decode_audio3,

-+      (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),

-+      (avctx, samples, frame_size_ptr, avpkt)

-+   );

-+#else

-+   FFMPEG_FUNCTION_WITH_RETURN(

-+      int,

-       avcodec_decode_audio2,

-       (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size),

-       (avctx, samples, frame_size_ptr, buf, buf_size)

-    );

-+#endif

-    FFMPEG_FUNCTION_WITH_RETURN(

-       int,

--      avcodec_decode_audio3,

--      (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),

--      (avctx, samples, frame_size_ptr, avpkt)

--   );

--   FFMPEG_FUNCTION_WITH_RETURN(

--      int,

-       avcodec_encode_audio,

-       (AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples),

-       (avctx, buf, buf_size, samples)

-@@ -556,13 +574,22 @@

-       (void),

-       ()

-    );

-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)

-    FFMPEG_FUNCTION_WITH_RETURN(

-       void*,

-       av_fast_realloc,

-       (void *ptr, unsigned int *size, unsigned int min_size),

-       (ptr, size, min_size)

-    );

-+#else

-    FFMPEG_FUNCTION_WITH_RETURN(

-+      void*,

-+      av_fast_realloc,

-+      (void *ptr, unsigned int *size, size_t min_size),

-+      (ptr, size, min_size)

-+   );

-+#endif

-+   FFMPEG_FUNCTION_WITH_RETURN(

-       int,

-       av_open_input_stream,

-       (AVFormatContext **ic_ptr, AVIOContext *pb, const char *filename, AVInputFormat *fmt, AVFormatParameters *ap),

-@@ -744,12 +771,21 @@

-       (AVFifoBuffer *f),

-       (f)

-    );

-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 0, 0)

-    FFMPEG_FUNCTION_WITH_RETURN(

-       void*,

-       av_malloc,

-       (unsigned int size),

-       (size)

-    );

-+#else

-+   FFMPEG_FUNCTION_WITH_RETURN(

-+      void*,

-+      av_malloc,

-+      (size_t size),

-+      (size)

-+   );

-+#endif

-    FFMPEG_FUNCTION_NO_RETURN(

-       av_freep,

-       (void *ptr),

-@@ -761,11 +797,16 @@

-       (int64_t a, AVRational bq, AVRational cq),

-       (a, bq, cq)

-    );

-+

-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)

-    FFMPEG_FUNCTION_NO_RETURN(

-       av_free_packet,

-       (AVPacket *pkt),

-       (pkt)

-    );

-+#endif

-+

-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)

-    FFMPEG_FUNCTION_WITH_RETURN(

-       AVFifoBuffer*,

-       av_fifo_alloc,

-@@ -778,8 +819,22 @@

-       (AVFifoBuffer *f, void *buf, int buf_size, void (*func)(void*, void*, int)),

-       (f, buf, buf_size, func)

-    );

-+#else

-    FFMPEG_FUNCTION_WITH_RETURN(

-       int,

-+      av_fifo_init,

-+      (AVFifoBuffer *f, unsigned int size),

-+      (f, size)

-+   );

-+   FFMPEG_FUNCTION_WITH_RETURN(

-+      int,

-+      av_fifo_generic_read,

-+      (AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest),

-+      (f, buf_size, func, dest)

-+   );

-+#endif

-+   FFMPEG_FUNCTION_WITH_RETURN(

-+      int,

-       av_fifo_realloc2,

-       (AVFifoBuffer *f, unsigned int size),

-       (f, size)

-Index: src/FFmpeg.cpp

-===================================================================

---- src/FFmpeg.cpp	(revision 11286)

-+++ src/FFmpeg.cpp	(working copy)

-@@ -186,9 +186,15 @@

-       return AVERROR(ENOMEM);

-    }

- 

--   if (flags & URL_RDWR) {

-+   // LLL:  These really should be logical AND tests, but on 2011/04/28, the URL_ open flags

-+   //       changed in the FFmpeg source to values that were not compatible with previous

-+   //       values.

-+   //

-+   //       Since Audacity doesn't use any other open flags (there aren't any others defined

-+   //       anyway), making equality tests works for older and new FFmpeg headers.

-+   if (flags == URL_RDWR) {

-       mode = wxFile::read_write;

--   } else if (flags & URL_WRONLY) {

-+   } else if (flags == URL_WRONLY) {

-       mode = wxFile::write;

-    } else {

-       mode = wxFile::read;

-@@ -222,6 +228,10 @@

- {

-    wxSeekMode mode = wxFromStart;

- 

-+#if !defined(AVSEEK_FORCE)

-+#define AVSEEK_FORCE 0

-+#endif

-+

-    switch (whence & ~AVSEEK_FORCE)

-    {

-    case (SEEK_SET):

-@@ -316,7 +326,7 @@

-    pd.buf_size = 0;

-    pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);

-    if (pd.buf == NULL) {

--      err = AVERROR_NOMEM;

-+      err = AVERROR(ENOMEM);

-       goto fail;

-    }

- 

-@@ -381,7 +391,7 @@

- 

-    // Didn't find a suitable format, so bail

-    if (!fmt) {

--      err = AVERROR_NOFMT;

-+      err = AVERROR(EILSEQ);

-       goto fail;

-    }

- 

-@@ -847,39 +857,53 @@

-    FFMPEG_INITALT(avformat, av_guess_format, guess_format);

-    FFMPEG_INITALT(avformat, av_match_ext, match_ext);

- 

--   FFMPEG_INITDYN(codec, av_init_packet);

--   FFMPEG_INITDYN(codec, av_free_packet);

--   FFMPEG_INITDYN(codec, avcodec_init);

--   FFMPEG_INITDYN(codec, avcodec_find_encoder);

--   FFMPEG_INITDYN(codec, avcodec_find_encoder_by_name);

--   FFMPEG_INITDYN(codec, avcodec_find_decoder);

--   FFMPEG_INITDYN(codec, avcodec_get_context_defaults);

--   FFMPEG_INITDYN(codec, avcodec_open);

--   FFMPEG_INITDYN(codec, avcodec_decode_audio2);

--   FFMPEG_INITDYN(codec, avcodec_decode_audio3);

--   FFMPEG_INITDYN(codec, avcodec_encode_audio);

--   FFMPEG_INITDYN(codec, avcodec_close);

--   FFMPEG_INITDYN(codec, avcodec_register_all);

--   FFMPEG_INITDYN(codec, avcodec_version);

--   FFMPEG_INITDYN(codec, av_fast_realloc);

--   FFMPEG_INITDYN(codec, av_codec_next);

--   FFMPEG_INITDYN(codec, av_get_bits_per_sample_format);

-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 58, 0)

-+   FFMPEG_INITDYN(avcodec, av_init_packet);

-+#else

-+   FFMPEG_INITDYN(avformat, av_init_packet);

-+#endif

- 

-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)

-+   FFMPEG_INITDYN(avcodec, av_free_packet);

-+#endif

-+   FFMPEG_INITDYN(avcodec, avcodec_init);

-+   FFMPEG_INITDYN(avcodec, avcodec_find_encoder);

-+   FFMPEG_INITDYN(avcodec, avcodec_find_encoder_by_name);

-+   FFMPEG_INITDYN(avcodec, avcodec_find_decoder);

-+   FFMPEG_INITDYN(avcodec, avcodec_get_context_defaults);

-+   FFMPEG_INITDYN(avcodec, avcodec_open);

-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)

-+   FFMPEG_INITDYN(avcodec, avcodec_decode_audio3);

-+#else

-+   FFMPEG_INITDYN(avcodec, avcodec_decode_audio2);

-+#endif

-+   FFMPEG_INITDYN(avcodec, avcodec_encode_audio);

-+   FFMPEG_INITDYN(avcodec, avcodec_close);

-+   FFMPEG_INITDYN(avcodec, avcodec_register_all);

-+   FFMPEG_INITDYN(avcodec, avcodec_version);

-+   FFMPEG_INITDYN(avcodec, av_fast_realloc);

-+   FFMPEG_INITDYN(avcodec, av_codec_next);

-+   FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);

-+

-    FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);

- 

--   FFMPEG_INITDYN(util, av_free);

--   FFMPEG_INITDYN(util, av_log_set_callback);

--   FFMPEG_INITDYN(util, av_log_default_callback);

--   FFMPEG_INITDYN(util, av_fifo_alloc);

--   FFMPEG_INITDYN(util, av_fifo_generic_read);

--   FFMPEG_INITDYN(util, av_fifo_realloc2);

--   FFMPEG_INITDYN(util, av_fifo_free);

--   FFMPEG_INITDYN(util, av_fifo_size);

--   FFMPEG_INITDYN(util, av_malloc);

--   FFMPEG_INITDYN(util, av_fifo_generic_write);

--   FFMPEG_INITDYN(util, av_freep);

--   FFMPEG_INITDYN(util, av_rescale_q);

--   FFMPEG_INITDYN(util, avutil_version);

-+   FFMPEG_INITDYN(avutil, av_free);

-+   FFMPEG_INITDYN(avutil, av_log_set_callback);

-+   FFMPEG_INITDYN(avutil, av_log_default_callback);

-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)

-+   FFMPEG_INITDYN(avutil, av_fifo_alloc);

-+#else

-+   FFMPEG_INITDYN(avutil, av_fifo_init);

-+#endif

-+   FFMPEG_INITDYN(avutil, av_fifo_generic_read);

-+   FFMPEG_INITDYN(avutil, av_fifo_realloc2);

-+   FFMPEG_INITDYN(avutil, av_fifo_free);

-+   FFMPEG_INITDYN(avutil, av_fifo_size);

-+   FFMPEG_INITDYN(avutil, av_malloc);

-+   FFMPEG_INITDYN(avutil, av_fifo_generic_write);

-+   FFMPEG_INITDYN(avutil, av_freep);

-+   FFMPEG_INITDYN(avutil, av_rescale_q);

-+   FFMPEG_INITDYN(avutil, avutil_version);

- 

-    //FFmpeg initialization

-    wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));

-Index: src/import/ImportFFmpeg.cpp

-===================================================================

---- src/import/ImportFFmpeg.cpp	(revision 11286)

-+++ src/import/ImportFFmpeg.cpp	(working copy)

-@@ -808,9 +808,12 @@

-       }

-    }

- 

-+

-+   sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;

-+

-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)

-    // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but

-    // also returns the number of bytes it decoded in the same parameter.

--   sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;

-    AVPacket avpkt;

-    av_init_packet(&avpkt);

-    avpkt.data = pDecode;

-@@ -820,7 +823,16 @@

-                             (int16_t *)sc->m_decodedAudioSamples,    // out

-                             &sc->m_decodedAudioSamplesValidSiz,      // in/out

-                             &avpkt);                                 // in

--

-+#else

-+   // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but

-+   // also returns the number of bytes it decoded in the same parameter.

-+   nBytesDecoded =

-+      avcodec_decode_audio2(sc->m_codecCtx, 

-+                            (int16_t *) sc->m_decodedAudioSamples,   // out

-+                            &sc->m_decodedAudioSamplesValidSiz,      // in/out

-+                            pDecode,                                 // in

-+                            nDecodeSiz);                             // in

-+#endif

-    if (nBytesDecoded < 0)

-    {

-       // Decoding failed. Don't stop.

-Index: src/export/ExportFFmpeg.cpp

-===================================================================

---- src/export/ExportFFmpeg.cpp	(revision 11286)

-+++ src/export/ExportFFmpeg.cpp	(working copy)

-@@ -154,6 +154,10 @@

-    AVFifoBuffer	 * mEncAudioFifo;				// FIFO to write incoming audio samples into

-    uint8_t         *	mEncAudioFifoOutBuf;		// buffer to read _out_ of the FIFO into

- 

-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)

-+   AVFifoBuffer      mEncAudioFifoBuffer;    // FIFO to write incoming audio samples into

-+#endif

-+

-    wxString          mName;

- 

-    int               mSubFormat;

-@@ -174,6 +178,11 @@

-    #define MAX_AUDIO_PACKET_SIZE (128 * 1024)

-    mEncAudioEncodedBufSiz = 4*MAX_AUDIO_PACKET_SIZE;

-    mEncAudioFifoOutBuf = NULL;	// buffer to read _out_ of the FIFO into

-+   

-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)

-+   mEncAudioFifo = &mEncAudioFifoBuffer;

-+#endif

-+

-    mSampleRate = 0;

-    mSupportsUTF8 = true;

- 

-@@ -350,7 +359,6 @@

-    mEncAudioCodecCtx = mEncAudioStream->codec;

-   

-    avcodec_get_context_defaults(mEncAudioCodecCtx);

--

-    mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;

-    mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;

-    mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);

-@@ -403,7 +411,9 @@

-       mEncAudioCodecCtx->flags2 = 0;

-       if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;

-       if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?

-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)

-       mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);

-+#endif

-       mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);

-       mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);

-       mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);

-@@ -487,7 +497,11 @@

-    // The encoder may require a minimum number of raw audio samples for each encoding but we can't

-    // guarantee we'll get this minimum each time an audio frame is decoded from the input file so 

-    // we use a FIFO to store up incoming raw samples until we have enough for one call to the codec.

-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)

-    mEncAudioFifo = av_fifo_alloc(1024);

-+#else

-+   av_fifo_init(mEncAudioFifo, 1024);

-+#endif

- 

-    // Allocate a buffer to read OUT of the FIFO into. The FIFO maintains its own buffer internally.

-    if ((mEncAudioFifoOutBuf = (uint8_t*)av_malloc(2*MAX_AUDIO_PACKET_SIZE)) == NULL)

-@@ -544,7 +558,11 @@

-                nFifoBytes, mEncAudioCodecCtx->frame_size);

- 

-             // Pull the bytes out from the FIFO and feed them to the encoder.

-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)

-             if (av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nFifoBytes, NULL) == 0)

-+#else

-+            if (av_fifo_generic_read(mEncAudioFifo, nFifoBytes, NULL, mEncAudioFifoOutBuf) == 0)

-+#endif

-             {

-                if (mEncAudioCodecCtx->frame_size != 1)

-                   nEncodedBytes = avcodec_encode_audio(mEncAudioCodecCtx, mEncAudioEncodedBuf, mEncAudioEncodedBufSiz, (int16_t*)mEncAudioFifoOutBuf);

-@@ -609,7 +627,10 @@

-       av_free(mEncAudioFifoOutBuf);

- 

-    av_fifo_free(mEncAudioFifo);

-+

-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)

-    mEncAudioFifo = NULL;

-+#endif

- 

-    return true;

- }

-@@ -635,7 +656,11 @@

-    // Read raw audio samples out of the FIFO in nAudioFrameSizeOut byte-sized groups to encode.

-    while ((ret = av_fifo_size(mEncAudioFifo)) >= nAudioFrameSizeOut)

-    {

-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)

-       ret = av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nAudioFrameSizeOut, NULL);

-+#else

-+      ret = av_fifo_generic_read(mEncAudioFifo, nAudioFrameSizeOut, NULL, mEncAudioFifoOutBuf);

-+#endif

- 

-       av_init_packet(&pkt);

- 

diff --git a/extra/bluez/fix-a2dp.patch b/extra/bluez/fix-a2dp.patch
deleted file mode 100644
index e4bb1372a..000000000
--- a/extra/bluez/fix-a2dp.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Thu, 26 Jan 2012 23:39:02 +0200
-Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket
- is disabled
-
-Local endpoints can only be used when UNIX socket API is available.
----
- audio/a2dp.c |   15 +++++++--------
- 1 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/audio/a2dp.c b/audio/a2dp.c
-index 5ca105c..bbb91ce 100644
---- a/audio/a2dp.c
-+++ b/audio/a2dp.c
-@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
- 
- int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- {
--	int sbc_srcs = 1, sbc_sinks = 1;
-+	int sbc_srcs = 0, sbc_sinks = 0;
- 	int mpeg12_srcs = 0, mpeg12_sinks = 0;
--	gboolean source = TRUE, sink = FALSE, socket = TRUE;
-+	gboolean source = TRUE, sink = FALSE, socket = FALSE;
- 	gboolean delay_reporting = FALSE;
- 	char *str;
- 	GError *err = NULL;
-@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 			source = TRUE;
- 		if (strstr(str, "Source"))
- 			sink = TRUE;
-+		if (strstr(str, "Socket"))
-+			socket = TRUE;
- 		g_free(str);
- 	}
- 
-@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	}
- 
- 	/* Don't register any local sep if Socket is disabled */
--	if (socket == FALSE) {
--		sbc_srcs = 0;
--		sbc_sinks = 0;
--		mpeg12_srcs = 0;
--		mpeg12_sinks = 0;
-+	if (socket == FALSE)
- 		goto proceed;
--	}
- 
- 	str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_srcs = 1;
- 	} else {
- 		sbc_srcs = atoi(str);
- 		g_free(str);
-@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_sinks = 1;
- 	} else {
- 		sbc_sinks = atoi(str);
- 		g_free(str);
--- 
-1.7.6.5
-
diff --git a/extra/bluez/fix-compile-issue.patch b/extra/bluez/fix-compile-issue.patch
deleted file mode 100644
index ddb5d94e8..000000000
--- a/extra/bluez/fix-compile-issue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4002cf271e3939714296c535a1ed8d4f0d5ac005 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@intel.com>
-Date: Mon, 16 Jan 2012 11:11:55 +0100
-Subject: [PATCH] lib: Fix compile issue when using in C++
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The compiler error is:
- /usr/include/bluetooth/bluetooth.h::131:9: error: invalid conversion from 'void*' to 'bt_get_le64(void*)::<anonymous struct>*'
- ...
-
-The reason is that C++, in contrast to C, does not allow conversion of
-void * to anything, and this code gets compiled as C++ when the app is
-written in C++. The macro with the assignment itself is older, but only
-recent Bluez starts to use it in inline functions, thus triggering the
-problem.
-
-This patch keeps the "struct __attribute__((packed))" magic and merely
-changes the typecast so that it works in C and C++. Like the existing
-macro this patch relies on support for typeof.
----
- lib/bluetooth.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/bluetooth.h b/lib/bluetooth.h
-index ea7373d..0541842 100644
---- a/lib/bluetooth.h
-+++ b/lib/bluetooth.h
-@@ -141,7 +141,7 @@ enum {
- ({						\
- 	struct __attribute__((packed)) {	\
- 		typeof(*(ptr)) __v;		\
--	} *__p = (void *) (ptr);		\
-+	} *__p = (typeof(__p)) (ptr);		\
- 	__p->__v;				\
- })
- 
-@@ -149,7 +149,7 @@ enum {
- do {						\
- 	struct __attribute__((packed)) {	\
- 		typeof(*(ptr)) __v;		\
--	} *__p = (void *) (ptr);		\
-+	} *__p = (typeof(__p)) (ptr);		\
- 	__p->__v = (val);			\
- } while(0)
- 
--- 
-1.7.6.5
-
diff --git a/extra/boost/BOOST_FOREACH.patch b/extra/boost/BOOST_FOREACH.patch
deleted file mode 100644
index 12cf08800..000000000
--- a/extra/boost/BOOST_FOREACH.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: /trunk/boost/foreach_fwd.hpp

-===================================================================

---- /trunk/boost/foreach_fwd.hpp	(revision 62661)

-+++ /trunk/boost/foreach_fwd.hpp	(revision 75540)

-@@ -15,4 +15,6 @@

- #define BOOST_FOREACH_FWD_HPP

- 

-+#include <utility> // for std::pair

-+

- // This must be at global scope, hence the uglified name

- enum boost_foreach_argument_dependent_lookup_hack

-@@ -26,4 +28,7 @@

- namespace foreach

- {

-+    template<typename T>

-+    std::pair<T, T> in_range(T begin, T end);

-+

-     ///////////////////////////////////////////////////////////////////////////////

-     // boost::foreach::tag

-@@ -47,4 +52,22 @@

- } // namespace foreach

- 

-+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131

-+namespace BOOST_FOREACH

-+{

-+    using foreach::in_range;

-+    using foreach::tag;

-+

-+    template<typename T>

-+    struct is_lightweight_proxy

-+      : foreach::is_lightweight_proxy<T>

-+    {};

-+

-+    template<typename T>

-+    struct is_noncopyable

-+      : foreach::is_noncopyable<T>

-+    {};

-+

-+} // namespace BOOST_FOREACH

-+

- } // namespace boost

- 

-Index: /trunk/boost/foreach.hpp

-===================================================================

---- /trunk/boost/foreach.hpp	(revision 75077)

-+++ /trunk/boost/foreach.hpp	(revision 75540)

-@@ -166,5 +166,5 @@

- //   at the global namespace for your type.

- template<typename T>

--inline boost::foreach::is_lightweight_proxy<T> *

-+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *

- boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }

- 

-@@ -191,5 +191,5 @@

- //   at the global namespace for your type.

- template<typename T>

--inline boost::foreach::is_noncopyable<T> *

-+inline boost::BOOST_FOREACH::is_noncopyable<T> *

- boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }

- 

diff --git a/extra/capi4k-utils/PKGBUILD b/extra/capi4k-utils/PKGBUILD
deleted file mode 100644
index 07ec42be0..000000000
--- a/extra/capi4k-utils/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 137697 2011-09-10 12:45:15Z pierre $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=capi4k-utils
-pkgver=050718
-pkgrel=8
-pkgdesc="capi utils for isdn cards"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="ftp://ftp.in-berlin.de/pub/capi4linux/"
-makedepends=('ppp')
-depends=('glibc' 'bash')
-backup=('etc/capi.conf')
-source=('ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz'
-        'ppp-2.4.4.patch'
-        'config'
-        'capi.conf'
-        'capiinit.rc'
-        'capi-compile.patch')
-options=('!libtool')
-md5sums=('c745759b6b3d64e19763727176648cdf'
-         'c5416b8b1b76a82c4bcaad76140369e1'
-         '146aa9e06588511c447d7e81dafec86a'
-         'c88940f0ace5759b7a0e8b267ca77ce2'
-         'aa59439a70299290a4d9bcdfaeafed72'
-         '4fa27c5b7b1ee60524fce875bb54bca8')
-
-build() {
-  cd $srcdir/$pkgname
-  patch -Np1 -i ../ppp-2.4.4.patch
-  # fix compiling with gcc 4.2
-  patch -Np1 -i ../capi-compile.patch
-  cp ../config .config
-  # fix pppd plugin
-  sed -i -e 's/2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3/2.4.4/g' $srcdir/$pkgname/pppdcapiplugin/Makefile
-  # patch all Makefile.* and Rules.make to use our CFLAGS
-  sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make
-  # Arch64 fix from Gentoo
-  # patch capi20/Makefile.* to use -fPIC for shared library
-  [ "$CARCH" = "x86_64" ] &&  (sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.*)
-  cd capi20
-  aclocal
-  libtoolize --copy --force
-  cd $srcdir/$pkgname
-  make subconfig
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname
-  make DESTDIR=$pkgdir install
-  install -m755 -D $srcdir/capiinit.rc $pkgdir/etc/rc.d/capiinit
-  install -m644 $srcdir/capi.conf $pkgdir/etc
-  cd $pkgdir/usr/lib
-  ln -s libcapi20 libcapi20.so.2
-  # fix wrong manpage permission
-  chmod 644 $pkgdir/usr/share/man/man8/capiplugin.8
-}
diff --git a/extra/capi4k-utils/capi-compile.patch b/extra/capi4k-utils/capi-compile.patch
deleted file mode 100644
index e6b3acb3b..000000000
--- a/extra/capi4k-utils/capi-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- capi4k-utils/capi20/capi20.h~	2000-11-19 11:15:01.000000000 +0100
-+++ capi4k-utils/capi20/capi20.h	2007-11-12 12:07:30.000000000 +0100
-@@ -21,6 +21,7 @@
- #define __CAPI20_H__
- 
- #include <sys/time.h>
-+#include <sys/types.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/extra/capi4k-utils/capi.conf b/extra/capi4k-utils/capi.conf
deleted file mode 100644
index c6b35751f..000000000
--- a/extra/capi4k-utils/capi.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# card		file	proto	io	irq	mem	cardnr	options
-#b1isa		b1.t4	DSS1	0x150	7	-	-	P2P
-#b1pci		b1.t4	DSS1	-	-	-	-
-#c4		c4.bin	DSS1	-	-	-	-
-#c4		-	DSS1	-	-	-	-
-#c4		-	DSS1	-	-	-	-	P2P
-#c4		-	DSS1	-	-	-	-	P2P
-#c2		c2.bin	DSS1	-	-	-	-
-#c2		-	DSS1	-	-	-	-
-#t1isa		t1.t4	DSS1	0x340	9	-	0
-#t1pci		t1.t4	DSS1	-	-	-	-
-#fcpci		-	-	-	-	-	-
-#fcclassic	-	-	0x150	10	-	-
-#fcpcmcia	-	-	-	-	-	-
\ No newline at end of file
diff --git a/extra/capi4k-utils/capiinit.rc b/extra/capi4k-utils/capiinit.rc
deleted file mode 100755
index 841be67f3..000000000
--- a/extra/capi4k-utils/capiinit.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/capiinit`
-case "$1" in
-  start)
-    stat_busy "Starting capiinit"
-    [ -f /proc/capi/capi20 ] || /sbin/modprobe -s capi
-
-    CNT=0  # wait for udev
-	while [ ! -e /dev/capi20 -a $CNT -lt 10 ]; do
-		sleep 1; : $((CNT++))
-	done
-
-    if [ -z "$PID" ]; then
-       /usr/sbin/capiinit 2>/dev/null start
-    fi
-    
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon capiinit
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping capiinit"
-    /usr/sbin/capiinit 2>/dev/null stop
-    /sbin/modprobe -sqr capi
-    rm_daemon capiinit
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/capi4k-utils/config b/extra/capi4k-utils/config
deleted file mode 100644
index 6ca0dfd61..000000000
--- a/extra/capi4k-utils/config
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-CONFIG_KERNELDIR='/usr/src/$(uname -r)'
-CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/usr/sbin'
-CONFIG_MANDIR='/usr/share/man'
-CONFIG_AVMCAPICTRL=y
-CONFIG_CAPIFAX=y
-CONFIG_RCAPID=y
-CONFIG_PPPDCAPIPLUGIN=y
diff --git a/extra/capi4k-utils/ppp-2.4.4.patch b/extra/capi4k-utils/ppp-2.4.4.patch
deleted file mode 100644
index 24a06a63b..000000000
--- a/extra/capi4k-utils/ppp-2.4.4.patch
+++ /dev/null
@@ -1,1874 +0,0 @@
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/Makefile capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/Makefile
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/Makefile	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,14 @@
-+# Makefile for the capiplugin for pppd(8).
-+#
-+# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de)
-+# Copyright 2000 AVM GmbH Berlin (info@avm.de)
-+#
-+#  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.
-+
-+PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+
-+include $(TOPDIR)/Rules.make
-+
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,4 @@
-+/* $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ */
-+
-+#define VERSION		"2.4.4"
-+#define DATE		"28 June 2006"
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,909 @@
-+/*
-+ * pppd.h - PPP daemon global declarations.
-+ *
-+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For permission or any legal
-+ *    details, please contact
-+ *      Office of Technology Transfer
-+ *      Carnegie Mellon University
-+ *      5000 Forbes Avenue
-+ *      Pittsburgh, PA  15213-3890
-+ *      (412) 268-4387, fax: (412) 268-7395
-+ *      tech-transfer@andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by Computing Services
-+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY 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.
-+ *
-+ * $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $
-+ */
-+
-+/*
-+ * TODO:
-+ */
-+
-+#ifndef __PPPD_H__
-+#define __PPPD_H__
-+
-+#include <stdio.h>		/* for FILE */
-+#include <limits.h>		/* for NGROUPS_MAX */
-+#include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
-+#include <sys/types.h>		/* for u_int32_t, if defined */
-+#include <sys/time.h>		/* for struct timeval */
-+#include <net/ppp_defs.h>
-+#include "patchlevel.h"
-+
-+#if defined(__STDC__)
-+#include <stdarg.h>
-+#define __V(x)	x
-+#else
-+#include <varargs.h>
-+#define __V(x)	(va_alist) va_dcl
-+#define const
-+#define volatile
-+#endif
-+
-+#ifdef INET6
-+#include "eui64.h"
-+#endif
-+
-+/*
-+ * Limits.
-+ */
-+
-+#define NUM_PPP		1	/* One PPP interface supported (per process) */
-+#define MAXWORDLEN	1024	/* max length of word in file (incl null) */
-+#define MAXARGS		1	/* max # args to a command */
-+#define MAXNAMELEN	256	/* max length of hostname or name for auth */
-+#define MAXSECRETLEN	256	/* max length of password or secret */
-+
-+/*
-+ * Option descriptor structure.
-+ */
-+
-+typedef unsigned char	bool;
-+
-+enum opt_type {
-+	o_special_noarg = 0,
-+	o_special = 1,
-+	o_bool,
-+	o_int,
-+	o_uint32,
-+	o_string,
-+	o_wild
-+};
-+
-+typedef struct {
-+	char	*name;		/* name of the option */
-+	enum opt_type type;
-+	void	*addr;
-+	char	*description;
-+	unsigned int flags;
-+	void	*addr2;
-+	int	upper_limit;
-+	int	lower_limit;
-+	const char *source;
-+	short int priority;
-+	short int winner;
-+} option_t;
-+
-+/* Values for flags */
-+#define OPT_VALUE	0xff	/* mask for presupplied value */
-+#define OPT_HEX		0x100	/* int option is in hex */
-+#define OPT_NOARG	0x200	/* option doesn't take argument */
-+#define OPT_OR		0x400	/* OR in argument to value */
-+#define OPT_INC		0x800	/* increment value */
-+#define OPT_A2OR	0x800	/* for o_bool, OR arg to *(u_char *)addr2 */
-+#define OPT_PRIV	0x1000	/* privileged option */
-+#define OPT_STATIC	0x2000	/* string option goes into static array */
-+#define OPT_LLIMIT	0x4000	/* check value against lower limit */
-+#define OPT_ULIMIT	0x8000	/* check value against upper limit */
-+#define OPT_LIMITS	(OPT_LLIMIT|OPT_ULIMIT)
-+#define OPT_ZEROOK	0x10000	/* 0 value is OK even if not within limits */
-+#define OPT_HIDE	0x10000	/* for o_string, print value as ?????? */
-+#define OPT_A2LIST	0x10000 /* for o_special, keep list of values */
-+#define OPT_A2CLRB	0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
-+#define OPT_NOINCR	0x20000	/* value mustn't be increased */
-+#define OPT_ZEROINF	0x40000	/* with OPT_NOINCR, 0 == infinity */
-+#define OPT_PRIO	0x80000	/* process option priorities for this option */
-+#define OPT_PRIOSUB	0x100000 /* subsidiary member of priority group */
-+#define OPT_ALIAS	0x200000 /* option is alias for previous option */
-+#define OPT_A2COPY	0x400000 /* addr2 -> second location to rcv value */
-+#define OPT_ENABLE	0x800000 /* use *addr2 as enable for option */
-+#define OPT_A2CLR	0x1000000 /* clear *(bool *)addr2 */
-+#define OPT_PRIVFIX	0x2000000 /* user can't override if set by root */
-+#define OPT_INITONLY	0x4000000 /* option can only be set in init phase */
-+#define OPT_DEVEQUIV	0x8000000 /* equiv to device name */
-+#define OPT_DEVNAM	(OPT_INITONLY | OPT_DEVEQUIV)
-+#define OPT_A2PRINTER	0x10000000 /* *addr2 is a fn for printing option */
-+#define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
-+#define OPT_NOPRINT	0x40000000 /* don't print this option at all */
-+
-+#define OPT_VAL(x)	((x) & OPT_VALUE)
-+
-+/* Values for priority */
-+#define OPRIO_DEFAULT	0	/* a default value */
-+#define OPRIO_CFGFILE	1	/* value from a configuration file */
-+#define OPRIO_CMDLINE	2	/* value from the command line */
-+#define OPRIO_SECFILE	3	/* value from options in a secrets file */
-+#define OPRIO_ROOT	100	/* added to priority if OPT_PRIVFIX && root */
-+
-+#ifndef GIDSET_TYPE
-+#define GIDSET_TYPE	gid_t
-+#endif
-+
-+/* Structure representing a list of permitted IP addresses. */
-+struct permitted_ip {
-+    int		permit;		/* 1 = permit, 0 = forbid */
-+    u_int32_t	base;		/* match if (addr & mask) == base */
-+    u_int32_t	mask;		/* base and mask are in network byte order */
-+};
-+
-+/*
-+ * Unfortunately, the linux kernel driver uses a different structure
-+ * for statistics from the rest of the ports.
-+ * This structure serves as a common representation for the bits
-+ * pppd needs.
-+ */
-+struct pppd_stats {
-+    unsigned int	bytes_in;
-+    unsigned int	bytes_out;
-+    unsigned int	pkts_in;
-+    unsigned int	pkts_out;
-+};
-+
-+/* Used for storing a sequence of words.  Usually malloced. */
-+struct wordlist {
-+    struct wordlist	*next;
-+    char		*word;
-+};
-+
-+/* An endpoint discriminator, used with multilink. */
-+#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
-+struct epdisc {
-+    unsigned char	class;
-+    unsigned char	length;
-+    unsigned char	value[MAX_ENDP_LEN];
-+};
-+
-+/* values for epdisc.class */
-+#define EPD_NULL	0	/* null discriminator, no data */
-+#define EPD_LOCAL	1
-+#define EPD_IP		2
-+#define EPD_MAC		3
-+#define EPD_MAGIC	4
-+#define EPD_PHONENUM	5
-+
-+typedef void (*notify_func) __P((void *, int));
-+
-+struct notifier {
-+    struct notifier *next;
-+    notify_func	    func;
-+    void	    *arg;
-+};
-+
-+/*
-+ * Global variables.
-+ */
-+
-+extern int	hungup;		/* Physical layer has disconnected */
-+extern int	ifunit;		/* Interface unit number */
-+extern char	ifname[];	/* Interface name */
-+extern char	hostname[];	/* Our hostname */
-+extern u_char	outpacket_buf[]; /* Buffer for outgoing packets */
-+extern int	devfd;		/* fd of underlying device */
-+extern int	fd_ppp;		/* fd for talking PPP */
-+extern int	phase;		/* Current state of link - see values below */
-+extern int	baud_rate;	/* Current link speed in bits/sec */
-+extern char	*progname;	/* Name of this program */
-+extern int	redirect_stderr;/* Connector's stderr should go to file */
-+extern char	peer_authname[];/* Authenticated name of peer */
-+extern int	auth_done[NUM_PPP]; /* Methods actually used for auth */
-+extern int	privileged;	/* We were run by real-uid root */
-+extern int	need_holdoff;	/* Need holdoff period after link terminates */
-+extern char	**script_env;	/* Environment variables for scripts */
-+extern int	detached;	/* Have detached from controlling tty */
-+extern GIDSET_TYPE groups[NGROUPS_MAX];	/* groups the user is in */
-+extern int	ngroups;	/* How many groups valid in groups */
-+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
-+extern int	link_stats_valid; /* set if link_stats is valid */
-+extern unsigned	link_connect_time; /* time the link was up for */
-+extern int	using_pty;	/* using pty as device (notty or pty opt.) */
-+extern int	log_to_fd;	/* logging to this fd as well as syslog */
-+extern bool	log_default;	/* log_to_fd is default (stdout) */
-+extern char	*no_ppp_msg;	/* message to print if ppp not in kernel */
-+extern volatile int status;	/* exit status for pppd */
-+extern bool	devnam_fixed;	/* can no longer change devnam */
-+extern int	unsuccess;	/* # unsuccessful connection attempts */
-+extern int	do_callback;	/* set if we want to do callback next */
-+extern int	doing_callback;	/* set if this is a callback */
-+extern int	error_count;	/* # of times error() has been called */
-+extern char	ppp_devnam[MAXPATHLEN];
-+extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
-+extern int      ppp_session_number; /* Session number (eg PPPoE session) */
-+extern int	fd_devnull;	/* fd open to /dev/null */
-+
-+extern int	listen_time;	/* time to listen first (ms) */
-+extern bool	doing_multilink;
-+extern bool	multilink_master;
-+extern bool	bundle_eof;
-+extern bool	bundle_terminating;
-+
-+extern struct notifier *pidchange;   /* for notifications of pid changing */
-+extern struct notifier *phasechange; /* for notifications of phase changes */
-+extern struct notifier *exitnotify;  /* for notification that we're exiting */
-+extern struct notifier *sigreceived; /* notification of received signal */
-+extern struct notifier *ip_up_notifier; /* IPCP has come up */
-+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
-+extern struct notifier *auth_up_notifier; /* peer has authenticated */
-+extern struct notifier *link_down_notifier; /* link has gone down */
-+extern struct notifier *fork_notifier;	/* we are a new child process */
-+
-+/* Values for do_callback and doing_callback */
-+#define CALLBACK_DIALIN		1	/* we are expecting the call back */
-+#define CALLBACK_DIALOUT	2	/* we are dialling out to call back */
-+
-+/*
-+ * Variables set by command-line options.
-+ */
-+
-+extern int	debug;		/* Debug flag */
-+extern int	kdebugflag;	/* Tell kernel to print debug messages */
-+extern int	default_device;	/* Using /dev/tty or equivalent */
-+extern char	devnam[MAXPATHLEN];	/* Device name */
-+extern int	crtscts;	/* Use hardware flow control */
-+extern bool	modem;		/* Use modem control lines */
-+extern int	inspeed;	/* Input/Output speed requested */
-+extern u_int32_t netmask;	/* IP netmask to set on interface */
-+extern bool	lockflag;	/* Create lock file to lock the serial dev */
-+extern bool	nodetach;	/* Don't detach from controlling tty */
-+extern bool	updetach;	/* Detach from controlling tty when link up */
-+extern char	*initializer;	/* Script to initialize physical link */
-+extern char	*connect_script; /* Script to establish physical link */
-+extern char	*disconnect_script; /* Script to disestablish physical link */
-+extern char	*welcomer;	/* Script to welcome client after connection */
-+extern char	*ptycommand;	/* Command to run on other side of pty */
-+extern int	maxconnect;	/* Maximum connect time (seconds) */
-+extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
-+extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
-+extern bool	auth_required;	/* Peer is required to authenticate */
-+extern bool	persist;	/* Reopen link after it goes down */
-+extern bool	uselogin;	/* Use /etc/passwd for checking PAP */
-+extern char	our_name[MAXNAMELEN];/* Our name for authentication purposes */
-+extern char	remote_name[MAXNAMELEN]; /* Peer's name for authentication */
-+extern bool	explicit_remote;/* remote_name specified with remotename opt */
-+extern bool	demand;		/* Do dial-on-demand */
-+extern char	*ipparam;	/* Extra parameter for ip up/down scripts */
-+extern bool	cryptpap;	/* Others' PAP passwords are encrypted */
-+extern int	idle_time_limit;/* Shut down link if idle for this long */
-+extern int	holdoff;	/* Dead time before restarting */
-+extern bool	holdoff_specified; /* true if user gave a holdoff value */
-+extern bool	notty;		/* Stdin/out is not a tty */
-+extern char	*pty_socket;	/* Socket to connect to pty */
-+extern char	*record_file;	/* File to record chars sent/received */
-+extern bool	sync_serial;	/* Device is synchronous serial device */
-+extern int	maxfail;	/* Max # of unsuccessful connection attempts */
-+extern char	linkname[MAXPATHLEN]; /* logical name for link */
-+extern bool	tune_kernel;	/* May alter kernel settings as necessary */
-+extern int	connect_delay;	/* Time to delay after connect script */
-+extern int	max_data_rate;	/* max bytes/sec through charshunt */
-+extern int	req_unit;	/* interface unit number to use */
-+extern char	path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
-+extern char	path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
-+extern bool	multilink;	/* enable multilink operation */
-+extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
-+extern char	*bundle_name;	/* bundle name for multilink */
-+extern bool	dump_options;	/* print out option values */
-+extern bool	dryrun;		/* check everything, print options, exit */
-+extern int	child_wait;	/* # seconds to wait for children at end */
-+
-+#ifdef MAXOCTETS
-+extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
-+extern int       maxoctets_dir;      /* Direction :
-+				      0 - in+out (default)
-+				      1 - in 
-+				      2 - out
-+				      3 - max(in,out) */
-+extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-+#define PPP_OCTETS_DIRECTION_SUM        0
-+#define PPP_OCTETS_DIRECTION_IN         1
-+#define PPP_OCTETS_DIRECTION_OUT        2
-+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
-+/* same as previos, but little different on RADIUS side */
-+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
-+#endif
-+
-+#ifdef PPP_FILTER
-+extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
-+extern struct	bpf_program active_filter; /* Filter for link-active pkts */
-+#endif
-+
-+#ifdef MSLANMAN
-+extern bool	ms_lanman;	/* Use LanMan password instead of NT */
-+				/* Has meaning only with MS-CHAP challenges */
-+#endif
-+
-+/* Values for auth_pending, auth_done */
-+#define PAP_WITHPEER	0x1
-+#define PAP_PEER	0x2
-+#define CHAP_WITHPEER	0x4
-+#define CHAP_PEER	0x8
-+#define EAP_WITHPEER	0x10
-+#define EAP_PEER	0x20
-+
-+/* Values for auth_done only */
-+#define CHAP_MD5_WITHPEER	0x40
-+#define CHAP_MD5_PEER		0x80
-+#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
-+#define CHAP_MS_WITHPEER	0x100
-+#define CHAP_MS_PEER		0x200
-+#define CHAP_MS2_WITHPEER	0x400
-+#define CHAP_MS2_PEER		0x800
-+
-+extern char *current_option;	/* the name of the option being parsed */
-+extern int  privileged_option;	/* set iff the current option came from root */
-+extern char *option_source;	/* string saying where the option came from */
-+extern int  option_priority;	/* priority of current options */
-+
-+/*
-+ * Values for phase.
-+ */
-+#define PHASE_DEAD		0
-+#define PHASE_INITIALIZE	1
-+#define PHASE_SERIALCONN	2
-+#define PHASE_DORMANT		3
-+#define PHASE_ESTABLISH		4
-+#define PHASE_AUTHENTICATE	5
-+#define PHASE_CALLBACK		6
-+#define PHASE_NETWORK		7
-+#define PHASE_RUNNING		8
-+#define PHASE_TERMINATE		9
-+#define PHASE_DISCONNECT	10
-+#define PHASE_HOLDOFF		11
-+#define PHASE_MASTER		12
-+
-+/*
-+ * The following struct gives the addresses of procedures to call
-+ * for a particular protocol.
-+ */
-+struct protent {
-+    u_short protocol;		/* PPP protocol number */
-+    /* Initialization procedure */
-+    void (*init) __P((int unit));
-+    /* Process a received packet */
-+    void (*input) __P((int unit, u_char *pkt, int len));
-+    /* Process a received protocol-reject */
-+    void (*protrej) __P((int unit));
-+    /* Lower layer has come up */
-+    void (*lowerup) __P((int unit));
-+    /* Lower layer has gone down */
-+    void (*lowerdown) __P((int unit));
-+    /* Open the protocol */
-+    void (*open) __P((int unit));
-+    /* Close the protocol */
-+    void (*close) __P((int unit, char *reason));
-+    /* Print a packet in readable form */
-+    int  (*printpkt) __P((u_char *pkt, int len,
-+			  void (*printer) __P((void *, char *, ...)),
-+			  void *arg));
-+    /* Process a received data packet */
-+    void (*datainput) __P((int unit, u_char *pkt, int len));
-+    bool enabled_flag;		/* 0 iff protocol is disabled */
-+    char *name;			/* Text name of protocol */
-+    char *data_name;		/* Text name of corresponding data protocol */
-+    option_t *options;		/* List of command-line options */
-+    /* Check requested options, assign defaults */
-+    void (*check_options) __P((void));
-+    /* Configure interface for demand-dial */
-+    int  (*demand_conf) __P((int unit));
-+    /* Say whether to bring up link for this pkt */
-+    int  (*active_pkt) __P((u_char *pkt, int len));
-+};
-+
-+/* Table of pointers to supported protocols */
-+extern struct protent *protocols[];
-+
-+/*
-+ * This struct contains pointers to a set of procedures for
-+ * doing operations on a "channel".  A channel provides a way
-+ * to send and receive PPP packets - the canonical example is
-+ * a serial port device in PPP line discipline (or equivalently
-+ * with PPP STREAMS modules pushed onto it).
-+ */
-+struct channel {
-+	/* set of options for this channel */
-+	option_t *options;
-+	/* find and process a per-channel options file */
-+	void (*process_extra_options) __P((void));
-+	/* check all the options that have been given */
-+	void (*check_options) __P((void));
-+	/* get the channel ready to do PPP, return a file descriptor */
-+	int  (*connect) __P((void));
-+	/* we're finished with the channel */
-+	void (*disconnect) __P((void));
-+	/* put the channel into PPP `mode' */
-+	int  (*establish_ppp) __P((int));
-+	/* take the channel out of PPP `mode', restore loopback if demand */
-+	void (*disestablish_ppp) __P((int));
-+	/* set the transmit-side PPP parameters of the channel */
-+	void (*send_config) __P((int, u_int32_t, int, int));
-+	/* set the receive-side PPP parameters of the channel */
-+	void (*recv_config) __P((int, u_int32_t, int, int));
-+	/* cleanup on error or normal exit */
-+	void (*cleanup) __P((void));
-+	/* close the device, called in children after fork */
-+	void (*close) __P((void));
-+};
-+
-+extern struct channel *the_channel;
-+
-+/*
-+ * Prototypes.
-+ */
-+
-+/* Procedures exported from main.c. */
-+void set_ifunit __P((int));	/* set stuff that depends on ifunit */
-+void detach __P((void));	/* Detach from controlling tty */
-+void die __P((int));		/* Cleanup and exit */
-+void quit __P((void));		/* like die(1) */
-+void novm __P((char *));	/* Say we ran out of memory, and die */
-+void timeout __P((void (*func)(void *), void *arg, int s, int us));
-+				/* Call func(arg) after s.us seconds */
-+void untimeout __P((void (*func)(void *), void *arg));
-+				/* Cancel call to func(arg) */
-+void record_child __P((int, char *, void (*) (void *), void *));
-+pid_t safe_fork __P((int, int, int));	/* Fork & close stuff in child */
-+int  device_script __P((char *cmd, int in, int out, int dont_wait));
-+				/* Run `cmd' with given stdin and stdout */
-+pid_t run_program __P((char *prog, char **args, int must_exist,
-+		       void (*done)(void *), void *arg, int wait));
-+				/* Run program prog with args in child */
-+void reopen_log __P((void));	/* (re)open the connection to syslog */
-+void print_link_stats __P((void)); /* Print stats, if available */
-+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
-+void update_link_stats __P((int)); /* Get stats at link termination */
-+void script_setenv __P((char *, char *, int));	/* set script env var */
-+void script_unsetenv __P((char *));		/* unset script env var */
-+void new_phase __P((int));	/* signal start of new phase */
-+void add_notifier __P((struct notifier **, notify_func, void *));
-+void remove_notifier __P((struct notifier **, notify_func, void *));
-+void notify __P((struct notifier *, int));
-+int  ppp_send_config __P((int, int, u_int32_t, int, int));
-+int  ppp_recv_config __P((int, int, u_int32_t, int, int));
-+const char *protocol_name __P((int));
-+void remove_pidfiles __P((void));
-+void lock_db __P((void));
-+void unlock_db __P((void));
-+
-+/* Procedures exported from tty.c. */
-+void tty_init __P((void));
-+
-+/* Procedures exported from utils.c. */
-+void log_packet __P((u_char *, int, char *, int));
-+				/* Format a packet and log it with syslog */
-+void print_string __P((char *, int,  void (*) (void *, char *, ...),
-+		void *));	/* Format a string for output */
-+int slprintf __P((char *, int, char *, ...));		/* sprintf++ */
-+int vslprintf __P((char *, int, char *, va_list));	/* vsprintf++ */
-+size_t strlcpy __P((char *, const char *, size_t));	/* safe strcpy */
-+size_t strlcat __P((char *, const char *, size_t));	/* safe strncpy */
-+void dbglog __P((char *, ...));	/* log a debug message */
-+void info __P((char *, ...));	/* log an informational message */
-+void notice __P((char *, ...));	/* log a notice-level message */
-+void warn __P((char *, ...));	/* log a warning message */
-+void error __P((char *, ...));	/* log an error message */
-+void fatal __P((char *, ...));	/* log an error message and die(1) */
-+void init_pr_log __P((char *, int));	/* initialize for using pr_log */
-+void pr_log __P((void *, char *, ...));	/* printer fn, output to syslog */
-+void end_pr_log __P((void));	/* finish up after using pr_log */
-+void dump_packet __P((const char *, u_char *, int));
-+				/* dump packet to debug log if interesting */
-+ssize_t complete_read __P((int, void *, size_t));
-+				/* read a complete buffer */
-+
-+/* Procedures exported from auth.c */
-+void link_required __P((int));	  /* we are starting to use the link */
-+void start_link __P((int));	  /* bring the link up now */
-+void link_terminated __P((int));  /* we are finished with the link */
-+void link_down __P((int));	  /* the LCP layer has left the Opened state */
-+void upper_layers_down __P((int));/* take all NCPs down */
-+void link_established __P((int)); /* the link is up; authenticate now */
-+void start_networks __P((int));   /* start all the network control protos */
-+void continue_networks __P((int)); /* start network [ip, etc] control protos */
-+void np_up __P((int, int));	  /* a network protocol has come up */
-+void np_down __P((int, int));	  /* a network protocol has gone down */
-+void np_finished __P((int, int)); /* a network protocol no longer needs link */
-+void auth_peer_fail __P((int, int));
-+				/* peer failed to authenticate itself */
-+void auth_peer_success __P((int, int, int, char *, int));
-+				/* peer successfully authenticated itself */
-+void auth_withpeer_fail __P((int, int));
-+				/* we failed to authenticate ourselves */
-+void auth_withpeer_success __P((int, int, int));
-+				/* we successfully authenticated ourselves */
-+void auth_check_options __P((void));
-+				/* check authentication options supplied */
-+void auth_reset __P((int));	/* check what secrets we have */
-+int  check_passwd __P((int, char *, int, char *, int, char **));
-+				/* Check peer-supplied username/password */
-+int  get_secret __P((int, char *, char *, char *, int *, int));
-+				/* get "secret" for chap */
-+int  get_srp_secret __P((int unit, char *client, char *server, char *secret,
-+    int am_server));
-+int  auth_ip_addr __P((int, u_int32_t));
-+				/* check if IP address is authorized */
-+int  auth_number __P((void));	/* check if remote number is authorized */
-+int  bad_ip_adrs __P((u_int32_t));
-+				/* check if IP address is unreasonable */
-+
-+/* Procedures exported from demand.c */
-+void demand_conf __P((void));	/* config interface(s) for demand-dial */
-+void demand_block __P((void));	/* set all NPs to queue up packets */
-+void demand_unblock __P((void)); /* set all NPs to pass packets */
-+void demand_discard __P((void)); /* set all NPs to discard packets */
-+void demand_rexmit __P((int, u_int32_t)); /* retransmit saved frames for an NP*/
-+int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
-+int  loop_frame __P((unsigned char *, int)); /* should we bring link up? */
-+
-+/* Procedures exported from multilink.c */
-+#ifdef HAVE_MULTILINK
-+void mp_check_options __P((void)); /* Check multilink-related options */
-+int  mp_join_bundle __P((void));  /* join our link to an appropriate bundle */
-+void mp_exit_bundle __P((void));  /* have disconnected our link from bundle */
-+void mp_bundle_terminated __P((void));
-+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
-+int  str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
-+#else
-+#define mp_bundle_terminated()	/* nothing */
-+#define mp_exit_bundle()	/* nothing */
-+#define doing_multilink		0
-+#define multilink_master	0
-+#endif
-+
-+/* Procedures exported from sys-*.c */
-+void sys_init __P((void));	/* Do system-dependent initialization */
-+void sys_cleanup __P((void));	/* Restore system state before exiting */
-+int  sys_check_options __P((void)); /* Check options specified */
-+void sys_close __P((void));	/* Clean up in a child before execing */
-+int  ppp_available __P((void));	/* Test whether ppp kernel support exists */
-+int  get_pty __P((int *, int *, char *, int));	/* Get pty master/slave */
-+int  open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
-+int  tty_establish_ppp __P((int));  /* Turn serial port into a ppp interface */
-+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
-+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
-+int  generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
-+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
-+int  bundle_attach __P((int));	/* Attach link to existing bundle */
-+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
-+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
-+void clean_check __P((void));	/* Check if line was 8-bit clean */
-+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
-+void restore_tty __P((int));	/* Restore port's original parameters */
-+void setdtr __P((int, int));	/* Raise or lower port's DTR line */
-+void output __P((int, u_char *, int)); /* Output a PPP packet */
-+void wait_input __P((struct timeval *));
-+				/* Wait for input, with timeout */
-+void add_fd __P((int));		/* Add fd to set to wait for */
-+void remove_fd __P((int));	/* Remove fd from set to wait for */
-+int  read_packet __P((u_char *)); /* Read PPP packet */
-+int  get_loop_output __P((void)); /* Read pkts from loopback */
-+void tty_send_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f transmit parameters */
-+void tty_set_xaccm __P((ext_accm));
-+				/* Set extended transmit ACCM */
-+void tty_recv_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f receive parameters */
-+int  ccp_test __P((int, u_char *, int, int));
-+				/* Test support for compression scheme */
-+void ccp_flags_set __P((int, int, int));
-+				/* Set kernel CCP state */
-+int  ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
-+int  get_idle_time __P((int, struct ppp_idle *));
-+				/* Find out how long link has been idle */
-+int  get_ppp_stats __P((int, struct pppd_stats *));
-+				/* Return link statistics */
-+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
-+int  netif_get_mtu __P((int));      /* Get PPP interface MTU */
-+int  sifvjcomp __P((int, int, int, int));
-+				/* Configure VJ TCP header compression */
-+int  sifup __P((int));		/* Configure i/f up for one protocol */
-+int  sifnpmode __P((int u, int proto, enum NPmode mode));
-+				/* Set mode for handling packets for proto */
-+int  sifdown __P((int));	/* Configure i/f down for one protocol */
-+int  sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
-+				/* Configure IPv4 addresses for i/f */
-+int  cifaddr __P((int, u_int32_t, u_int32_t));
-+				/* Reset i/f IP addresses */
-+#ifdef INET6
-+int  sif6addr __P((int, eui64_t, eui64_t));
-+				/* Configure IPv6 addresses for i/f */
-+int  cif6addr __P((int, eui64_t, eui64_t));
-+				/* Remove an IPv6 address from i/f */
-+#endif
-+int  sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
-+				/* Create default route through i/f */
-+int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
-+				/* Delete default route through i/f */
-+int  sifproxyarp __P((int, u_int32_t));
-+				/* Add proxy ARP entry for peer */
-+int  cifproxyarp __P((int, u_int32_t));
-+				/* Delete proxy ARP entry for peer */
-+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
-+int  lock __P((char *));	/* Create lock file for device */
-+int  relock __P((int));		/* Rewrite lock file with new pid */
-+void unlock __P((void));	/* Delete previously-created lock file */
-+void logwtmp __P((const char *, const char *, const char *));
-+				/* Write entry to wtmp file */
-+int  get_host_seed __P((void));	/* Get host-dependent random number seed */
-+int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
-+#ifdef PPP_FILTER
-+int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
-+				/* Set filter programs in kernel */
-+#endif
-+#ifdef IPX_CHANGE
-+int  sipxfaddr __P((int, unsigned long, unsigned char *));
-+int  cipxfaddr __P((int));
-+#endif
-+int  get_if_hwaddr __P((u_char *addr, char *name));
-+char *get_first_ethernet __P((void));
-+
-+/* Procedures exported from options.c */
-+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
-+int  parse_args __P((int argc, char **argv));
-+				/* Parse options from arguments given */
-+int  options_from_file __P((char *filename, int must_exist, int check_prot,
-+			    int privileged));
-+				/* Parse options from an options file */
-+int  options_from_user __P((void)); /* Parse options from user's .ppprc */
-+int  options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
-+int  options_from_list __P((struct wordlist *, int privileged));
-+				/* Parse options from a wordlist */
-+int  getword __P((FILE *f, char *word, int *newlinep, char *filename));
-+				/* Read a word from a file */
-+void option_error __P((char *fmt, ...));
-+				/* Print an error message about an option */
-+int int_option __P((char *, int *));
-+				/* Simplified number_option for decimal ints */
-+void add_options __P((option_t *)); /* Add extra options */
-+void check_options __P((void));	/* check values after all options parsed */
-+int  override_value __P((const char *, int, const char *));
-+				/* override value if permitted by priority */
-+void print_options __P((void (*) __P((void *, char *, ...)), void *));
-+				/* print out values of all options */
-+
-+int parse_dotted_ip __P((char *, u_int32_t *));
-+
-+/*
-+ * Hooks to enable plugins to change various things.
-+ */
-+extern int (*new_phase_hook) __P((int));
-+extern int (*idle_time_hook) __P((struct ppp_idle *));
-+extern int (*holdoff_hook) __P((void));
-+extern int (*pap_check_hook) __P((void));
-+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
-+				 struct wordlist **paddrs,
-+				 struct wordlist **popts));
-+extern void (*pap_logout_hook) __P((void));
-+extern int (*pap_passwd_hook) __P((char *user, char *passwd));
-+extern int (*allowed_address_hook) __P((u_int32_t addr));
-+extern void (*ip_up_hook) __P((void));
-+extern void (*ip_down_hook) __P((void));
-+extern void (*ip_choose_hook) __P((u_int32_t *));
-+
-+extern int (*chap_check_hook) __P((void));
-+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
-+
-+/* Let a plugin snoop sent and received packets.  Useful for L2TP */
-+extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
-+extern void (*snoop_send_hook) __P((unsigned char *p, int len));
-+
-+/*
-+ * Inline versions of get/put char/short/long.
-+ * Pointer is advanced; we assume that both arguments
-+ * are lvalues and will already be in registers.
-+ * cp MUST be u_char *.
-+ */
-+#define GETCHAR(c, cp) { \
-+	(c) = *(cp)++; \
-+}
-+#define PUTCHAR(c, cp) { \
-+	*(cp)++ = (u_char) (c); \
-+}
-+
-+
-+#define GETSHORT(s, cp) { \
-+	(s) = *(cp)++ << 8; \
-+	(s) |= *(cp)++; \
-+}
-+#define PUTSHORT(s, cp) { \
-+	*(cp)++ = (u_char) ((s) >> 8); \
-+	*(cp)++ = (u_char) (s); \
-+}
-+
-+#define GETLONG(l, cp) { \
-+	(l) = *(cp)++ << 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; \
-+}
-+#define PUTLONG(l, cp) { \
-+	*(cp)++ = (u_char) ((l) >> 24); \
-+	*(cp)++ = (u_char) ((l) >> 16); \
-+	*(cp)++ = (u_char) ((l) >> 8); \
-+	*(cp)++ = (u_char) (l); \
-+}
-+
-+#define INCPTR(n, cp)	((cp) += (n))
-+#define DECPTR(n, cp)	((cp) -= (n))
-+
-+/*
-+ * System dependent definitions for user-level 4.3BSD UNIX implementation.
-+ */
-+
-+#define TIMEOUT(r, f, t)	timeout((r), (f), (t), 0)
-+#define UNTIMEOUT(r, f)		untimeout((r), (f))
-+
-+#define BCOPY(s, d, l)		memcpy(d, s, l)
-+#define BZERO(s, n)		memset(s, 0, n)
-+#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
-+
-+#define PRINTMSG(m, l)		{ info("Remote message: %0.*v", l, m); }
-+
-+/*
-+ * MAKEHEADER - Add Header fields to a packet.
-+ */
-+#define MAKEHEADER(p, t) { \
-+    PUTCHAR(PPP_ALLSTATIONS, p); \
-+    PUTCHAR(PPP_UI, p); \
-+    PUTSHORT(t, p); }
-+
-+/*
-+ * Exit status values.
-+ */
-+#define EXIT_OK			0
-+#define EXIT_FATAL_ERROR	1
-+#define EXIT_OPTION_ERROR	2
-+#define EXIT_NOT_ROOT		3
-+#define EXIT_NO_KERNEL_SUPPORT	4
-+#define EXIT_USER_REQUEST	5
-+#define EXIT_LOCK_FAILED	6
-+#define EXIT_OPEN_FAILED	7
-+#define EXIT_CONNECT_FAILED	8
-+#define EXIT_PTYCMD_FAILED	9
-+#define EXIT_NEGOTIATION_FAILED	10
-+#define EXIT_PEER_AUTH_FAILED	11
-+#define EXIT_IDLE_TIMEOUT	12
-+#define EXIT_CONNECT_TIME	13
-+#define EXIT_CALLBACK		14
-+#define EXIT_PEER_DEAD		15
-+#define EXIT_HANGUP		16
-+#define EXIT_LOOPBACK		17
-+#define EXIT_INIT_FAILED	18
-+#define EXIT_AUTH_TOPEER_FAILED	19
-+#ifdef MAXOCTETS
-+#define EXIT_TRAFFIC_LIMIT	20
-+#endif
-+#define EXIT_CNID_AUTH_FAILED	21
-+
-+/*
-+ * Debug macros.  Slightly useful for finding bugs in pppd, not particularly
-+ * useful for finding out why your connection isn't being established.
-+ */
-+#ifdef DEBUGALL
-+#define DEBUGMAIN	1
-+#define DEBUGFSM	1
-+#define DEBUGLCP	1
-+#define DEBUGIPCP	1
-+#define DEBUGIPV6CP	1
-+#define DEBUGUPAP	1
-+#define DEBUGCHAP	1
-+#endif
-+
-+#ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
-+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
-+  || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-+  || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
-+#define LOG_PPP LOG_LOCAL2
-+#else
-+#define LOG_PPP LOG_LOCAL2
-+#endif
-+#endif /* LOG_PPP */
-+
-+#ifdef DEBUGMAIN
-+#define MAINDEBUG(x)	if (debug) dbglog x
-+#else
-+#define MAINDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGSYS
-+#define SYSDEBUG(x)	if (debug) dbglog x
-+#else
-+#define SYSDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGFSM
-+#define FSMDEBUG(x)	if (debug) dbglog x
-+#else
-+#define FSMDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGLCP
-+#define LCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define LCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPCP
-+#define IPCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPV6CP
-+#define IPV6CPDEBUG(x)  if (debug) dbglog x
-+#else
-+#define IPV6CPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGUPAP
-+#define UPAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define UPAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGCHAP
-+#define CHAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define CHAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPXCP
-+#define IPXCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPXCPDEBUG(x)
-+#endif
-+
-+#ifndef SIGTYPE
-+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
-+#define SIGTYPE void
-+#else
-+#define SIGTYPE int
-+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
-+#endif /* SIGTYPE */
-+
-+#ifndef MIN
-+#define MIN(a, b)	((a) < (b)? (a): (b))
-+#endif
-+#ifndef MAX
-+#define MAX(a, b)	((a) > (b)? (a): (b))
-+#endif
-+
-+#ifndef offsetof
-+#define offsetof(type, member) ((size_t) &((type *)0)->member)
-+#endif
-+
-+#endif /* __PPP_H__ */
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/Makefile capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/Makefile
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/Makefile	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,14 @@
-+# Makefile for the capiplugin for pppd(8).
-+#
-+# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de)
-+# Copyright 2000 AVM GmbH Berlin (info@avm.de)
-+#
-+#  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.
-+
-+PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+
-+include $(TOPDIR)/Rules.make
-+
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,4 @@
-+/* $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ */
-+
-+#define VERSION		"2.4.4b1"
-+#define DATE		"5 December 2005"
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,905 @@
-+/*
-+ * pppd.h - PPP daemon global declarations.
-+ *
-+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For permission or any legal
-+ *    details, please contact
-+ *      Office of Technology Transfer
-+ *      Carnegie Mellon University
-+ *      5000 Forbes Avenue
-+ *      Pittsburgh, PA  15213-3890
-+ *      (412) 268-4387, fax: (412) 268-7395
-+ *      tech-transfer@andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by Computing Services
-+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY 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.
-+ *
-+ * $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $
-+ */
-+
-+/*
-+ * TODO:
-+ */
-+
-+#ifndef __PPPD_H__
-+#define __PPPD_H__
-+
-+#include <stdio.h>		/* for FILE */
-+#include <limits.h>		/* for NGROUPS_MAX */
-+#include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
-+#include <sys/types.h>		/* for u_int32_t, if defined */
-+#include <sys/time.h>		/* for struct timeval */
-+#include <net/ppp_defs.h>
-+#include "patchlevel.h"
-+
-+#if defined(__STDC__)
-+#include <stdarg.h>
-+#define __V(x)	x
-+#else
-+#include <varargs.h>
-+#define __V(x)	(va_alist) va_dcl
-+#define const
-+#define volatile
-+#endif
-+
-+#ifdef INET6
-+#include "eui64.h"
-+#endif
-+
-+/*
-+ * Limits.
-+ */
-+
-+#define NUM_PPP		1	/* One PPP interface supported (per process) */
-+#define MAXWORDLEN	1024	/* max length of word in file (incl null) */
-+#define MAXARGS		1	/* max # args to a command */
-+#define MAXNAMELEN	256	/* max length of hostname or name for auth */
-+#define MAXSECRETLEN	256	/* max length of password or secret */
-+
-+/*
-+ * Option descriptor structure.
-+ */
-+
-+typedef unsigned char	bool;
-+
-+enum opt_type {
-+	o_special_noarg = 0,
-+	o_special = 1,
-+	o_bool,
-+	o_int,
-+	o_uint32,
-+	o_string,
-+	o_wild
-+};
-+
-+typedef struct {
-+	char	*name;		/* name of the option */
-+	enum opt_type type;
-+	void	*addr;
-+	char	*description;
-+	unsigned int flags;
-+	void	*addr2;
-+	int	upper_limit;
-+	int	lower_limit;
-+	const char *source;
-+	short int priority;
-+	short int winner;
-+} option_t;
-+
-+/* Values for flags */
-+#define OPT_VALUE	0xff	/* mask for presupplied value */
-+#define OPT_HEX		0x100	/* int option is in hex */
-+#define OPT_NOARG	0x200	/* option doesn't take argument */
-+#define OPT_OR		0x400	/* OR in argument to value */
-+#define OPT_INC		0x800	/* increment value */
-+#define OPT_A2OR	0x800	/* for o_bool, OR arg to *(u_char *)addr2 */
-+#define OPT_PRIV	0x1000	/* privileged option */
-+#define OPT_STATIC	0x2000	/* string option goes into static array */
-+#define OPT_LLIMIT	0x4000	/* check value against lower limit */
-+#define OPT_ULIMIT	0x8000	/* check value against upper limit */
-+#define OPT_LIMITS	(OPT_LLIMIT|OPT_ULIMIT)
-+#define OPT_ZEROOK	0x10000	/* 0 value is OK even if not within limits */
-+#define OPT_HIDE	0x10000	/* for o_string, print value as ?????? */
-+#define OPT_A2LIST	0x10000 /* for o_special, keep list of values */
-+#define OPT_A2CLRB	0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
-+#define OPT_NOINCR	0x20000	/* value mustn't be increased */
-+#define OPT_ZEROINF	0x40000	/* with OPT_NOINCR, 0 == infinity */
-+#define OPT_PRIO	0x80000	/* process option priorities for this option */
-+#define OPT_PRIOSUB	0x100000 /* subsidiary member of priority group */
-+#define OPT_ALIAS	0x200000 /* option is alias for previous option */
-+#define OPT_A2COPY	0x400000 /* addr2 -> second location to rcv value */
-+#define OPT_ENABLE	0x800000 /* use *addr2 as enable for option */
-+#define OPT_A2CLR	0x1000000 /* clear *(bool *)addr2 */
-+#define OPT_PRIVFIX	0x2000000 /* user can't override if set by root */
-+#define OPT_INITONLY	0x4000000 /* option can only be set in init phase */
-+#define OPT_DEVEQUIV	0x8000000 /* equiv to device name */
-+#define OPT_DEVNAM	(OPT_INITONLY | OPT_DEVEQUIV)
-+#define OPT_A2PRINTER	0x10000000 /* *addr2 is a fn for printing option */
-+#define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
-+#define OPT_NOPRINT	0x40000000 /* don't print this option at all */
-+
-+#define OPT_VAL(x)	((x) & OPT_VALUE)
-+
-+/* Values for priority */
-+#define OPRIO_DEFAULT	0	/* a default value */
-+#define OPRIO_CFGFILE	1	/* value from a configuration file */
-+#define OPRIO_CMDLINE	2	/* value from the command line */
-+#define OPRIO_SECFILE	3	/* value from options in a secrets file */
-+#define OPRIO_ROOT	100	/* added to priority if OPT_PRIVFIX && root */
-+
-+#ifndef GIDSET_TYPE
-+#define GIDSET_TYPE	gid_t
-+#endif
-+
-+/* Structure representing a list of permitted IP addresses. */
-+struct permitted_ip {
-+    int		permit;		/* 1 = permit, 0 = forbid */
-+    u_int32_t	base;		/* match if (addr & mask) == base */
-+    u_int32_t	mask;		/* base and mask are in network byte order */
-+};
-+
-+/*
-+ * Unfortunately, the linux kernel driver uses a different structure
-+ * for statistics from the rest of the ports.
-+ * This structure serves as a common representation for the bits
-+ * pppd needs.
-+ */
-+struct pppd_stats {
-+    unsigned int	bytes_in;
-+    unsigned int	bytes_out;
-+    unsigned int	pkts_in;
-+    unsigned int	pkts_out;
-+};
-+
-+/* Used for storing a sequence of words.  Usually malloced. */
-+struct wordlist {
-+    struct wordlist	*next;
-+    char		*word;
-+};
-+
-+/* An endpoint discriminator, used with multilink. */
-+#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
-+struct epdisc {
-+    unsigned char	class;
-+    unsigned char	length;
-+    unsigned char	value[MAX_ENDP_LEN];
-+};
-+
-+/* values for epdisc.class */
-+#define EPD_NULL	0	/* null discriminator, no data */
-+#define EPD_LOCAL	1
-+#define EPD_IP		2
-+#define EPD_MAC		3
-+#define EPD_MAGIC	4
-+#define EPD_PHONENUM	5
-+
-+typedef void (*notify_func) __P((void *, int));
-+
-+struct notifier {
-+    struct notifier *next;
-+    notify_func	    func;
-+    void	    *arg;
-+};
-+
-+/*
-+ * Global variables.
-+ */
-+
-+extern int	hungup;		/* Physical layer has disconnected */
-+extern int	ifunit;		/* Interface unit number */
-+extern char	ifname[];	/* Interface name */
-+extern char	hostname[];	/* Our hostname */
-+extern u_char	outpacket_buf[]; /* Buffer for outgoing packets */
-+extern int	devfd;		/* fd of underlying device */
-+extern int	fd_ppp;		/* fd for talking PPP */
-+extern int	phase;		/* Current state of link - see values below */
-+extern int	baud_rate;	/* Current link speed in bits/sec */
-+extern char	*progname;	/* Name of this program */
-+extern int	redirect_stderr;/* Connector's stderr should go to file */
-+extern char	peer_authname[];/* Authenticated name of peer */
-+extern int	auth_done[NUM_PPP]; /* Methods actually used for auth */
-+extern int	privileged;	/* We were run by real-uid root */
-+extern int	need_holdoff;	/* Need holdoff period after link terminates */
-+extern char	**script_env;	/* Environment variables for scripts */
-+extern int	detached;	/* Have detached from controlling tty */
-+extern GIDSET_TYPE groups[NGROUPS_MAX];	/* groups the user is in */
-+extern int	ngroups;	/* How many groups valid in groups */
-+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
-+extern int	link_stats_valid; /* set if link_stats is valid */
-+extern unsigned	link_connect_time; /* time the link was up for */
-+extern int	using_pty;	/* using pty as device (notty or pty opt.) */
-+extern int	log_to_fd;	/* logging to this fd as well as syslog */
-+extern bool	log_default;	/* log_to_fd is default (stdout) */
-+extern char	*no_ppp_msg;	/* message to print if ppp not in kernel */
-+extern volatile int status;	/* exit status for pppd */
-+extern bool	devnam_fixed;	/* can no longer change devnam */
-+extern int	unsuccess;	/* # unsuccessful connection attempts */
-+extern int	do_callback;	/* set if we want to do callback next */
-+extern int	doing_callback;	/* set if this is a callback */
-+extern int	error_count;	/* # of times error() has been called */
-+extern char	ppp_devnam[MAXPATHLEN];
-+extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
-+extern int      ppp_session_number; /* Session number (eg PPPoE session) */
-+extern int	fd_devnull;	/* fd open to /dev/null */
-+
-+extern int	listen_time;	/* time to listen first (ms) */
-+extern bool	doing_multilink;
-+extern bool	multilink_master;
-+extern bool	bundle_eof;
-+extern bool	bundle_terminating;
-+
-+extern struct notifier *pidchange;   /* for notifications of pid changing */
-+extern struct notifier *phasechange; /* for notifications of phase changes */
-+extern struct notifier *exitnotify;  /* for notification that we're exiting */
-+extern struct notifier *sigreceived; /* notification of received signal */
-+extern struct notifier *ip_up_notifier; /* IPCP has come up */
-+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
-+extern struct notifier *auth_up_notifier; /* peer has authenticated */
-+extern struct notifier *link_down_notifier; /* link has gone down */
-+extern struct notifier *fork_notifier;	/* we are a new child process */
-+
-+/* Values for do_callback and doing_callback */
-+#define CALLBACK_DIALIN		1	/* we are expecting the call back */
-+#define CALLBACK_DIALOUT	2	/* we are dialling out to call back */
-+
-+/*
-+ * Variables set by command-line options.
-+ */
-+
-+extern int	debug;		/* Debug flag */
-+extern int	kdebugflag;	/* Tell kernel to print debug messages */
-+extern int	default_device;	/* Using /dev/tty or equivalent */
-+extern char	devnam[MAXPATHLEN];	/* Device name */
-+extern int	crtscts;	/* Use hardware flow control */
-+extern bool	modem;		/* Use modem control lines */
-+extern int	inspeed;	/* Input/Output speed requested */
-+extern u_int32_t netmask;	/* IP netmask to set on interface */
-+extern bool	lockflag;	/* Create lock file to lock the serial dev */
-+extern bool	nodetach;	/* Don't detach from controlling tty */
-+extern bool	updetach;	/* Detach from controlling tty when link up */
-+extern char	*initializer;	/* Script to initialize physical link */
-+extern char	*connect_script; /* Script to establish physical link */
-+extern char	*disconnect_script; /* Script to disestablish physical link */
-+extern char	*welcomer;	/* Script to welcome client after connection */
-+extern char	*ptycommand;	/* Command to run on other side of pty */
-+extern int	maxconnect;	/* Maximum connect time (seconds) */
-+extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
-+extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
-+extern bool	auth_required;	/* Peer is required to authenticate */
-+extern bool	persist;	/* Reopen link after it goes down */
-+extern bool	uselogin;	/* Use /etc/passwd for checking PAP */
-+extern char	our_name[MAXNAMELEN];/* Our name for authentication purposes */
-+extern char	remote_name[MAXNAMELEN]; /* Peer's name for authentication */
-+extern bool	explicit_remote;/* remote_name specified with remotename opt */
-+extern bool	demand;		/* Do dial-on-demand */
-+extern char	*ipparam;	/* Extra parameter for ip up/down scripts */
-+extern bool	cryptpap;	/* Others' PAP passwords are encrypted */
-+extern int	idle_time_limit;/* Shut down link if idle for this long */
-+extern int	holdoff;	/* Dead time before restarting */
-+extern bool	holdoff_specified; /* true if user gave a holdoff value */
-+extern bool	notty;		/* Stdin/out is not a tty */
-+extern char	*pty_socket;	/* Socket to connect to pty */
-+extern char	*record_file;	/* File to record chars sent/received */
-+extern bool	sync_serial;	/* Device is synchronous serial device */
-+extern int	maxfail;	/* Max # of unsuccessful connection attempts */
-+extern char	linkname[MAXPATHLEN]; /* logical name for link */
-+extern bool	tune_kernel;	/* May alter kernel settings as necessary */
-+extern int	connect_delay;	/* Time to delay after connect script */
-+extern int	max_data_rate;	/* max bytes/sec through charshunt */
-+extern int	req_unit;	/* interface unit number to use */
-+extern bool	multilink;	/* enable multilink operation */
-+extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
-+extern char	*bundle_name;	/* bundle name for multilink */
-+extern bool	dump_options;	/* print out option values */
-+extern bool	dryrun;		/* check everything, print options, exit */
-+extern int	child_wait;	/* # seconds to wait for children at end */
-+
-+#ifdef MAXOCTETS
-+extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
-+extern int       maxoctets_dir;      /* Direction :
-+				      0 - in+out (default)
-+				      1 - in 
-+				      2 - out
-+				      3 - max(in,out) */
-+extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-+#define PPP_OCTETS_DIRECTION_SUM        0
-+#define PPP_OCTETS_DIRECTION_IN         1
-+#define PPP_OCTETS_DIRECTION_OUT        2
-+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
-+/* same as previos, but little different on RADIUS side */
-+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
-+#endif
-+
-+#ifdef PPP_FILTER
-+extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
-+extern struct	bpf_program active_filter; /* Filter for link-active pkts */
-+#endif
-+
-+#ifdef MSLANMAN
-+extern bool	ms_lanman;	/* Use LanMan password instead of NT */
-+				/* Has meaning only with MS-CHAP challenges */
-+#endif
-+
-+/* Values for auth_pending, auth_done */
-+#define PAP_WITHPEER	0x1
-+#define PAP_PEER	0x2
-+#define CHAP_WITHPEER	0x4
-+#define CHAP_PEER	0x8
-+#define EAP_WITHPEER	0x10
-+#define EAP_PEER	0x20
-+
-+/* Values for auth_done only */
-+#define CHAP_MD5_WITHPEER	0x40
-+#define CHAP_MD5_PEER		0x80
-+#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
-+#define CHAP_MS_WITHPEER	0x100
-+#define CHAP_MS_PEER		0x200
-+#define CHAP_MS2_WITHPEER	0x400
-+#define CHAP_MS2_PEER		0x800
-+
-+extern char *current_option;	/* the name of the option being parsed */
-+extern int  privileged_option;	/* set iff the current option came from root */
-+extern char *option_source;	/* string saying where the option came from */
-+extern int  option_priority;	/* priority of current options */
-+
-+/*
-+ * Values for phase.
-+ */
-+#define PHASE_DEAD		0
-+#define PHASE_INITIALIZE	1
-+#define PHASE_SERIALCONN	2
-+#define PHASE_DORMANT		3
-+#define PHASE_ESTABLISH		4
-+#define PHASE_AUTHENTICATE	5
-+#define PHASE_CALLBACK		6
-+#define PHASE_NETWORK		7
-+#define PHASE_RUNNING		8
-+#define PHASE_TERMINATE		9
-+#define PHASE_DISCONNECT	10
-+#define PHASE_HOLDOFF		11
-+#define PHASE_MASTER		12
-+
-+/*
-+ * The following struct gives the addresses of procedures to call
-+ * for a particular protocol.
-+ */
-+struct protent {
-+    u_short protocol;		/* PPP protocol number */
-+    /* Initialization procedure */
-+    void (*init) __P((int unit));
-+    /* Process a received packet */
-+    void (*input) __P((int unit, u_char *pkt, int len));
-+    /* Process a received protocol-reject */
-+    void (*protrej) __P((int unit));
-+    /* Lower layer has come up */
-+    void (*lowerup) __P((int unit));
-+    /* Lower layer has gone down */
-+    void (*lowerdown) __P((int unit));
-+    /* Open the protocol */
-+    void (*open) __P((int unit));
-+    /* Close the protocol */
-+    void (*close) __P((int unit, char *reason));
-+    /* Print a packet in readable form */
-+    int  (*printpkt) __P((u_char *pkt, int len,
-+			  void (*printer) __P((void *, char *, ...)),
-+			  void *arg));
-+    /* Process a received data packet */
-+    void (*datainput) __P((int unit, u_char *pkt, int len));
-+    bool enabled_flag;		/* 0 iff protocol is disabled */
-+    char *name;			/* Text name of protocol */
-+    char *data_name;		/* Text name of corresponding data protocol */
-+    option_t *options;		/* List of command-line options */
-+    /* Check requested options, assign defaults */
-+    void (*check_options) __P((void));
-+    /* Configure interface for demand-dial */
-+    int  (*demand_conf) __P((int unit));
-+    /* Say whether to bring up link for this pkt */
-+    int  (*active_pkt) __P((u_char *pkt, int len));
-+};
-+
-+/* Table of pointers to supported protocols */
-+extern struct protent *protocols[];
-+
-+/*
-+ * This struct contains pointers to a set of procedures for
-+ * doing operations on a "channel".  A channel provides a way
-+ * to send and receive PPP packets - the canonical example is
-+ * a serial port device in PPP line discipline (or equivalently
-+ * with PPP STREAMS modules pushed onto it).
-+ */
-+struct channel {
-+	/* set of options for this channel */
-+	option_t *options;
-+	/* find and process a per-channel options file */
-+	void (*process_extra_options) __P((void));
-+	/* check all the options that have been given */
-+	void (*check_options) __P((void));
-+	/* get the channel ready to do PPP, return a file descriptor */
-+	int  (*connect) __P((void));
-+	/* we're finished with the channel */
-+	void (*disconnect) __P((void));
-+	/* put the channel into PPP `mode' */
-+	int  (*establish_ppp) __P((int));
-+	/* take the channel out of PPP `mode', restore loopback if demand */
-+	void (*disestablish_ppp) __P((int));
-+	/* set the transmit-side PPP parameters of the channel */
-+	void (*send_config) __P((int, u_int32_t, int, int));
-+	/* set the receive-side PPP parameters of the channel */
-+	void (*recv_config) __P((int, u_int32_t, int, int));
-+	/* cleanup on error or normal exit */
-+	void (*cleanup) __P((void));
-+	/* close the device, called in children after fork */
-+	void (*close) __P((void));
-+};
-+
-+extern struct channel *the_channel;
-+
-+/*
-+ * Prototypes.
-+ */
-+
-+/* Procedures exported from main.c. */
-+void set_ifunit __P((int));	/* set stuff that depends on ifunit */
-+void detach __P((void));	/* Detach from controlling tty */
-+void die __P((int));		/* Cleanup and exit */
-+void quit __P((void));		/* like die(1) */
-+void novm __P((char *));	/* Say we ran out of memory, and die */
-+void timeout __P((void (*func)(void *), void *arg, int s, int us));
-+				/* Call func(arg) after s.us seconds */
-+void untimeout __P((void (*func)(void *), void *arg));
-+				/* Cancel call to func(arg) */
-+void record_child __P((int, char *, void (*) (void *), void *));
-+pid_t safe_fork __P((int, int, int));	/* Fork & close stuff in child */
-+int  device_script __P((char *cmd, int in, int out, int dont_wait));
-+				/* Run `cmd' with given stdin and stdout */
-+pid_t run_program __P((char *prog, char **args, int must_exist,
-+		       void (*done)(void *), void *arg));
-+				/* Run program prog with args in child */
-+void reopen_log __P((void));	/* (re)open the connection to syslog */
-+void print_link_stats __P((void)); /* Print stats, if available */
-+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
-+void update_link_stats __P((int)); /* Get stats at link termination */
-+void script_setenv __P((char *, char *, int));	/* set script env var */
-+void script_unsetenv __P((char *));		/* unset script env var */
-+void new_phase __P((int));	/* signal start of new phase */
-+void add_notifier __P((struct notifier **, notify_func, void *));
-+void remove_notifier __P((struct notifier **, notify_func, void *));
-+void notify __P((struct notifier *, int));
-+int  ppp_send_config __P((int, int, u_int32_t, int, int));
-+int  ppp_recv_config __P((int, int, u_int32_t, int, int));
-+void remove_pidfiles __P((void));
-+void lock_db __P((void));
-+void unlock_db __P((void));
-+
-+/* Procedures exported from tty.c. */
-+void tty_init __P((void));
-+
-+/* Procedures exported from utils.c. */
-+void log_packet __P((u_char *, int, char *, int));
-+				/* Format a packet and log it with syslog */
-+void print_string __P((char *, int,  void (*) (void *, char *, ...),
-+		void *));	/* Format a string for output */
-+int slprintf __P((char *, int, char *, ...));		/* sprintf++ */
-+int vslprintf __P((char *, int, char *, va_list));	/* vsprintf++ */
-+size_t strlcpy __P((char *, const char *, size_t));	/* safe strcpy */
-+size_t strlcat __P((char *, const char *, size_t));	/* safe strncpy */
-+void dbglog __P((char *, ...));	/* log a debug message */
-+void info __P((char *, ...));	/* log an informational message */
-+void notice __P((char *, ...));	/* log a notice-level message */
-+void warn __P((char *, ...));	/* log a warning message */
-+void error __P((char *, ...));	/* log an error message */
-+void fatal __P((char *, ...));	/* log an error message and die(1) */
-+void init_pr_log __P((char *, int));	/* initialize for using pr_log */
-+void pr_log __P((void *, char *, ...));	/* printer fn, output to syslog */
-+void end_pr_log __P((void));	/* finish up after using pr_log */
-+void dump_packet __P((const char *, u_char *, int));
-+				/* dump packet to debug log if interesting */
-+ssize_t complete_read __P((int, void *, size_t));
-+				/* read a complete buffer */
-+
-+/* Procedures exported from auth.c */
-+void link_required __P((int));	  /* we are starting to use the link */
-+void link_terminated __P((int));  /* we are finished with the link */
-+void link_down __P((int));	  /* the LCP layer has left the Opened state */
-+void upper_layers_down __P((int));/* take all NCPs down */
-+void link_established __P((int)); /* the link is up; authenticate now */
-+void start_networks __P((int));   /* start all the network control protos */
-+void continue_networks __P((int)); /* start network [ip, etc] control protos */
-+void np_up __P((int, int));	  /* a network protocol has come up */
-+void np_down __P((int, int));	  /* a network protocol has gone down */
-+void np_finished __P((int, int)); /* a network protocol no longer needs link */
-+void auth_peer_fail __P((int, int));
-+				/* peer failed to authenticate itself */
-+void auth_peer_success __P((int, int, int, char *, int));
-+				/* peer successfully authenticated itself */
-+void auth_withpeer_fail __P((int, int));
-+				/* we failed to authenticate ourselves */
-+void auth_withpeer_success __P((int, int, int));
-+				/* we successfully authenticated ourselves */
-+void auth_check_options __P((void));
-+				/* check authentication options supplied */
-+void auth_reset __P((int));	/* check what secrets we have */
-+int  check_passwd __P((int, char *, int, char *, int, char **));
-+				/* Check peer-supplied username/password */
-+int  get_secret __P((int, char *, char *, char *, int *, int));
-+				/* get "secret" for chap */
-+int  get_srp_secret __P((int unit, char *client, char *server, char *secret,
-+    int am_server));
-+int  auth_ip_addr __P((int, u_int32_t));
-+				/* check if IP address is authorized */
-+int  auth_number __P((void));	/* check if remote number is authorized */
-+int  bad_ip_adrs __P((u_int32_t));
-+				/* check if IP address is unreasonable */
-+
-+/* Procedures exported from demand.c */
-+void demand_conf __P((void));	/* config interface(s) for demand-dial */
-+void demand_block __P((void));	/* set all NPs to queue up packets */
-+void demand_unblock __P((void)); /* set all NPs to pass packets */
-+void demand_discard __P((void)); /* set all NPs to discard packets */
-+void demand_rexmit __P((int));	/* retransmit saved frames for an NP */
-+int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
-+int  loop_frame __P((unsigned char *, int)); /* should we bring link up? */
-+
-+/* Procedures exported from multilink.c */
-+#ifdef HAVE_MULTILINK
-+void mp_check_options __P((void)); /* Check multilink-related options */
-+int  mp_join_bundle __P((void));  /* join our link to an appropriate bundle */
-+void mp_exit_bundle __P((void));  /* have disconnected our link from bundle */
-+void mp_bundle_terminated __P((void));
-+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
-+int  str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
-+#else
-+#define mp_bundle_terminated()	/* nothing */
-+#define mp_exit_bundle()	/* nothing */
-+#define doing_multilink		0
-+#define multilink_master	0
-+#endif
-+
-+/* Procedures exported from sys-*.c */
-+void sys_init __P((void));	/* Do system-dependent initialization */
-+void sys_cleanup __P((void));	/* Restore system state before exiting */
-+int  sys_check_options __P((void)); /* Check options specified */
-+void sys_close __P((void));	/* Clean up in a child before execing */
-+int  ppp_available __P((void));	/* Test whether ppp kernel support exists */
-+int  get_pty __P((int *, int *, char *, int));	/* Get pty master/slave */
-+int  open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
-+int  tty_establish_ppp __P((int));  /* Turn serial port into a ppp interface */
-+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
-+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
-+int  generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
-+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
-+int  bundle_attach __P((int));	/* Attach link to existing bundle */
-+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
-+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
-+void clean_check __P((void));	/* Check if line was 8-bit clean */
-+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
-+void restore_tty __P((int));	/* Restore port's original parameters */
-+void setdtr __P((int, int));	/* Raise or lower port's DTR line */
-+void output __P((int, u_char *, int)); /* Output a PPP packet */
-+void wait_input __P((struct timeval *));
-+				/* Wait for input, with timeout */
-+void add_fd __P((int));		/* Add fd to set to wait for */
-+void remove_fd __P((int));	/* Remove fd from set to wait for */
-+int  read_packet __P((u_char *)); /* Read PPP packet */
-+int  get_loop_output __P((void)); /* Read pkts from loopback */
-+void tty_send_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f transmit parameters */
-+void tty_set_xaccm __P((ext_accm));
-+				/* Set extended transmit ACCM */
-+void tty_recv_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f receive parameters */
-+int  ccp_test __P((int, u_char *, int, int));
-+				/* Test support for compression scheme */
-+void ccp_flags_set __P((int, int, int));
-+				/* Set kernel CCP state */
-+int  ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
-+int  get_idle_time __P((int, struct ppp_idle *));
-+				/* Find out how long link has been idle */
-+int  get_ppp_stats __P((int, struct pppd_stats *));
-+				/* Return link statistics */
-+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
-+int  netif_get_mtu __P((int));      /* Get PPP interface MTU */
-+int  sifvjcomp __P((int, int, int, int));
-+				/* Configure VJ TCP header compression */
-+int  sifup __P((int));		/* Configure i/f up for one protocol */
-+int  sifnpmode __P((int u, int proto, enum NPmode mode));
-+				/* Set mode for handling packets for proto */
-+int  sifdown __P((int));	/* Configure i/f down for one protocol */
-+int  sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
-+				/* Configure IPv4 addresses for i/f */
-+int  cifaddr __P((int, u_int32_t, u_int32_t));
-+				/* Reset i/f IP addresses */
-+#ifdef INET6
-+int  sif6addr __P((int, eui64_t, eui64_t));
-+				/* Configure IPv6 addresses for i/f */
-+int  cif6addr __P((int, eui64_t, eui64_t));
-+				/* Remove an IPv6 address from i/f */
-+#endif
-+int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
-+				/* Create default route through i/f */
-+int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
-+				/* Delete default route through i/f */
-+int  sifproxyarp __P((int, u_int32_t));
-+				/* Add proxy ARP entry for peer */
-+int  cifproxyarp __P((int, u_int32_t));
-+				/* Delete proxy ARP entry for peer */
-+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
-+int  lock __P((char *));	/* Create lock file for device */
-+int  relock __P((int));		/* Rewrite lock file with new pid */
-+void unlock __P((void));	/* Delete previously-created lock file */
-+void logwtmp __P((const char *, const char *, const char *));
-+				/* Write entry to wtmp file */
-+int  get_host_seed __P((void));	/* Get host-dependent random number seed */
-+int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
-+#ifdef PPP_FILTER
-+int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
-+				/* Set filter programs in kernel */
-+#endif
-+#ifdef IPX_CHANGE
-+int  sipxfaddr __P((int, unsigned long, unsigned char *));
-+int  cipxfaddr __P((int));
-+#endif
-+int  get_if_hwaddr __P((u_char *addr, char *name));
-+char *get_first_ethernet __P((void));
-+
-+/* Procedures exported from options.c */
-+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
-+int  parse_args __P((int argc, char **argv));
-+				/* Parse options from arguments given */
-+int  options_from_file __P((char *filename, int must_exist, int check_prot,
-+			    int privileged));
-+				/* Parse options from an options file */
-+int  options_from_user __P((void)); /* Parse options from user's .ppprc */
-+int  options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
-+int  options_from_list __P((struct wordlist *, int privileged));
-+				/* Parse options from a wordlist */
-+int  getword __P((FILE *f, char *word, int *newlinep, char *filename));
-+				/* Read a word from a file */
-+void option_error __P((char *fmt, ...));
-+				/* Print an error message about an option */
-+int int_option __P((char *, int *));
-+				/* Simplified number_option for decimal ints */
-+void add_options __P((option_t *)); /* Add extra options */
-+void check_options __P((void));	/* check values after all options parsed */
-+int  override_value __P((const char *, int, const char *));
-+				/* override value if permitted by priority */
-+void print_options __P((void (*) __P((void *, char *, ...)), void *));
-+				/* print out values of all options */
-+
-+int parse_dotted_ip __P((char *, u_int32_t *));
-+
-+/*
-+ * Hooks to enable plugins to change various things.
-+ */
-+extern int (*new_phase_hook) __P((int));
-+extern int (*idle_time_hook) __P((struct ppp_idle *));
-+extern int (*holdoff_hook) __P((void));
-+extern int (*pap_check_hook) __P((void));
-+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
-+				 struct wordlist **paddrs,
-+				 struct wordlist **popts));
-+extern void (*pap_logout_hook) __P((void));
-+extern int (*pap_passwd_hook) __P((char *user, char *passwd));
-+extern int (*allowed_address_hook) __P((u_int32_t addr));
-+extern void (*ip_up_hook) __P((void));
-+extern void (*ip_down_hook) __P((void));
-+extern void (*ip_choose_hook) __P((u_int32_t *));
-+
-+extern int (*chap_check_hook) __P((void));
-+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
-+
-+/* Let a plugin snoop sent and received packets.  Useful for L2TP */
-+extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
-+extern void (*snoop_send_hook) __P((unsigned char *p, int len));
-+
-+/*
-+ * Inline versions of get/put char/short/long.
-+ * Pointer is advanced; we assume that both arguments
-+ * are lvalues and will already be in registers.
-+ * cp MUST be u_char *.
-+ */
-+#define GETCHAR(c, cp) { \
-+	(c) = *(cp)++; \
-+}
-+#define PUTCHAR(c, cp) { \
-+	*(cp)++ = (u_char) (c); \
-+}
-+
-+
-+#define GETSHORT(s, cp) { \
-+	(s) = *(cp)++ << 8; \
-+	(s) |= *(cp)++; \
-+}
-+#define PUTSHORT(s, cp) { \
-+	*(cp)++ = (u_char) ((s) >> 8); \
-+	*(cp)++ = (u_char) (s); \
-+}
-+
-+#define GETLONG(l, cp) { \
-+	(l) = *(cp)++ << 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; \
-+}
-+#define PUTLONG(l, cp) { \
-+	*(cp)++ = (u_char) ((l) >> 24); \
-+	*(cp)++ = (u_char) ((l) >> 16); \
-+	*(cp)++ = (u_char) ((l) >> 8); \
-+	*(cp)++ = (u_char) (l); \
-+}
-+
-+#define INCPTR(n, cp)	((cp) += (n))
-+#define DECPTR(n, cp)	((cp) -= (n))
-+
-+/*
-+ * System dependent definitions for user-level 4.3BSD UNIX implementation.
-+ */
-+
-+#define TIMEOUT(r, f, t)	timeout((r), (f), (t), 0)
-+#define UNTIMEOUT(r, f)		untimeout((r), (f))
-+
-+#define BCOPY(s, d, l)		memcpy(d, s, l)
-+#define BZERO(s, n)		memset(s, 0, n)
-+#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
-+
-+#define PRINTMSG(m, l)		{ info("Remote message: %0.*v", l, m); }
-+
-+/*
-+ * MAKEHEADER - Add Header fields to a packet.
-+ */
-+#define MAKEHEADER(p, t) { \
-+    PUTCHAR(PPP_ALLSTATIONS, p); \
-+    PUTCHAR(PPP_UI, p); \
-+    PUTSHORT(t, p); }
-+
-+/*
-+ * Exit status values.
-+ */
-+#define EXIT_OK			0
-+#define EXIT_FATAL_ERROR	1
-+#define EXIT_OPTION_ERROR	2
-+#define EXIT_NOT_ROOT		3
-+#define EXIT_NO_KERNEL_SUPPORT	4
-+#define EXIT_USER_REQUEST	5
-+#define EXIT_LOCK_FAILED	6
-+#define EXIT_OPEN_FAILED	7
-+#define EXIT_CONNECT_FAILED	8
-+#define EXIT_PTYCMD_FAILED	9
-+#define EXIT_NEGOTIATION_FAILED	10
-+#define EXIT_PEER_AUTH_FAILED	11
-+#define EXIT_IDLE_TIMEOUT	12
-+#define EXIT_CONNECT_TIME	13
-+#define EXIT_CALLBACK		14
-+#define EXIT_PEER_DEAD		15
-+#define EXIT_HANGUP		16
-+#define EXIT_LOOPBACK		17
-+#define EXIT_INIT_FAILED	18
-+#define EXIT_AUTH_TOPEER_FAILED	19
-+#ifdef MAXOCTETS
-+#define EXIT_TRAFFIC_LIMIT	20
-+#endif
-+#define EXIT_CNID_AUTH_FAILED	21
-+
-+/*
-+ * Debug macros.  Slightly useful for finding bugs in pppd, not particularly
-+ * useful for finding out why your connection isn't being established.
-+ */
-+#ifdef DEBUGALL
-+#define DEBUGMAIN	1
-+#define DEBUGFSM	1
-+#define DEBUGLCP	1
-+#define DEBUGIPCP	1
-+#define DEBUGIPV6CP	1
-+#define DEBUGUPAP	1
-+#define DEBUGCHAP	1
-+#endif
-+
-+#ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
-+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
-+  || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-+  || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
-+#define LOG_PPP LOG_LOCAL2
-+#else
-+#define LOG_PPP LOG_DAEMON
-+#endif
-+#endif /* LOG_PPP */
-+
-+#ifdef DEBUGMAIN
-+#define MAINDEBUG(x)	if (debug) dbglog x
-+#else
-+#define MAINDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGSYS
-+#define SYSDEBUG(x)	if (debug) dbglog x
-+#else
-+#define SYSDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGFSM
-+#define FSMDEBUG(x)	if (debug) dbglog x
-+#else
-+#define FSMDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGLCP
-+#define LCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define LCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPCP
-+#define IPCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPV6CP
-+#define IPV6CPDEBUG(x)  if (debug) dbglog x
-+#else
-+#define IPV6CPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGUPAP
-+#define UPAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define UPAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGCHAP
-+#define CHAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define CHAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPXCP
-+#define IPXCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPXCPDEBUG(x)
-+#endif
-+
-+#ifndef SIGTYPE
-+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
-+#define SIGTYPE void
-+#else
-+#define SIGTYPE int
-+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
-+#endif /* SIGTYPE */
-+
-+#ifndef MIN
-+#define MIN(a, b)	((a) < (b)? (a): (b))
-+#endif
-+#ifndef MAX
-+#define MAX(a, b)	((a) > (b)? (a): (b))
-+#endif
-+
-+#ifndef offsetof
-+#define offsetof(type, member) ((size_t) &((type *)0)->member)
-+#endif
-+
-+#endif /* __PPP_H__ */
diff --git a/extra/dnsutils/PKGBUILD b/extra/dnsutils/PKGBUILD
deleted file mode 100644
index 9917297d0..000000000
--- a/extra/dnsutils/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 151740 2012-03-01 22:01:16Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: mario <mario_vazq@hotmail.com>
-
-pkgname=dnsutils
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.0
-_pkgver=9.9.0
-pkgrel=1
-
-pkgdesc='DNS utilities: dig host nslookup'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
-options=('!makeflags')
-depends=('openssl' 'krb5' 'idnkit')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch'
-        'trusted-key.key')
-sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
-          'b465ef6160b004838f04de9978fe1be8422af777'
-          'ca93da30c89de4365b846325d6ec4674a3e4fc02')
-
-replaces=('bind-tools' 'host')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-bind.patch
-	export STD_CDEFINES='-DDIG_SIGCHASE'
-
-	# hack to remove unused bloat from the binaries
-	CFLAGS+=' -fdata-sections -ffunction-sections'
-	LDFLAGS+=' -Wl,--gc-sections'
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-idn \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-	install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	cd bin; make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/dnsutils/remove-bind.patch b/extra/dnsutils/remove-bind.patch
deleted file mode 100644
index 19d650964..000000000
--- a/extra/dnsutils/remove-bind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
-@@ -19,8 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PKCS11_TOOLS@
-+SUBDIRS =	dig
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -aur old/lib/Makefile.in new/lib/Makefile.in
---- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
-+++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
-@@ -23,7 +23,7 @@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =	isc dns isccfg bind9 lwres
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/extra/dnsutils/trusted-key.key b/extra/dnsutils/trusted-key.key
deleted file mode 100644
index 866cadda2..000000000
--- a/extra/dnsutils/trusted-key.key
+++ /dev/null
@@ -1,2 +0,0 @@
-.			172800	IN	DNSKEY	256 3 8 AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF
-.			172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0=
diff --git a/extra/easytag/mp4v2-1.9.patch b/extra/easytag/mp4v2-1.9.patch
deleted file mode 100644
index 774bf7fb2..000000000
--- a/extra/easytag/mp4v2-1.9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur easytag-2.1.6.orig/configure easytag-2.1.6/configure
---- easytag-2.1.6.orig/configure	2008-07-12 17:57:44.000000000 +0300
-+++ easytag-2.1.6/configure	2009-07-10 16:44:39.000000000 +0300
-@@ -22418,12 +22418,12 @@
- /* end confdefs.h.  */
- 
-                 #include <stdio.h>
--                #include <mpeg4ip_config.h>
-+                #include <mp4v2/mp4v2.h>
-                 int main (void)
-                 {
-                     FILE *output;
-                     output=fopen("conftest.mp4v2","w");
--                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-+                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-                     fclose(output);
-                     exit(0);
-                 }
-@@ -22471,7 +22471,7 @@
- 
-                 cat >conftest.$ac_ext <<_ACEOF
- 
--           #include <mp4.h>
-+           #include <mp4v2/mp4v2.h>
-            main () {
-            MP4FileHandle hFile;
-            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
-diff -ur easytag-2.1.6.orig/src/mp4_header.c easytag-2.1.6/src/mp4_header.c
---- easytag-2.1.6.orig/src/mp4_header.c	2007-11-28 10:54:35.000000000 +0200
-+++ easytag-2.1.6/src/mp4_header.c	2009-07-10 16:44:54.000000000 +0300
-@@ -44,7 +44,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************
-diff -ur easytag-2.1.6.orig/src/mp4_tag.c easytag-2.1.6/src/mp4_tag.c
---- easytag-2.1.6.orig/src/mp4_tag.c	2007-12-11 00:08:11.000000000 +0200
-+++ easytag-2.1.6/src/mp4_tag.c	2009-07-10 16:45:08.000000000 +0300
-@@ -50,7 +50,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************
diff --git a/extra/eclipse/eclipse.ini.patch b/extra/eclipse/eclipse.ini.patch
deleted file mode 100644
index 0f2e3b226..000000000
--- a/extra/eclipse/eclipse.ini.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- eclipse/eclipse.ini	2010-06-24 09:22:59.474998451 +0200
-+++ eclipse/eclipse.ini~	2010-06-24 09:24:26.325011998 +0200
-@@ -5,9 +5,9 @@
- -showsplash
- org.eclipse.platform
- --launcher.XXMaxPermSize
--256m
-+512m
- --launcher.defaultAction
- openFile
- -vmargs
- -Xms40m
---Xmx384m
-+-Xmx768m
diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD
deleted file mode 100644
index 62458f595..000000000
--- a/extra/erlang/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 145333 2011-12-21 20:47:12Z andrea $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
-
-pkgname=erlang
-pkgver=R14B04
-pkgrel=2
-pkgdesc="A small concurrent functional programming language developed by Ericsson."
-arch=(i686 x86_64)
-url="http://www.erlang.org/index.html"
-license=('custom')
-depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
-optdepends=('wxgtk: for wx support' 'unixodbc: database')
-
-options=('!makeflags')
-source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
-	http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
-md5sums=('4b469729f103f52702bfb1fb24529dc0'
-         'f31e72518daae4007f595c0b224dd59f')
-
-# please check these deps reported by namcap when you do the next build:
-#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar)
-#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so'])
-
-
-build() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-  export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
-  export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
-
-  sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
-
-  CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
-  make
-}
-
-package() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-  make INSTALL_PREFIX="$pkgdir" install
-
-# fix prefix
-  cd "$pkgdir"
-  for i in usr/lib/erlang/bin/erl \
-      usr/lib/erlang/bin/start \
-      usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
-      usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
-      usr/lib/erlang/releases/RELEASES ;do
-    sed -i "s#$pkgdir##" $i
-  done
-
-# fix symlinks
-  cd "$pkgdir/usr/lib/erlang/bin"
-  ln -sf ../erts-${ERTSVERSION}/bin/epmd
-
-  cd "$pkgdir/usr/bin"
-  for file in *; do
-    ln -sfv ../lib/erlang/bin/$file
-  done
-
-  ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
-
-# install documentation
-  install -d "$pkgdir/usr/share/doc/erlang"
-  install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
-  cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
-
-  install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
-
-}
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
deleted file mode 100644
index 207d020ad..000000000
--- a/extra/ettercap/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 149946 2012-02-11 23:30:37Z 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/extra/ettercap/ettercap-gtk.install b/extra/ettercap/ettercap-gtk.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/extra/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/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch
deleted file mode 100644
index c47248beb..000000000
--- a/extra/gcin/qt4-lib64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur old/configure new/configure
---- old/configure	2011-12-21 00:48:03.000000000 +1100
-+++ new/configure	2011-12-25 04:06:14.424317251 +1100
-@@ -188,7 +188,7 @@
- 
- 
- QT4_IM='N'
--QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
-+QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods
- echo "testing if you have qt4 support"
- pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
- if [ $? = 0 ]; then
-@@ -245,7 +245,7 @@
-   mv gcin.spec gcin.spec.tmp
-   grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
- else
--  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
-+  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc
-   do
- 	[ -x $i ] && QT4_MOC=$i
-   done
-diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
-+++ new/qt4-im/Makefile	2011-12-25 04:06:14.424317251 +1100
-@@ -1,5 +1,5 @@
- include ../config.mak
--QT=qt4
-+QT=qt
- QTIM=$(QT)/plugins/inputmethods
- IMMODULES=$(libdir)/$(QTIM)
- 
diff --git a/extra/gecko-sharp-2.0/PKGBUILD b/extra/gecko-sharp-2.0/PKGBUILD
deleted file mode 100644
index a6b0033a1..000000000
--- a/extra/gecko-sharp-2.0/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137770 2011-09-10 17:09:41Z pierre $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=gecko-sharp-2.0
-pkgver=0.13
-pkgrel=4
-pkgdesc="C# bindings for gtkmozembed"
-arch=('i686' 'x86_64')
-license=('LGPL' 'MPL')
-url="http://www.mono-project.com/"
-depends=('xulrunner' 'gtk-sharp-2')
-makedepends=('monodoc' 'pkgconfig')
-source=("http://go-mono.com/sources/gecko-sharp-2.0/gecko-sharp-2.0-${pkgver}.tar.bz2"
-        'gecko-sharp-2.0-0.12-xulrunner.patch')
-md5sums=('f88eaa06e71f8d8fa34cf59a3e034a6b'
-         '4f2c07c3fb0c1a94adaa4e4c8d57608b')
-
-build() {
-  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd ${srcdir}/gecko-sharp-2.0-${pkgver}
-  patch -Np1 -i ${srcdir}/gecko-sharp-2.0-0.12-xulrunner.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/gecko-sharp-2.0-${pkgver}
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-    DESTDIR=${pkgdir} install
-}
diff --git a/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch b/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch
deleted file mode 100644
index 5d19fea72..000000000
--- a/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw.xl gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw
---- gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw.xl	2006-12-22 20:57:47.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw	2007-11-27 15:54:41.000000000 +0100
-@@ -349,6 +349,12 @@
-           <parameter type="const-char*" name="aPath" />
-         </parameters>
-       </method>
-+      <method name="SetPath" cname="gtk_moz_embed_set_path" shared="true">
-+        <return-type type="void" />
-+        <parameters>
-+          <parameter type="const-char*" name="aPath" />
-+        </parameters>
-+      </method>
-       <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
-         <return-type type="void" />
-         <parameters>
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml.xl gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml
---- gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml.xl	2006-12-22 20:57:54.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml	2007-11-27 15:54:41.000000000 +0100
-@@ -349,6 +349,12 @@
-           <parameter type="const-char*" name="aPath" />
-         </parameters>
-       </method>
-+      <method name="SetPath" cname="gtk_moz_embed_set_path" shared="true">
-+        <return-type type="void" />
-+        <parameters>
-+          <parameter type="const-char*" name="aPath" />
-+        </parameters>
-+      </method>
-       <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
-         <return-type type="void" />
-         <parameters>
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in.xl gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in
---- gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in.xl	2006-12-22 20:57:47.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in	2007-11-27 16:05:02.000000000 +0100
-@@ -3,5 +3,5 @@
-   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
--  <dllmap dll="gtkembedmoz.dll" target="libgtkembedmoz@LIB_PREFIX@@LIB_SUFFIX@"/>
-+  <dllmap dll="gtkembedmoz.dll" target="libxul@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/extra/gftp/PKGBUILD b/extra/gftp/PKGBUILD
deleted file mode 100644
index 01abbb7bf..000000000
--- a/extra/gftp/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 150475 2012-02-18 01:48:17Z allan $
-# Maintainer:
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=gftp
-pkgver=2.0.19
-pkgrel=4
-pkgdesc="A multithreaded ftp client for X Windows"
-arch=('i686' 'x86_64')
-url="http://www.gftp.org/"
-license=('GPL2')
-depends=('gtk2' 'openssl' 'readline')
-source=(http://www.gftp.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('5183cb4955d94be0e03c892585547c64')
-
-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/extra/gif2png/gif2png-2.5.5-libpng15.patch b/extra/gif2png/gif2png-2.5.5-libpng15.patch
deleted file mode 100644
index 58ca43186..000000000
--- a/extra/gif2png/gif2png-2.5.5-libpng15.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/gif2png.c	2012-01-29 00:02:06.000000000 +0100
-+++ b/gif2png.c	2012-02-06 00:49:14.000000000 +0100
-@@ -12,6 +12,7 @@
- #include <unistd.h>	/* for isatty() */
- #include <sys/stat.h>
- #include <utime.h>
-+#include <zlib.h>
- 
- #if !defined(TRUE)
- #define FALSE	0
-@@ -122,8 +123,8 @@
-     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;
-@@ -138,6 +139,19 @@
-     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/extra/gimp-refocus/PKGBUILD b/extra/gimp-refocus/PKGBUILD
deleted file mode 100644
index 5cc3b5703..000000000
--- a/extra/gimp-refocus/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 128457 2011-06-24 02:06:37Z eric $
-# Maintainer: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gimp-refocus
-pkgver=0.9.0
-pkgrel=3
-pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering"
-arch=('i686' 'x86_64')
-url="http://refocus.sourceforge.net/"
-license=('GPL2')
-depends=('gimp')
-source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \
-        refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch)
-md5sums=('8d4eac4ef45c904fb5e73021696bec94'
-         '8ef9dfe697cd20be2be14c1ee53a240a'
-         '532593cba030feab8ffa7800fc9cd782'
-         '6b55dbdc656646c765064cf21e1a3c57')
-
-build() {
-  cd "${srcdir}/refocus-${pkgver}"
-  patch -Np0 -i ../refocus-gimp-2.0.patch
-  patch -Np0 -i ../refocus-mirror-fix.patch
-  patch -Np0 -i ../refocus-gimp-preview.patch
-  aclocal
-  autoconf
-  automake --add-missing
-  ./configure --prefix=/usr --bindir=/usr/lib/gimp/2.0/plug-ins
-  make
-}
-
-package() {
-  cd "${srcdir}/refocus-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gimp-refocus/refocus-gimp-2.0.patch b/extra/gimp-refocus/refocus-gimp-2.0.patch
deleted file mode 100644
index 259ee9f87..000000000
--- a/extra/gimp-refocus/refocus-gimp-2.0.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvsroot/refocus/refocus/configure.in,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 configure.in
---- configure.in	30 Jan 2003 21:29:29 -0000	1.1.1.1
-+++ configure.in	6 Apr 2004 20:26:54 -0000
-@@ -1,8 +1,8 @@
- dnl Process this file with autoconf to produce a configure script.
- 
--AC_INIT(README)
--
--AM_INIT_AUTOMAKE(refocus, 0.9.0)
-+AC_INIT([refocus],[0.9.0])
-+AC_CONFIG_SRCDIR(README)
-+AM_INIT_AUTOMAKE
- 
- AC_PROG_CC
- AC_CHECK_PROG(GCC3, gcc3, gcc3)
-@@ -12,7 +12,7 @@
-    AC_MSG_RESULT([using $CC as compiler])
- fi
- 
--AC_STDC_HEADERS
-+AC_HEADER_STDC([])
- AC_PROG_RANLIB
- 
- # Check if the user has ATLAS installed in ./lib-atlas
-@@ -36,7 +36,7 @@
- AC_SUBST(LAPACK_INCLUDE_DIR)
- AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)
- 
--AM_PATH_GIMP(1.2.0)
-+AM_PATH_GIMP_2_0(2.0.0)
- AM_PATH_GTK_2_0(2.0.0)
- AM_PATH_GLIB_2_0(2.0.0)
- 
-@@ -106,5 +106,6 @@
- #Check if erf is defined in the mathlibrary
- AC_CHECK_LIB(m, erf, AC_DEFINE(HAVE_ERF))
- 
--AC_OUTPUT([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
-+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
-+AC_OUTPUT
- 
-Index: lib/Makefile.am
-===================================================================
-RCS file: /cvsroot/refocus/refocus/lib/Makefile.am,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 Makefile.am
---- lib/Makefile.am	30 Jan 2003 21:29:52 -0000	1.1.1.1
-+++ lib/Makefile.am	6 Apr 2004 20:26:55 -0000
-@@ -1,4 +1,4 @@
--CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
-+AM_CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
- 
- 
- noinst_LIBRARIES = liblapack.a libatlas.a libcblas.a
-Index: src/Makefile.am
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/Makefile.am,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 Makefile.am
---- src/Makefile.am	30 Jan 2003 21:30:18 -0000	1.1.1.1
-+++ src/Makefile.am	6 Apr 2004 20:26:55 -0000
-@@ -11,7 +11,7 @@
- EXTRA_DIST = dummy-plugin.c
- 
- refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c
--refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas}
-+refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas}
- refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a
- 
- test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
-Index: src/gimppreview.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/gimppreview.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 gimppreview.c
---- src/gimppreview.c	30 Jan 2003 21:30:18 -0000	1.1.1.1
-+++ src/gimppreview.c	6 Apr 2004 20:26:55 -0000
-@@ -344,7 +344,7 @@
- 
-   /* Save the drawable info. */
-   preview->drawable = drawable;
--  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
- 
-   /* Calculate our preview size. */
-   if (preview_size == PREVIEW_FIXED_SIZE)
-Index: src/prevman.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/prevman.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 prevman.c
---- src/prevman.c	30 Jan 2003 21:30:18 -0000	1.1.1.1
-+++ src/prevman.c	6 Apr 2004 20:26:56 -0000
-@@ -52,7 +52,7 @@
-   tile_source->width = drawable->width;
-   tile_source->height = drawable->height;
-   tile_source->bpp = drawable->bpp;
--  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
-   tile_source->un.drw.drawable = drawable;
-   gimp_pixel_rgn_init (&tile_source->un.drw.pixel_rgn, drawable, x, y, width,
-                        height, FALSE, FALSE);
-@@ -144,7 +144,7 @@
-   tile_sink->width = drawable->width;
-   tile_sink->height = drawable->height;
-   tile_sink->bpp = drawable->bpp;
--  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
-   gimp_pixel_rgn_init (&tile_sink->un.drw.pixel_rgn, drawable, x, y, width,
-                        height, TRUE, TRUE);
- }
-@@ -159,7 +159,7 @@
-   tile_sink->width = width;
-   tile_sink->height = height;
-   tile_sink->bpp = drawable->bpp;
--  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
-   tile_sink->un.prv.data = g_new (guchar,
-                                   tile_sink->width * tile_sink->height *
-                                   tile_sink->bpp);
-Index: src/refocus.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/refocus.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 refocus.c
---- src/refocus.c	30 Jan 2003 21:30:19 -0000	1.1.1.1
-+++ src/refocus.c	6 Apr 2004 20:26:56 -0000
-@@ -45,9 +45,9 @@
- 
- /* Declare local functions. */
- static void query (void);
--static void run (char *name,
-+static void run (const gchar *name,
-                  gint nparams,
--                 GimpParam * param,
-+                 const GimpParam * param,
-                  gint * nreturn_vals, GimpParam ** return_vals);
- static gint dialog ();
- static void doit (void);
-@@ -111,7 +111,6 @@
-     {GIMP_PDB_FLOAT, "noise", "Noise to Signal ratio"},
-   };
-   static GimpParamDef *return_vals = NULL;
--  static gint nargs = (gint) (sizeof (args) / sizeof (args[0]));
-   static gint nreturn_vals = 0;
- 
-   gimp_install_procedure ("plug_in_refocus",
-@@ -123,15 +122,15 @@
-                           "<Image>/Filters/Enhance/Refocus ...",
-                           "RGB*, GRAY*",
-                           GIMP_PLUGIN,
--                          nargs, nreturn_vals, args, return_vals);
-+                          G_N_ELEMENTS(args), nreturn_vals, args, return_vals);
- }
- 
- static void
--run (char *name, gint n_params, GimpParam * param,
-+run (const gchar *name, gint n_params, const GimpParam * param,
-      gint * nreturn_vals, GimpParam ** return_vals)
- {
-   static GimpParam values[1];
--  GimpRunModeType run_mode;
-+  GimpRunMode run_mode;
-   GimpPDBStatusType status = GIMP_PDB_SUCCESS;
- 
-   (void) name;                  /* Shut up warnings about unused parameters. */
-@@ -186,8 +185,8 @@
-     {
- 
-       /*  Make sure that the drawable is gray or RGB color  */
--      if (gimp_drawable_is_rgb (drawable->id) ||
--          gimp_drawable_is_gray (drawable->id))
-+      if (gimp_drawable_is_rgb (drawable->drawable_id) ||
-+          gimp_drawable_is_gray (drawable->drawable_id))
-         {
-           doit ();
- 
-@@ -411,7 +410,7 @@
-           event_is_current =
-             gimp_preview_draw_unscaled_row (GIMP_PREVIEW (my_widgets.preview),
-                                             event->event_id,
--                                            gimp_drawable_type (drawable->id),
-+                                            gimp_drawable_type (drawable->drawable_id),
-                                             row, buf);
-         };
-       g_free (buf);
-@@ -608,7 +607,7 @@
-   gimp_progress_init ("Computing matrix");
-   update_matrix ();
-   gimp_progress_init ("Applying convolution");
--  gimp_drawable_mask_bounds (drawable->id, &sx1, &sy1, &sx2, &sy2);
-+  gimp_drawable_mask_bounds (drawable->drawable_id, &sx1, &sy1, &sx2, &sy2);
-   width = sx2 - sx1;
-   height = sy2 - sy1;
-   tile_source_init_from_drawable (&source, drawable, sx1, sy1, width, height);
-@@ -618,7 +617,7 @@
-                   matrix, 2 * my_config.mat_width + 1,
-                   &update_progress_closure);
-   gimp_drawable_flush (drawable);
--  gimp_drawable_merge_shadow (drawable->id, TRUE);
--  gimp_drawable_update (drawable->id, sx1, sy1, width, height);
-+  gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
-+  gimp_drawable_update (drawable->drawable_id, sx1, sy1, width, height);
-   g_free (matrix);
- }
diff --git a/extra/gimp-refocus/refocus-gimp-preview.patch b/extra/gimp-refocus/refocus-gimp-preview.patch
deleted file mode 100644
index 089365dcb..000000000
--- a/extra/gimp-refocus/refocus-gimp-preview.patch
+++ /dev/null
@@ -1,440 +0,0 @@
-diff -ur src/gimppreview.c src/gimppreview.c
---- src/gimppreview.c	2008-03-17 17:20:49.000000000 -0700
-+++ src/gimppreview.c	2008-03-17 17:15:51.000000000 -0700
-@@ -36,18 +36,18 @@
- #include "gimppreview.h"
- 
- 
--static void gimp_preview_init (GimpPreview * preview);
--static void gimp_preview_class_init (GimpPreviewClass * klass);
-+static void gimp_preview_init (RefocusPreview * preview);
-+static void gimp_preview_class_init (RefocusPreviewClass * klass);
- 
- static void gimp_preview_plus_callback (GtkWidget * widget, gpointer data);
- static void gimp_preview_minus_callback (GtkWidget * widget, gpointer data);
- static gint gimp_preview_event (GtkWidget * widget, GdkEvent * event,
-                                 gpointer data);
--static void gimp_preview_recompute_sizes (GimpPreview * preview,
-+static void gimp_preview_recompute_sizes (RefocusPreview * preview,
-                                           gdouble newscale);
--static void gimp_preview_update_preview (GimpPreview * preview);
-+static void gimp_preview_update_preview (RefocusPreview * preview);
- 
--static void gimp_preview_image_set_size (GimpPreview * preview, gint width,
-+static void gimp_preview_image_set_size (RefocusPreview * preview, gint width,
-                                          gint height);
- static void gimp_preview_size_request (GtkWidget * widget,
-                                        GtkRequisition * requisition);
-@@ -58,7 +58,7 @@
-                                  GtkCallback callback,
-                                  gpointer callback_data);
- gboolean gimp_preview_update_preview_idle_fun (gpointer data);
--void gimp_preview_schedule_update (GimpPreview * preview);
-+void gimp_preview_schedule_update (RefocusPreview * preview);
- 
- #define PROGRESS_BAR_HEIGHT (10)
- #define PREVIEW_SIZE (100)
-@@ -94,11 +94,11 @@
- 
- 
- /*
-- * Apps which use a GimpPreview widget should not be accessing the private
-+ * Apps which use a RefocusPreview widget should not be accessing the private
-  * data!
-  */
- #define PREVIEW_DATA(preview) \
--        ((GimpPreviewData*)(GIMP_PREVIEW (preview)->private_data))
-+        ((RefocusPreviewData*)(GIMP_PREVIEW (preview)->private_data))
- 
- typedef struct
- {
-@@ -126,7 +126,7 @@
-   GtkWidget *image;
-   GtkWidget *progress_bar;
- }
--GimpPreviewData;
-+RefocusPreviewData;
- 
- 
- /* Convert coordinate in preview space to image coordinates */
-@@ -155,20 +155,20 @@
-   if (!preview_type)
-     {
-       GTypeInfo preview_info = {
--        sizeof (GimpPreviewClass),
-+        sizeof (RefocusPreviewClass),
-         (GBaseInitFunc) NULL,
-         (GBaseFinalizeFunc) NULL,
-         (GClassInitFunc) gimp_preview_class_init,
-         (GClassFinalizeFunc) NULL,
-         (gconstpointer) NULL,   /* class_data */
--        sizeof (GimpPreview),
-+        sizeof (RefocusPreview),
-         0,                      /* n_preallocs */
-         (GInstanceInitFunc) gimp_preview_init,
-         (GTypeValueTable *) NULL /* value_table */
-       };
- 
-       preview_type =
--        g_type_register_static (GTK_TYPE_CONTAINER, "GimpPreview",
-+        g_type_register_static (GTK_TYPE_CONTAINER, "RefocusPreview",
-                                 &preview_info, 0);
-     }
- 
-@@ -181,7 +181,7 @@
-  * by GTK's internal mechanisms.
-  */
- static void
--gimp_preview_class_init (GimpPreviewClass * klass)
-+gimp_preview_class_init (RefocusPreviewClass * klass)
- {
-   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-@@ -190,7 +190,7 @@
-     g_signal_new ("update_preview",
-                   G_TYPE_FROM_CLASS (klass),
-                   G_SIGNAL_RUN_FIRST,
--                  G_STRUCT_OFFSET (GimpPreviewClass, update_preview),
-+                  G_STRUCT_OFFSET (RefocusPreviewClass, update_preview),
-                   NULL,
-                   NULL,
-                   g_cclosure_marshal_VOID__POINTER,
-@@ -200,7 +200,7 @@
-     g_signal_new ("preview_changed",
-                   G_TYPE_FROM_CLASS (klass),
-                   G_SIGNAL_RUN_FIRST,
--                  G_STRUCT_OFFSET (GimpPreviewClass, preview_changed),
-+                  G_STRUCT_OFFSET (RefocusPreviewClass, preview_changed),
-                   NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
- 
-   klass->update_preview = NULL;
-@@ -212,7 +212,7 @@
- 
- 
- void
--gimp_preview_set_scale_amount(GimpPreview *preview, gdouble scale_amount)
-+gimp_preview_set_scale_amount(RefocusPreview *preview, gdouble scale_amount)
- {
-   /*
-    * If the caller wants to set the scale amount, let them do so.
-@@ -269,7 +269,7 @@
-  * by GTK's internal mechanisms.
-  */
- static void
--gimp_preview_init (GimpPreview * preview)
-+gimp_preview_init (RefocusPreview * preview)
- {
-   gchar buffer[10];
- 
-@@ -277,7 +277,7 @@
-   GTK_WIDGET_SET_FLAGS (preview, GTK_NO_WINDOW);
-   GTK_CONTAINER (preview)->resize_mode = GTK_RESIZE_IMMEDIATE;
- 
--  preview->private_data = g_malloc0 (sizeof (GimpPreviewData));
-+  preview->private_data = g_malloc0 (sizeof (RefocusPreviewData));
- 
- 
-   PREVIEW_DATA (preview)->label = gtk_label_new ("");
-@@ -307,7 +307,7 @@
- gimp_preview_new_with_args (GimpDrawable * drawable, gint cb_preview_size,
-                             gdouble cb_scale_amount, gint cb_allow_scale)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   GtkWidget *frame;
-   GtkWidget *hbox;
-   GtkWidget *event_box;
-@@ -454,7 +454,7 @@
- static void
- gimp_preview_size_request (GtkWidget * widget, GtkRequisition * requisition)
- {
--  GimpPreview *preview = GIMP_PREVIEW (widget);
-+  RefocusPreview *preview = GIMP_PREVIEW (widget);
-   GtkRequisition resize_box_requisition;
- 
- #ifdef PREVIEW_DEBUG
-@@ -478,7 +478,7 @@
- static void
- gimp_preview_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
- {
--  GimpPreview *preview = GIMP_PREVIEW (widget);
-+  RefocusPreview *preview = GIMP_PREVIEW (widget);
-   GtkAllocation resize_box_allocation, progress_bar_allocation,
-     event_box_allocation;
-   GtkRequisition resize_box_requisition;
-@@ -543,7 +543,7 @@
-                      gboolean include_internals,
-                      GtkCallback callback, gpointer callback_data)
- {
--  GimpPreview *preview = GIMP_PREVIEW (container);
-+  RefocusPreview *preview = GIMP_PREVIEW (container);
- 
-   if (PREVIEW_DATA (preview)->resize_box)
-     {
-@@ -564,7 +564,7 @@
-  * Plug-ins call this to do an update of the preview area.
-  */
- void
--gimp_preview_update (GimpPreview * preview)
-+gimp_preview_update (RefocusPreview * preview)
- {
-   gimp_preview_recompute_sizes (preview, preview->scale);
-   gimp_preview_update_preview (preview);
-@@ -579,7 +579,7 @@
- static void
- gimp_preview_plus_callback (GtkWidget * widget, gpointer data)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   gchar buffer[10];
-   gdouble new_scale;
- 
-@@ -616,7 +616,7 @@
- static void
- gimp_preview_minus_callback (GtkWidget * widget, gpointer data)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   gchar buffer[10];
-   gdouble new_scale;
- 
-@@ -651,7 +651,7 @@
- static gint
- gimp_preview_event (GtkWidget * widget, GdkEvent * event, gpointer data)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   GdkEventButton *button_event;
-   gint x, y;
-   gint dx, dy;
-@@ -733,7 +733,7 @@
-  * This function is also used for initializing the preview.
-  */
- static void
--gimp_preview_recompute_sizes (GimpPreview * preview, gdouble new_scale)
-+gimp_preview_recompute_sizes (RefocusPreview * preview, gdouble new_scale)
- {
- 
-   /* The center of the preview in image coordinates.
-@@ -765,7 +765,7 @@
- }
- 
- void
--gimp_preview_generate_update_event (GimpPreview * preview)
-+gimp_preview_generate_update_event (RefocusPreview * preview)
-      /* Signal the user that the preview must be updated */
- {
-   const gdouble scale = preview->scale;
-@@ -783,7 +783,7 @@
-            0,
-            preview->drawable->height - image_y);
- 
--  GimpPreviewEvent preview_event;
-+  RefocusPreviewEvent preview_event;
- 
-   preview_event.event_id = PREVIEW_DATA (preview)->current_event_id;
-   preview_event.scale = preview->scale;
-@@ -814,7 +814,7 @@
-  * to step through source and destination!
-  */
- static void
--gimp_preview_update_preview (GimpPreview * preview)
-+gimp_preview_update_preview (RefocusPreview * preview)
- {
-   GimpPixelRgn region;
-   guchar *image_data = NULL;
-@@ -1012,7 +1012,7 @@
- 
- 
- void
--gimp_preview_force_redraw (GimpPreview * preview)
-+gimp_preview_force_redraw (RefocusPreview * preview)
- {
-   gtk_widget_queue_draw (GTK_WIDGET (PREVIEW_DATA (preview)->image));
- }
-@@ -1022,7 +1022,7 @@
- gboolean
- gimp_preview_update_preview_idle_fun (gpointer data)
- {
--  GimpPreview *preview = GIMP_PREVIEW (data);
-+  RefocusPreview *preview = GIMP_PREVIEW (data);
-   gint event_id = PREVIEW_DATA (preview)->current_event_id;
- 
- #ifdef PREVIEW_DEBUG
-@@ -1041,7 +1041,7 @@
- }
- 
- void
--gimp_preview_schedule_update (GimpPreview * preview)
-+gimp_preview_schedule_update (RefocusPreview * preview)
- {
-   PREVIEW_DATA (preview)->current_event_id++;
- 
-@@ -1082,7 +1082,7 @@
- }
- 
- void
--gimp_preview_image_set_size (GimpPreview * preview, gint width, gint height)
-+gimp_preview_image_set_size (RefocusPreview * preview, gint width, gint height)
- {
-   const gint real_width = MIN (preview->max_width, width);
-   const gint real_height = MIN (preview->max_height, height);
-@@ -1120,8 +1120,8 @@
- 
- /**
-  * gimp_preview_draw_row:
-- * @preview: the #GimpPreview
-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
-+ * @preview: the #RefocusPreview
-+ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
-  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
-  * @row:the relative number of the row within the preview.
-  * The top row of the preview is number 0.
-@@ -1137,7 +1137,7 @@
-  * with the same event-id will be ignored by the preview.
-  **/
- gboolean
--gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
-+gimp_preview_draw_row (RefocusPreview * preview, const gint event_id,
-                        GimpImageType type, gint row,
-                        const guchar * const data)
- {
-@@ -1247,8 +1247,8 @@
- 
- /**
-  * gimp_preview_draw_unscaled_row:
-- * @preview: the #GimpPreview
-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
-+ * @preview: the #RefocusPreview
-+ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
-  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
-  * @row:row is the relative position of the row w.r.t. preview_event->image_y.
-  * The top row has number 0.
-@@ -1267,7 +1267,7 @@
-  * with the same event-id will be ignored by the preview.
-  **/
- gboolean
--gimp_preview_draw_unscaled_row (GimpPreview * preview, const gint event_id,
-+gimp_preview_draw_unscaled_row (RefocusPreview * preview, const gint event_id,
-                                 GimpImageType type, const gint row,
-                                 const guchar * const data)
- {
-@@ -1445,8 +1445,8 @@
- 
- /**
-  * gimp_preview_progress_set_fraction:
-- * @preview: the #GimpPreview.
-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
-+ * @preview: the #RefocusPreview.
-+ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
-  * @fraction: the fraction completed.
-  *
-  * Set the progress bar of the preview to @fraction completed.
-@@ -1456,7 +1456,7 @@
-  * with the same event-id will be ignored by the preview.
-  **/
- gboolean
--gimp_preview_progress_set_fraction (GimpPreview * preview,
-+gimp_preview_progress_set_fraction (RefocusPreview * preview,
-                                     const gint event_id, double fraction)
- {
-   const gboolean return_status =
-diff -ur src/gimppreview.h src/gimppreview.h
---- src/gimppreview.h	2003-01-30 13:30:18.000000000 -0800
-+++ src/gimppreview.h	2008-03-17 17:16:29.000000000 -0700
-@@ -33,24 +33,24 @@
- #define PREVIEW_FIXED_SIZE           0
- #define PREVIEW_DEFAULT_SIZE         -1
- #define GIMP_TYPE_PREVIEW            (gimp_preview_get_type ())
--#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview))
--#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, GimpPreviewClass))
-+#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, RefocusPreview))
-+#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, RefocusPreviewClass))
- #define GIMP_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW))
- #define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW))
--typedef struct _GimpPreview GimpPreview;
--typedef struct _GimpPreviewClass GimpPreviewClass;
--typedef struct _GimpPreviewEvent GimpPreviewEvent;
-+typedef struct _RefocusPreview RefocusPreview;
-+typedef struct _RefocusPreviewClass RefocusPreviewClass;
-+typedef struct _RefocusPreviewEvent RefocusPreviewEvent;
- 
--struct _GimpPreviewClass
-+struct _RefocusPreviewClass
- {
-   GtkContainerClass parent_class;
- 
--  void (*update_preview) (GimpPreview * preview, GimpPreviewEvent * event);
--  void (*preview_changed) (GimpPreview * preview);
-+  void (*update_preview) (RefocusPreview * preview, RefocusPreviewEvent * event);
-+  void (*preview_changed) (RefocusPreview * preview);
- };
- 
- 
--struct _GimpPreview
-+struct _RefocusPreview
- {
-   GtkContainer parent;
- 
-@@ -75,13 +75,13 @@
- };
- 
- /**
-- * GimpPreviewEvent:
-+ * RefocusPreviewEvent:
-  * @event_id: Id of this event. This is needed for gimp_preview_draw_row,
-  * gimp_preview_draw_unscaled_row and gimp_preview_progress_set_fraction.
-  * @scale: Current scale of the preview.
-  *
-  **/
--struct _GimpPreviewEvent
-+struct _RefocusPreviewEvent
- {
-   gint event_id;                /* Id of this event */
-   gdouble scale;                /* Scale of preview */
-@@ -113,20 +113,20 @@
-                                        gint preview_size,
-                                        gdouble scale_amount,
-                                        gint allow_scale);
--void gimp_preview_update (GimpPreview * preview);
-+void gimp_preview_update (RefocusPreview * preview);
- 
--gboolean gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
-+gboolean gimp_preview_draw_row (RefocusPreview * preview, const gint event_id,
-                                 GimpImageType type, const gint row,
-                                 const guchar * const data);
- 
--gboolean gimp_preview_draw_unscaled_row (GimpPreview * preview,
-+gboolean gimp_preview_draw_unscaled_row (RefocusPreview * preview,
-                                          const gint event_id,
-                                          GimpImageType type, const gint row,
-                                          const guchar * const data);
- 
--void gimp_preview_force_redraw (GimpPreview * preview);
-+void gimp_preview_force_redraw (RefocusPreview * preview);
- 
--gboolean gimp_preview_progress_set_fraction (GimpPreview * preview,
-+gboolean gimp_preview_progress_set_fraction (RefocusPreview * preview,
-                                              const gint event_id,
-                                              double fraction);
- 
-diff -ur src/refocus.c src/refocus.c
---- src/refocus.c	2008-03-17 17:20:49.000000000 -0700
-+++ src/refocus.c	2008-03-17 17:18:48.000000000 -0700
-@@ -25,6 +25,7 @@
- #include <time.h>
- #include <string.h>
- #include <libgimp/gimp.h>
-+#include <libgimp/gimpcompat.h>
- #include <gtk/gtk.h>
- #include <sys/types.h>
- #include <signal.h>
-@@ -372,7 +373,7 @@
- }
- 
- static void
--preview_callback (GtkWidget * widget, GimpPreviewEvent * event, gpointer data)
-+preview_callback (GtkWidget * widget, RefocusPreviewEvent * event, gpointer data)
- {
-   TileSource source;
-   TileSink sink;
diff --git a/extra/gimp-refocus/refocus-mirror-fix.patch b/extra/gimp-refocus/refocus-mirror-fix.patch
deleted file mode 100644
index af79dd893..000000000
--- a/extra/gimp-refocus/refocus-mirror-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: src/tilebuf.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/tilebuf.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 tilebuf.c
---- src/tilebuf.c	30 Jan 2003 21:30:19 -0000	1.1.1.1
-+++ src/tilebuf.c	6 Apr 2004 20:26:56 -0000
-@@ -140,7 +140,10 @@
- 
-         for (x = x_lo - 1; x >= buf->real_x; x--)
-           {
--            copy_col (buf, 2 * x_lo - x, y_start, y_end - y_start, x);
-+            gint sx = 2 * x_lo - x;
-+            copy_col (buf,
-+                      sx<=buf->real_x+buf->real_width-1?sx:buf->real_x+buf->real_width-1,
-+                      y_start, y_end - y_start, x);
-           };
-       }
-       break;
-@@ -171,7 +174,9 @@
- 
-         for (x = x_hi; x < buf->real_x + buf->real_width; x++)
-           {
--            copy_col (buf, 2 * (x_hi - 1) - x, y_start, y_end - y_start, x);
-+            gint sx = 2 * (x_hi - 1) - x;
-+            copy_col (buf, sx>=buf->real_x?sx:buf->real_x,
-+                      y_start, y_end - y_start, x);
-           };
-       }
-       break;
-@@ -200,7 +205,10 @@
- 
-         for (y = y_lo - 1; y >= buf->real_y; y--)
-           {
--            copy_row (buf, buf->real_x, 2 * y_lo - y, buf->real_width, y);
-+            gint sy = 2 * y_lo - y;
-+            copy_row (buf, buf->real_x,
-+                      sy<=buf->real_y+buf->real_height-1?sy:buf->real_y+buf->real_height-1,
-+                      buf->real_width, y);
-           };
-       }
-       break;
-@@ -230,8 +238,9 @@
- 
-         for (y = y_hi; y < buf->real_y + buf->real_height; y++)
-           {
--            copy_row (buf, buf->real_x, 2 * (y_hi - 1) - y, buf->real_width,
--                      y);
-+            gint sy = 2 * (y_hi - 1) - y;
-+            copy_row (buf, buf->real_x, sy>=buf->real_y?sy:buf->real_y,
-+                      buf->real_width, y);
-           };
-       }
-       break;
diff --git a/extra/gnuplot/lua_tikz.patch b/extra/gnuplot/lua_tikz.patch
deleted file mode 100644
index f9a939d47..000000000
--- a/extra/gnuplot/lua_tikz.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- term/lua/gnuplot-tikz-444.lua	Sun Nov 13 00:57:15 2011

-+++ term/lua/gnuplot-tikz.lua	Fri Nov 25 01:11:38 2011

-@@ -251,6 +251,7 @@

-   gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))

-   gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",

-       term.gp_version, term.gp_patchlevel,

-+      _VERSION,

-       string.sub(term.lua_term_revision,7,-3),

-       pgf.REVISION,os.date()))

-   if font ~= "" then
\ No newline at end of file
diff --git a/extra/gnutls/buildfix.diff b/extra/gnutls/buildfix.diff
deleted file mode 100644
index 23c749e9d..000000000
--- a/extra/gnutls/buildfix.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-index 17f6d3f..cc01dcd 100644 (file)
-
-
---- a/tests/mini-loss-time.c
-+++ b/tests/mini-loss-time.c
-@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
-     {
-       /* parent */
-       server (fd[0], server_packet);
-+      kill(child, SIGTERM);
-     }
-   else 
-     {
---- a/src/libopts/m4/libopts.m4
-+++ b/src/libopts/m4/libopts.m4
-@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
-     fi])
- 
-   AC_ARG_ENABLE([libopts-install],
--    AC_HELP_STRING([--disable-libopts-install],
--       [Do not install libopts with client installation]))
--  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
-+    AC_HELP_STRING([--enable-libopts-install],
-+       [Install libopts with client installation]))
-+  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
- 
-   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
-      AC_MSG_CHECKING([whether autoopts-config can be found])
diff --git a/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch b/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch
deleted file mode 100644
index 8ba4c8ed3..000000000
--- a/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8bd3bdaf3768b3fb6adc85b3bc681fdce07b786e Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Wed, 03 Aug 2011 08:18:29 +0000
-Subject: oggstream: Fix crashes with 0-byte vorbis packets
-
-Fixes bug #655574.
----
-diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
-index e843f48..77f39d4 100644
---- a/ext/ogg/gstoggstream.c
-+++ b/ext/ogg/gstoggstream.c
-@@ -792,7 +792,7 @@ packet_duration_vorbis (GstOggStream * pad, ogg_packet * packet)
-   int size;
-   int duration;
- 
--  if (packet->packet[0] & 1)
-+  if (packet->bytes == 0 || packet->packet[0] & 1)
-     return 0;
- 
-   mode = (packet->packet[0] >> 1) & ((1 << pad->vorbis_log2_num_modes) - 1);
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch b/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch
deleted file mode 100644
index b9883d407..000000000
--- a/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7d22d91fca6b9f24ca205eef98031f1ed6a44d33 Mon Sep 17 00:00:00 2001
-From: Philip Jägenstedt <philipj@opera.com>
-Date: Tue, 26 Jul 2011 14:10:17 +0000
-Subject: theoradec: segfault on 0-byte ogg_packet in _chain_reverse
-
----
-diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c
-index 96e12ee..25d68db 100644
---- a/ext/theora/gsttheoradec.c
-+++ b/ext/theora/gsttheoradec.c
-@@ -1440,7 +1440,7 @@ theora_dec_chain_reverse (GstTheoraDec * dec, gboolean discont, GstBuffer * buf)
- 
-       /* if we copied a keyframe, flush and decode the decode queue */
-       data = GST_BUFFER_DATA (gbuf);
--      if ((data[0] & 0x40) == 0) {
-+      if (data && (data[0] & 0x40) == 0) {
-         GST_DEBUG_OBJECT (dec, "copied keyframe");
-         res = theora_dec_flush_decode (dec);
-       }
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/gv/buildfix.diff b/extra/gv/buildfix.diff
deleted file mode 100644
index 76c88b158..000000000
--- a/extra/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/extra/happy/PKGBUILD b/extra/happy/PKGBUILD
deleted file mode 100644
index 062f85e81..000000000
--- a/extra/happy/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 151874 2012-03-03 16:05:59Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
- 
-pkgname=happy
-pkgver=1.18.9
-pkgrel=4
-pkgdesc="The Parser Generator for Haskell"
-url="http://www.haskell.org/happy/"
-arch=('i686' 'x86_64')
-license=("custom:BSD3")
-depends=('gmp')
-makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('aeb565fe572f979f15a24db0df2de37d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  runhaskell Setup.lhs configure -O --prefix=/usr
-  runhaskell Setup.lhs build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  runhaskell Setup.lhs copy --destdir="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/haskell-cgi/PKGBUILD b/extra/haskell-cgi/PKGBUILD
deleted file mode 100644
index 4b64ba578..000000000
--- a/extra/haskell-cgi/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=cgi
-pkgname=haskell-cgi
-pkgver=3001.1.7.4
-pkgrel=3.1
-pkgdesc="A library for writing CGI programs"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-xhtml=3000.2.0.1-7.1')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('0e551afc8d6f39aaa70520e31de26506')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-cgi/haskell-cgi.install b/extra/haskell-cgi/haskell-cgi.install
deleted file mode 100644
index 533fe4dc5..000000000
--- a/extra/haskell-cgi/haskell-cgi.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-cgi
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-deepseq/PKGBUILD b/extra/haskell-deepseq/PKGBUILD
deleted file mode 100644
index 934303f2b..000000000
--- a/extra/haskell-deepseq/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=deepseq
-pkgname=haskell-deepseq
-pkgver=1.1.0.2
-pkgrel=2.1
-pkgdesc="Fully evaluate data structures"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('90b66480f0eb659c1db209ee703e0162')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-deepseq/haskell-deepseq.install b/extra/haskell-deepseq/haskell-deepseq.install
deleted file mode 100644
index 8ba51eac7..000000000
--- a/extra/haskell-deepseq/haskell-deepseq.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-deepseq
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-fgl/PKGBUILD b/extra/haskell-fgl/PKGBUILD
deleted file mode 100644
index 45f466e91..000000000
--- a/extra/haskell-fgl/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=fgl
-pkgname=haskell-fgl
-pkgver=5.4.2.3
-pkgrel=4.1
-pkgdesc="Martin Erwig's Functional Graph Library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c')
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c')
diff --git a/extra/haskell-fgl/haskell-fgl.install b/extra/haskell-fgl/haskell-fgl.install
deleted file mode 100644
index 0da0edb7b..000000000
--- a/extra/haskell-fgl/haskell-fgl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-fgl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-glut/PKGBUILD b/extra/haskell-glut/PKGBUILD
deleted file mode 100644
index 98a30495c..000000000
--- a/extra/haskell-glut/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=GLUT
-pkgname=haskell-glut
-pkgver=2.1.2.1
-pkgrel=7.1
-pkgdesc="A binding for the OpenGL Utility Toolkit"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc=7.0.3-2' 'haskell-opengl=2.2.3.0-7.1' 'freeglut')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('b97f476a04098701e330e86c1f89ed52')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-glut/haskell-glut.install b/extra/haskell-glut/haskell-glut.install
deleted file mode 100644
index 44c7cb3c1..000000000
--- a/extra/haskell-glut/haskell-glut.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-glut
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-haskell-src/PKGBUILD b/extra/haskell-haskell-src/PKGBUILD
deleted file mode 100644
index eeb4844a7..000000000
--- a/extra/haskell-haskell-src/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=haskell-src
-pkgname=haskell-haskell-src
-pkgver=1.0.1.4
-pkgrel=2.1
-pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-syb=0.3-2.1' sh)
-makedepends=(happy)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('32d181c082393ab859e72610803bac6e')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/extra/haskell-haskell-src/haskell-haskell-src.install b/extra/haskell-haskell-src/haskell-haskell-src.install
deleted file mode 100644
index 03ce601bc..000000000
--- a/extra/haskell-haskell-src/haskell-haskell-src.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskell-src
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-html/PKGBUILD b/extra/haskell-html/PKGBUILD
deleted file mode 100644
index 44a3ea50b..000000000
--- a/extra/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=10
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-html/haskell-html.install b/extra/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/extra/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-hunit/PKGBUILD b/extra/haskell-hunit/PKGBUILD
deleted file mode 100644
index 401887e4e..000000000
--- a/extra/haskell-hunit/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=HUnit
-pkgname=haskell-hunit
-pkgver=1.2.2.3
-pkgrel=2.1
-pkgdesc="A unit testing framework for Haskell"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('f179add502f88153e5c9fdc69056b657')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-hunit/haskell-hunit.install b/extra/haskell-hunit/haskell-hunit.install
deleted file mode 100644
index ceb108b5b..000000000
--- a/extra/haskell-hunit/haskell-hunit.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hunit
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-opengl/PKGBUILD b/extra/haskell-opengl/PKGBUILD
deleted file mode 100644
index 8d70bbc91..000000000
--- a/extra/haskell-opengl/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=OpenGL
-pkgname=haskell-opengl
-pkgver=2.2.3.0
-pkgrel=7.1
-pkgdesc="A binding for the OpenGL graphics system"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'mesa')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('f4e3ccb471034a6a74921d4dab9dd32d')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-opengl/haskell-opengl.install b/extra/haskell-opengl/haskell-opengl.install
deleted file mode 100644
index d0f3474b3..000000000
--- a/extra/haskell-opengl/haskell-opengl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-opengl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-parallel/PKGBUILD b/extra/haskell-parallel/PKGBUILD
deleted file mode 100644
index 0e46c2c93..000000000
--- a/extra/haskell-parallel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=parallel
-pkgname=haskell-parallel
-pkgver=3.1.0.1
-pkgrel=3.1
-pkgdesc="Parallel programming library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-deepseq=1.1.0.2-2.1')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('591979e7897dbc09157edf73a4614957')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-parallel/haskell-parallel.install b/extra/haskell-parallel/haskell-parallel.install
deleted file mode 100644
index e6ec0c449..000000000
--- a/extra/haskell-parallel/haskell-parallel.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parallel
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-platform/PKGBUILD b/extra/haskell-platform/PKGBUILD
deleted file mode 100644
index 2534d95c2..000000000
--- a/extra/haskell-platform/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-pkgname=haskell-platform
-pkgver=2011.2.0.0
-pkgrel=4
-pkgdesc="The Haskell Platform"
-url="http://hackage.haskell.org/platform/"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 
-         'haskell-glut=2.1.2.1-7.1' 
-         'haskell-http=4000.1.1-3.1'
-         'haskell-hunit=1.2.2.3-2.1'
-         'haskell-opengl=2.2.3.0-7.1'
-         'haskell-quickcheck=2.4.0.1-3.1'
-         'haskell-cgi=3001.1.7.4-3.1'
-         'haskell-deepseq=1.1.0.2-2.1'
-         'haskell-fgl=5.4.2.3-4.1'
-         'haskell-haskell-src=1.0.1.4-2.1'
-         'haskell-html=1.0.1.2-9.1'
-         'haskell-mtl=2.0.1.0-3.1'
-         'haskell-network=2.3.0.2-2.1'
-         'haskell-parallel=3.1.0.1-3.1'
-         'haskell-parsec=3.1.1-2.1'
-         'haskell-regex-base=0.93.2-4.1'
-         'haskell-regex-posix=0.94.4-2.1'
-         'haskell-regex-compat=0.93.1-4.1'	
-         'haskell-stm=2.2.0.1-2.1'
-         'haskell-syb=0.3-2.1'
-         'haskell-text=0.11.0.5-2.1'
-         'haskell-transformers=0.2.2.0-3.1'
-         'haskell-xhtml=3000.2.0.1-7.1'
-         'haskell-zlib=0.5.3.1-2.1'
-         'cabal-install=0.10.2'
-         'alex=2.3.5'
-         'happy=1.18.6' )
-
-build() {
-  return 0 
-}
diff --git a/extra/haskell-quickcheck/PKGBUILD b/extra/haskell-quickcheck/PKGBUILD
deleted file mode 100644
index 7b27cfb0c..000000000
--- a/extra/haskell-quickcheck/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=QuickCheck
-pkgname=haskell-quickcheck
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Automatic testing of Haskell programs"
-url="http://hackage.haskell.org/package/QuickCheck"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-quickcheck/haskell-quickcheck.install b/extra/haskell-quickcheck/haskell-quickcheck.install
deleted file mode 100644
index c9e12fadc..000000000
--- a/extra/haskell-quickcheck/haskell-quickcheck.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-quickcheck
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-regex-base/PKGBUILD b/extra/haskell-regex-base/PKGBUILD
deleted file mode 100644
index 3b8ecb4bb..000000000
--- a/extra/haskell-regex-base/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-base
-pkgname=haskell-regex-base
-pkgver=0.93.2
-pkgrel=5
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-regex-base/haskell-regex-base.install b/extra/haskell-regex-base/haskell-regex-base.install
deleted file mode 100644
index 3ad2fea28..000000000
--- a/extra/haskell-regex-base/haskell-regex-base.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-base
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-regex-compat/PKGBUILD b/extra/haskell-regex-compat/PKGBUILD
deleted file mode 100644
index c880ff4f2..000000000
--- a/extra/haskell-regex-compat/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-compat
-pkgname=haskell-regex-compat
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d0573ab4e2f3de5faa61380b67333320')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-regex-compat/haskell-regex-compat.install b/extra/haskell-regex-compat/haskell-regex-compat.install
deleted file mode 100644
index 898c0bba1..000000000
--- a/extra/haskell-regex-compat/haskell-regex-compat.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-regex-posix/PKGBUILD b/extra/haskell-regex-posix/PKGBUILD
deleted file mode 100644
index 1bed15490..000000000
--- a/extra/haskell-regex-posix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-posix
-pkgname=haskell-regex-posix
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="The posix regex backend for regex-base"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-regex-posix/haskell-regex-posix.install b/extra/haskell-regex-posix/haskell-regex-posix.install
deleted file mode 100644
index 2b89fae7b..000000000
--- a/extra/haskell-regex-posix/haskell-regex-posix.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-posix
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-stm/PKGBUILD b/extra/haskell-stm/PKGBUILD
deleted file mode 100644
index 9a9c9a962..000000000
--- a/extra/haskell-stm/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=stm
-pkgname=haskell-stm
-pkgver=2.2.0.1
-pkgrel=2.1
-pkgdesc="A modular composable concurrency abstraction."
-url="http://hackage.haskell.org/package/stm"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('b1cf03ed315e00c33160746feeee8682')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-stm/haskell-stm.install b/extra/haskell-stm/haskell-stm.install
deleted file mode 100644
index 0283c2fc5..000000000
--- a/extra/haskell-stm/haskell-stm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stm
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-syb/PKGBUILD b/extra/haskell-syb/PKGBUILD
deleted file mode 100644
index 64faf05ed..000000000
--- a/extra/haskell-syb/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=syb
-pkgname=haskell-syb
-pkgver=0.3
-pkgrel=2.1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('c4f6771fa32d467a029e6e813757a9fe')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/extra/haskell-syb/haskell-syb.install b/extra/haskell-syb/haskell-syb.install
deleted file mode 100644
index 080055165..000000000
--- a/extra/haskell-syb/haskell-syb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-syb
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-xhtml/PKGBUILD b/extra/haskell-xhtml/PKGBUILD
deleted file mode 100644
index 4a34206ad..000000000
--- a/extra/haskell-xhtml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=xhtml
-pkgname=haskell-xhtml
-pkgver=3000.2.0.1
-pkgrel=7.1
-pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
-url="http://hackage.haskell.org/package/xhtml"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('9e3e7d9c66618c5e29716f90e54363c9')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-xhtml/haskell-xhtml.install b/extra/haskell-xhtml/haskell-xhtml.install
deleted file mode 100644
index d03b8a053..000000000
--- a/extra/haskell-xhtml/haskell-xhtml.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-xhtml
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/imake/xorg-cf-files-1.0.2-xprint.patch b/extra/imake/xorg-cf-files-1.0.2-xprint.patch
deleted file mode 100644
index 3926d724a..000000000
--- a/extra/imake/xorg-cf-files-1.0.2-xprint.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- xorg-cf-files-1.0.3/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
-+++ xorg-cf-files-1.0.3/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
-@@ -3920,21 +3920,13 @@
- #endif
- 
- #ifndef ExtraXawReqs
--# if BuildXaw
--#  define ExtraXawReqs $(XPLIB)
--# else
--#  define ExtraXawReqs /**/
--# endif
-+# define ExtraXawReqs /**/
- #endif
- 
- EXTRAXAWREQS = ExtraXawReqs
- 
- #ifndef ExtraXawClientDepLibs
--# if BuildXaw
--#  define ExtraXawClientDepLibs $(DEPXPLIB)
--# else
--#  define ExtraXawClientDepLibs /**/
--# endif
-+# define ExtraXawClientDepLibs /**/
- #endif
- 
- EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
-@@ -3944,11 +3936,7 @@
- #endif
- 
- #ifndef ExtraXawClientLibs
--# if BuildXaw
--#  define ExtraXawClientLibs $(XPLIB)
--# else
--#  define ExtraXawClientLibs /**/
--# endif
-+# define ExtraXawClientLibs /**/
- #endif
- 
- EXTRAXAWCLIENTLIBS = ExtraXawClientLibs
diff --git a/extra/iperf/license b/extra/iperf/license
deleted file mode 100644
index e31f98080..000000000
--- a/extra/iperf/license
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 1999-2006, The Board of Trustees of the University of Illinois
-All Rights Reserved.
-
-Iperf performance test
-Mark Gates
-Ajay Tirumala
-Jim Ferguson
-Jon Dugan
-Feng Qin
-Kevin Gibbs
-John Estabrook
-National Laboratory for Applied Network Research
-National Center for Supercomputing Applications
-University of Illinois at Urbana-Champaign
-http://www.ncsa.uiuc.edu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software (Iperf) 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:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
-
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the University of Illinois, NCSA, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. 
-
-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 CONTIBUTORS 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/extra/kdebase/fix-controlclick-selection.patch b/extra/kdebase/fix-controlclick-selection.patch
deleted file mode 100644
index a51161326..000000000
--- a/extra/kdebase/fix-controlclick-selection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
-+++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
-@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
-                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
-     if (clearSelection) {
-         m_selectionManager->clearSelection();
--    } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
-+    } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
-         // The user might want to start dragging multiple items, but if he clicks the item
-         // in order to trigger it instead, the other selected items must be deselected.
-         // However, we do not know yet what the user is going to do.
diff --git a/extra/kdeedu-marble/fix-with-qt48.patch b/extra/kdeedu-marble/fix-with-qt48.patch
deleted file mode 100644
index 3694a48fb..000000000
--- a/extra/kdeedu-marble/fix-with-qt48.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 79c39f45468bace95169d1ba959884ce27087d1e
-Author: Torsten Rahn <rahn@kde.org>
-Date:   Wed Feb 8 17:18:15 2012 +0100
-
-    Fixes for Marble with Qt 4.8:
-    
-    - Provide proper colors for Marble's Atlas, Temperature,
-      Precipitation and Venus/Mars Topography maps.
-      ( due to introduction of QImage::fill( QColor ) overload )
-    
-    - Show proper icons for MarbleLegendBrowser
-      ( due to new interpretation of the "current directory" in
-        QTextBrowser )
-
-diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
-index 4a25095..ffa0a23 100644
---- a/src/lib/MarbleLegendBrowser.cpp
-+++ b/src/lib/MarbleLegendBrowser.cpp
-@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
-     t.start();
- 
-     // Read the html string.
--    QString finalHtml;
-+    QString legendPath;
- 
-     // Check for a theme specific legend.html first
-     if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
-     {
-         GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
- 
--        QString customLegendPath = MarbleDirs::path( "maps/" + 
-+        legendPath = MarbleDirs::path( "maps/" + 
-         currentMapTheme->head()->target() + '/' + 
-         currentMapTheme->head()->theme() + "/legend.html" ); 
--        if ( !customLegendPath.isEmpty() )
--            finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath  ) );
--        else
--            finalHtml.clear();
-     }
--
--    if ( finalHtml.isEmpty() ) {
--        finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) );
-+    if ( legendPath.isEmpty() ) {
-+	legendPath = MarbleDirs::path( "legend.html" ); 
-     }
- 
-+    QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
-+    finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' );
-+
-     // Generate some parts of the html from the MapTheme <Legend> tag. 
-     const QString sectionsHtml = generateSectionsHtml();
- 
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index 4a4f8f3..d0deead 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( Qt::transparent );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0) );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {
-commit b89ff577fcbd085fbd180f59aa669dded1818082
-Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de>
-Date:   Wed Feb 8 18:14:59 2012 +0100
-
-    compile with Qt < 4.8
-    
-    * take into account the comment in the API doc, which suggests to use QColor::rgb()
-    (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index d0deead..9319a89 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( QColor( 0, 0, 255, 0) );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {
diff --git a/extra/kdeutils-printer-applet/PKGBUILD b/extra/kdeutils-printer-applet/PKGBUILD
deleted file mode 100644
index c80b49411..000000000
--- a/extra/kdeutils-printer-applet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 153227 2012-03-12 09:46:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-printer-applet
-pkgver=4.8.1
-pkgrel=1
-pkgdesc='System tray icon for managing print jobs'
-url='http://kde.org/applications/system/printerapplet/'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/printer-applet-${pkgver}.tar.xz")
-sha1sums=('c3002fea0382386256c3acaebd907a41db0ccc4e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../printer-applet-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-}
diff --git a/extra/kdevplatform/subversion17.patch b/extra/kdevplatform/subversion17.patch
deleted file mode 100644
index 782ac38ea..000000000
--- a/extra/kdevplatform/subversion17.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-commit 74dec52749e3c3af2ac6492f50e2676128f35b27
-Author: Milian Wolff <mail@milianw.de>
-Date:   Fri Nov 18 16:26:06 2011 +0100
-
-    fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style
-    
-    this was suggested by Stephan Sperling
-    
-    CCBUG: 284061
-
-diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp
-index eaa84c1..4dced08 100644
---- a/plugins/subversion/kdevsvncpp/path.cpp
-+++ b/plugins/subversion/kdevsvncpp/path.cpp
-@@ -24,6 +24,7 @@
- 
- // subversion api
- #include "svn_path.h"
-+#include "svn_dirent_uri.h"
- 
- // apr api
- #include "apr_file_io.h"
-@@ -63,8 +64,7 @@ namespace svn
-       m_path = "";
-     else
-     {
--      const char * int_path =
--        svn_path_internal_style(path, pool.pool());
-+      const char * int_path = svn_dirent_canonicalize(path, pool);
- 
-       m_path = int_path;
- 
-commit cc7f0798d314cdac14b90e427abe22e99c6bd591
-Author: Milian Wolff <mail@milianw.de>
-Date:   Fri Nov 18 16:23:36 2011 +0100
-
-    properly initialize client context for compatibility with subversion API
-    
-    this should hopefully fix the crash with svn 1.7 in kdevelop, please test
-    
-    BUG: 284061
-
-diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp
-index d277591..ddbb657 100644
---- a/plugins/subversion/kdevsvncpp/context.cpp
-+++ b/plugins/subversion/kdevsvncpp/context.cpp
-@@ -65,7 +65,7 @@ public:
-     bool logIsSet;
-     int promptCounter;
-     Pool pool;
--    svn_client_ctx_t ctx;
-+    svn_client_ctx_t * ctx;
-     std::string username;
-     std::string password;
-     std::string logMessage;
-@@ -205,26 +205,26 @@ public:
-       svn_auth_open(&ab, providers, pool);
- 
-       // initialize ctx structure
--      memset(&ctx, 0, sizeof(ctx));
-+      svn_client_create_context(&ctx, pool);
- 
-       // get the config based on the configDir passed in
--      svn_config_get_config(&ctx.config, c_configDir, pool);
-+      svn_config_get_config(&ctx->config, c_configDir, pool);
- 
-       // tell the auth functions where the config is
-       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
-                              c_configDir);
- 
--      ctx.auth_baton = ab;
--      ctx.log_msg_func = onLogMsg;
--      ctx.log_msg_baton = this;
--      ctx.notify_func = onNotify;
--      ctx.notify_baton = this;
--      ctx.cancel_func = onCancel;
--      ctx.cancel_baton = this;
-+      ctx->auth_baton = ab;
-+      ctx->log_msg_func = onLogMsg;
-+      ctx->log_msg_baton = this;
-+      ctx->notify_func = onNotify;
-+      ctx->notify_baton = this;
-+      ctx->cancel_func = onCancel;
-+      ctx->cancel_baton = this;
- 
- #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2)
--      ctx.notify_func2 = onNotify2;
--      ctx.notify_baton2 = this;
-+      ctx->notify_func2 = onNotify2;
-+      ctx->notify_baton2 = this;
- #endif
-     }
- 
-@@ -234,7 +234,7 @@ public:
-       if (!value)
-         param = (void *)"1";
- 
--      svn_auth_set_parameter(ctx.auth_baton,
-+      svn_auth_set_parameter(ctx->auth_baton,
-                              SVN_AUTH_PARAM_NO_AUTH_CACHE,
-                              param);
-     }
-@@ -245,7 +245,7 @@ public:
-       username = usr;
-       password = pwd;
- 
--      svn_auth_baton_t * ab = ctx.auth_baton;
-+      svn_auth_baton_t * ab = ctx->auth_baton;
-       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
-                              username.c_str());
-       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
-@@ -654,13 +654,13 @@ public:
- 
-   Context::operator svn_client_ctx_t * ()
-   {
--    return &(m->ctx);
-+    return m->ctx;
-   }
- 
-   svn_client_ctx_t *
-   Context::ctx()
-   {
--    return &(m->ctx);
-+    return m->ctx;
-   }
- 
-   void
diff --git a/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch b/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
deleted file mode 100644
index 4739e601d..000000000
--- a/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr kshutdown-3.0beta2.orig/src/kshutdown.cpp kshutdown-3.0beta2/src/kshutdown.cpp
---- kshutdown-3.0beta2.orig/src/kshutdown.cpp	2011-12-29 22:18:45.000000000 -0500
-+++ kshutdown-3.0beta2/src/kshutdown.cpp	2011-12-30 19:09:08.128451522 -0500
-@@ -886,13 +886,13 @@
- 	#ifdef KS_NATIVE_KDE
- 	if (
- // TODO: check if logout is available
--		(m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT)) &&
-+		(m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT))) 
- 		KWorkSpace::requestShutDown(
- 			KWorkSpace::ShutdownConfirmNo,
- 			m_type,
- 			KWorkSpace::ShutdownModeForceNow
--		)
--	)
-+		);
-+
- 		return true;
- 	#endif // KS_NATIVE_KDE
- 	
diff --git a/extra/libnet/PKGBUILD b/extra/libnet/PKGBUILD
deleted file mode 100644
index bc07a3d78..000000000
--- a/extra/libnet/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 150607 2012-02-18 22:50:44Z pierre $
-# Maintainer:
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=libnet
-pkgver=1.1.5
-pkgrel=2
-pkgdesc="A library which provides API for commonly used low-level net functions"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/libnet-dev/"
-license=('BSD')
-depends=('glibc' 'sh')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/libnet-dev/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a9bc1d75a610efcfee200d3e28d8eb8f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make CFLAGS="${CFLAGS} -fPIC"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 doc/COPYING \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/libpng/CVE-2011-3026.patch b/extra/libpng/CVE-2011-3026.patch
deleted file mode 100644
index 209b0691e..000000000
--- a/extra/libpng/CVE-2011-3026.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660026
-http://src.chromium.org/viewvc/chrome/branches/963/src/third_party/libpng/pngrutil.c?r1=121492&r2=121491&pathrev=121492
-
-Check for both truncation (64-bit platforms) and integer overflow.
-
---- a/pngrutil.c	2012-02-01 16:00:34.000000000 +1100
-+++ b/pngrutil.c	2012-02-16 09:05:45.000000000 +1100
-@@ -457,8 +457,16 @@ png_decompress_chunk(png_structp png_ptr
-       {
-          /* Success (maybe) - really uncompress the chunk. */
-          png_size_t new_size = 0;
--         png_charp text = (png_charp)png_malloc_warn(png_ptr,
--             prefix_size + expanded_size + 1);
-+         png_charp text = NULL;
-+         /* Need to check for both truncation (64-bit platforms) and integer
-+          * overflow.
-+          */
-+         if (prefix_size + expanded_size > prefix_size &&
-+             prefix_size + expanded_size < 0xffffffffU)
-+         {
-+            png_charp text = (png_charp)png_malloc_warn(png_ptr,
-+                prefix_size + expanded_size + 1);
-+         }
- 
-          if (text != NULL)
-          {
diff --git a/extra/libreoffice-i18n/PKGBUILD b/extra/libreoffice-i18n/PKGBUILD
deleted file mode 100644
index 5751c4ddb..000000000
--- a/extra/libreoffice-i18n/PKGBUILD
+++ /dev/null
@@ -1,1516 +0,0 @@
-# $Id: PKGBUILD 153705 2012-03-18 09:00:45Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="libreoffice-i18n"
-pkgname=('libreoffice-af'    'libreoffice-ar'    'libreoffice-as'    'libreoffice-ast'	 'libreoffice-be'    'libreoffice-bg'    'libreoffice-bn'
-	 'libreoffice-bo'    'libreoffice-br'    'libreoffice-brx'   'libreoffice-bs'    'libreoffice-ca'    'libreoffice-ca-XV' 'libreoffice-cs'
-	 'libreoffice-cy'    'libreoffice-da'    'libreoffice-de'    'libreoffice-dgo'	 'libreoffice-dz'    'libreoffice-el'
-	 'libreoffice-en-GB' 'libreoffice-en-ZA' 'libreoffice-eo'    'libreoffice-es'    'libreoffice-et'    'libreoffice-eu'
-	 'libreoffice-fa'    'libreoffice-fi'    'libreoffice-fr'    'libreoffice-ga'	 'libreoffice-gl' # 'libreoffice-gd'
-	 'libreoffice-gu'    'libreoffice-he'    'libreoffice-hi'    'libreoffice-hr'    'libreoffice-hu'    'libreoffice-id'    'libreoffice-is'
-	 'libreoffice-it'    'libreoffice-ja'    'libreoffice-ka'    'libreoffice-kk'    'libreoffice-km' #'libreoffice-kid'
-	 'libreoffice-kn'    'libreoffice-ko'    'libreoffice-kok'   'libreoffice-ks'    'libreoffice-ku' #   'libreoffice-ky'
-	 'libreoffice-lo'    'libreoffice-lt'    'libreoffice-lv'    'libreoffice-mai'   'libreoffice-mk'    'libreoffice-ml'
-	 'libreoffice-mn'    'libreoffice-mni'   'libreoffice-mr'    'libreoffice-my'    'libreoffice-nb' # 'libreoffice-ms'
-	 'libreoffice-ne'    'libreoffice-nl'    'libreoffice-nn'    'libreoffice-nr'    'libreoffice-nso'    'libreoffice-oc'
-	 'libreoffice-om'    'libreoffice-or'    'libreoffice-pa-IN' 'libreoffice-pl'  #  'libreoffice-ps' #'libreoffice-pap'
-	 'libreoffice-pt-BR' 'libreoffice-pt'    'libreoffice-ro'    'libreoffice-ru'    'libreoffice-rw'    'libreoffice-sa-IN'
-	 'libreoffice-sat'   'libreoffice-sd'    'libreoffice-sh'    'libreoffice-si'    'libreoffice-sk' #'libreoffice-sc'
-	 'libreoffice-sl'    'libreoffice-sq'    'libreoffice-sr'    'libreoffice-ss'    'libreoffice-st'    'libreoffice-sv'
-	 'libreoffice-sw-TZ' 'libreoffice-ta'    'libreoffice-te'    'libreoffice-tg'    'libreoffice-th' #    'libreoffice-ti'
-	 'libreoffice-tn'    'libreoffice-tr'    'libreoffice-ts'    'libreoffice-ug'    'libreoffice-uk' #   'libreoffice-ur'
-	 'libreoffice-uz'    'libreoffice-ve'    'libreoffice-vi'    'libreoffice-xh'    'libreoffice-zh-CN' 'libreoffice-zh-TW'
-	 'libreoffice-zu')
-pkgver=3.5.1
-pkgrel=1
-pkgdesc="LibreOffice language/localisation files"
-arch=('any')
-url="http://www.documentfoundation.org"
-license=('LGPL')
-#depends=('libreoffice-common') #>=${pkgver}")
-makedepends=('rpmextract')
-
-# http://wiki.documentfoundation.org/Language_Teams
-
-#http://download.documentfoundation.org/mirrors/all.html
-#_url="http://dev-builds.libreoffice.org/pre-releases"
-_url="http://download.documentfoundation.org/libreoffice/stable"
-#_url="http://download.documentfoundation.org/libreoffice/testing" 
-#_url="http://www.libreoffice.org/download/pre-releases"
-_oover="3.5.1"
-_oodlver="3.5.1rc2"
-_oomainver="3.5"
-_helpver=${_oodlver}
-_dirver="${_oodlver}"
-#_url+="/${pkgver}-rc2"
-_url+="/${pkgver}"
-
-source=(#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_af.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_af.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ar.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ar.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_as.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_as.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ast.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ast.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_be.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_be.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bg.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bo.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_br.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_br.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_brx.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_brx.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bs.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ca.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ca-XV.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_cs.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_cy.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_cy.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_da.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_de.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_dgo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_dgo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_dz.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_el.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-GB.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-ZA.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_eo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_es.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_et.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_eu.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fa.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_fa.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fi.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fr.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ga.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ga.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gd.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gl.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gu.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_he.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hi.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hu.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_id.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_is.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_it.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ja.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ka.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kid.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kk.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kk.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_km.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ko.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kok.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kok.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ks.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ks.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ku.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ku.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ky.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lo.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lt.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lt.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lv.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lv.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mai.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mai.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mk.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ml.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ml.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mn.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mni.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mni.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mr.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ms.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_my.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_my.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nb.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ne.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nl.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nn.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_nr.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nso.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_nso.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_oc.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_oc.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_om.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_or.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_or.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pa-IN.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_pa-IN.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pap.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pl.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ps.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pt-BR.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pt.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ro.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ro.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ru.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_rw.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_rw.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sa-IN.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sa-IN.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sat.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sat.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sc.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sd.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sd.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_si.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sk.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sl.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sq.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sr.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ss.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ss.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_st.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_st.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sv.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sw-TZ.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sw-TZ.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ta.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ta.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_te.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_te.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tg.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_th.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_th.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ti.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_tn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tr.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ts.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ts.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ug.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_uk.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ur.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_uz.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_uz.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ve.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ve.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_vi.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_xh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_xh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zh-CN.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zh-TW.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zu.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_zu.tar.gz)
-md5sums=('7f7c20098cef08074621ace2d094ea31'
-         'd9da365aba23e4ba9272af0f975aef6a'
-         '33700c2de7bf93a244d93156ee68415c'
-         'c91333e958e92228a7322d8efdc403a7'
-         '23cf166396efc097dc9bfc28e2efaeb7'
-         'cc38d36e2c209905b8796b6c65751902'
-         '98a3e7343bd41d76ea35ca175e1dc617'
-         '5444bc87475deeeb8469838f664c3c99'
-         'c3659fd23b371060a37931b084df34d3'
-         '35e9cdd5b3081a494e6370378eb17a6c'
-         '7971d82da443d123c3f3d58fa82fbee4'
-         'a4064fce8ec70c90ae7c36a10c18c8a7'
-         'f74a4e41946ca7170caaf8552b94d98e'
-         '8ce7ed1da720f57c5f36cad49a603988'
-         '227db2189ec19bec26d5d7f7d40d16a4'
-         '961c8f16db4e54ed7b693fa953ec339f'
-         '56f28eabed7a4410638d5bf1a184b977'
-         '967e424a97121cfa450c8065fed7a2f2'
-         '01f9c8c2857f930fa1c2e8ff7f243c46'
-         '8a30300b997c430102a4d3a626f2d828'
-         '1a4d977b3a19e15c4c06b701d377a7ee'
-         '7a0800f444f736e5453158a3628a2214'
-         '86e1738c96301b85d897fd8dbec8525d'
-         '51658722f9de1becc136fceb89f0c5b1'
-         '0da38c79cd0d04f9f3f274ff494f9149'
-         '92a3a63ba45c834a652afffb0b2cbce6'
-         'a927cc7d714c3bd19ee00c44d43820a8'
-         'ddaa9ef62aebe8f6da65348a00438e89'
-         '31ee5eb38aca769cb1a54fc0f12d3346'
-         'c4e4ce4753b2103a9a8cf89a2288a4ed'
-         'b55e670c058f6e487f94f4c11dbaf6c4'
-         '2d6d038897d5b00f32b8cb00c0b34e42'
-         'af73050370dfa0133ffddf9d80d36c1f'
-         'c4374695b2a4184b3df40de8bc5f3e54'
-         'f7271273e1368c2f6b7f64ec9188c1da'
-         '9b054c89b87ee961e9a70f1d215ee68d'
-         '73cb365f04b4e640fe1b195478f9129c'
-         '9b62dd5ee618d1b81df7bb388f310536'
-         '07a24c9517b9d0a6ba9265acc1612a3b'
-         'c46137f48ef7bd9f6f1b56dc6ddea6c5'
-         'b377795238f10ecf5c7c9956cf550b9d'
-         '578960152f6cccbfd9c301f5c53ca472'
-         'efe2ce1e0027ad4c334322bda6abb949'
-         'b92f61047259d942724784e4c8477b7c'
-         '94800c565aca2a1a84c27554a0581788'
-         '98dde6f6e9bc9d2f2bae0aca5577ffdd'
-         '448086486a50155e6a1da1ebe4872a48'
-         'b3354c8a56dce30ed351767c9b5fe172'
-         '820043d781de782d0aeedde465ff5ff0'
-         '68e3579dc96b65129286596258d84e82'
-         'd6dc451fcfe8de71124370e886c164d5'
-         '9b5e9ac9808b317b72bf306eb36800f6'
-         '4a2546a7b490f77a09ad64eecddbe840'
-         '59f8425aafa21dda7c526c42ac5243a6'
-         'f5e5ca3d3b695303df89d22d79f64417'
-         '4e1205f5d0e0ad38402651d73da0626a'
-         'ebbf87de2eb6cf622a3b7297eac2cb7a'
-         'ee94ced34e6032582537f1ac6447b939'
-         '129dabaf3d69558bd5ec065b863fbcfe'
-         '43166858ac3725741bb6244a7ec45dc7'
-         '0c0757b7d4beaa3958e153e7bb9e29c0'
-         'e42f16201626fc03ac1dda8295a3bfbe'
-         '5a30a5403265fed3ec470b13c2396225'
-         '52f56e4baf21b89bc2c87e46907d6ff5'
-         '099d7c871aef460ac5a9172108a2a65a'
-         'a4b57c6ea335b9ede0f3fc69de536cf5'
-         '13658761b955c9a1edc42b7c0df977c5'
-         '86bbe011b089542ea4fcc24c990048a2'
-         '923333dc1b26951ee0c3947000fe09ba'
-         '6d089390c2e6dd94b06f3534963636bc'
-         'c359828593c0a6965e280df42341e8c5'
-         'aaf21c9f0e7bdaeee355a78e0afa57f9'
-         '964cd91fbdfb322f3c9be5eb46831413'
-         'a21249b96179c806510f66114d0a7edd'
-         '6c1d4a8aec5ab047e0c25cc31733b219'
-         'a7563af3f895f45003cb46744405d54b'
-         'cb867c1a6a33439bb940cf2781112536'
-         '684b6b2de1e44d1becae7c59d77800bc'
-         '41faae601b5487af8829cf4cb1ccfce9'
-         '2541f33385bc4c2e12c3c4f84456b187'
-         '9e06900f3440a2cacb160a4b1b4b63dd'
-         '5c37081bbb6e1548a6b609b67b358bd1'
-         'a63d83bedf1e88ec3a9349ca91140b69'
-         'b6dedb96f9a67654984b748f881c226c'
-         '67b95ed19403cecfd172deee96f96cd8'
-         '826fcb7cffd08f72193d2a4631a44549'
-         'a30d83c886be7ad46929aca501dab464'
-         '6b98b000d0004655e417b16176d83590'
-         'a4dc7c4e3ce9788d2a03a767ec74ca09'
-         'fd6a75dfa5a6a33ee98c1dd33776904a'
-         '5303045a16e2a93f8afb1e6f2c737717'
-         'c4e586cbf1b4b05b4af2c01802ea12ff'
-         '3a9f96d299b5e39f41265b2f0655a3f4'
-         '367b44c7102bc525361b558b52afbcc6'
-         'fca64b9927eabd5a89b3469be153eb14'
-         '784875f950b29c37fa0befe3f6c17497'
-         '960bff67ccb3d60699db1da8844f55e4'
-         'd0a3de17dd475f2eee0e332af0733fc7'
-         '08746cdec9a71b4c2cd9d7299d984f73'
-         '1daafbf90a956f61af1e0ffe5fef9d75'
-         '455be925daf8f36c85bd78ac7e7a0754'
-         'e66ac970e40b4a21f28293370ac30f24'
-         'f8832de55a9b00dc3427f917f2d1094f'
-         'caabfedfdb225d034a2da72f08072b2f'
-         'ebd679024ccade59c98327d6994a1c5f'
-         '57fdfa1fb7839b58d98e87d11b94e904'
-         'bbeba1455907fda8e7fb2d4f8f173d15'
-         'af7f18dbefb5f241880a71f1e3ff3410'
-         '8e51ee0ad50bb3dc2ba4a29489929b2d'
-         '1348facb77bef09d7d29a3975aa24fbc'
-         '271d87462683d25ee7242c688fd648af'
-         '2e42b59f823fe1923c2d0c57062e2081'
-         '4c03c6902d802b68d819526e19606cca'
-         '773b423f96e60efdbfec62e66056d07f'
-         '414b2bdfbc4759f8c2633c221a2b12b5'
-         '9019dfbeacd30bd48875b6c5f64feca6'
-         '53a926b86484356f66c7cb1b0ab98304'
-         '1dc3df40820ff960c091b4f0477e60fe'
-         '7fbed4c3455165ac0cccbbdb84d613fb'
-         '4bf17b83bc24e92d99c4bbfb4d0e7362'
-         '7d24b9550b8ca3ebdae3fdee7ef2dd43'
-         '2151c78cabd670c668114af9d115e9b6'
-         '60155f678e2d9100297d64479847d462'
-         '5ea84e7b97f6b21cf704448c27cb5d77'
-         '705f9c41046ec499463270beff2ffbad'
-         '4b87b090d9939fb5b2ed6d0bf2beb88d'
-         '941700fd1b86846d64537e21ee39c461'
-         '52d96e5641485e65051d66234438eeea'
-         '4955f2da1c49f00f0f4a4a80a4d6d94d'
-         '05e37592d91e1ce9b1c076dfe65a8d24'
-         '061df11a24b6756a7c19aa39547602a3'
-         '2b5385ff57d479b511c5d67909d53141'
-         '20c1b9d81629f65c61e92a70a72de596'
-         '208056e90fd5e0120c32f685f8a1de3f'
-         '3afa7f135a042934d9ed05ca347640c3'
-         'd750c7533da6a62b4e4a76b29b4d9bfc'
-         '6c21140cd09ccc02df086b17f36a0ffa'
-         '836285a841b30e5549a08ea29c9c314e'
-         '68ee8a8f877244bb64d5af5507b7611e'
-         'f5774090a254277d4007a2dbfefcbb6a'
-         '89c840e327f846d3528f9ad76e7ce614'
-         '4db5ebfb5defa12ac0c119ea798429e1'
-         '05d9bbfe5e0d90e65ce546b0a9a473f2'
-         '8ad36add10ff1d90520370eeed7fba92'
-         '5fc1006dfed7f5105efa1187b45fb081'
-         'd2d939b9a08be8dfb63da6dd0c7367ff'
-         '7dacd033acaa438724cf2f32dae1f315'
-         'e4bcd4e489d4e272b5060429f14ba7e6'
-         '4a2d3bc92bed3db53843b16f5b5b0673'
-         'f9742f14279ed582378834c67656ef99'
-         '1929c4d496e39308506ac4ca89fd17ed'
-         '28d0f1bebad98d434debd47da63744ea'
-         '6f11112f5479cfddbb1f4da2d656382c'
-         'ecbccc62f2cc08fd429a73a9e0ff05cf'
-         '2d90fd6735c69db33f358de39a9cc76e'
-         '0879ebe63824414f08d04e2755ba0694'
-         '4a8f28bce3937d834098a300abb35506')
-
-build() {
-  for i in ${pkgname[@]}
-   do _pkglang=${i#*-}
-    echo ${_pkglang} " unpacking..."
-    #cd ${srcdir}/LibO_${_oover/-/}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
-    cd ${srcdir}/LibO_${_helpver}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
-    # remove dictionaries if shipped - we ship them now in separate packages
-    rm libreoffice3.5-dict-*.rpm || /bin/true
-	for j in *.rpm
-	 do rpmextract.sh $j
-	done
-    # the helppack rpm goes also into the langpack dir - so far we don't want to split the helppacks separate
-#     rpmextract.sh ${srcdir}/LibO_${_oover/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/libobasis3.3-${_pkglang}-help-${_helpver}.i586.rpm
-    #rpmextract.sh ${srcdir}/LibO_${_oover/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/*.rpm
-    rpmextract.sh ${srcdir}/LibO_${_helpver/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/*.rpm || /bin/true
-  done
-}
-
-package_libreoffice-af() {
-  pkgdesc="Afrikaans language pack for LibreOffice"
-  provides=('openoffice-af' 'libreoffice-langpack')
-  replaces=(openoffice-af)
-  conflicts=(openoffice-af)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_af/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ar() {
-  pkgdesc="Arabic language pack for LibreOffice"
-  provides=('openoffice-ar' 'libreoffice-langpack')
-  replaces=(openoffice-ar)
-  conflicts=(openoffice-ar)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ar/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-as() {
-  pkgdesc="Assamese (India) language pack for LibreOffice"
-  provides=('openoffice-as' 'libreoffice-langpack')
-  replaces=(openoffice-as)
-  conflicts=(openoffice-as)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_as/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ast() {
-  pkgdesc="Asturianu language pack for LibreOffice"
-  provides=('openoffice-ast' 'libreoffice-langpack')
-  replaces=(openoffice-ast)
-  conflicts=(openoffice-ast)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ast/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-be() {
-  pkgdesc="Belarusian language pack for LibreOffice"
-  provides=('openoffice-be-BY' 'libreoffice-langpack')
-  replaces=(openoffice-be-BY)
-  conflicts=(openoffice-be-BY)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_be/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bg() {
-  pkgdesc="Bulgarian language pack for LibreOffice"
-  provides=('openoffice-bg' 'libreoffice-langpack')
-  replaces=(openoffice-bg)
-  conflicts=(openoffice-bg)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bg/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bn() {
-  pkgdesc="Bengali language pack for LibreOffice"
-  provides=('openoffice-bn' 'libreoffice-langpack')
-  replaces=(openoffice-bn)
-  conflicts=(openoffice-bn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bo() {
-  pkgdesc="Tibetan language pack for LibreOffice"
-  provides=('openoffice-bo' 'libreoffice-langpack')
-  replaces=(openoffice-bo)
-  conflicts=(openoffice-bo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-br() {
-  pkgdesc="Breton language pack for LibreOffice"
-  provides=('openoffice-br' 'libreoffice-langpack')
-  replaces=(openoffice-br)
-  conflicts=(openoffice-br)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_br/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-brx() {
-  pkgdesc="Bodo language pack for LibreOffice"
-  provides=('openoffice-brx' 'libreoffice-langpack')
-  replaces=(openoffice-brx)
-  conflicts=(openoffice-brx)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_brx/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bs() {
-  pkgdesc="Bosnian language pack for LibreOffice"
-  provides=('openoffice-bs' 'libreoffice-langpack')
-  replaces=(openoffice-bs)
-  conflicts=(openoffice-bs)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bs/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ca() {
-  pkgdesc="Catalan language pack for LibreOffice"
-  provides=('openoffice-ca' 'libreoffice-langpack')
-  replaces=(openoffice-ca)
-  conflicts=(openoffice-ca)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ca/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ca-XV() {
-  pkgdesc="Catalan (Valencia) language pack for LibreOffice"
-  provides=('openoffice-ca-XV' 'libreoffice-langpack')
-  replaces=(openoffice-ca-XV)
-  conflicts=(openoffice-ca-XV)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ca-XV/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-cs() {
-  pkgdesc="Czech language pack for LibreOffice"
-  provides=('openoffice-cs' 'libreoffice-langpack')
-  replaces=(openoffice-cs)
-  conflicts=(openoffice-cs)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_cs/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-cy() {
-  pkgdesc="Welsh language pack for LibreOffice"
-  provides=('openoffice-cy' 'libreoffice-langpack')
-  replaces=(openoffice-cy)
-  conflicts=(openoffice-cy)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_cy/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-da() {
-  pkgdesc="Danish language pack for LibreOffice"
-  provides=('openoffice-da' 'libreoffice-langpack')
-  replaces=(openoffice-da)
-  conflicts=(openoffice-da)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_da/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-de() {
-  pkgdesc="German language pack for LibreOffice"
-  provides=('openoffice-de' 'libreoffice-langpack')
-  replaces=(openoffice-de)
-  conflicts=(openoffice-de)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_de/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-dgo() {
-  pkgdesc="Dogri language pack for LibreOffice"
-  provides=('openoffice-dgo' 'libreoffice-langpack')
-  replaces=(openoffice-dgo)
-  conflicts=(openoffice-dgo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_dgo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-dz() {
-  pkgdesc="Dzongkha language pack for LibreOffice"
-  provides=('openoffice-dz' 'libreoffice-langpack')
-  replaces=(openoffice-dz)
-  conflicts=(openoffice-dz)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_dz/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-el() {
-  pkgdesc="Greek language pack for LibreOffice"
-  provides=('openoffice-el' 'libreoffice-langpack')
-  replaces=(openoffice-el)
-  conflicts=(openoffice-el)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_el/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-en-GB() {
-  pkgdesc="English (GB) language pack for LibreOffice"
-  provides=('openoffice-en-GB' 'libreoffice-langpack')
-  replaces=(openoffice-en-GB)
-  conflicts=(openoffice-en-GB)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-GB/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-en-ZA() {
-  pkgdesc="English (ZA) language pack for LibreOffice"
-  provides=('openoffice-en-ZA' 'libreoffice-langpack')
-  replaces=(openoffice-en-ZA)
-  conflicts=(openoffice-en-ZA)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-ZA/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-eo() {
-  pkgdesc="Esperanto language pack for LibreOffice"
-  provides=('openoffice-eo' 'libreoffice-langpack')
-  replaces=(openoffice-eo)
-  conflicts=(openoffice-eo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_eo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-es() {
-  pkgdesc="Spanish language pack for LibreOffice"
-  provides=('openoffice-es' 'libreoffice-langpack')
-  replaces=(openoffice-es)
-  conflicts=(openoffice-es)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_es/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-et() {
-  pkgdesc="Estonian language pack for LibreOffice"
-  provides=('openoffice-et' 'libreoffice-langpack')
-  replaces=(openoffice-et)
-  conflicts=(openoffice-et)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_et/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-eu() {
-  pkgdesc="Basque language pack for LibreOffice"
-  provides=('openoffice-eu' 'libreoffice-langpack')
-  replaces=(openoffice-eu)
-  conflicts=(openoffice-eu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_eu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-fa() {
-  pkgdesc="Persian language pack for LibreOffice"
-  provides=('openoffice-fa' 'libreoffice-langpack')
-  replaces=(openoffice-fa)
-  conflicts=(openoffice-fa)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fa/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-fi() {
-  pkgdesc="Finnish language pack for LibreOffice"
-  provides=('openoffice-fi' 'libreoffice-langpack')
-  replaces=(openoffice-fi)
-  conflicts=(openoffice-fi)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fi/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-fr() {
-  pkgdesc="French language pack for LibreOffice"
-  provides=('openoffice-fr' 'libreoffice-langpack')
-  replaces=(openoffice-fr)
-  conflicts=(openoffice-fr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ga() {
-  pkgdesc="Irish language pack for LibreOffice"
-  provides=('openoffice-ga' 'libreoffice-langpack')
-  replaces=(openoffice-ga)
-  conflicts=(openoffice-ga)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ga/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-gl() {
-  pkgdesc="Galician language pack for LibreOffice"
-  provides=('openoffice-gl' 'libreoffice-langpack')
-  replaces=(openoffice-gl)
-  conflicts=(openoffice-gl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_gl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-gu() {
-  pkgdesc="Gujarati language pack for LibreOffice"
-  provides=('openoffice-gu' 'libreoffice-langpack')
-  replaces=(openoffice-gu)
-  conflicts=(openoffice-gu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_gu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-he() {
-  pkgdesc="Hebrew language pack for LibreOffice"
-  provides=('openoffice-he' 'libreoffice-langpack')
-  replaces=(openoffice-he)
-  conflicts=(openoffice-he)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_he/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-hi() {
-  pkgdesc="Hindi language pack for LibreOffice"
-  provides=('openoffice-hi' 'libreoffice-langpack')
-  replaces=(openoffice-hi)
-  conflicts=(openoffice-hi)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hi/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-hr() {
-  pkgdesc="Croatian language pack for LibreOffice"
-  provides=('openoffice-hr' 'libreoffice-langpack')
-  replaces=(openoffice-hr)
-  conflicts=(openoffice-hr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-hu() {
-  pkgdesc="Hungarian language pack for LibreOffice"
-  provides=('openoffice-hu' 'libreoffice-langpack')
-  replaces=(openoffice-hu)
-  conflicts=(openoffice-hu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-id() {
-  pkgdesc="Bahasa Indonesia language pack for LibreOffice"
-  provides=('openoffice-id' 'libreoffice-langpack')
-  replaces=(openoffice-id)
-  conflicts=(openoffice-id)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_id/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-is() {
-  pkgdesc="Icelandic language pack for LibreOffice"
-  provides=('openoffice-is' 'libreoffice-langpack')
-  replaces=(openoffice-is)
-  conflicts=(openoffice-is)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_is/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-it() {
-  pkgdesc="Italian language pack for LibreOffice"
-  provides=('openoffice-it' 'libreoffice-langpack')
-  replaces=(openoffice-it)
-  conflicts=(openoffice-it)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_it/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ja() {
-  pkgdesc="Japanese language pack for LibreOffice"
-  provides=('openoffice-ja' 'libreoffice-langpack')
-  replaces=(openoffice-ja)
-  conflicts=(openoffice-ja)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ja/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ka() {
-  pkgdesc="Georgian language pack for LibreOffice"
-  provides=('openoffice-ka' 'libreoffice-langpack')
-  replaces=(openoffice-ka)
-  conflicts=(openoffice-ka)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ka/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-kk() {
-  pkgdesc="Kazakh language pack for LibreOffice"
-  provides=('openoffice-kk' 'libreoffice-langpack')
-  replaces=(openoffice-kk)
-  conflicts=(openoffice-kk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-km() {
-  pkgdesc="Khmer (Cambodia) language pack for LibreOffice"
-  provides=('openoffice-km' 'libreoffice-langpack')
-  replaces=(openoffice-km)
-  conflicts=(openoffice-km)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_km/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-kn() {
-  pkgdesc="Kannada language pack for LibreOffice"
-  provides=('openoffice-kn' 'libreoffice-langpack')
-  replaces=(openoffice-kn)
-  conflicts=(openoffice-kn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ko() {
-  pkgdesc="Korean language pack for LibreOffice"
-  provides=('openoffice-ko' 'libreoffice-langpack')
-  replaces=(openoffice-ko)
-  conflicts=(openoffice-ko)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ko/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-kok() {
-  pkgdesc="Konkani language pack for LibreOffice"
-  provides=('openoffice-kok' 'libreoffice-langpack')
-  replaces=(openoffice-kok)
-  conflicts=(openoffice-kok)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kok/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ks() {
-  pkgdesc="Kashmiri language pack for LibreOffice"
-  provides=('openoffice-ks' 'libreoffice-langpack')
-  replaces=(openoffice-ks)
-  conflicts=(openoffice-ks)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ks/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ku() {
-  pkgdesc="Kurdish language pack for LibreOffice"
-  provides=('openoffice-ku' 'libreoffice-langpack')
-  replaces=(openoffice-ku)
-  conflicts=(openoffice-ku)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ku/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-lo() {
-  pkgdesc="Lao language pack for LibreOffice"
-  provides=('openoffice-lo' 'libreoffice-langpack')
-  replaces=(openoffice-lo)
-  conflicts=(openoffice-lo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-lt() {
-  pkgdesc="Lithuanian language pack for LibreOffice"
-  provides=('openoffice-lt' 'libreoffice-langpack')
-  replaces=(openoffice-lt)
-  conflicts=(openoffice-lt)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lt/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-lv() {
-  pkgdesc="Latvian language pack for LibreOffice"
-  provides=('openoffice-lv' 'libreoffice-langpack')
-  replaces=(openoffice-lv)
-  conflicts=(openoffice-lv)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lv/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mai() {
-  pkgdesc="Maithili language pack for LibreOffice"
-  provides=('openoffice-mai' 'libreoffice-langpack')
-  replaces=(openoffice-mai)
-  conflicts=(openoffice-mai)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mai/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mk() {
-  pkgdesc="Macedonian language pack for LibreOffice"
-  provides=('openoffice-mk' 'libreoffice-langpack')
-  replaces=(openoffice-mk)
-  conflicts=(openoffice-mk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ml() {
-  pkgdesc="Malayalam language pack for LibreOffice"
-  provides=('openoffice-ml' 'libreoffice-langpack')
-  replaces=(openoffice-ml)
-  conflicts=(openoffice-ml)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ml/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mn() {
-  pkgdesc="Mongolian language pack for LibreOffice"
-  provides=('openoffice-mn' 'libreoffice-langpack')
-  replaces=(openoffice-mn)
-  conflicts=(openoffice-mn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mni() {
-  pkgdesc="Manipuri language pack for LibreOffice"
-  provides=('openoffice-mni' 'libreoffice-langpack')
-  replaces=(openoffice-mni)
-  conflicts=(openoffice-mni)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mni/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mr() {
-  pkgdesc="Marathi language pack for LibreOffice"
-  provides=('openoffice-mr' 'libreoffice-langpack')
-  replaces=(openoffice-mr)
-  conflicts=(openoffice-mr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-my() {
-  pkgdesc="Burmese language pack for LibreOffice"
-  provides=('openoffice-my' 'libreoffice-langpack')
-  replaces=(openoffice-my)
-  conflicts=(openoffice-my)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_my/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nb() {
-  pkgdesc="Norwegian Bokmal language pack for LibreOffice"
-  provides=('openoffice-nb' 'libreoffice-langpack')
-  replaces=(openoffice-nb)
-  conflicts=(openoffice-nb)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nb/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ne() {
-  pkgdesc="Nepali language pack for LibreOffice"
-  provides=('openoffice-ne' 'libreoffice-langpack')
-  replaces=('openoffice-ne')
-  conflicts=(openoffice-ne)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ne/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nl() {
-  pkgdesc="Dutch language pack for LibreOffice"
-  provides=('openoffice-nl' 'libreoffice-langpack')
-  replaces=(openoffice-nl)
-  conflicts=(openoffice-nl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nn() {
-  pkgdesc="Norwegian Nynorsk language pack for LibreOffice"
-  provides=('openoffice-nn' 'libreoffice-langpack')
-  replaces=(openoffice-nn)
-  conflicts=(openoffice-nn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nr() {
-  pkgdesc="Ndebele (South) language pack for LibreOffice"
-  provides=(openoffice-nr)
-  replaces=(openoffice-nr)
-  conflicts=(openoffice-nr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nso() {
-  pkgdesc="Northern Sotho language pack for LibreOffice"
-  provides=('openoffice-ns' 'libreoffice-ns' 'libreoffice-langpack')
-  replaces=('openoffice-ns' 'libreoffice-ns')
-  conflicts=(openoffice-ns)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nso/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-oc() {
-  pkgdesc="Occitan language pack for LibreOffice"
-  provides=('openoffice-oc' 'libreoffice-langpack')
-  replaces=(openoffice-oc)
-  conflicts=(openoffice-oc)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_oc/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-om() {
-  pkgdesc="Oromo language pack for LibreOffice"
-  provides=('openoffice-om' 'libreoffice-langpack')
-  replaces=(openoffice-om)
-  conflicts=(openoffice-om)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_om/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-or() {
-  pkgdesc="Oriya language pack for LibreOffice"
-  provides=('openoffice-or' 'libreoffice-langpack')
-  replaces=(openoffice-or)
-  conflicts=(openoffice-or)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_or/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pa-IN() {
-  pkgdesc="Punjabi (India) language pack for LibreOffice"
-  provides=('openoffice-pa-IN' 'libreoffice-langpack')
-  replaces=(openoffice-pa-IN)
-  conflicts=(openoffice-pa-IN)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pa-IN/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pl() {
-  pkgdesc="Polish language pack for LibreOffice"
-  provides=('openoffice-pl' 'libreoffice-langpack')
-  replaces=(openoffice-pl)
-  conflicts=(openoffice-pl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pt-BR() {
-  pkgdesc="Portuguese (Brasil) language pack for LibreOffice"
-  provides=('openoffice-pt-BR' 'libreoffice-langpack')
-  replaces=(openoffice-pt-BR)
-  conflicts=(openoffice-pt-BR)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pt-BR/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pt() {
-  pkgdesc="Portuguese language pack for LibreOffice"
-  provides=('openoffice-pt' 'libreoffice-langpack')
-  replaces=(openoffice-pt)
-  conflicts=(openoffice-pt)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pt/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ro() {
-  pkgdesc="Romanian language pack for LibreOffice"
-  provides=('openoffice-ro' 'libreoffice-langpack')
-  replaces=(openoffice-ro)
-  conflicts=(openoffice-ro)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ro/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ru() {
-  pkgdesc="Russian language pack for LibreOffice"
-  provides=('openoffice-ru' 'libreoffice-langpack')
-  replaces=(openoffice-ru)
-  conflicts=(openoffice-ru)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ru/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-rw() {
-  pkgdesc="Kinyarwanda language pack for LibreOffice"
-  provides=('openoffice-rw' 'libreoffice-langpack')
-  replaces=(openoffice-rw)
-  conflicts=(openoffice-rw)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_rw/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sa-IN() {
-  pkgdesc="Sanskrit (India) language pack for LibreOffice"
-  provides=('openoffice-sa-IN' 'libreoffice-langpack')
-  replaces=(openoffice-sa-IN)
-  conflicts=(openoffice-sa-IN)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sa-IN/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sat() {
-  pkgdesc="Santali language pack for LibreOffice"
-  provides=('openoffice-sat' 'libreoffice-langpack')
-  replaces=(openoffice-sat)
-  conflicts=(openoffice-sat)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sat/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sd() {
-  pkgdesc="Sindhi language pack for LibreOffice"
-  provides=('openoffice-sd' 'libreoffice-langpack')
-  replaces=(openoffice-sd)
-  conflicts=(openoffice-sd)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sd/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sh() {
-  pkgdesc="Serbo-Croatian language pack for LibreOffice"
-  provides=('openoffice-sh' 'libreoffice-langpack')
-  replaces=(openoffice-sh)
-  conflicts=(openoffice-sh)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sh/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-si() {
-  pkgdesc="Singhalese language pack for LibreOffice"
-  provides=('openoffice-si' 'libreoffice-langpack')
-  replaces=(openoffice-si)
-  conflicts=(openoffice-si)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_si/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sk() {
-  pkgdesc="Slovak language pack for LibreOffice"
-  provides=('openoffice-sk' 'libreoffice-langpack')
-  replaces=(openoffice-sk)
-  conflicts=(openoffice-sk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sl() {
-  pkgdesc="Slovenian language pack for LibreOffice"
-  provides=('openoffice-sl' 'libreoffice-langpack')
-  replaces=(openoffice-sl)
-  conflicts=(openoffice-sl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sq() {
-  pkgdesc="Albanien language pack for LibreOffice"
-  provides=('openoffice-sq' 'libreoffice-langpack')
-  replaces=(openoffice-sq)
-  conflicts=(openoffice-sq)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sq/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sr() {
-  pkgdesc="Serbian language pack for LibreOffice"
-  provides=('openoffice-sr' 'libreoffice-langpack')
-  replaces=(openoffice-sr)
-  conflicts=(openoffice-sr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ss() {
-  pkgdesc="Swati language pack for LibreOffice"
-  provides=('openoffice-ss' 'libreoffice-langpack')
-  replaces=(openoffice-ss)
-  conflicts=(openoffice-ss)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ss/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-st() {
-  pkgdesc="Southern Sotho language pack for LibreOffice"
-  provides=('openoffice-st' 'libreoffice-langpack')
-  replaces=(openoffice-st)
-  conflicts=(openoffice-st)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_st/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sv() {
-  pkgdesc="Swedish language pack for LibreOffice"
-  provides=('openoffice-sv' 'libreoffice-langpack')
-  replaces=(openoffice-sv)
-  conflicts=(openoffice-sv)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sv/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sw-TZ() {
-  pkgdesc="Swahili (Tanzania) language pack for LibreOffice"
-  provides=('openoffice-sw-TZ' 'libreoffice-langpack')
-  replaces=(openoffice-sw-TZ)
-  conflicts=(openoffice-sw-TZ)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sw-TZ/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ta() {
-  pkgdesc="Tamil language pack for LibreOffice"
-  provides=('openoffice-ta' 'libreoffice-langpack')
-  replaces=(openoffice-ta)
-  conflicts=(openoffice-ta)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ta/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-te() {
-  pkgdesc="Telugu language pack for LibreOffice"
-  provides=('openoffice-te' 'libreoffice-langpack')
-  replaces=(openoffice-te)
-  conflicts=(openoffice-te)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_te/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-tg() {
-  pkgdesc="Tajik language pack for LibreOffice"
-  provides=('openoffice-tg' 'libreoffice-langpack')
-  replaces=(openoffice-tg)
-  conflicts=(openoffice-tg)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tg/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-th() {
-  pkgdesc="Thai language pack for LibreOffice"
-  provides=('openoffice-th' 'libreoffice-langpack')
-  replaces=(openoffice-th)
-  conflicts=(openoffice-th)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_th/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-tn() {
-  pkgdesc="Tswana language pack for LibreOffice"
-  provides=('openoffice-tn' 'libreoffice-langpack')
-  replaces=(openoffice-tn)
-  conflicts=(openoffice-tn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-tr() {
-  pkgdesc="Turkish language pack for LibreOffice"
-  provides=('openoffice-tr' 'libreoffice-langpack')
-  replaces=(openoffice-tr)
-  conflicts=(openoffice-tr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ts() {
-  pkgdesc="Tsonga language pack for LibreOffice"
-  provides=('openoffice-ts' 'libreoffice-langpack')
-  replaces=(openoffice-ts)
-  conflicts=(openoffice-ts)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ts/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ug() {
-  pkgdesc="Uighur language pack for LibreOffice"
-  provides=('openoffice-ug' 'libreoffice-langpack')
-  replaces=(openoffice-ug)
-  conflicts=(openoffice-ug)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ug/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-uk() {
-  pkgdesc="Ukrainian language pack for LibreOffice"
-  provides=('openoffice-uk' 'libreoffice-langpack')
-  replaces=(openoffice-uk)
-  conflicts=(openoffice-uk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_uk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-uz() {
-  pkgdesc="Uzbek language pack for LibreOffice"
-  provides=('openoffice-uz' 'libreoffice-langpack')
-  replaces=(openoffice-uz)
-  conflicts=(openoffice-uz)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_uz/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ve() {
-  pkgdesc="Venda language pack for LibreOffice"
-  provides=('openoffice-ve' 'libreoffice-langpack')
-  replaces=(openoffice-ve)
-  conflicts=(openoffice-ve)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ve/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-vi() {
-  pkgdesc="Vietnamese language pack for LibreOffice"
-  provides=('openoffice-vi' 'libreoffice-langpack')
-  replaces=(openoffice-vi)
-  conflicts=(openoffice-vi)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_vi/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-xh() {
-  pkgdesc="Xhosa language pack for LibreOffice"
-  provides=('openoffice-xh' 'libreoffice-langpack')
-  replaces=(openoffice-xh)
-  conflicts=(openoffice-xh)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_xh/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-zh-CN() {
-  pkgdesc="Chinese (simplified) language pack for LibreOffice"
-  provides=('openoffice-zh-CN' 'libreoffice-langpack')
-  replaces=(openoffice-zh-CN)
-  conflicts=(openoffice-zh-CN)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zh-CN/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-zh-TW() {
-  pkgdesc="Chinese (traditional) language pack for LibreOffice"
-  provides=('openoffice-zh-TW' 'libreoffice-langpack')
-  replaces=(openoffice-zh-TW)
-  conflicts=(openoffice-zh-TW)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zh-TW/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-zu() {
-  pkgdesc="Zulu language pack for LibreOffice"
-  provides=('openoffice-zu' 'libreoffice-langpack')
-  replaces=(openoffice-zu)
-  conflicts=(openoffice-zu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
diff --git a/extra/libreoffice/PKGBUILD.next_stable b/extra/libreoffice/PKGBUILD.next_stable
deleted file mode 100644
index a8cb4c5ad..000000000
--- a/extra/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/extra/libxcb/xcb_auth-fix-memory-leak.patch b/extra/libxcb/xcb_auth-fix-memory-leak.patch
deleted file mode 100644
index d1000913a..000000000
--- a/extra/libxcb/xcb_auth-fix-memory-leak.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5755582444ad0ba79e661ab3173cc38e9e588d83 Mon Sep 17 00:00:00 2001
-From: Nick Bowler <nbowler@draconx.ca>
-Date: Thu, 11 Nov 2010 01:49:41 +0000
-Subject: xcb_auth: Fix memory leak in _xcb_get_auth_info.
-
-If the initial get_peer_sock_name(getpeername ...) succeeds, the
-pointer to allocated memory is overwritten by the later call to
-get_peer_sock_name(getsockname ...).  Fix that up by freeing
-the allocated memory before overwriting the pointer.
-
-Signed-off-by: Nick Bowler <nbowler@draconx.ca>
-Signed-off-by: Julien Danjou <julien@danjou.info>
----
-diff --git a/src/xcb_auth.c b/src/xcb_auth.c
-index 1af27fc..4839b78 100644
---- a/src/xcb_auth.c
-+++ b/src/xcb_auth.c
-@@ -327,10 +327,15 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
-     if (!info->namelen)
-         goto no_auth;   /* out of memory */
- 
--    if (!gotsockname && (sockname = get_peer_sock_name(getsockname, fd)) == NULL)
-+    if (!gotsockname)
-     {
--        free(info->name);
--        goto no_auth;   /* can only authenticate sockets */
-+        free(sockname);
-+
-+        if ((sockname = get_peer_sock_name(getsockname, fd)) == NULL)
-+        {
-+            free(info->name);
-+            goto no_auth;   /* can only authenticate sockets */
-+        }
-     }
- 
-     ret = compute_auth(info, authptr, sockname);
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/libxt/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff b/extra/libxt/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
deleted file mode 100644
index b3f708292..000000000
--- a/extra/libxt/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From 70bb9e28d37fff4ead4d0a2c672af77059765fa4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 04 Jan 2012 18:33:29 +0000
-Subject: Treat unexpected returned events from poll as errors
-
-Inspired by libxcb's f0565e8f06aadf760a9065a97b8cf5ab9cbd18de
-
-Resolves https://bugs.freedesktop.org/show_bug.cgi?id=20048
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/NextEvent.c b/src/NextEvent.c
-index b1f7bc7..c8c9dd5 100644
---- a/src/NextEvent.c
-+++ b/src/NextEvent.c
-@@ -356,7 +356,21 @@ static int IoWait (
-     return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
- 		   wt->wait_time_ptr);
- #else
--    return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+    int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+    /* If poll() returns an event we didn't expect, such as POLLNVAL, treat
-+     * it as if it failed. */
-+    if(ret >= 0) {
-+        nfds_t i;
-+        for (i=0; i < wf->fdlistlen; i++) {
-+            struct pollfd *fd = &wf->fdlist[i];
-+            if (fd->revents & ~fd->events) {
-+                ret = -1;
-+                errno = EIO;
-+                break;
-+            }
-+        }
-+    }
-+    return ret;
- #endif
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD
deleted file mode 100644
index 30fab1149..000000000
--- a/extra/linux_logo/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 140770 2011-10-19 00:51:32Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=linux_logo
-pkgver=5.11
-pkgrel=1
-pkgdesc="Text-based logo and system information program"
-arch=('i686' 'x86_64') 
-url="http://www.deater.net/weave/vmwprod/linux_logo"
-license=('GPL')
-depends=('glibc')
-source=(http://www.deater.net/weave/vmwprod/linux_logo/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('bd22808f165574cb3bc98c579aa48c0acab65f39')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX="${pkgdir}/usr" install
-}
diff --git a/extra/mailman/PKGBUILD b/extra/mailman/PKGBUILD
deleted file mode 100644
index 48dc1c20c..000000000
--- a/extra/mailman/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 151515 2012-02-27 10:52:55Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=mailman
-pkgver=2.1.14
-pkgrel=4
-pkgdesc="Mailing list manager with built in web access"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.list.org/"
-depends=('python2' 'smtp-server')
-# we need to have the mailman user to build mailman
-makedepends=('mailman')
-# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
-backup=('usr/lib/mailman/Mailman/mm_cfg.py')
-install=$pkgname.install
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
-        'mailman-2.1-build.patch'
-        'rc.mailman')
-md5sums=('9ea163871ceccbd33fee4c9e335fcf7b'
-         'ed04d062379eb21e39ce1e70e6b1ade2'
-         '3d83d06d0ec3319bf3c7d9df5d18e89f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # fix calls to /usr/bin/python
-  find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} +
-  # fix directory permissions to satisfy check_perms
-  patch -p1 -i ${srcdir}/mailman-2.1-build.patch
-  # set some sane defaults before the configure script has a chance to screw them up
-  sed -e 's/@MAILHOST@/localhost/g' \
-      -e 's/@URLHOST@/localhost/g' \
-      -i Mailman/Defaults.py.in
-
-  ./configure --without-permcheck \
-              --prefix=/usr/lib/mailman \
-              --with-var-prefix=/var/lib/mailman \
-              --with-mail-gid=mailman \
-              --with-username=mailman --with-groupname=mailman \
-              --with-cgi-gid=http --with-python=/usr/bin/python2
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # let's follow Fedora FHS way; Gentoo does it the other way round
-
-  # Create a link so that the config file mm_cfg.py appears in config
-  # directory /etc/mailman. We don't put mm_cfg.py in the config directory
-  # because its executable code (python file) and the security policy wants
-  # to keep executable code out of /etc and inside of a lib directory instead,
-  # and because traditionally mm_cfg.py was in the Mailman subdirectory and
-  # experienced mailman admins will expect to find it there. But having it
-  # "appear" in the config directory is good practice and heading in the
-  # right direction for FHS compliance.
-  install -d -m755 ${pkgdir}/etc/${pkgname}
-  ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py
-
-  # fix some permissions to satisfy check_perms
-  chown -R mailman:mailman $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
-  chown http:mailman ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2770 ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* 
-  chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman
-
-  # install the launch script
-  install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman
-}
diff --git a/extra/mailman/mailman-2.1-build.patch b/extra/mailman/mailman-2.1-build.patch
deleted file mode 100644
index d00613ad7..000000000
--- a/extra/mailman/mailman-2.1-build.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
---- mailman-2.1.12-a/bin/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/bin/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -56,7 +55,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -72,8 +71,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
---- mailman-2.1.12-a/cron/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/cron/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -68,8 +67,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
---- mailman-2.1.12-a/Mailman/Archiver/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
---- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
---- mailman-2.1.12-a/Mailman/Cgi/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
-         done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
---- mailman-2.1.12-a/Mailman/Commands/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Commands/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
---- mailman-2.1.12-a/Mailman/Gui/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Gui/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
---- mailman-2.1.12-a/Mailman/Handlers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
---- mailman-2.1.12-a/Mailman/Logging/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Logging/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
---- mailman-2.1.12-a/Mailman/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -20,8 +20,6 @@
- 
- # Variables set by configure
- 
--VERSION=	@VERSION@
--
- VPATH=		@srcdir@
- srcdir= 	@srcdir@
- bindir= 	@bindir@
-@@ -30,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -48,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -79,12 +76,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--	@for d in $(SUBDIRS); \
--	do \
--	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
--	done
--
- clean:
- 	for d in $(SUBDIRS); \
- 	do \
-diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
---- mailman-2.1.12-a/Mailman/MTA/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/MTA/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
---- mailman-2.1.12-a/Mailman/Queue/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Queue/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
---- mailman-2.1.12-a/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -61,11 +61,10 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
- LANGPACK = README-I18N.en templates messages
-@@ -85,14 +84,24 @@
- 
- doinstall: $(SUBDIRS)
- 	@echo "Creating architecture independent directories..."
-+	dir=$(DESTDIR)$(prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
-+	dir=$(DESTDIR)$(var_prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
- 	@for d in $(VAR_DIRS); \
- 	do \
- 	    dir=$(DESTDIR)$(var_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -102,9 +111,7 @@
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -114,9 +121,7 @@
- 	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
---- mailman-2.1.12-a/messages/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/messages/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -32,7 +32,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -43,7 +42,6 @@
- CFLAGS=		$(OPT) $(DEFS)
- PACKAGEDIR= 	$(prefix)/messages
- SHELL=		/bin/sh
--DIRSETGID=	chmod g+s
- MSGFMT= 	@PYTHON@ ../build/bin/msgfmt.py
- MSGMERGE=	msgmerge
- 
-@@ -60,7 +58,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -90,9 +88,8 @@
- 	do \
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    echo "Creating language directory $$dir"; \
--	    $(srcdir)/../mkinstalldirs $$dir; \
--	    chmod $(DIRMODE) $$dir; \
--	    $(DIRSETGID) $$dir; \
-+	    $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \
-+	    $(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	done
- 	@for d in $(LANGUAGES); \
- 	do \
-@@ -113,8 +110,6 @@
- 
- mofiles: $(MOFILES)
- 
--finish:
--
- clean:
- 	-rm -f */LC_MESSAGES/mailman.mo
- 
-diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
---- mailman-2.1.12-a/misc/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/misc/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -30,7 +30,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=		@PYTHON@
- 
-@@ -62,7 +61,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- DATAMODE=	664
-@@ -101,8 +100,6 @@
- 	    (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
---- mailman-2.1.12-a/scripts/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/scripts/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -49,7 +48,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -68,8 +67,6 @@
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
---- mailman-2.1.12-a/src/Makefile.in	2009-07-28 12:19:47.000000000 +0200
-+++ mailman-2.1.12-b/src/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=  	@PYTHON@
- 
-@@ -63,10 +62,9 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
--EXEMODE=	755
-+DIRMODE=	2775
-+EXEMODE=	2755
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- # Fixed definitions
- 
-@@ -110,20 +108,10 @@
- 	do \
- 	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
- 	    $(INSTALL_PROGRAM) $$f $$exe; \
--	    $(DIRSETGID) $$exe; \
- 	done
- 	for f in $(MAIL_PROGS); \
- 	do \
- 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \
--	    $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \
--	done
--
--finish:
--	-for f in $(SUID_CGI_PROGS); \
--	do \
--	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
--	    chown $(MAILMAN_USER) $$exe; \
--	    chmod u+s $$exe; \
- 	done
- 
- clean:
-diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
---- mailman-2.1.12-a/templates/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/templates/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- TRUE=		@TRUE@
- 
-@@ -48,7 +47,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,15 +60,13 @@
- install:
- 	for d in $(LANGUAGES); \
- 	do \
--	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
-+	    $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
- 	    do \
- 	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    done; \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
---- mailman-2.1.12-a/tests/bounces/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/bounces/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
---- mailman-2.1.12-a/tests/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
---- mailman-2.1.12-a/tests/msgs/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/msgs/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
diff --git a/extra/mailman/mailman.install b/extra/mailman/mailman.install
deleted file mode 100644
index ec85260a5..000000000
--- a/extra/mailman/mailman.install
+++ /dev/null
@@ -1,31 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  # Make sure the group and user "mailman" exists on this system and has the correct values
-  if grep -q "^mailman:" /etc/group &> /dev/null ; then
-    groupmod -g 80 -n mailman mailman &> /dev/null
-  else
-    groupadd -g 80 mailman &> /dev/null
-  fi
-  
-  if grep -q "^mailman:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman mailman &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman &> /dev/null
-  fi 
-
-  # check file permissions
-#  cd /usr/lib/mailman && bin/check_perms -f  > /dev/null 2>&1     # -f applies fixes we should solve in the PKGBUILD
-  cd /usr/lib/mailman && bin/check_perms > /dev/null
-}
-
-## 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() {
-  userdel mailman &>/dev/null
-  groupdel mailman &>/dev/null || /bin/true
-}
diff --git a/extra/mailman/rc.mailman b/extra/mailman/rc.mailman
deleted file mode 100644
index 07660e530..000000000
--- a/extra/mailman/rc.mailman
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting mailman Daemon"
-      /usr/lib/mailman/bin/mailmanctl start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mailman
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mailman Daemon"
-    /usr/lib/mailman/bin/mailmanctl stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mailman
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/mercurial/mercurial-2.1-return-code.patch b/extra/mercurial/mercurial-2.1-return-code.patch
deleted file mode 100644
index 8139badfd..000000000
--- a/extra/mercurial/mercurial-2.1-return-code.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-
-# HG changeset patch
-# User Matt Mackall <mpm@selenic.com>
-# Date 1328911770 21600
-# Node ID a3dcc59054cac3a78d0d5e5402680b17a396d59e
-# Parent  d75aa756149bfd54b1f7f84b86072b3c1a50d683
-pull: backout change to return code
-
-This bit a number of people.
-
-diff --git a/mercurial/commands.py b/mercurial/commands.py
---- a/mercurial/commands.py
-+++ b/mercurial/commands.py
-@@ -4261,7 +4261,7 @@
- 
- def postincoming(ui, repo, modheads, optupdate, checkout):
-     if modheads == 0:
--        return 1
-+        return
-     if optupdate:
-         movemarkfrom = repo['.'].node()
-         try:
-@@ -4312,8 +4312,7 @@
-     If SOURCE is omitted, the 'default' path will be used.
-     See :hg:`help urls` for more information.
- 
--    Returns 0 on success, 1 if no changes found or an update had
--    unresolved files.
-+    Returns 0 on success, 1 if an update had unresolved files.
-     """
-     source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
-     other = hg.peer(repo, opts, source)
-diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
---- a/tests/test-bookmarks-pushpull.t
-+++ b/tests/test-bookmarks-pushpull.t
-@@ -44,7 +44,6 @@
-   pulling from ../a
-   no changes found
-   importing bookmark X
--  [1]
-   $ hg bookmark
-      X                         0:4e3505fd9583
-      Y                         0:4e3505fd9583
-@@ -185,7 +184,6 @@
-   no changes found
-   divergent bookmark X stored as X@1
-   importing bookmark Z
--  [1]
-   $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
-   requesting all changes
-   adding changesets
-diff --git a/tests/test-bundle.t b/tests/test-bundle.t
---- a/tests/test-bundle.t
-+++ b/tests/test-bundle.t
-@@ -85,7 +85,6 @@
-   pulling from ../full.hg
-   searching for changes
-   no changes found
--  [1]
- 
- Pull full.hg into empty (using --cwd)
- 
-@@ -120,7 +119,6 @@
-   pulling from full.hg
-   searching for changes
-   no changes found
--  [1]
- 
- Pull full.hg into empty (using -R)
- 
-@@ -128,7 +126,6 @@
-   pulling from full.hg
-   searching for changes
-   no changes found
--  [1]
- 
- Rollback empty
- 
-diff --git a/tests/test-convert.t b/tests/test-convert.t
---- a/tests/test-convert.t
-+++ b/tests/test-convert.t
-@@ -293,7 +293,6 @@
-   pulling from ../a
-   searching for changes
-   no changes found
--  [1]
-   $ touch bogusfile
- 
- should fail
-diff --git a/tests/test-hook.t b/tests/test-hook.t
---- a/tests/test-hook.t
-+++ b/tests/test-hook.t
-@@ -196,7 +196,6 @@
-   listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} 
-   listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} 
-   importing bookmark bar
--  [1]
-   $ cd ../a
- 
- test that prepushkey can prevent incoming keys
-diff --git a/tests/test-https.t b/tests/test-https.t
---- a/tests/test-https.t
-+++ b/tests/test-https.t
-@@ -160,7 +160,6 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc
- 
- cacert configured globally, also testing expansion of environment
-@@ -172,13 +171,11 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ P=`pwd` hg -R copy-pull pull --insecure
-   warning: localhost certificate with fingerprint 91:4f:1a:ff:87:24:9c:09:b6:85:9b:88:b1:90:6d:30:75:64:91:ca not verified (check hostfingerprints or web.cacerts config setting)
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- cacert mismatch
- 
-@@ -191,7 +188,6 @@
-   pulling from https://127.0.0.1:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg -R copy-pull pull --config web.cacerts=pub-other.pem
-   abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob)
-   [255]
-@@ -200,7 +196,6 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- Test server cert which isn't valid yet
- 
-@@ -260,7 +255,6 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- Test https with cacert and fingerprint through proxy
- 
-@@ -268,12 +262,10 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://127.0.0.1:$HGPORT/
-   pulling from https://127.0.0.1:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- Test https with cert problems through proxy
- 
-diff --git a/tests/test-mq-qimport-fail-cleanup.t b/tests/test-mq-qimport-fail-cleanup.t
---- a/tests/test-mq-qimport-fail-cleanup.t
-+++ b/tests/test-mq-qimport-fail-cleanup.t
-@@ -34,7 +34,6 @@
-   b.patch
- 
-   $ hg pull -q -r 0 . # update phase
--  [1]
-   $ hg qimport -r 0
-   abort: revision 0 is not mutable
-   (see "hg help phases" for details)
-diff --git a/tests/test-pending.t b/tests/test-pending.t
---- a/tests/test-pending.t
-+++ b/tests/test-pending.t
-@@ -102,7 +102,6 @@
-   rollback completed
-   abort: pretxnchangegroup hook failed
-   pull 0000000000000000000000000000000000000000
--  [1]
- 
- test external hook
- 
-@@ -118,4 +117,3 @@
-   rollback completed
-   abort: pretxnchangegroup hook exited with status 1
-   pull 0000000000000000000000000000000000000000
--  [1]
-diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
---- a/tests/test-phases-exchange.t
-+++ b/tests/test-phases-exchange.t
-@@ -136,7 +136,6 @@
-   pulling from ../alpha
-   searching for changes
-   no changes found
--  [1]
-   $ hgph
-   o  4 public a-D - b555f63b6063
-   |
-@@ -344,7 +343,6 @@
-   pulling from ../alpha
-   searching for changes
-   no changes found
--  [1]
-   $ hgph
-   @  6 public n-B - 145e75495359
-   |
-@@ -777,7 +775,6 @@
-   pulling from ../mu
-   searching for changes
-   no changes found
--  [1]
-   $ hgph
-   @  11 draft A-secret - 435b5d83910c
-   |
-@@ -930,7 +927,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg phase f54f1bb90ff3
-   2: draft
- 
-diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
---- a/tests/test-pull-r.t
-+++ b/tests/test-pull-r.t
-@@ -100,5 +100,4 @@
- This used to abort: received changelog group is empty:
- 
-   $ hg pull -qr 1 ../repo
--  [1]
- 
-diff --git a/tests/test-pull.t b/tests/test-pull.t
---- a/tests/test-pull.t
-+++ b/tests/test-pull.t
-@@ -48,7 +48,6 @@
-   pulling from http://foo@localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
-   $ hg rollback --dry-run --verbose
-   repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
-@@ -78,7 +77,6 @@
-   [255]
- 
-   $ hg pull -q file:../test
--  [1]
- 
- It's tricky to make file:// URLs working on every platform with
- regular shell commands.
-@@ -90,4 +88,3 @@
- 
-   $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
-   $ hg pull -q "$URL"
--  [1]
-diff --git a/tests/test-ssh.t b/tests/test-ssh.t
---- a/tests/test-ssh.t
-+++ b/tests/test-ssh.t
-@@ -80,7 +80,6 @@
-   pulling from ssh://user@dummy/remote
-   searching for changes
-   no changes found
--  [1]
- 
- local change
- 
-@@ -199,7 +198,6 @@
-   no changes found
-   updating bookmark foo
-   importing bookmark foo
--  [1]
-   $ hg book -d foo
-   $ hg push -B foo
-   pushing to ssh://user@dummy/remote
-diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
---- a/tests/test-subrepo.t
-+++ b/tests/test-subrepo.t
-@@ -580,7 +580,6 @@
-   cloning subrepo s from $TESTTMP/sub/repo/s (glob)
-   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-   $ hg -q -R repo2 pull -u
--  [1]
-   $ echo 1 > repo2/s/a
-   $ hg -R repo2/s ci -m2
-   $ hg -q -R repo2/s push
-@@ -639,7 +638,6 @@
-   pulling from issue1852a
-   searching for changes
-   no changes found
--  [1]
- 
- Try the same, but with pull -u
- 
-diff --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t
---- a/tests/test-treediscovery-legacy.t
-+++ b/tests/test-treediscovery-legacy.t
-@@ -48,7 +48,6 @@
-   $ hg pull -R empty1 $remote
-   pulling from http://localhost:$HGPORT/
-   no changes found
--  [1]
-   $ hg push -R empty1 $remote
-   pushing to http://localhost:$HGPORT/
-   no changes found
-@@ -108,7 +107,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -233,7 +231,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -278,7 +275,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t
---- a/tests/test-treediscovery.t
-+++ b/tests/test-treediscovery.t
-@@ -42,7 +42,6 @@
-   $ hg pull -R empty1 $remote
-   pulling from http://localhost:$HGPORT/
-   no changes found
--  [1]
-   $ hg push -R empty1 $remote
-   pushing to http://localhost:$HGPORT/
-   no changes found
-@@ -102,7 +101,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -221,7 +219,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -266,7 +263,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t
---- a/tests/test-url-rev.t
-+++ b/tests/test-url-rev.t
-@@ -141,7 +141,6 @@
- No new revs, no update:
- 
-   $ hg pull -qu
--  [1]
- 
-   $ hg parents -q
-   0:1f0dee641bb7
-
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
deleted file mode 100644
index 432e226e2..000000000
--- a/extra/midori/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 145174 2011-12-19 00:22:14Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-
-pkgname=midori
-pkgver=0.4.3
-pkgrel=1
-pkgdesc="A lightweight web browser based on Gtk WebKit"
-arch=('i686' 'x86_64')
-url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-license=('LGPL2.1')
-install=midori.install
-depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
-optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('900037557b82818d79d2dd1c5a7d7fd2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  # python2 
-  export PYTHON=/usr/bin/python2
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
-  
-  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-	--enable-addons \
-	--disable-hildon \
-	--enable-unique \
-	--enable-nls \
-	--enable-docs \
-	--enable-apidocs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/midori/midori.install b/extra/midori/midori.install
deleted file mode 100644
index 4da5511fd..000000000
--- a/extra/midori/midori.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/midori/webkit_search.diff b/extra/midori/webkit_search.diff
deleted file mode 100644
index 620cdc96f..000000000
--- a/extra/midori/webkit_search.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Wed, 21 Sep 2011 21:50:51 +0000
-Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1
-
-Fixes: https://bugs.launchpad.net/midori/+bug/799603
----
-diff --git a/midori/midori-view.c b/midori/midori-view.c
-index 0d7a96e..e426e7f 100644
---- a/midori/midori-view.c
-+++ b/midori/midori-view.c
-@@ -39,9 +39,11 @@
-     #include <sys/utsname.h>
- #endif
- 
-+#if !WEBKIT_CHECK_VERSION (1, 5, 1)
- /* This is unstable API, so we need to declare it */
- gchar*
- webkit_web_view_get_selected_text (WebKitWebView* web_view);
-+#endif
- 
- static void
- midori_view_construct_web_view (MidoriView* view);
-@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
- gboolean
- midori_view_has_selection (MidoriView* view)
- {
-+#if WEBKIT_CHECK_VERSION (1, 5, 1)
-+    WebKitDOMDocument* doc;
-+    WebKitDOMDOMWindow* window;
-+    WebKitDOMDOMSelection* selection;
-+    WebKitDOMRange* range;
-+#endif
-+
-     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
- 
-+
-+#if WEBKIT_CHECK_VERSION (1, 5, 1)
-+    doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
-+    window = webkit_dom_document_get_default_view (doc);
-+    selection = webkit_dom_dom_window_get_selection (window);
-+    if (selection == NULL)
-+        return FALSE;
-+
-+    range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
-+    if (range == NULL)
-+        return FALSE;
-+
-+    katze_assign (view->selected_text, webkit_dom_range_get_text (range));
-+#else
-     katze_assign (view->selected_text, webkit_web_view_get_selected_text (
-         WEBKIT_WEB_VIEW (view->web_view)));
-+#endif
-+
-     if (view->selected_text && *view->selected_text)
-         return TRUE;
-     else
---
-cgit 
diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog
deleted file mode 100644
index 7e174cfb4..000000000
--- a/extra/mpd/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2012-02-11 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.7
-
-2011-12-05 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.6
-
-2011-09-03 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.4
-    * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
-
-2011-06-25 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for bug with ffmpeg FS#24839 
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/extra/mpd/mpd b/extra/mpd/mpd
deleted file mode 100755
index 6134e2ed4..000000000
--- a/extra/mpd/mpd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Music Player Daemon"
-    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
-    /usr/bin/mpd /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Music Player Daemon"
-    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/mpd/mpd.install b/extra/mpd/mpd.install
deleted file mode 100644
index 885505a07..000000000
--- a/extra/mpd/mpd.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade
-  echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
-  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
-  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
-  for dir in /var/{lib,log}/mpd; do
-    chown -R mpd:mpd "$dir" 1>/dev/null
-  done
-}
-
-post_remove() {
-  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
-  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
-  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
diff --git a/extra/nss-mdns/mdns.allow b/extra/nss-mdns/mdns.allow
deleted file mode 100644
index ed64c974c..000000000
--- a/extra/nss-mdns/mdns.allow
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/mdns.allow
-#
-
-.local.
-.local
-
-# End of file
diff --git a/extra/nss/bug702090.patch b/extra/nss/bug702090.patch
deleted file mode 100644
index e25148554..000000000
--- a/extra/nss/bug702090.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./mozilla/security/nss/lib/util/pkcs11n.h.orig	2011-09-14 10:21:10.000000000 +0900
-+++ ./mozilla/security/nss/lib/util/pkcs11n.h	2011-11-19 00:45:01.131860104 +0900
-@@ -346,7 +346,7 @@
-  * labels have never been accurate to what was really implemented.
-  * The new labels correctly reflect what the values effectively mean.
-  */
--#if __GNUC__ > 3
-+#if defined(__GNUC__) && (__GNUC__ > 3)
- /* make GCC warn when we use these #defines */
- /*
-  *  This is really painful because GCC doesn't allow us to mark random
-@@ -362,7 +362,7 @@
-  *  cast the resulting value to the deprecated type in the #define, thus
-  *  producting the warning when the #define is used.
-  */
--#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
-+#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
- /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
-  * is a gcc version issue rather than mac or ppc specific */
- typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
deleted file mode 100644
index 160ac938d..000000000
--- a/extra/ntrack/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150906 2012-02-23 13:55:25Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=ntrack
-pkgver=16
-pkgrel=2
-epoch=1
-pkgdesc="A network connectivity tracking library"
-arch=('i686' 'x86_64')
-url="http://launchpad.net/ntrack/"
-license=('LGPL')
-depends=('qt' 'libnl')
-makedepends=('python2')
-options=('!libtool' '!emptydirs')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
-        'libnl3.patch')
-md5sums=('21691dac43460a6791cba3decbc68242'
-         '0a1f6b7f9a01c323e81d6da95cad93cd')
-
-build() {
-  cd "${srcdir}/${pkgname}-0${pkgver}"
-  patch -p1 -i "${srcdir}"/libnl3.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-0${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ntrack/libnl3.patch b/extra/ntrack/libnl3.patch
deleted file mode 100644
index 879b52c8c..000000000
--- a/extra/ntrack/libnl3.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
-Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib.
-
-Index: ntrack/glib/Makefile.am
-===================================================================
---- ntrack.orig/glib/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/Makefile.am	2011-12-22 20:07:10.243344976 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS =
-Index: ntrack/glib/Makefile.in
-===================================================================
---- ntrack.orig/glib/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/Makefile.in	2011-12-22 20:07:14.871344769 -0500
-@@ -325,7 +325,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS = 
-Index: ntrack/glib/test/Makefile.am
-===================================================================
---- ntrack.orig/glib/test/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/test/Makefile.am	2011-12-22 20:07:19.451344565 -0500
-@@ -27,7 +27,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/glib/test/Makefile.in
-===================================================================
---- ntrack.orig/glib/test/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/test/Makefile.in	2011-12-22 20:07:23.903344367 -0500
-@@ -260,7 +260,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/gobject/Makefile.am
-===================================================================
---- ntrack.orig/gobject/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.am	2011-12-22 20:07:27.515344206 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/gobject/Makefile.in
-===================================================================
---- ntrack.orig/gobject/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.in	2011-12-22 20:07:31.519344028 -0500
-@@ -347,7 +347,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/modules/Makefile.am
-===================================================================
---- ntrack.orig/modules/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.am	2011-12-22 20:07:35.519343851 -0500
-@@ -26,7 +26,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS =
-Index: ntrack/modules/Makefile.in
-===================================================================
---- ntrack.orig/modules/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.in	2011-12-22 20:07:39.391343676 -0500
-@@ -352,7 +352,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS = 
diff --git a/extra/pekwm/libpng-1.4.patch b/extra/pekwm/libpng-1.4.patch
deleted file mode 100644
index bc4df2c4d..000000000
--- a/extra/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/extra/pidgin/nm09-more.patch b/extra/pidgin/nm09-more.patch
deleted file mode 100644
index 8c708df9a..000000000
--- a/extra/pidgin/nm09-more.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
---- pidgin-2.7.11/libpurple/network.c.nm09more	2011-04-26 12:01:27.700085246 -0500
-+++ pidgin-2.7.11/libpurple/network.c	2011-05-24 13:13:28.185165657 -0500
-@@ -833,8 +833,20 @@ purple_network_is_available(void)
- 			purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
- 	}
- 
--	if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
--		return TRUE;
-+	switch (nm_state)
-+	{
-+		case NM_STATE_UNKNOWN:
-+#if NM_CHECK_VERSION(0,8,992)
-+		case NM_STATE_CONNECTED_LOCAL:
-+		case NM_STATE_CONNECTED_SITE:
-+		case NM_STATE_CONNECTED_GLOBAL:
-+#else
-+		case NM_STATE_CONNECTED:
-+#endif
-+			return TRUE;
-+		default:
-+			break;
-+	}
- 
- 	return FALSE;
- 
-@@ -1170,9 +1182,14 @@ purple_network_init(void)
- 		                                     NM_DBUS_SERVICE,
- 		                                     NM_DBUS_PATH,
- 		                                     NM_DBUS_INTERFACE);
-+		/* NM 0.6 signal */
- 		dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
- 		dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
- 		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
-+		/* NM 0.7 and later signal */
-+		dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
-+		dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
-+		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
- 
- 		dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
- 		                                       DBUS_SERVICE_DBUS,
-@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
- #ifdef HAVE_NETWORKMANAGER
- 	if (nm_proxy) {
- 		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
-+		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
- 		g_object_unref(G_OBJECT(nm_proxy));
- 	}
- 	if (dbus_proxy) {
diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch
deleted file mode 100644
index 24a66b84f..000000000
--- a/extra/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/extra/postgresql/postgresql b/extra/postgresql/postgresql
deleted file mode 100755
index 2ff845f73..000000000
--- a/extra/postgresql/postgresql
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-# Default PGROOT if it wasn't defined in the conf.d file
-PGROOT=${PGROOT:-/var/lib/postgres}
-PGLOG=${PGLOG:-/var/log/postgresql.log}
-PGCTL_BIN=/usr/bin/pg_ctl
-PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w)
-[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS")
-
-postgres_init() {
-    # initialization
-    if [[ ! -d "$PGROOT/data" ]]; then
-        mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT"
-        su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'"
-    fi
-    if [[ ! -e "$PGLOG" ]]; then
-        touch "$PGLOG"
-        chown postgres "$PGLOG"
-    fi
-}
-
-do_postgres() {
-  su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}") $@"
-}
-
-case $1 in
-  start)
-    postgres_init
-    stat_busy "Starting PostgreSQL"
-    if do_postgres start; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    if do_postgres stop -m fast; then
-      rm_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading PostgreSQL"
-    if do_postgres reload; then
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    postgres_init
-    stat_busy "Restarting PostgreSQL"
-    if do_postgres restart -m fast; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  status)
-    stat_busy "Checking PostgreSQL status";
-    ck_status postgresql
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-    exit 1
-esac
diff --git a/extra/pwgen/PKGBUILD b/extra/pwgen/PKGBUILD
deleted file mode 100644
index 7798a8370..000000000
--- a/extra/pwgen/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 149610 2012-02-08 20:11:44Z pierre $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor : Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=pwgen
-pkgver=2.06
-pkgrel=3
-pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human"
-arch=("i686" "x86_64")
-url="http://sourceforge.net/projects/pwgen/"
-license=('GPL')
-depends=('glibc')
-source=("http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz")
-md5sums=('935aebcbe610fbc9de8125e7b7d71297')
-
-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/extra/python-pygame/ChangeLog b/extra/python-pygame/ChangeLog
deleted file mode 100644
index 566be3f65..000000000
--- a/extra/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/extra/qt/fix-qgraphicsscene-regression.patch b/extra/qt/fix-qgraphicsscene-regression.patch
deleted file mode 100644
index 0c0a28a61..000000000
--- a/extra/qt/fix-qgraphicsscene-regression.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 15c14584199dc43e4a309fc331f3144009008128 Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Fri, 24 Feb 2012 00:42:34 +1100
-Subject: [PATCH] Revert "Don't rely on mapFromGlobal in
- QGraphicsScenePrivate::itemsAtPosition."
-
-This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e.
-The commit caused a regression whereby tooltips may be shown even if the
-mouse is not over the item if it has the Qt::ItemIgnoresTransformations
-flag and the QGraphicsView had been scaled.
-
-Task-number: QTBUG-17517
-Task-number: QTBUG-22663
-Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2
-Reviewed-by: Andy Shaw <andy.shaw@digia.com>
-Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
----
- src/gui/graphicsview/qgraphicsscene.cpp |   10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
-index 14c0f3c..d1cdd4f 100644
---- a/src/gui/graphicsview/qgraphicsscene.cpp
-+++ b/src/gui/graphicsview/qgraphicsscene.cpp
-@@ -1084,7 +1084,7 @@ void QGraphicsScenePrivate::enableMouseTrackingOnViews()
- /*!
-     Returns all items for the screen position in \a event.
- */
--QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*screenPos*/,
-+QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &screenPos,
-                                                               const QPointF &scenePos,
-                                                               QWidget *widget) const
- {
-@@ -1093,12 +1093,16 @@ QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*sc
-     if (!view)
-         return q->items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder, QTransform());
- 
--    const QRectF pointRect(scenePos, QSizeF(1, 1));
-+    const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)), QSizeF(1, 1));
-     if (!view->isTransformed())
-         return q->items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder);
- 
-     const QTransform viewTransform = view->viewportTransform();
--    return q->items(pointRect, Qt::IntersectsItemShape,
-+    if (viewTransform.type() <= QTransform::TxScale) {
-+        return q->items(viewTransform.inverted().mapRect(pointRect), Qt::IntersectsItemShape,
-+                        Qt::DescendingOrder, viewTransform);
-+    }
-+    return q->items(viewTransform.inverted().map(pointRect), Qt::IntersectsItemShape,
-                     Qt::DescendingOrder, viewTransform);
- }
- 
--- 
-1.7.6
-
diff --git a/extra/qt/fix-qurl.patch b/extra/qt/fix-qurl.patch
deleted file mode 100644
index 1c666dba4..000000000
--- a/extra/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/extra/qt/improve-cups-support.patch b/extra/qt/improve-cups-support.patch
deleted file mode 100644
index e0305e11b..000000000
--- a/extra/qt/improve-cups-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
-     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+    if (cups) {
-+        const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                options.duplexShort->setChecked(true);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                options.duplexLong->setChecked(true);
-+            else
-+                options.noDuplex->setChecked(true);
-+        }
-+
-+        if (cups->currentPPD()) {
-+            // set default color
-+            if (cups->currentPPD()->color_device)
-+                options.color->setChecked(true);
-+            else
-+                options.grayscale->setChecked(true);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups->ppdOption("Collate");
-+        if (collate)
-+            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+    }
- }
- #endif
- 
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
-                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
-         setOutputFormat(QPrinter::PdfFormat);
-     }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+    // fill in defaults from ppd file
-+    QCUPSSupport cups;
-+
-+    int printernum = -1;
-+    for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+            printernum = i;
-+    }
-+    if (printernum >= 0) {
-+        cups.setCurrentPrinter(printernum);
-+
-+        const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                setDuplex(DuplexShortSide);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                setDuplex(DuplexLongSide);
-+            else
-+                setDuplex(DuplexNone);
-+        }
-+
-+        if (cups.currentPPD()) {
-+            // set default color
-+            if (cups.currentPPD()->color_device)
-+                setColorMode(Color);
-+            else
-+                setColorMode(GrayScale);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups.ppdOption("Collate");
-+        if (collate)
-+            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+    }
-+#endif
- }
- 
- /*!
diff --git a/extra/qt/improved-filter-event.patch b/extra/qt/improved-filter-event.patch
deleted file mode 100644
index b03cdbe94..000000000
--- a/extra/qt/improved-filter-event.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- qt-opensource-4.8.0.old/src/gui/kernel/qapplication_x11.cpp	2011-12-16 03:22:33.918428374 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qapplication_x11.cpp	2012-01-07 18:18:40.258246384 -0500
-@@ -4244,7 +4205,12 @@ bool QETWidget::translateMouseEvent(cons
-                     && (nextEvent.xclient.message_type == ATOM(_QT_SCROLL_DONE) ||
-                     (nextEvent.xclient.message_type == ATOM(WM_PROTOCOLS) &&
-                      (Atom)nextEvent.xclient.data.l[0] == ATOM(_NET_WM_SYNC_REQUEST))))) {
--                qApp->x11ProcessEvent(&nextEvent);
-+                // As we may run through a significant number of a large class of non-MotionNotify
-+                // events here, without returning to the event loop, first pass nextEvent to
-+                // QAbstractEventDispatcher::filterEvent() to allow applications which override
-+                // QAbstractEventDispatcher::filterEvent() to handle the event first.
-+                if (!QAbstractEventDispatcher::instance()->filterEvent(&nextEvent))
-+                    qApp->x11ProcessEvent(&nextEvent);
-                 continue;
-             } else if (nextEvent.type != MotionNotify ||
-                        nextEvent.xmotion.window != event->xmotion.window ||
---- qt-opensource-4.8.0.old/src/gui/kernel/qclipboard_x11.cpp	2011-12-08 00:06:02.000000000 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qclipboard_x11.cpp	2012-01-07 18:30:35.298287639 -0500
-@@ -573,7 +573,11 @@ bool QX11Data::clipboardWaitForEvent(Win
- 
-             // process other clipboard events, since someone is probably requesting data from us
-             XEvent e;
--            if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0))
-+            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
-+            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
-+            // x11ProcessEvent().
-+            if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0) && 
-+                !QAbstractEventDispatcher::instance()->filterEvent(&e))
-                 qApp->x11ProcessEvent(&e);
- 
-             now.start();
---- qt-opensource-4.8.0.old/src/gui/kernel/qdnd_x11.cpp	2011-12-08 00:06:02.000000000 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qdnd_x11.cpp	2012-01-07 18:28:13.841279478 -0500
-@@ -42,6 +42,7 @@
- #include "qplatformdefs.h"
- 
- #include "qapplication.h"
-+#include "qabstracteventdispatcher.h"
- 
- #ifndef QT_NO_DRAGANDDROP
- 
-@@ -1941,7 +1942,11 @@ Qt::DropAction QDragManager::drag(QDrag
-         timer.start();
-         do {
-             XEvent event;
--            if (XCheckTypedEvent(X11->display, ClientMessage, &event))
-+            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
-+            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
-+            // x11ProcessEvent().
-+            if (XCheckTypedEvent(X11->display, ClientMessage, &event) &&
-+                !QAbstractEventDispatcher::instance()->filterEvent(&event))
-                 qApp->x11ProcessEvent(&event);
- 
-             // sleep 50 ms, so we don't use up CPU cycles all the time.
---- qt-opensource-4.8.0.old/src/gui/kernel/qwidget_x11.cpp	2011-12-08 00:06:02.000000000 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qwidget_x11.cpp	2012-01-07 18:29:26.286283657 -0500
-@@ -44,6 +44,7 @@
- #include "qdesktopwidget.h"
- #include "qapplication.h"
- #include "qapplication_p.h"
-+#include "qabstracteventdispatcher.h"
- #include "qnamespace.h"
- #include "qpainter.h"
- #include "qbitmap.h"
-@@ -376,17 +377,22 @@ void qt_x11_wait_for_window_manager(QWid
-     do {
-         if (XEventsQueued(X11->display, QueuedAlready)) {
-             XNextEvent(X11->display, &ev);
--            qApp->x11ProcessEvent(&ev);
--
--            switch (state) {
--            case Initial:
--                if (ev.type == MapNotify && ev.xany.window == winid)
--                    state = Mapped;
--                break;
--            case Mapped:
--                if (ev.type == Expose && ev.xany.window == winid)
--                    return;
--                break;
-+            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
-+            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
-+            // x11ProcessEvent().
-+            if (!QAbstractEventDispatcher::instance()->filterEvent(&ev)) {
-+                qApp->x11ProcessEvent(&ev);
-+
-+                switch (state) {
-+                case Initial:
-+                    if (ev.type == MapNotify && ev.xany.window == winid)
-+                        state = Mapped;
-+                    break;
-+                case Mapped:
-+                    if (ev.type == Expose && ev.xany.window == winid)
-+                        return;
-+                    break;
-+                }
-             }
-         } else {
-             if (!XEventsQueued(X11->display, QueuedAfterFlush))
diff --git a/extra/qt/qurl-backward-compatibility.patch b/extra/qt/qurl-backward-compatibility.patch
deleted file mode 100644
index 1c666dba4..000000000
--- a/extra/qt/qurl-backward-compatibility.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/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD
deleted file mode 100644
index cd5e3cfce..000000000
--- a/extra/qtcurve-gtk2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141029 2011-10-22 02:18:45Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-gtk2
-pkgver=1.8.12
-pkgrel=1
-pkgdesc="A configurable set of widget styles for KDE and Gtk"
-arch=('i686' 'x86_64')
-url="http://www.kde-look.org/content/show.php?content=40492"
-license=('GPL')
-depends=('gtk2')
-makedepends=('cmake')
-groups=('qtcurve')
-options=('!libtool')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2")
-sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f')
-
-build() {
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../QtCurve-Gtk2-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/qtcurve-kde3/PKGBUILD b/extra/qtcurve-kde3/PKGBUILD
deleted file mode 100644
index 214bdb40d..000000000
--- a/extra/qtcurve-kde3/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 149631 2012-02-08 20:57:56Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde3
-pkgver=1.8.5
-pkgrel=2
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdelibs3')
-makedepends=('cmake' 'kdelibs')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE3-${pkgver}.tar.bz2"
-	'kdeglobals'
-	'bypass-kde-config.patch')
-md5sums=('d9cca99526079782f9fc7bd7ba432582'
-         '05a6294c7f0e239e698e7e5224fc8e7f'
-         'e1ab2c0995e412b2cbfe804fba75517e')
-
-build() {
-  . /etc/profile.d/qt3.sh
-  . /etc/profile.d/kde3.sh
-
-  cd ${srcdir}/QtCurve-KDE3-${pkgver}
-  # Bypass KDE prefix detection by kde4-config, see:
-  # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-  patch -Np1 -i ${srcdir}/bypass-kde-config.patch
-
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../QtCurve-KDE3-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/opt/kde
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-
-  # remove kcontrol plugins
-  rm -f $pkgdir/opt/kde/lib/kde3/kstyle_qtcurve_config.*
-
-  # set default theme
-  install -D -m644 $srcdir/kdeglobals $pkgdir/opt/kde/share/config/kdeglobals
-}
diff --git a/extra/qtcurve-kde3/bypass-kde-config.patch b/extra/qtcurve-kde3/bypass-kde-config.patch
deleted file mode 100644
index 113fb93b8..000000000
--- a/extra/qtcurve-kde3/bypass-kde-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- QtCurve-KDE3-1.6.0/CMakeLists.txt~	2010-09-14 16:19:36.543333337 +0200
-+++ QtCurve-KDE3-1.6.0/CMakeLists.txt	2010-09-14 16:22:18.160000003 +0200
-@@ -44,6 +44,12 @@
-     endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
- endif (NOT QTC_QT_ONLY)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
-+
- if (NOT QTC_QT_ONLY)
- exec_program(kde-config
-              ARGS --prefix --expandvars
-@@ -71,6 +77,8 @@
-                  OUTPUT_VARIABLE KDE4PREFIX)
- endif(KDE4_KDECONFIG_EXECUTABLE)
- 
-+endif (BRAINDEAD_DETECTION)
-+
- if(NOT KDE4PREFIX)
-     set(KDE4PREFIX ${KDE3PREFIX})
- endif(NOT KDE4PREFIX)
diff --git a/extra/qtcurve-kde3/kdeglobals b/extra/qtcurve-kde3/kdeglobals
deleted file mode 100644
index ffbe26579..000000000
--- a/extra/qtcurve-kde3/kdeglobals
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-widgetStyle=qtcurve
diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD
deleted file mode 100644
index cf5716603..000000000
--- a/extra/qtcurve-kde4/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 140653 2011-10-17 18:59:52Z ronald $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde4
-pkgver=1.8.9
-pkgrel=1
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
-        'bypass-kde-config.patch')
-sha1sums=('93bc8ce3e5bed506521a8839a254f7076b4bc988'
-          '8005c8bf0e9c5d75e80b417a01513bd45853274c')
-build() {
-	cd "${srcdir}"/QtCurve-KDE4-${pkgver}
-	# Bypass KDE prefix detection by kde4-config, see:
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-	patch -p1 -i "${srcdir}"/bypass-kde-config.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../QtCurve-KDE4-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/qtcurve-kde4/bypass-kde-config.patch b/extra/qtcurve-kde4/bypass-kde-config.patch
deleted file mode 100644
index d09e5ead5..000000000
--- a/extra/qtcurve-kde4/bypass-kde-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Pino Toscano <pino@kde.org>
-Description: Disable braindead KDE3/4 prefix detection
- The current detection of the KDE 3 and KDE 4 prefixes is done running
- kde-config and kde4-config, resp.
- This can be problematic, as these two could create files in ~/.kde,
- thus breaking when the home of the current user (eg in buildds) is read-only.
- Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4
- if they were not detected, then just let it to.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CM
- set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
- include(CPack)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
- set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- 
- # Try to find kde4-config...
-@@ -48,6 +53,7 @@ if (KDE4_KDECONFIG_EXECUTABLE)
-                     ARGS --prefix
-                     OUTPUT_VARIABLE KDE4PREFIX)
- endif (KDE4_KDECONFIG_EXECUTABLE)
-+endif (BRAINDEAD_DETECTION)
- 
- if(NOT KDE3PREFIX)
-     if(KDE4PREFIX)
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
deleted file mode 100644
index 0b113c93a..000000000
--- a/extra/ristretto/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148434 2012-01-31 20:33:48Z ronald $
-# Maintainer:
-# Contributor: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=ristretto
-pkgver=0.3.4
-pkgrel=1
-pkgdesc="A fast and lightweight picture-viewer for Xfce"
-arch=('i686' 'x86_64')
-url="http://goodies.xfce.org/projects/applications/ristretto"
-license=('GPL')
-depends=('libxfce4ui' 'libexif' 'exo' 'desktop-file-utils')
-makedepends=('intltool')
-groups=('xfce4-goodies')
-install=ristretto.install
-source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-sha1sums=('7da6c287c45949193fd6046e82a099fd0469278c')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ristretto/ristretto.install b/extra/ristretto/ristretto.install
deleted file mode 100644
index 75e2b7b55..000000000
--- a/extra/ristretto/ristretto.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/extra/rubberband/gcc46.patch b/extra/rubberband/gcc46.patch
deleted file mode 100644
index 38ac76d42..000000000
--- a/extra/rubberband/gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h
-+++ rubberband-1.6.0/rubberband/RubberBandStretcher.h
-@@ -21,6 +21,7 @@
- 
- #include <vector>
- #include <map>
-+#include <cstddef>
- 
- /**
-  * @mainpage RubberBand
diff --git a/extra/rubberband/vectorops.patch b/extra/rubberband/vectorops.patch
deleted file mode 100644
index cae961591..000000000
--- a/extra/rubberband/vectorops.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/system/VectorOps.h    Mon Mar 21 21:51:33 2011 +0000
-+++ b/src/system/VectorOps.h    Sun Oct 02 21:12:42 2011 +0100
-@@ -84,8 +84,8 @@
- }
-
- template<typename T>
--inline void v_move(T *const R__ dst,
--                   const T *const R__ src,
-+inline void v_move(T *const dst,
-+                   const T *const src,
-                    const int count)
- {
-     memmove(dst, src, count * sizeof(T));
diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog
deleted file mode 100644
index ba267d49e..000000000
--- a/extra/rxvt-unicode/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-2012-01-22  Angel Velasquez <angvp@archlinux.org>
-	* Version bump to 9.15
-
-2011-12-02  Angel Velasquez <angvp@archlinux.org>
-	* Version bump to 9.14
-
-2011-12-02  Angel Velasquez <angvp@archlinux.org>
-	* Moved perl from optdepend to depend (closes FS#25782)
-
-2011-05-22  Angel Velasquez <angvp@archlinux.org>
-	* Rebuilt against perl 5.14.0
-
-2011-05-17  Angel Velasquez <angvp@archlinux.org>
-	* Removed not accepted upstream patch (closes FS#23324)
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
deleted file mode 100644
index 3d976c041..000000000
--- a/extra/rxvt-unicode/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 147102 2012-01-22 04:46:15Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-
-pkgname=rxvt-unicode
-pkgver=9.15
-pkgrel=1
-pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
-arch=('i686' 'x86_64')
-url="http://software.schmorp.de/pkg/rxvt-unicode.html"
-license=('GPL')
-depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl')
-optdepends=('gtk2-perl: to use the urxvt-tabbed')
-changelog=ChangeLog
-source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop)
-md5sums=('15595aa326167ac5eb68c28d95432faf'
-         '3de6c13126a45bc3bc9f6bba077a1311')
-sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7'
-          '962aebc88982dbeb62a7c4a051ff567e015f61a0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-terminfo=/usr/share/terminfo \
-    --enable-256-color \
-    --enable-font-styles \
-    --enable-xim \
-    --enable-keepscrolling \
-    --enable-selectionscrolling \
-    --enable-smart-resize \
-    --enable-pixbuf \
-    --enable-transparency \
-    --enable-utmp \
-    --enable-wtmp \
-    --enable-lastlog \
-    --disable-frills
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/share/terminfo"
-  export TERMINFO="${pkgdir}/usr/share/terminfo"
-  make DESTDIR="${pkgdir}" install
- # install the tabbing wrapper ( requires gtk2-perl! )
-  sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
-  install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed"
- # install freedesktop menu
-  install -Dm644 ../${pkgname}.desktop \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
diff --git a/extra/rxvt-unicode/rxvt-unicode.desktop b/extra/rxvt-unicode/rxvt-unicode.desktop
deleted file mode 100644
index 68d613dbd..000000000
--- a/extra/rxvt-unicode/rxvt-unicode.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=rxvt-unicode
-Comment=An Unicode capable rxvt clone
-Exec=urxvt
-Icon=terminal
-Terminal=false
-Type=Application
-Categories=Application;System;TerminalEmulator;
diff --git a/extra/samba/fix-ipv6-mount.patch b/extra/samba/fix-ipv6-mount.patch
deleted file mode 100644
index 89bef6533..000000000
--- a/extra/samba/fix-ipv6-mount.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/mount.cifs.c.orig	2010-03-03 13:42:02.143936727 +1000
-+++ client/mount.cifs.c	2010-03-04 01:53:22.752879004 +1000
-@@ -1563,7 +1563,7 @@
- 		}
- 	}
-
--	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
-+	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
- 		strlcat(options, "%", options_size);
- 		current_len = strnlen(options, options_size);
- 		optionstail = options + current_len; 
diff --git a/extra/telepathy-sofiasip/PKGBUILD b/extra/telepathy-sofiasip/PKGBUILD
deleted file mode 100644
index 7704eac95..000000000
--- a/extra/telepathy-sofiasip/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 120816 2011-04-26 16:16:06Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-pkgname=telepathy-sofiasip
-pkgver=0.7.1
-pkgrel=1
-pkgdesc="a SIP-protocol connection manager for the Telepathy framework based on SofiaSIP-stack."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL')
-depends=('telepathy-glib' 'sofia-sip')
-makedepends=('libxslt' 'python2')
-install=telepathy-sofiasip.install
-groups=('telepathy')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4139027790aae97d8a18260e09a747c6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/telepathy-sofiasip/telepathy-sofiasip.install b/extra/telepathy-sofiasip/telepathy-sofiasip.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/extra/telepathy-sofiasip/telepathy-sofiasip.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/tightvnc/PKGBUILD b/extra/tightvnc/PKGBUILD
deleted file mode 100644
index 881aa1cfb..000000000
--- a/extra/tightvnc/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 150962 2012-02-24 10:13:24Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-pkgname=tightvnc
-pkgver=1.3.10
-pkgrel=6
-pkgdesc="VNC Unix server && viewer"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.tightvnc.com"
-depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth')
-makedepends=('imake')
-conflicts=('vnc')
-options=('!makeflags')
-source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2"
-        'tightvnc-fontpath-xcolors.patch')
-md5sums=('397b35faad32d5246b6d44b142f8304f'
-         '21aa7f3376ec3c608ff22d199a19c601')
-
-build() {
-  cd $srcdir/vnc_unixsrc
-  patch -Np1 -i ../tightvnc-fontpath-xcolors.patch
-  sed -i 's|/usr/local/|/usr/share/|' vncserver
-
-  xmkmf
-  make World
-  cd Xvnc
-  ./configure
-  sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \
-    -i programs/Xserver/os/Makefile lib/font/fc/Makefile
-  make
-}
-
-package() {
-  cd $srcdir/vnc_unixsrc
-  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
-  ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man
-
-  # install java classes
-  mkdir -p $pkgdir/usr/share/vnc/classes
-  install -Dm644 $srcdir/vnc_unixsrc/classes/* \
-    $pkgdir/usr/share/vnc/classes
-}
diff --git a/extra/tightvnc/tightvnc-fontpath-xcolors.patch b/extra/tightvnc/tightvnc-fontpath-xcolors.patch
deleted file mode 100644
index 10bc4b596..000000000
--- a/extra/tightvnc/tightvnc-fontpath-xcolors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver
---- vnc_unixsrc/vncserver	2009-02-11 23:27:18.000000000 -0500
-+++ vnc_unixsrc.fixed/vncserver	2009-04-23 21:46:46.000000000 -0400
-@@ -34,7 +34,8 @@
- $desktopName = "X";
- $vncClasses = "/usr/local/vnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
-+$colorPath = "/usr/share/X11/rgb";
- $authType = "-rfbauth $vncUserDir/passwd";
- 
- # Read configuration from the system-wide and user files if present.
diff --git a/extra/transmission/fix_minimize.patch b/extra/transmission/fix_minimize.patch
deleted file mode 100644
index fe0f42a03..000000000
--- a/extra/transmission/fix_minimize.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: /trunk/gtk/main.c

-===================================================================

---- /trunk/gtk/main.c	(revision 12968)

-+++ /trunk/gtk/main.c	(revision 13067)

-@@ -73,4 +73,5 @@

-     gboolean                    is_iconified;

- 

-+    guint                       activation_count;

-     guint                       timer;

-     guint                       update_model_soon_tag;

-@@ -533,6 +534,14 @@

- 

- static void

--on_activate( GApplication * app UNUSED, gpointer unused UNUSED )

--{

-+on_activate( GApplication * app UNUSED, struct cbdata * cbdata )

-+{

-+    cbdata->activation_count++;

-+

-+    /* GApplication emits an 'activate' signal when bootstrapping the primary.

-+     * Ordinarily we handle that by presenting the main window, but if the user

-+     * user started Transmission minimized, ignore that initial signal... */

-+    if( cbdata->is_iconified && ( cbdata->activation_count == 1 ) )

-+        return;

-+

-     gtr_action_activate( "present-main-window" );

- }

diff --git a/extra/umfpack/UFconfig.mk b/extra/umfpack/UFconfig.mk
deleted file mode 100644
index 209be5bd0..000000000
--- a/extra/umfpack/UFconfig.mk
+++ /dev/null
@@ -1,351 +0,0 @@
-#===============================================================================
-# UFconfig.mk:  common configuration file for the SuiteSparse
-#===============================================================================
-
-# This file contains all configuration settings for all packages authored or
-# co-authored by Tim Davis at the University of Florida:
-#
-# Package Version       Description
-# ------- -------       -----------
-# AMD	  1.2 or later  approximate minimum degree ordering
-# COLAMD  2.4 or later  column approximate minimum degree ordering
-# CCOLAMD 1.0 or later  constrained column approximate minimum degree ordering
-# CAMD    any		constrained approximate minimum degree ordering
-# UMFPACK 4.5 or later	sparse LU factorization, with the BLAS
-# CHOLMOD any		sparse Cholesky factorization, update/downdate
-# KLU	  0.8 or later  sparse LU factorization, BLAS-free
-# BTF	  0.8 or later  permutation to block triangular form
-# LDL	  1.2 or later	concise sparse LDL'
-# LPDASA  any		linear program solve (dual active set algorithm)
-# CXSparse any		extended version of CSparse (int/long, real/complex)
-# SuiteSparseQR	any	sparse QR factorization
-#
-# The UFconfig directory and the above packages should all appear in a single
-# directory, in order for the Makefile's within each package to find this file.
-#
-# To enable an option of the form "# OPTION = ...", edit this file and
-# delete the "#" in the first column of the option you wish to use.
-
-#------------------------------------------------------------------------------
-# Generic configuration
-#------------------------------------------------------------------------------
-
-# C compiler and compiler flags:  These will normally not give you optimal
-# performance.  You should select the optimization parameters that are best
-# for your system.  On Linux, use "CFLAGS = -O3 -fexceptions" for example.
-CC = cc
- CFLAGS = -O   (for example; see below for details)
-
-# C++ compiler (also uses CFLAGS)
-CPLUSPLUS = g++
-
-# ranlib, and ar, for generating libraries
-RANLIB = ranlib
-AR = ar cr
-
-# delete and rename a file
-RM = rm -f
-MV = mv -f
-
-# Fortran compiler (not normally required)
-F77 = gfortran
-F77FLAGS = -O3
-F77LIB =
-
-# C and Fortran libraries
-LIB = -lm
-
-# For compiling MATLAB mexFunctions (MATLAB 7.5 or later)
-MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
-
-# For compiling MATLAB mexFunctions (MATLAB 7.3 and 7.4)
-# MEX = mex -O -largeArrayDims -lmwlapack
-
-# For MATLAB 7.2 or earlier, you must use one of these options:
-# MEX = mex -O -lmwlapack
-# MEX = mex -O
-
-# Which version of MAKE you are using (default is "make")
-# MAKE = make
-# MAKE = gmake
-
-#------------------------------------------------------------------------------
-# BLAS and LAPACK configuration:
-#------------------------------------------------------------------------------
-
-# UMFPACK and CHOLMOD both require the BLAS.  CHOLMOD also requires LAPACK.
-# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
-# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
-# LAPACK is at http://www.netlib.org/lapack/ .  You can use the standard
-# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
-# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
-# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
-# on a 2.5Ghz dual-core AMD Opteron.
-
-# These settings will probably not work, since there is no fixed convention for
-# naming the BLAS and LAPACK library (*.a or *.so) files.
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lgfortran -lgfortranbegin -lg2c
-
-# This is probably slow ... it might connect to the Standard Reference BLAS:
-BLAS = -Lusr/lib -lblas -lgfortran -lgfortranbegin
-LAPACK = -llapack
-
-# Using non-optimized versions:
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin -lg2c
-# LAPACK = -llapack_plain
-
-# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-# the BLAS.  Also, the standard xerbla requires the Fortran I/O library, and
-# stops the application program if an error occurs.  A C version of xerbla
-# distributed with this software (UFconfig/xerbla/libcerbla.a) includes a
-# Fortran-callable xerbla routine that prints nothing and does not stop the
-# application program.  This is optional.
-# XERBLA = ../../UFconfig/xerbla/libcerbla.a 
-
-# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
-# use this option:
-XERBLA = 
-
-# If you wish to use the Fortran UFconfig/xerbla/xerbla.f instead, use this:
-# XERBLA = ../../UFconfig/xerbla/libxerbla.a 
-
-#------------------------------------------------------------------------------
-# METIS, optionally used by CHOLMOD
-#------------------------------------------------------------------------------
-
-# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
-# compile CHOLMOD with the -DNPARTITION flag.  You must also use the
-# "METIS =" option, below.
-
-# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
-# You may wish to use an absolute path.  METIS is optional.  Compile
-# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-METIS_PATH = ../../metis-4.0
-METIS = ../../metis-4.0/libmetis.a
-
-# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
-# options:
-# METIS_PATH =
-# METIS =
-
-#------------------------------------------------------------------------------
-# UMFPACK configuration:
-#------------------------------------------------------------------------------
-
-# Configuration flags for UMFPACK.  See UMFPACK/Source/umf_config.h for details.
-#
-# -DNBLAS	do not use the BLAS.  UMFPACK will be very slow.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#  		LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF	do not use the Sun Perf. Library (default is use it on Solaris)
-# -DNPOSIX	do not use POSIX routines sysconf and times.
-# -DGETRUSAGE	use getrusage
-# -DNO_TIMER	do not use any timing routines
-# -DNRECIPROCAL	do not multiply by the reciprocal
-# -DNO_DIVIDE_BY_ZERO	do not divide by zero
-
-UMFPACK_CONFIG = 
-
-#------------------------------------------------------------------------------
-# CHOLMOD configuration
-#------------------------------------------------------------------------------
-
-# CHOLMOD Library Modules, which appear in libcholmod.a:
-# Core		requires: none
-# Check		requires: Core
-# Cholesky	requires: Core, AMD, COLAMD.  optional: Partition, Supernodal
-# MatrixOps	requires: Core
-# Modify	requires: Core
-# Partition	requires: Core, CCOLAMD, METIS.  optional: Cholesky
-# Supernodal	requires: Core, BLAS, LAPACK
-#
-# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
-# Tcov		requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
-#		optional: Partition
-# Valgrind	same as Tcov
-# Demo		requires: Core, Check, Cholesky, MatrixOps, Supernodal
-#		optional: Partition
-#
-# Configuration flags:
-# -DNCHECK	    do not include the Check module.	   License GNU LGPL
-# -DNCHOLESKY	    do not include the Cholesky module.	   License GNU LGPL
-# -DNPARTITION	    do not include the Partition module.   License GNU LGPL
-#		    also do not include METIS.
-# -DNGPL	    do not include any GNU GPL Modules in the CHOLMOD library:
-# -DNMATRIXOPS	    do not include the MatrixOps module.   License GNU GPL
-# -DNMODIFY	    do not include the Modify module.      License GNU GPL
-# -DNSUPERNODAL     do not include the Supernodal module.  License GNU GPL
-#
-# -DNPRINT	    do not print anything.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#  		    	LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF	    for Solaris only.  If defined, do not use the Sun
-#			Performance Library
-
-CHOLMOD_CONFIG =
-
-#------------------------------------------------------------------------------
-# SuiteSparseQR configuration:
-#------------------------------------------------------------------------------
-
-# The SuiteSparseQR library can be compiled with the following options:
-#
-# -DNPARTITION      do not include the CHOLMOD partition module
-# -DNEXPERT         do not include the functions in SuiteSparseQR_expert.cpp
-# -DTIMING          enable timing and flop counts
-# -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
-
-# default, without timing, without TBB:
-SPQR_CONFIG =
-# with timing and TBB:
-# SPQR_CONFIG = -DTIMING -DHAVE_TBB
-# with timing
-# SPQR_CONFIG = -DTIMING
-
-# with TBB, you must select this:
-# TBB = -ltbb
-# without TBB:
-TBB =
-
-# with timing, you must include the timing library:
-# RTLIB = -lrt
-# without timing
-RTLIB =
-
-#------------------------------------------------------------------------------
-# Linux
-#------------------------------------------------------------------------------
-
-# Using default compilers:
-# CC = gcc
-CFLAGS = -O3 -fexceptions -DNCHOLMOD
-
-# alternatives:
-# CFLAGS = -g -fexceptions \
-   	-Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-    	-Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CFLAGS = -O3 -fexceptions \
-   	-Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-    	-Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-# CFLAGS = -O3
-# CFLAGS = -O3 -g -fexceptions
-
-# consider:
-# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
-# -frename-registers -ffast-math -funroll-loops
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
-
-# Using Intel's icc and ifort compilers:
-#   (does not work for mexFunctions unless you add a mexopts.sh file)
-# F77 = ifort
-# CC = icc
-# CFLAGS = -O3 -xN -vec_report=0
-# CFLAGS = -g
-# old (broken): CFLAGS = -ansi -O3 -ip -tpp7 -xW -vec_report0
-
-# 64bit:
-# F77FLAGS = -O -m64
-# CFLAGS = -O3 -fexceptions -m64
-# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
-# LAPACK = -llapack64
-
-
-# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-
-# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto -lgfortran
-
-#------------------------------------------------------------------------------
-# Solaris
-#------------------------------------------------------------------------------
-
-# 32-bit
-# CFLAGS = -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
-
-# 64-bit
-# CFLAGS = -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
-
-# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
-
-# The Sun Performance Library includes both LAPACK and the BLAS:
-# BLAS = -xlic_lib=sunperf
-# LAPACK =
-
-
-#------------------------------------------------------------------------------
-# Compaq Alpha
-#------------------------------------------------------------------------------
-
-# 64-bit mode only
-# CFLAGS = -O2 -std1
-# BLAS = -ldxml
-# LAPACK =
-
-#------------------------------------------------------------------------------
-# Macintosh
-#------------------------------------------------------------------------------
-
-# CC = gcc
-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
-# LIB = -lstdc++
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
-
-#------------------------------------------------------------------------------
-# IBM RS 6000
-#------------------------------------------------------------------------------
-
-# BLAS = -lessl
-# LAPACK =
-
-# 32-bit mode:
-# CFLAGS   = -O4 -qipa -qmaxmem=16384 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384
-
-# 64-bit mode:
-# CFLAGS   = -O4 -qipa -qmaxmem=16384 -q64 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
-# AR = ar -X64
-
-#------------------------------------------------------------------------------
-# SGI IRIX
-#------------------------------------------------------------------------------
-
-# BLAS = -lscsl
-# LAPACK =
-
-# 32-bit mode
-# CFLAGS = -O
-
-# 64-bit mode (32 bit int's and 64-bit long's):
-# CFLAGS = -64
-# F77FLAGS = -64
-
-# SGI doesn't have ranlib
-# RANLIB = echo
-
-#------------------------------------------------------------------------------
-# AMD Opteron (64 bit)
-#------------------------------------------------------------------------------
-
-# BLAS = -lgoto_opteron64 -lg2c
-# LAPACK = -llapack_opteron64
-
-# SUSE Linux 10.1, AMD Opteron
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-# LAPACK = -llapack_opteron64
-
-#------------------------------------------------------------------------------
-# remove object files and profile output
-#------------------------------------------------------------------------------
-
-CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD
deleted file mode 100644
index 465974f25..000000000
--- a/extra/vsftpd/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 146202 2012-01-06 00:42:46Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=vsftpd
-pkgver=2.3.5
-pkgrel=1
-pkgdesc="Very Secure FTP daemon"
-arch=('i686' 'x86_64')
-url="https://security.appspot.com/vsftpd.html"
-license=('GPL2')
-depends=('openssl')
-backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
-install=vsftpd.install
-source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'vsftpd.xinetd' 'vsftpd.d')
-sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
-          '2ddf92782f19dafc72439a2917acb1d7e124d149'
-          'c87b4ce56dac15223694a6e86c01ea813b877596'
-          '24f268956c24e78be0c234c6d31f41487922eafe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # build-time config
-  sed \
-    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
-    -i builddefs.h
-  make CFLAGS="${CFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
-  install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
-  install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
-  install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5"
-  install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd"
-  install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd"
-
-  install -d -m755 "${pkgdir}/usr/share/empty"
-}
diff --git a/extra/vsftpd/vsftpd.d b/extra/vsftpd/vsftpd.d
deleted file mode 100644
index 27310855c..000000000
--- a/extra/vsftpd/vsftpd.d
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-daemon_name=vsftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name &
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/vsftpd/vsftpd.install b/extra/vsftpd/vsftpd.install
deleted file mode 100644
index 48f134e24..000000000
--- a/extra/vsftpd/vsftpd.install
+++ /dev/null
@@ -1,17 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
-    echo ">>> It appears that your current kernel has linux security"
-    echo ">>> capabilities built as a module.  vsftpd requires this"
-    echo ">>> functionality to operate."
-    echo ">>>"
-    echo ">>> To activate the module, please load it now (modprobe capability)."
-    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
-    echo ">>> it will be activated automatically at boot-up."
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
diff --git a/extra/vsftpd/vsftpd.xinetd b/extra/vsftpd/vsftpd.xinetd
deleted file mode 100644
index eff2eb3db..000000000
--- a/extra/vsftpd/vsftpd.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service ftp
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/vsftpd
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD
deleted file mode 100644
index 8cc7010f9..000000000
--- a/extra/windowmaker-crm-git/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148962 2012-02-05 11:58:02Z 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/extra/windowmaker-crm-git/libpng-1.4.patch b/extra/windowmaker-crm-git/libpng-1.4.patch
deleted file mode 100644
index 5dbe5fd25..000000000
--- a/extra/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/extra/windowmaker-crm-git/wmaker.desktop b/extra/windowmaker-crm-git/wmaker.desktop
deleted file mode 100644
index f819c7577..000000000
--- a/extra/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/extra/xaw3d/xaw3d.patch b/extra/xaw3d/xaw3d.patch
deleted file mode 100644
index d126f7c5c..000000000
--- a/extra/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/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch
deleted file mode 100644
index fee383855..000000000
--- a/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From patchwork Wed Mar 14 03:27:29 2012
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [synaptics] Fix inverted circular scrolling direction
-Date: Wed, 14 Mar 2012 03:27:29 -0000
-From: Peter Hutterer <peter.hutterer@who-t.net>
-X-Patchwork-Id: 9512
-Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com>
-To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org>
-Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas@archlinux.org>
-
-Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10.
-In said commit, the old-style button events were changed to delta
-accumulation. Alas, for circular scrolling, a positive delta is up whereas
-for everything else a positive delta is down.
-
-Reported-by: Thomas Bächler <thomas@archlinux.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
----
-src/synaptics.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/synaptics.c b/src/synaptics.c
-index fa46f0d..c9609cd 100644
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
- 	double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y));
- 	if (delta >= 0.005 && diff != 0.0) {
- 	    if (priv->circ_scroll_vert)
--		priv->scroll.delta_y += diff / delta * para->scroll_dist_vert;
-+		priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert;
- 	    else
--		priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;;
-+		priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;;
- 	    priv->scroll.last_a = angle(priv, hw->x, hw->y);
- 	    DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a);
-         }
diff --git a/extra/xf86-video-ast/ast-0.93.9-vga.patch b/extra/xf86-video-ast/ast-0.93.9-vga.patch
deleted file mode 100644
index e05a78f56..000000000
--- a/extra/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/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch b/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
deleted file mode 100644
index b9c832238..000000000
--- a/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
+++ /dev/null
@@ -1,580 +0,0 @@
-From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 29 Mar 2011 03:53:31 +0000
-Subject: chips: gut the overlay 8/16 support from driver.
-
-This driver is for chips that were bought by Intel in 1997,
-this feature means maintaining a lot of code in the X server
-for little gain.
-
-Drop it like its hot.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/man/chips.man b/man/chips.man
-index 740af38..0c022ee 100644
---- a/man/chips.man
-+++ b/man/chips.man
-@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
- Force driver to leave centering and stretching registers alone. This
- can fix some laptop suspend/resume problems. Default: off
- .TP
--.BI "Option \*qOverlay\*q"
--Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
--.TP
- .BI "Option \*qColorKey\*q \*q" integer \*q
- Set the colormap index used for the transparency key for the depth 8 plane
- when operating in 8+16 overlay mode.  The value must be in the range
-diff --git a/src/ct_accel.c b/src/ct_accel.c
-index 3920b0a..4b5776a 100644
---- a/src/ct_accel.c
-+++ b/src/ct_accel.c
-@@ -428,19 +428,7 @@ chips_imagewrite:
-         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
- #endif
- 
--
--#ifdef CHIPS_HIQV
--    if (XAAInit(pScreen, infoPtr)) {
--	if (cPtr->Flags & ChipsOverlay8plus16)      
--	    return(XAAInitDualFramebufferOverlay(pScreen,
--						 CTNAME(DepthChange)));
--	else
--	    return TRUE;
--    } else
--	return FALSE;
--#else
-     return(XAAInit(pScreen, infoPtr));
--#endif
- }
- 
- #ifdef CHIPS_HIQV
-@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
- #endif
-     w *= cAcl->BytesPerPixel;
-     ctBLTWAIT;
--#ifdef CHIPS_HIQV
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
--	    (pScrn->depth == 8))
--	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
--#endif
-     ctSETSRCADDR(srcaddr);
-     ctSETDSTADDR(destaddr);
- #ifdef CHIPS_HIQV
-@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
-     patternaddr = (paty * pScrn->displayWidth + 
- 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
-     cAcl->patternyrot = (patx & 0x3F) >> 3;
--#ifdef CHIPS_HIQV
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr += cPtr->FbOffset16;
--#endif
- 
-     ctBLTWAIT;
-     ctSETPATSRCADDR(patternaddr);
-@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
- 
- #ifdef CHIPS_HIQV
-     patternaddr = paty * pScrn->displayWidth + patx;
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
--    else
--	patternaddr *= cAcl->BytesPerPixel;
-+    patternaddr *= cAcl->BytesPerPixel;
- #else
-     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
- #endif
-@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
-     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     destpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	destaddr += cPtr->FbOffset16;
--    else
--	destaddr += cAcl->FbOffset;
-+    destaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
- 
-@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	y++;
- 
- 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    destaddr += cPtr->FbOffset16;
--	else
--	    destaddr += cAcl->FbOffset;
-+	destaddr += cAcl->FbOffset;
- 
- 	ctBLTWAIT;
- 	ctSETDSTADDR(destaddr);
-@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
-     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     srcpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	srcaddr += cPtr->FbOffset16;
--    else
--	srcaddr += cAcl->FbOffset;
-+    srcaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
-     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
-@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	dst += dstwidth;
- 	y++;
- 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    srcaddr += cPtr->FbOffset16;
--	else
--	    srcaddr += cAcl->FbOffset;
-+	srcaddr += cAcl->FbOffset;
- 	ctBLTWAIT;
- 	ctSETSRCADDR(srcaddr);
- 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
-diff --git a/src/ct_driver.c b/src/ct_driver.c
-index 6624b79..08df050 100644
---- a/src/ct_driver.c
-+++ b/src/ct_driver.c
-@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
-     
--    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
--	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
--	  if (pScrn->bitsPerPixel == 16) {
--	    if (cPtr->Flags & ChipsLinearSupport) {
--		cPtr->Flags |= ChipsOverlay8plus16;
--		if(!xf86GetOptValInteger(
--			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
--		    pScrn->colorKey = TRANSPARENCY_KEY;
--		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
--		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
--			   "PseudoColor overlay enabled.\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"Stretch\" \"ON\".\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
--		if (cPtr->Flags & ChipsShadowFB) {
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
--		           "                             - Disabling \"Shadow Framebuffer\".\n");
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                               Not support with option \"8Plus16\".\n");
--		    cPtr->Flags &= ~ChipsShadowFB;
--		    cPtr->Rotate = 0;
--		}
--	    } else {
--		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
--	    }
--	  } else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"Option \"Overlay\" is not supported in this configuration\n");
--	  }
--	} else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
--	}
--    }
--
--    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
--	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
--		&(cPtr->videoKey))) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
-+    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
-+	&(cPtr->videoKey))) {
-+         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
- 		cPtr->videoKey);
--	} else {
--	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
-+    } else {
-+       cPtr->videoKey =  (1 << pScrn->offset.red) | 
- 			(1 << pScrn->offset.green) |
- 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
- 			<< pScrn->offset.blue); 
--	}
-     }
- 
-     if (cPtr->Flags & ChipsShadowFB) {
-@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
-     /* and 32bits on the others. Thus multiply by a suitable factor      */  
-     if (cPtr->Flags & Chips64BitMemory) {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
-     } else {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
-     }
-@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
-     /* Should we re-save the text mode on each VT enter? */
-     if(!chipsModeInit(pScrn, pScrn->currentMode))
-       return FALSE;
--    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	&& (cPtr->Flags & ChipsVideoSupport)
-+    if ((cPtr->Flags & ChipsVideoSupport)
- 	&& (cPtr->Flags & ChipsLinearSupport)) 
-         CHIPSResetVideo(pScrn); 
- 
-@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-     int i, index, shift ;
-     CHIPSEntPtr cPtrEnt;    
- 
--    shift = ((pScrn->depth == 15) && 
--	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
-+    shift = (pScrn->depth == 15) ? 3 : 0;
- 
-     if (cPtr->UseDualChannel) {
-         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
-@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
-     hwp->disablePalette(hwp);
- }
- 
--static Bool
--cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
--                  int xsize, int ysize, int dpix, int dpiy,
--                  int width16, int width8)
--{
--    return
--        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
--                              dpix, dpiy, width16, width8, 16, 8) &&
--         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
--                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
--}
--
- /* Mandatory */
- static Bool
- CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!chipsMapMem(pScrn))
- 	return FALSE;
- 
--    /* Setup a pointer to the overlay if needed */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
--	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
--	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Too little memory for overlay. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--    }
--
-     /* Setup the MMIO register access functions if need */
-     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
- 	CHIPSSetMmioExtFuncs(cPtr);
-@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     miClearVisualTypes();
- 
-     /* Setup the visuals we support. */
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
--	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
--			      pScrn->rgbBits, PseudoColor))
--		return FALSE;
--	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
--		return FALSE;
--    } else {
--      if (!miSetVisualTypes(pScrn->depth,
-+    if (!miSetVisualTypes(pScrn->depth,
- 			    miGetDefaultVisualMask(pScrn->depth),
- 			    pScrn->rgbBits, pScrn->defaultVisual))
--	return FALSE;
--    }
-+        return FALSE;
-     miSetPixmapDepths ();
- 
-     /*
-@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	break;
- #endif
-     case 16:
--      if (cPtr->Flags & ChipsOverlay8plus16) {
--	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
--				  cPtr->FbOffset16, FBStart, width, 
--				  height, pScrn->xDpi, pScrn->yDpi,
--				  displayWidth, displayWidth);
--	  break;
--      }
-     default:
- 	ret = fbScreenInit(pScreen, FBStart,
-  		        width,height,
-@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	if (pScrn->bitsPerPixel < 8)
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY / 2;
--	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
--	    freespace = allocatebase - pScrn->displayWidth * 
--		    pScrn->virtualY - cPtr->FbSize16;
- 	else	
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
-@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	    AvailFBArea.y2 = cAcl->CacheEnd /
- 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
- 
--	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
--		xf86InitFBManager(pScreen, &AvailFBArea); 
--	    }
-+	    xf86InitFBManager(pScreen, &AvailFBArea); 
- 	}
- 	if (cPtr->Flags & ChipsAccelSupport) {
- 	    if (IS_HiQV(cPtr)) {
-@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!miCreateDefColormap(pScreen))
- 	return FALSE;
-     
--    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
--		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
--	    return FALSE;
--    } else {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
-+    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
- 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
- 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
--	    return FALSE;
--    }
-+	return FALSE;
-     
- #ifndef XSERVER_LIBPCIACCESS
-     racflag = RAC_COLORMAP;
-@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	xf86SetSilkenMouse(pScreen);
- #endif
- 
--	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	    && (cPtr->Flags & ChipsVideoSupport)
-+	if ((cPtr->Flags & ChipsVideoSupport)
- 	    && (cPtr->Flags & ChipsLinearSupport)) {
- 	    CHIPSInitVideo(pScreen);
-     }
-@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	Base >>= 3;
- 	break;
-     case 16:
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	   Base >>= 1;
--	else
--	   Base >>= 2;
-+	Base >>= 1;
- 	break;
-     case 24:
- 	if (!IS_HiQV(cPtr))
-@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	cPtr->writeMSS(cPtr, hwp, MSS);
-     }
- 
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	Base = (Base << 3) & ~(unsigned long)0xF;
--
--	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
--	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
--	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
--    }
--
- }
- 
- /* Mandatory */
-@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
- 
--    if (flags & MODECHECK_FINAL) {
--    /* Don't subtract FrambufferSize here as it should be subtracted already */
--    if ((cPtr->Flags & ChipsOverlay8plus16) 
--      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
--	  < 0))
--	return MODE_MEM;
--    }
-     /* The tests here need to be expanded */
-     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
- 	return MODE_NO_INTERLACE;
-@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     } else {
- 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
-     }
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
--	/* Make sure that the overlay isn't visible in the overscan region */
--	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
--	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
--    } else
--	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-+    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
-     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
- 
-@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* set virtual screen width */
-     tmp = pScrn->displayWidth >> 3;
-     if (pScrn->bitsPerPixel == 16) {
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	    tmp <<= 1;		       /* double the width of the buffer */
-+	tmp <<= 1;		       /* double the width of the buffer */
-     } else if (pScrn->bitsPerPixel == 24) {
- 	tmp += tmp << 1;
-     } else if (pScrn->bitsPerPixel == 32) {
-@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
-     /* centering/stretching */
-     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
--	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
--	(cPtr->Flags & ChipsOverlay8plus16)) {
-+	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
- 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
- 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
- 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
-@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	}
-     }
- 
--    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
--		|| (cPtr->Flags & ChipsOverlay8plus16)) {
-+    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
- 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
- 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
-     } else {
-@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	ChipsNew->XR[0x82] |=0x02;
- 
-     /* software mode flag */
--    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
--	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
-+    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
- 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
- 	mode->CrtcHDisplay, mode->CrtcVDisplay);
- #ifdef DEBUG
-@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     	}
-     }	    
-     /* bpp depend */
--    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
-+    if (pScrn->bitsPerPixel == 16) {
- 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
- 	if (cPtr->Flags & ChipsGammaSupport)
- 	    ChipsNew->XR[0x82] |= 0x0C;
-@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* Turn off multimedia by default as it degrades performance */
-     ChipsNew->XR[0xD0] &= 0x0f;	 
-     
--    /* Setup the video/overlay */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
--#ifdef SAR04
--	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
--#endif
--	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
--	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
--	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
--	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
--	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
--	if (pScrn->weight.green == 5)
--	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
--
--	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
--	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
--	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
--	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
--	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
--	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
--
--	/* Left Edge of Overlay */
--	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
--	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
--	/* Right Edge of Overlay */
--	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
--							1) & 0xFF;
--	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
--							1) >> 8) & 0x07;
--	/* Top Edge of Overlay */
--	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
--	ChipsNew->MR[0x2F] &= 0xF8;
--	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
--	/* Bottom Edge of Overlay*/
--	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
--	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
--							1 ) >> 8) & 0x07;
--
--	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
--	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
--	ChipsNew->MR[0x3D] = 0x00;
--	ChipsNew->MR[0x3E] = 0x00;
--	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
--	ChipsNew->MR[0x40] = 0xFF;
--	ChipsNew->MR[0x41] = 0xFF;
--	ChipsNew->MR[0x42] = 0x00;
--    } else if (cPtr->Flags & ChipsVideoSupport) {
-+    if (cPtr->Flags & ChipsVideoSupport) {
- #if 0   /* if we do this even though video isn't playing we kill performance */
- 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
- #endif
-@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
- 	}
- 
- 	/* Set SAR04 multimedia register correctly */
--	if ((cPtr->Flags & ChipsOverlay8plus16)
--	    || (cPtr->Flags & ChipsVideoSupport)) {
-+	if ((cPtr->Flags & ChipsVideoSupport)) {
- #ifdef SAR04
- 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
- 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
-diff --git a/src/ct_driver.h b/src/ct_driver.h
-index d8ce228..10a24d4 100644
---- a/src/ct_driver.h
-+++ b/src/ct_driver.h
-@@ -114,7 +114,6 @@ typedef struct {
- /* Options flags for the C&T chipsets */
- #define ChipsHWCursor		0x00001000
- #define ChipsShadowFB		0x00002000
--#define ChipsOverlay8plus16	0x00004000
- #define ChipsUseNewFB		0x00008000
- 
- /* Architecture type flags */
-diff --git a/src/ct_video.c b/src/ct_video.c
-index a68acb9..c9e5bb4 100644
---- a/src/ct_video.c
-+++ b/src/ct_video.c
-@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
-     int num_adaptors;
- 	
--    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
--       (cPtr->Flags & ChipsVideoSupport)) {
-+    if ((cPtr->Flags & ChipsVideoSupport)) {
- 	newAdaptor = CHIPSSetupImageVideo(pScreen);
- 	CHIPSInitOffscreenImages(pScreen);
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-cirrus/cirrus-1.3.2-git.patch b/extra/xf86-video-cirrus/cirrus-1.3.2-git.patch
deleted file mode 100644
index 5701a8473..000000000
--- a/extra/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/extra/xf86-video-i128/i128-1.3.4-git.patch b/extra/xf86-video-i128/i128-1.3.4-git.patch
deleted file mode 100644
index 581ed7bb7..000000000
--- a/extra/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/extra/xf86-video-mga/git-fixes.patch b/extra/xf86-video-mga/git-fixes.patch
deleted file mode 100644
index 70650b0d1..000000000
--- a/extra/xf86-video-mga/git-fixes.patch
+++ /dev/null
@@ -1,5192 +0,0 @@
-From 951474c7fcd1b28d3178a6644d58958cb3bdf5a8 Mon Sep 17 00:00:00 2001
-From: Yannick Heneault <yheneaul@matrox.com>
-Date: Wed, 25 Aug 2010 15:16:27 +0000
-Subject: modified G200SE conditionnal statement about revision register for products compatibility.
-
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 5a1e9b4..83649ee 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1081,7 +1081,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;
-@@ -3253,7 +3253,7 @@ MGA_HAL(
-     MGA_NOT_HAL(
- 	if (pMga->is_G200SE) {
-             OUTREG8(0x1FDE, 0x06);
--	    if (pMga->reg_1e24 == 0x01)
-+	    if (pMga->reg_1e24 >= 0x01)
- 		OUTREG8(0x1FDF, 0x03);
- 	    else 
- 		OUTREG8(0x1FDF, 0x14);
-@@ -4326,7 +4326,7 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
- 	    return MODE_VIRTUAL_X;
- 	if (mode->VDisplay > 1200)
- 	    return MODE_VIRTUAL_Y;
--	if (pMga->reg_1e24 == 0x01 &&
-+	if (pMga->reg_1e24 >= 0x01 &&
- 	    xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244)
- 	    return MODE_BANDWIDTH;
-     } else if (pMga->is_G200WB){
---
-cgit v0.9.0.2-2-gbebe
-From 0bd44fad450843b7f1c35c70ab356a2b250d107d Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-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..7725b56 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
-  *
-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_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 83649ee..72e7acc 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
-  *
-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_reg.h b/src/mga_reg.h
-index 6251976..ffe4723 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
-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/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>
---
-cgit v0.9.0.2-2-gbebe
-From 636c3c88e7e9cb30010fe1731cd7356849f3f172 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 14 Oct 2010 18:36:06 +0000
-Subject: Don't allow the config file to override BIOS location
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 72e7acc..37bf847 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1779,23 +1779,16 @@ 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;
--	    pMga->BiosFrom = X_PROBED;
--	} else if (pMga->Primary) {
--	    pMga->BiosAddress = 0xc0000;
--	    pMga->BiosFrom = X_DEFAULT;
--	}
-+    /* details: rombase sdk pp 4-15 */
-+    if (pMga->PciInfo->biosBase != 0) {
-+	pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
-+	pMga->BiosFrom = X_PROBED;
-+    } else if (pMga->Primary) {
-+	pMga->BiosAddress = 0xc0000;
-+	pMga->BiosFrom = X_DEFAULT;
-     }
-     if (pMga->BiosAddress) {
- 	xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n",
---
-cgit v0.9.0.2-2-gbebe
-From f7a2ef60e18e2cc464f69c1cad4681096c645651 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 30 Oct 2010 16:38:31 +0000
-Subject: Sun's copyrights now belong to Oracle
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-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)
- 
---
-cgit v0.9.0.2-2-gbebe
-From 5f1b04e86e79938c8158055a777280a649f95510 Mon Sep 17 00:00:00 2001
-From: Yannick Heneault <yheneaul@matrox.com>
-Date: Fri, 17 Dec 2010 14:00:46 +0000
-Subject: added support for G200ER.
-
----
-diff --git a/src/mga.h b/src/mga.h
-index 7725b56..c520e86 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -136,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 
-  */
-@@ -199,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;
-@@ -478,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_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_driver.c b/src/mga_driver.c
-index 37bf847..7232c73 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -403,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
-@@ -432,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
-@@ -449,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" },
-@@ -471,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,
-@@ -912,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;
-@@ -1285,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) {
-@@ -1326,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);
-@@ -1619,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) {
-@@ -1782,14 +1819,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-      * use the VGA default.
-      */
- 
--    /* details: rombase sdk pp 4-15 */
--    if (pMga->PciInfo->biosBase != 0) {
--	pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
--	pMga->BiosFrom = X_PROBED;
--    } else if (pMga->Primary) {
--	pMga->BiosAddress = 0xc0000;
--	pMga->BiosFrom = X_DEFAULT;
--    }
-+	/* details: rombase sdk pp 4-15 */
-+	if (pMga->PciInfo->biosBase != 0) {
-+	    pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
-+	    pMga->BiosFrom = X_PROBED;
-+	} else if (pMga->Primary) {
-+	    pMga->BiosAddress = 0xc0000;
-+	    pMga->BiosFrom = X_DEFAULT;
-+	}
-     if (pMga->BiosAddress) {
- 	xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n",
- 		   (unsigned long)pMga->BiosAddress);
-@@ -2134,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);
-@@ -2247,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;
-@@ -2424,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;
-@@ -4332,10 +4372,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_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 ffe4723..5a37db6 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -369,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
-@@ -429,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_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);
---
-cgit v0.9.0.2-2-gbebe
-From 43280e6521815582f219d42821d896093c9c0d5f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 22 Jun 2011 21:02:29 +0000
-Subject: Don't include xf86Priv.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-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"
---
-cgit v0.9.0.2-2-gbebe
-From c083bf0a66bef9a4345847f39be5fb895c211f79 Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Wed, 03 Aug 2011 13:45:13 +0000
-Subject: Added support for G200SE Pilot3
-
-Optimize use of bandwidth and increase maximum resolution to 1920x1200
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 7232c73..b140013 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -3282,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;
- 
-@@ -4354,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;
---
-cgit v0.9.0.2-2-gbebe
-From 01ca2186ea028b2549de509b51726aa08519fce0 Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Tue, 20 Sep 2011 17:07:16 +0000
-Subject: Reset tagfifo for renesas.
-
-For renesas, we need to reset tagfifo after a mode switch.
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index b140013..58a1390 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -3282,6 +3282,28 @@ MGA_HAL(
- 	    outb(0xfac, 0x02);
-     }
- 
-+    /* Reset tagfifo*/ 
-+	if (pMga->is_G200ER) 
-+    {
-+        CARD32 ulMemCtl = INREG(MGAREG_MEMCTL);
-+        CARD8  ucSeq1;
-+
-+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Reset tagfifo\n");
-+        /* Screen off */
-+    	OUTREG8(MGAREG_SEQ_INDEX, 0x01);	/* Select SEQ1 */
-+	    ucSeq1 = INREG8(MGAREG_SEQ_DATA) | 0x20;
-+    	OUTREG8(MGAREG_SEQ_DATA, ucSeq1);
-+
-+        /* Reset tagfifo */
-+        OUTREG(MGAREG_MEMCTL, ulMemCtl | 0x002000000);
-+        usleep(1000); /* wait 1ms */
-+        OUTREG(MGAREG_MEMCTL, ulMemCtl & ~0x002000000);
-+
-+        /* Screen on */
-+    	OUTREG8(MGAREG_SEQ_DATA, ucSeq1 & ~0x20);
-+
-+    }
-+
-     /* 
-      This function optimize the Priority Request control
-      Higher HiPriLvl will reduce drawing performance
-diff --git a/src/mga_reg.h b/src/mga_reg.h
-index 5a37db6..ae0fe8c 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -119,6 +119,9 @@
- #define MGAREG_WACCEPTSEQ       0x1dd4
- #define MGAREG_WMISC            0x1e70
- 
-+
-+#define MGAREG_MEMCTL           0x2E08
-+
- /* OPMODE register additives */
- 
- #define MGAOPM_DMA_GENERAL	(0x00 << 2)
---
-cgit v0.9.0.2-2-gbebe
-From ae90c47503bc1015a50e7ea6d22ec10e5e0d4113 Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Tue, 13 Sep 2011 21:01:57 +0000
-Subject: Nothing uses clientlx.c, so delete it.
-
-Adam Jackson wrote:
-
-	Hey, so, remember back in the dark ages when dualhead was this
-	insanely wild differentiating feature?  Matrox thought it was so
-	special, in fact, that they hid most of the implementation of it
-	(and a bunch of other stuff) in a binary-only blob called the
-	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-	the relevant Windows code, and then some open glue to keep it
-	working; clientlx.c is that glue.
-
-	I guess the theory was that if you don't tell people which
-	registers to duplicate to implement a second pipe in their own
-	hardware, they won't figure it out?  A pretty eyeroll-worthy
-	idea even at the time, and definitely not something we should be
-	condoning anymore.
-
-	Kill it with fire ...
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 17211bb..44417de 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -32,7 +32,6 @@ mga_drv_la_LIBADD = $(noinst_LTLIBRARIES)
- mga_drv_la_SOURCES = \
-          binding.h \
-          client.h \
--         clientlx.c \
-          mga_arc.c \
-          mga_bios.c \
-          mga_common.h \
-diff --git a/src/binding.h b/src/binding.h
-index 57e9b92..616aed7 100644
---- a/src/binding.h
-+++ b/src/binding.h
-@@ -37,37 +37,6 @@ typedef char            CHAR;
- typedef unsigned char   UCHAR;
- typedef unsigned char   FAR*LPUCHAR;
- 
--typedef struct TAGCLIENTTABLE{
--    ULONG (DECL *ClientReadConfigSpaceByte       )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadConfigSpaceDword      )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteConfigSpaceByte      )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteConfigSpaceDword     )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenRegisterBase          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseRegisterBase         )(LPVOID );                        
--    ULONG (DECL *ClientReadRegisterByte          )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadRegisterDword         )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteRegisterByte         )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteRegisterDword        )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenMemoryBase            )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseMemoryBase           )(LPVOID );                        
--    ULONG (DECL *ClientReadMemoryByte            )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadMemoryDword           )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteMemoryByte           )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteMemoryDword          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenSystemDevice          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseSystemDevice         )(LPVOID );                        
--    ULONG (DECL *ClientReadSystemDeviceByte      )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadSystemDeviceDword     )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteSystemDeviceByte     )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteSystemDeviceDword    )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientWait                      )(LPVOID , ULONG);                 
--    ULONG (DECL *ClientGetBiosInfo               ) (LPVOID, LPVOID, LPVOID);        
--    ULONG (DECL *ClientReadDDCEdid               ) (LPVOID, LPVOID, ULONG);         
--#ifdef DEBUG
--    ULONG (DECL *ClientDebug                     ) (LPVOID, ULONG, LPVOID, ULONG, LPVOID);
--#endif
--} CLIENTTABLE, FAR *LPCLIENTTABLE;
--
- #endif /* _INTERNALBINDING */
- 
- /***************************************************************************************************
-diff --git a/src/client.h b/src/client.h
-index 8348b64..59aca5d 100644
---- a/src/client.h
-+++ b/src/client.h
-@@ -17,46 +17,6 @@ typedef struct TAGCLIENTDATA
-     pointer        pMga;
- } CLIENTDATA, *LPCLIENTDATA;
- 
--extern ULONG DECL ClientReadConfigSpaceByte(LPBOARDHANDLE, ULONG, LPUCHAR);
--extern ULONG DECL ClientReadConfigSpaceDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteConfigSpaceByte (LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteConfigSpaceDword(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenRegisterBase(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseRegisterBase (LPBOARDHANDLE );
--extern ULONG DECL ClientReadRegisterByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadRegisterDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteRegisterByte (LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteRegisterDword(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenMemoryBase(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseMemoryBase(LPBOARDHANDLE );
--extern ULONG DECL ClientReadMemoryByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadMemoryDword (LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteMemoryByte(LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteMemoryDword (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenSystemDevice (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseSystemDevice (LPBOARDHANDLE );
--extern ULONG DECL ClientReadSystemDeviceByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadSystemDeviceDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteSystemDeviceByte(LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteSystemDeviceDword (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientWait (LPBOARDHANDLE , ULONG);
--extern ULONG DECL ClientLocateFirstTwisterOfQuad(ULONG);
--extern ULONG DECL ClientSearchDevNode(ULONG, UCHAR, UCHAR);
--extern ULONG DECL ClientGetBiosInfo(LPBOARDHANDLE, LPUCHAR, LPULONG );
--extern ULONG DECL ClientDebug (LPBOARDHANDLE , ULONG, LPUCHAR, ULONG, LPVOID);
--extern ULONG DECL ClientCallBiosInt10(LPBOARDHANDLE, LPBIOSREGS);
--extern ULONG DECL ClientReadDDCEdid(LPBOARDHANDLE, LPUCHAR, ULONG);
--extern ULONG DECL ClientCustomCall(LPBOARDHANDLE, ULONG, LPVOID, LPVOID);
--extern ULONG DECL ClientApplyEpromPatch(LPBOARDHANDLE);
--extern ULONG DECL ClientDetectHostInterface(LPBOARDHANDLE, LPULONG);
--extern ULONG DECL ClientHSLPatchFunction(LPBOARDHANDLE, ULONG, ULONG, LPUCHAR);
--extern ULONG DECL InitClientFunctions(LPBOARDHANDLE, ULONG);
--extern ULONG DECL ClientInitTimeBase(LPBOARDHANDLE);
--extern ULONG DECL ClientOpenDMABase(LPBOARDHANDLE, ULONG, ULONG);
--extern ULONG DECL ClientReadDMAByte(LPBOARDHANDLE, ULONG, LPUCHAR);
--extern ULONG DECL ClientReadBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG, LPUCHAR);
--extern ULONG DECL ClientWriteBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG);
--
- #if defined(__cplusplus)
-     }
- #endif
-diff --git a/src/clientlx.c b/src/clientlx.c
-deleted file mode 100644
-index 9c6ab50..0000000
---- a/src/clientlx.c
-+++ b/dev/null
-@@ -1,848 +0,0 @@
--/******************************************************************************\
--
--    clientlx.c
--
--    Copyright © 1997, Matrox Graphics Inc.
--
--    All Rights Reserved.
--
--\******************************************************************************/
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
--#include "xf86_OSproc.h"
--#include "xf86Pci.h"
--#include "client.h"
--#include "mga.h"
--
--CLIENTTABLE ClientFunctions = {
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadConfigSpaceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadConfigSpaceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteConfigSpaceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteConfigSpaceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenRegisterBase,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseRegisterBase,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadRegisterByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadRegisterDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteRegisterByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteRegisterDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenMemoryBase,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseMemoryBase,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadMemoryByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadMemoryDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteMemoryByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteMemoryDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenSystemDevice,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseSystemDevice,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadSystemDeviceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadSystemDeviceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteSystemDeviceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteSystemDeviceDword,
--    (ULONG (DECL *)(LPVOID,ULONG))           ClientWait,
--    (ULONG (DECL *)(LPVOID,LPVOID,LPVOID))   ClientGetBiosInfo,
--    (ULONG (DECL *)(LPVOID,LPVOID,ULONG))    ClientReadDDCEdid
--};
--
--/******************************************************************************\
--
--    Function      : ClientReadConfigSpaceByte
--
--    Description   : Read a Byte from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specifib board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *pucByte | pointer to a byte that will receive
--                    the data
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_read_u8(pMga->PciInfo, pucByte, ulOffset);
--#else
--    *pucByte = pciReadByte(pMga->PciTag,ulOffset);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadConfigSpaceDword
--
--    Description   : Read a Dword from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset  | Offset of the Byte to be read.
--                    ULONG *pulDword | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_read_u32(pMga->PciInfo, (uint32_t *) pulDword, ulOffset);
--#else
--    *pulDword = pciReadLong(pMga->PciTag,ulOffset);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteConfigSpaceByte
--
--    Description   : Write a Byte from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | Byte to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_write_u8(pMga->PciInfo, ucByte, ulOffset);
--#else
--    pciWriteByte(pMga->PciTag,ulOffset, ucByte);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteConfigSpaceDword
--
--    Description   : Write a Dword from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword containing the data to  be written
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_write_u32(pMga->PciInfo, (uint32_t) ulDword, ulOffset);
--#else
--    pciWriteLong(pMga->PciTag,ulOffset, ulDword);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenRegisterBase
--
--    Description   : Map the register base for future call to ClientReadRegisterX
--                    and ClientWriteRegisterX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenRegisterBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--    pClientStruct->ulRegisterBase = (ULONG) pMga->IOBase;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseRegisterBase
--
--    Description   : Unmap the register base address and free resources needed
--                    to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseRegisterBase(LPBOARDHANDLE pBoard)
--{
--    ASSERT_HANDLER(pBoard);
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadRegisterByte
--
--    Description   : Read a byte from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure.
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *pucByte | pointer to the byte that will receive
--                    the data.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                             UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pucByte = *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadRegisterDword
--
--    Description   : Read a Dword from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset  | Offset of the Byte to be read.
--                    ULONG *pulDword | pointer to the dword that will receive
--                    the data.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientReadRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                              ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pulDword = *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteRegisterByte
--
--    Description   : Write a Byte from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | CHAR to receive the data.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                              UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset)) = ucByte;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteRegisterSpaceDword
--
--    Description   : Write a Dword from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE *| pBoard  | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to receive the data
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                               ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset)) = ulDword;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenMemoryBase
--
--    Description   : Map the Memory base for future call to ClientReadMemoryX
--                    and ClientWriteMemoryX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenMemoryBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr) pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--    pClientStruct->ulFrameBufferBase = (ULONG) pMga->FbBase;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseMemoryBase
--
--    Description   : Unmap the Frame Buffer aperture and free resources
--                    needed to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseMemoryBase(LPBOARDHANDLE pBoard)
--{
--    ASSERT_HANDLER(pBoard);
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadMemoryByte
--
--    Description   : Read a Byte from the Frame Buffer space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *ucByte  | CHAR to receive the data
--
--    Return Val : ULONG
--\******************************************************************************/
--ULONG ClientReadMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pucByte = *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadMemoryDword
--
--    Description   : Read a Dword from the Frame Buffer Space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG *uDword  | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                            ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pulDword = *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--   Function      : ClientWriteMemoryByte
--
--   Description   : Write a Byte from the Frame Buffer space.
--
--   I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                   containing all the information about a specific board.
--                   ULONG ulOffset | Offset of the Byte to be read.
--                   UCHAR ucByte   | CHAR to receive the data
--
--   Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ucByte;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteMemoryDword
--
--    Description   : Write a Dword from the Frame Buffer space.
--
--    I/O desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                            ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ulDword;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenSystemDevice
--
--    Description   : Map a System device aperture for future call to
--                    ClientReadSystemDeviceX and ClientWriteSystemDeviceX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenSystemDevice(LPBOARDHANDLE pBoard, ULONG ulAddress,
--                                    ULONG ulSize)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseSystemDevice
--
--    Description   : Unmap the System Device aperture address and free
--                    resources needed to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseSystemDevice (LPBOARDHANDLE pBoard)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadSystemDeviceByte
--
--    Description   : Read a Byte from the device Space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG pucByte  | Byte to read the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 UCHAR *pucByte)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadSystemDeviceDword
--
--    Description   : Read a Dword from the Frame Buffer Space
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to Read the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  ULONG *pulDword)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteSystemByte
--
--    Description   : Write a Byte from the System Device Aperture
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | Byte to receive the data
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  UCHAR ucByte)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteSystemDword
--
--    Description   : Write a Dword from the System Device Aperture.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG uDword   | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                   ULONG ulDword)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWait
--
--    Description   : Wait for ulDelayus micro-seconds.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulDelayus | Delay in uSec
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWait (LPBOARDHANDLE pBoard, ULONG ulDelayus)
--{
--    int i;
--    ULONG ulTmp;
--
--    ASSERT_HANDLER(pBoard);
--
--    for(i = 0; i < ulDelayus * 3; i++)
--    {
--        ClientReadRegisterDword(pBoard,0x1e14,&ulTmp);
--    }
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientGetBiosInfo
--
--    Description   : This function will be call if no PINS can be found
--                    in physical EEPROM.
--
--    I/O Desc.     :  LPBOARDHANDLE pBoard | Handle to the board structure
--                     containing all the information about a specific board.
--                     LPUCHAR    | Buffer where we copy bios pins.
--                     ULONG      | Bios version
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVersion)
--{
--    Bool bNotFound = TRUE;
--    UCHAR ucBIOS[32768];
--    UCHAR ucTmpByte;
--    UCHAR ucCheckSum;
--    UCHAR ucPinsIndex;
--    UCHAR ucPinsSize;
--    ULONG ulTmpDword;
--    ULONG ulPinsOffset = 0;
--    ULONG ulPCIINFOffset;
--
--    ASSERT_HANDLER(pBoard);
--
--    xf86ReadBIOS(0xc0000,0,ucBIOS,32768);
--
--    if(ucBIOS[0] == 0x55)
--    {
--        if(ucBIOS[1] == 0xaa)
--        {
--            while((ulPinsOffset < 0x10000) && bNotFound)
--            {
--                ulTmpDword = *(ULONG *)(ucBIOS + ulPinsOffset);
--                ucPinsSize = (UCHAR) (ulTmpDword >> 16);
--                if(((ulTmpDword & 0x0000ffff) == 0x0000412e)
--                    && ucPinsSize <= 128)
--                {
--                    ucCheckSum = 0;
--                    for(ucPinsIndex = 0;ucPinsIndex < ucPinsSize; ucPinsIndex++)
--                    {
--                        pucPins[ucPinsIndex] = ucBIOS[ulPinsOffset +
--                                               ucPinsIndex];
--                        ucCheckSum += pucPins[ucPinsIndex];
--                    }
--                    if(ucCheckSum == 0)
--                    {
--                        bNotFound = FALSE;
--                    }
--                }
--                ulPinsOffset++;
--            }
--
--            if(bNotFound)
--            {
--                return 1;
--            }
--
--            ulPCIINFOffset = *(ULONG *)(ucBIOS + 0x18);
--            ulPCIINFOffset &= 0x0000ffff;
--            ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset);
--
--            if(ulTmpDword == 0x52494350)  /* "PCIR" */
--            {
--                ulPCIINFOffset += 0x12;
--                ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset);
--                *pulBIOSVersion = ((ULONG) ((ulTmpDword & 0xf0) >> 4) << 16) |
--                                  ((ulTmpDword &0xf) << 12) | ((ulTmpDword >> 8)
--                                  & 0xff);
--            }
--            else
--            {
--                return 1;
--            }
--        }
--        else
--        {
--           return 1;
--        }
--    }
--    else
--    {
--        return 1;
--    }
--
--    if(!*pulBIOSVersion)
--    {
--        ucTmpByte = ucBIOS[5];
--        *pulBIOSVersion = ((ULONG) (ucTmpByte >> 4) << 16) | ((ULONG)
--                          (ucTmpByte & 0x0f) << 12);
--    }
--
--    return 0;
--}
--
--/******************************************************************************\
--
--    Function      : ClientCallBiosInt10
--
--    Description   : Call the BIOS Int10h with specified parameters.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCallBiosInt10(LPBOARDHANDLE pBoard, LPBIOSREGS pBiosRegs)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadDDCEdid
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadDDCEdid(LPBOARDHANDLE pBoard, LPUCHAR pEdid,
--                               ULONG ulMonitorIndex)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCustomCall
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCustomCall(LPBOARDHANDLE pBoard, ULONG ulServiceNumber,
--                       LPVOID pInData, LPVOID pOutData)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientApplyEpromPatch
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientApplyEpromPatch(LPBOARDHANDLE pBoard)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientDetectHostInterface
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientDetectHostInterface(LPBOARDHANDLE pBoard, LPULONG pulData)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
---
-cgit v0.9.0.2-2-gbebe
-From 94bbeb132c7eda912d1b402a1a91ca7cbbf5e6a1 Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Thu, 15 Sep 2011 15:29:11 +0000
-Subject: Delete support for MGA's proprietary HAL: unifdef USEMGAHAL.
-
-This patch produced with:
-	for f in `git grep -Fwl USEMGAHAL`; do
-		unifdef -B -UUSEMGAHAL $f | sponge $f
-	done
-
-Adam Jackson wrote:
-
-	Hey, so, remember back in the dark ages when dualhead was this
-	insanely wild differentiating feature?  Matrox thought it was so
-	special, in fact, that they hid most of the implementation of it
-	(and a bunch of other stuff) in a binary-only blob called the
-	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-	the relevant Windows code, and then some open glue to keep it
-	working; clientlx.c is that glue.
-
-	I guess the theory was that if you don't tell people which
-	registers to duplicate to implement a second pipe in their own
-	hardware, they won't figure it out?  A pretty eyeroll-worthy
-	idea even at the time, and definitely not something we should be
-	condoning anymore.
-
-	Kill it with fire, but while you're at it, untangle the hideous
-	mess of MGA_HAL() macros too.
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Cc: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/mga.h b/src/mga.h
-index c520e86..fced6aa 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -42,10 +42,6 @@
- #include "mga_dri.h"
- #endif
- 
--#ifdef USEMGAHAL
--#include "client.h"
--#endif
--
- typedef enum {
-     OPTION_SW_CURSOR,
-     OPTION_HW_CURSOR,
-@@ -329,11 +325,6 @@ typedef enum {
- 
- typedef struct {
-     int			lastInstance;
--#ifdef USEMGAHAL
--    LPCLIENTDATA	pClientStruct;
--    LPBOARDHANDLE	pBoard;
--    LPMGAHWINFO		pMgaHwInfo;
--#endif
-     int			refCount;
-     CARD32		masterFbAddress;
-     long		masterFbMapSize;
-@@ -459,12 +450,6 @@ struct mga_device_attributes {
- };
- 
- typedef struct {
--#ifdef USEMGAHAL
--    LPCLIENTDATA	pClientStruct;
--    LPBOARDHANDLE	pBoard;
--    LPMGAMODEINFO	pMgaModeInfo;
--    LPMGAHWINFO		pMgaHwInfo;
--#endif
-     EntityInfoPtr	pEnt;
-     struct mga_bios_values bios;
-     CARD8               BiosOutputMode;
-@@ -650,9 +635,6 @@ typedef struct {
-     MGAPaletteInfo	palinfo[256];  /* G400 hardware bug workaround */
-     FBLinearPtr		LinearScratch;
-     Bool                softbooted;
--#ifdef USEMGAHAL
--    Bool                HALLoaded;
--#endif
-     OptionInfoPtr	Options;
- 
-     /* Exa */
-@@ -810,26 +792,6 @@ void MGAG200SESaveMode(ScrnInfoPtr, vgaRegPtr);
- void MGAG200SERestoreMode(ScrnInfoPtr, vgaRegPtr);
- void MGAG200SEHWProtect(ScrnInfoPtr, Bool);
- 
--#ifdef USEMGAHAL
--/************ ESC Call Definition ***************/
--typedef struct {
--    char *function;
--    void (*funcptr)(ScrnInfoPtr pScrn, unsigned long *param, char *out, DisplayModePtr pMode);
--} MGAEscFuncRec, *MGAEscFuncPtr;
--
--typedef struct {
--    char function[32];
--    unsigned long parameters[32];
--} EscCmdStruct;
--
--extern LPMGAMODEINFO pMgaModeInfo[2];
--extern MGAMODEINFO   TmpMgaModeInfo[2];
--
--extern void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode);
--void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo);
--/************************************************/
--#endif
--
- static __inline__ void
- MGA_MARK_SYNC(MGAPtr pMga, ScrnInfoPtr pScrn)
- {
-diff --git a/src/mga_dacG.c b/src/mga_dacG.c
-index fca1031..b489dea 100644
---- a/src/mga_dacG.c
-+++ b/src/mga_dacG.c
-@@ -1001,9 +1001,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 		break;
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
--#ifdef USEMGAHAL
--	       MGA_HAL(break;);
--#endif
- 	       if (MGAISGx50(pMga))
- 		       break;
- 
-@@ -1046,9 +1043,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 		break;
- 	case PCI_CHIP_MGAG200_SE_A_PCI:
- 	case PCI_CHIP_MGAG200_SE_B_PCI:
--#ifdef USEMGAHAL
--		MGA_HAL(break;);
--#endif
-         pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03;
-                 pReg->DacRegs[MGA1064_PIX_CLK_CTL] =
-                     MGA1064_PIX_CLK_CTL_SEL_PLL;
-@@ -1097,9 +1091,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	case PCI_CHIP_MGAG200:
- 	case PCI_CHIP_MGAG200_PCI:
- 	default:
--#ifdef USEMGAHAL
--		MGA_HAL(break;);
--#endif
- 		if(pMga->OverclockMem) {
-                      /* 143 Mhz */
- 		    pReg->DacRegs[ MGA1064_SYS_PLL_M ] = 0x06;
-@@ -1496,21 +1487,6 @@ MGA_NOT_HAL(
-                MGAG200EHPIXPLLSET(pScrn, mgaReg);
-            }
- );	/* MGA_NOT_HAL */
--#ifdef USEMGAHAL
--          /* 
--	   * Work around another bug in HALlib: it doesn't restore the
--	   * DAC width register correctly. MATROX: hint, hint.
--	   */
--           MGA_HAL(	 
--    	       outMGAdac(MGA1064_MUL_CTL,mgaReg->DacRegs[0]);
--  	       outMGAdac(MGA1064_MISC_CTL,mgaReg->DacRegs[1]); 
--	       if (!MGAISGx50(pMga)) {
--		   outMGAdac(MGA1064_PIX_PLLC_M,mgaReg->DacRegs[2]);
--		   outMGAdac(MGA1064_PIX_PLLC_N,mgaReg->DacRegs[3]);
--		   outMGAdac(MGA1064_PIX_PLLC_P,mgaReg->DacRegs[4]);
--	       } 
--	       ); 
--#endif
- 	   /* restore CRTCEXT regs */
-            for (i = 0; i < 6; i++)
- 	      OUTREG16(MGAREG_CRTCEXT_INDEX, (mgaReg->ExtVga[i] << 8) | i);
-@@ -1650,24 +1626,6 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg,
- 	 * DAC width register correctly.
- 	 */
- 
--#ifdef USEMGAHAL
--	/* 
--	 * Work around another bug in HALlib: it doesn't restore the
--	 * DAC width register correctly (s.o.). MATROX: hint, hint.
--	 */
--  	MGA_HAL(
--  	    if (mgaReg->DacRegs == NULL) {
--  		mgaReg->DacRegs = xnfcalloc(MGAISGx50(pMga) ? 2 : 5, 1);
--  	    }
--    	    mgaReg->DacRegs[0] = inMGAdac(MGA1064_MUL_CTL);
--  	    mgaReg->DacRegs[1] = inMGAdac(MGA1064_MISC_CTL);
--	    if (!MGAISGx50(pMga)) {
--		mgaReg->DacRegs[2] = inMGAdac(MGA1064_PIX_PLLC_M);
--		mgaReg->DacRegs[3] = inMGAdac(MGA1064_PIX_PLLC_N);
--		mgaReg->DacRegs[4] = inMGAdac(MGA1064_PIX_PLLC_P);
--	    } 
--  	);
--#endif
- 	MGA_NOT_HAL(
- 	/*
- 	 * The port I/O code necessary to read in the extended registers.
-@@ -1793,12 +1751,6 @@ MGAGSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
-     x += 64;
-     y += 64;
- 
--#ifdef USEMGAHAL
--    MGA_HAL(
--	    x += pMga->HALGranularityOffX;
--	    y += pMga->HALGranularityOffY;
--    );
--#endif
-     /* cursor update must never occurs during a retrace period (pp 4-160) */
-     while( INREG( MGAREG_Status ) & 0x08 );
-     
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 58a1390..d770031 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1509,10 +1509,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     int flags24;
-     MGAEntPtr pMgaEnt = NULL;
-     Bool Default;
--#ifdef USEMGAHAL
--    ULONG status;
--    CARD8 MiscCtlReg;
--#endif
- 
-     /*
-      * Note: This function is only called once at server startup, and
-@@ -1657,37 +1653,9 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     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) {
--	Bool loadHal = TRUE;
--	
--	from = X_DEFAULT;
--	if (xf86FindOption(pMga->device->options, "NoHal")) {
--	    loadHal = !xf86SetBoolOption(pMga->device->options,
--					 "NoHal", !loadHal);
--	    from = X_CONFIG;
--	} else if (xf86FindOption(pMga->device->options, "Hal")) {
--	    loadHal = xf86SetBoolOption(pMga->device->options,
--					"Hal", loadHal);
--	    from = X_CONFIG;
--	}
--        if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) {
--	  xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n");
--	  pMga->HALLoaded = TRUE;
--	} else {
--	  xf86DrvMsg(pScrn->scrnIndex, from, "Matrox HAL module not loaded "
--		     "- using builtin mode setup instead\n");
--	  pMga->HALLoaded = FALSE;
--	}
--    }
--#endif
--
-     pMga->DualHeadEnabled = FALSE;
-     if (xf86IsEntityShared(pScrn->entityList[0])) {/* dual-head mode requested*/
- 	if (
--#ifdef USEMGAHAL
--	    pMga->HALLoaded ||
--#endif
- 	    !MGA_DH_NEEDS_HAL(pMga)) {
- 	    pMga->DualHeadEnabled = TRUE;
- 	} else if (xf86IsPrimInitDone(pScrn->entityList[0])) {
-@@ -2088,30 +2056,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                 "\"Merged Framebuffer\" mode only supported on G450 and G550 boards.\n");
-         } else { 
--#ifdef USEMGAHAL
--            if(pMga->HALLoaded)
--            { 
--                pMga->MergedFB = TRUE;
--                xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--                        "Using \"Merged Framebuffer\" mode.\n");
--                /*
--                * a few options that won't work well together
--                */
--                if(pMga->HWCursor) /*Should we give the choice? */
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Hardware Cursor disabled.\n");
--                pMga->HWCursor = FALSE; 
--                if(pMga->ShadowFB) 
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Shadow Framebuffer disabled.\n");
--                pMga->ShadowFB = FALSE;
--                if(pMga->FBDev) 
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Framebuffer device disabled.\n");
--                pMga->FBDev = FALSE;
--            } /* MGA_HAL */
--            else
--#endif
-             { 
-                 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                     "HALLib not loaded! NOT using \"Merged Framebuffer\" mode.\n");
-@@ -2404,10 +2348,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     clockRanges->clockIndex = -1;		/* programmable */
-     clockRanges->interlaceAllowed = TRUE;
-     clockRanges->doubleScanAllowed = TRUE;
--#ifdef USEMGAHAL
--    MGA_HAL(clockRanges->interlaceAllowed = FALSE);
--    MGA_HAL(clockRanges->doubleScanAllowed = FALSE);
--#endif
-     if (pMga->SecondCrtc == TRUE) 
- 	clockRanges->interlaceAllowed = FALSE;
- 
-@@ -2513,80 +2453,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	MGAFreeRec(pScrn);
- 	return FALSE;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--
--    if(pMga->SecondCrtc == FALSE) {
--	
--        pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--        pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--        pMga->pClientStruct->pMga = (MGAPtr) pMga;
--
--        MGAMapMem(pScrn);
--	/* 
--	 * For some reason the MGAOPM_DMA_BLIT bit needs to be set
--	 * on G200 before opening the HALlib. I don't know why.
--	 * MATROX: hint, hint.
--	 */
--	/*if (pMga->Chipset == PCI_CHIP_MGAG200 ||
--	  pMga->Chipset == PCI_CHIP_MGAG200_PCI) */{
--	    CARD32 opmode;
--	    opmode = INREG(MGAREG_OPMODE);
--	    OUTREG(MGAREG_OPMODE,  MGAOPM_DMA_BLIT | opmode);
--	}
--	/* wrapping OpenLibrary to fix broken registers. MATROX: hint, hint. */
--	MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--        MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--        MGAUnmapMem(pScrn);
--        pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--        MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--
--        /* copy the board handles */
--        if (pMga->DualHeadEnabled) {
--            pMgaEnt->pClientStruct = pMga->pClientStruct;
--            pMgaEnt->pBoard = pMga->pBoard;
--            pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo;
--        }
--
--    } else { /* Second CRTC && entity is shared */ 
--        pMga->pBoard = pMgaEnt->pBoard;
--        pMga->pClientStruct = pMgaEnt->pClientStruct;
--        pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo;
--
--    }
--
--    MGAFillModeInfoStruct(pScrn,NULL);
--    /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable
--     * because no mode is given
--     */
--    pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY;
--
--    
--    if (ISDIGITAL1(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "Digital screen detected on first head.\n");
--    if (ISTV1(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "TV detected on first head.\n");
--    if (ISDIGITAL2(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "Digital screen detected on second head.\n");
--    if (ISTV2(pMga))
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "TV detected on second head.\n");
--
--    
--    if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGAValidateMode from HALlib found the mode to be invalid.\n"
--		   "\tError: 0x%lx\n", status);
--        return FALSE;
--    }
--    pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch;
--    );	/* MGA_HAL */
--#endif
- 
-     /* If the Device section explicitly set HasSDRAM, don't bother checking.
-      */
-@@ -2620,9 +2486,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-      * driver and if the driver doesn't provide code to set them.  They
-      * are not pre-initialised at all.
-      */
--#ifdef USEMGAHAL
--    MGA_HAL(xf86SetCrtcForModes(pScrn, 0));
--#endif
-     MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V));
- 
-     /* Set the current mode to the first in the list */
-@@ -2790,46 +2653,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     };
- 
-     
--#ifdef USEMGAHAL
--    MGA_HAL(
--    /* Close the library after preinit */
--    /* This needs to only happen after this board has completed preinit
--     * both times
--     */
--
--      if(pMga->DualHeadEnabled) {
--	  /* Entity is shared make sure refcount == 2 */
--	  /* If ref count is 2 then reset it to 0 */
--	  if(pMgaEnt->refCount == 2) {
--	      /* Both boards have done there initialization */
--	      MGACloseLibrary(pMga->pBoard);
--
--	      if (pMga->pBoard)
--	        xfree(pMga->pBoard);
--	      if (pMga->pClientStruct)
--	        xfree(pMga->pClientStruct);
--	      if (pMga->pMgaModeInfo)
--	        xfree(pMga->pMgaModeInfo);
--	      if (pMga->pMgaHwInfo)
--	        xfree(pMga->pMgaHwInfo);
--	      pMgaEnt->refCount = 0;
--	  }
--      } else {
--	  MGACloseLibrary(pMga->pBoard);
--
--	  if (pMga->pBoard)
--	    xfree(pMga->pBoard);
--	  if (pMga->pClientStruct)
--	    xfree(pMga->pClientStruct);
--	  if (pMga->pMgaModeInfo)
--	    xfree(pMga->pMgaModeInfo);
--	  if (pMga->pMgaHwInfo)
--	    xfree(pMga->pMgaHwInfo);
--      }
--
--    );	/* MGA_HAL */
--#endif
--
-     xf86SetPrimInitDone(pScrn->entityList[0]);
-     
-     return TRUE;
-@@ -2995,9 +2818,6 @@ MGASave(ScrnInfoPtr pScrn)
-     MGARegPtr mgaReg = &pMga->SavedReg;
- 
-     if(pMga->SecondCrtc == TRUE) return;
--#ifdef USEMGAHAL
--    MGA_HAL(if (pMga->pBoard != NULL) MGASaveVgaState(pMga->pBoard));
--#endif
- 
-     /* I need to save the registers for the second head also */
-     /* Save the register for 0x80 to 0xa0 */
-@@ -3007,135 +2827,6 @@ MGASave(ScrnInfoPtr pScrn)
-     (*pMga->Save)(pScrn, vgaReg, mgaReg, pMga->Primary);
- }
- 
--#ifdef USEMGAHAL
--/* Convert DisplayModeRec parameters in MGAMODEINFO parameters.
--*  mode parameter optionnal. */
--void
--MGAFillModeInfoStruct(ScrnInfoPtr pScrn, DisplayModePtr mode)
--{
--     const char *s;
--    MGAPtr pMga = MGAPTR(pScrn);
--
--    Bool digital1 = FALSE;
--    Bool digital2 = FALSE;
--    Bool tv1 = FALSE;
--    Bool tv2 = FALSE;
--    Bool swap_head
--      = xf86ReturnOptValBool(pMga->Options, OPTION_SWAPPED_HEAD, FALSE);
--        
--    if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) {
--        mode = pMga->SecondCrtc ? 
--             ((MergedDisplayModePtr)mode->Private)->Monitor2
--            : ((MergedDisplayModePtr)mode->Private)->Monitor1;
--    }
--    
--    
--    if (pMga->pMgaHwInfo)
--    {
--	digital1 = ISDIGITAL1(pMga);
--	digital2 = ISDIGITAL2(pMga);
--	tv1 = ISTV1(pMga);
--	tv2 = ISTV2(pMga);
--    }
--
--    /*FIXME: causes segfault elsewhere if not commented*/
--    /*if(!pMga->pMgaModeInfo)*/ pMga->pMgaModeInfo = xalloc(sizeof(MGAMODEINFO));
--    pMga->pMgaModeInfo->flOutput = 0;
--    pMga->pMgaModeInfo->ulDeskWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDeskHeight = pScrn->virtualY;
--    pMga->pMgaModeInfo->ulFBPitch = 0;
--    pMga->pMgaModeInfo->ulBpp = pScrn->bitsPerPixel;
--    pMga->pMgaModeInfo->ulZoom = 1;
--    pMga->pMgaModeInfo->flSignalMode = 0x10;
--
--    /* Set TV standard */
--    if ((s = xf86GetOptValString(pMga->Options, OPTION_TVSTANDARD))) {
--    	if (!xf86NameCmp(s, "PAL")) {
--    		pMga->pMgaModeInfo->flSignalMode = 0x00;
--    		pMga->pMgaModeInfo->ulRefreshRate = 50;
--    		pMga->pMgaModeInfo->ulTVStandard = TV_PAL;
--    	} else {
--    		pMga->pMgaModeInfo->ulRefreshRate = 60;
--    		pMga->pMgaModeInfo->ulTVStandard = TV_NTSC;
--    	}
--    } else {
--    	pMga->pMgaModeInfo->ulRefreshRate = 0;
--    	pMga->pMgaModeInfo->ulTVStandard = TV_NTSC;
--    }
--
--    /* Set Cable Type */
--    if ((s = xf86GetOptValString(pMga->Options, OPTION_CABLETYPE))) {
--    	if (!xf86NameCmp(s, "SCART_RGB")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_RGB;
--    	} else if (!xf86NameCmp(s, "SCART_COMPOSITE")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_COMPOSITE;
--    	} else if (!xf86NameCmp(s, "SCART_TYPE2")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_TYPE2;
--    	} else {
--    		pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE;
--    	}
--    } else {
--    	pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE;
--    }
--
--    if(mode) {
--        pMga->pMgaModeInfo->ulHorizRate = 0;
--        pMga->pMgaModeInfo->ulDispWidth = mode->HDisplay;
--        pMga->pMgaModeInfo->ulDispHeight = mode->VDisplay;
--        pMga->pMgaModeInfo->ulPixClock = mode->Clock;
--        pMga->pMgaModeInfo->ulHFPorch = mode->HSyncStart - mode->HDisplay;
--        pMga->pMgaModeInfo->ulHSync = mode->HSyncEnd - mode->HSyncStart;
--        pMga->pMgaModeInfo->ulHBPorch = mode->HTotal - mode->HSyncEnd;
--        pMga->pMgaModeInfo->ulVFPorch = mode->VSyncStart - mode->VDisplay;
--        pMga->pMgaModeInfo->ulVSync = mode->VSyncEnd - mode->VSyncStart;
--        pMga->pMgaModeInfo->ulVBPorch = mode->VTotal - mode->VSyncEnd;
--    }
--    /* Use DstOrg directly */
--    /* This is an offset in pixels not memory */
--    pMga->pMgaModeInfo->ulDstOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8);
--    pMga->pMgaModeInfo->ulDisplayOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8);
--    pMga->pMgaModeInfo->ulPanXGran = 0;
--    pMga->pMgaModeInfo->ulPanYGran = 0;
--
--    if(pMga->SecondCrtc == TRUE) {
--	pMga->pMgaModeInfo->flOutput = MGAMODEINFO_SECOND_CRTC |
--				       MGAMODEINFO_FORCE_PITCH |
--				       MGAMODEINFO_FORCE_DISPLAYORG;
--	if (digital2) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2;
--	} else if (tv2) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV;
--	} else {
--            if (!swap_head) {
--	      pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2;
--            } else {
--              pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1;
--            }
--	}
--    } else { 
--	pMga->pMgaModeInfo->flOutput = MGAMODEINFO_FORCE_PITCH;
--        if (digital1) {
--	    if ((pMga->Chipset == PCI_CHIP_MGAG200) ||
--		(pMga->Chipset == PCI_CHIP_MGAG200_PCI)) {
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_FLATPANEL1;
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2;
--	    } else {
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL1;
--	    }
--        } else if (tv1) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV;
--       	} else {
--            if (!swap_head) {
--	        pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1;
--            } else {
--                pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2;
--            }
--        }
--    }
--    pMga->pMgaModeInfo->ulFBPitch = pScrn->displayWidth;
--}
--#endif
--
- /*
-  * Initialise a new mode.  This is currently still using the old
-  * "initialise struct, restore/write struct to HW" model.  That could
-@@ -3150,9 +2841,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGARegPtr mgaReg;
- 
--#ifdef USEMGAHAL
--   ULONG status;
--#endif
-     vgaHWUnlock(hwp);
- 
- /*    if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) {
-@@ -3175,56 +2863,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     }
-     vgaReg = &hwp->ModeReg;
-     mgaReg = &pMga->ModeReg;
--#ifdef USEMGAHAL
--    MGA_HAL( 
--        MGAFillModeInfoStruct(pScrn,mode);
--                    
--        /* Validate the parameters */
--        if ((status = MGAValidateMode(pMga->pBoard, pMga->pMgaModeInfo)) != 0) {
--            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                    "MGAValidateMode from HALlib found the mode to be invalid.\n"
--                    "\tError: %lx\n", status);
--            return FALSE;
--        }
--
--        /*
--         * Find mode for second head. 
--         */
--        if(pMga->MergedFB) {
--    
--            MGAFillModeInfoStruct(pMga->pScrn2,mode);
--            /* Validates the Video parameters */
--            if ((status = MGAValidateVideoParameters(pMga->pBoard, MGAPTR(pMga->pScrn2)->pMgaModeInfo))
--                != 0) {
--                xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        "MGAValidateVideoParameters from HALlib found the mode to be invalid.\n\tError: %lx\n", status);
--                return FALSE;
--            }
--        }
--    );	 /*MGA_HAL */
--    
--#endif
--
--#ifdef USEMGAHAL
--MGA_HAL(
--
--    /*************************** ESC *****************************/
--    TmpMgaModeInfo[0] =  *pMga->pMgaModeInfo;
--	
--    if(pMga->SecondCrtc == TRUE)
--        pMgaModeInfo[1] = pMga->pMgaModeInfo;
--    else
--        pMgaModeInfo[0] = pMga->pMgaModeInfo;
--    
--	TmpMgaModeInfo[0].ulDispWidth = 0;
--    
--    if(!pMga->MergedFB) /* FIXME: Must deal with this once PowerDesk & MergedFB 
--                           compatibility will exist */
--        MGAFillDisplayModeStruct(mode, pMga->pMgaModeInfo);  
--    /*************************************************************/
--
--);	/* MGA_HAL */
--#endif
- 
- #ifdef XF86DRI
-    if (pMga->directRenderingEnabled) {
-@@ -3232,38 +2870,6 @@ MGA_HAL(
-    }
- #endif
- 
--#ifdef USEMGAHAL
--    MGA_HAL(
--    /* Initialize the board */
--    if(MGASetMode(pMga->pBoard,pMga->pMgaModeInfo) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		"MGASetMode returned an error."
--		"  Make sure to validate the mode before.\n");
--	return FALSE;
--    }
--    if(pMga->MergedFB
--       && MGASetMode(pMga->pBoard,MGAPTR(pMga->pScrn2)->pMgaModeInfo) != 0) {
--  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGASetMode returned an error."
--		   "  Make sure to validate the mode before.\n");
--    }
--
--    );	/* MGA_HAL */
--
--    /* getting around bugs in the HAL lib. MATROX: hint, hint. */
--    MGA_HAL(
--	    if (pMga->chip_attribs->hwcursor_1064) {
--		if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
--		outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, 
--			  pMga->FbCursorOffset >> 10);
--		outMGAdac(MGA1064_CURSOR_BASE_ADR_HI, 
--			  pMga->FbCursorOffset >> 18);
--		outMGAdac(MGA1064_CURSOR_CTL, 0x00);
--	      }
--	    }
--    );	/* MGA_HAL */
--#endif
--
-     MGA_NOT_HAL((*pMga->Restore)(pScrn, vgaReg, mgaReg, FALSE));
- 
-     MGAStormSync(pScrn);
-@@ -3472,14 +3078,6 @@ MGARestore(ScrnInfoPtr pScrn)
- 	vgaHWProtect(pScrn, TRUE);
-     }
-     if (pMga->Primary) {
--#ifdef USEMGAHAL
--	MGA_HAL(
--	    if(pMga->pBoard != NULL) {
--		MGASetVgaMode(pMga->pBoard);
--		MGARestoreVgaState(pMga->pBoard);
--	    }
--	    );	/* MGA_HAL */
--#endif
-         (*pMga->Restore)(pScrn, vgaReg, mgaReg, TRUE);
-     } else {
-         vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
-@@ -3588,81 +3186,12 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-        pPriv = xf86GetEntityPrivate(pScrn->entityList[0], MGAEntityIndex);
-        pMgaEnt = pPriv->ptr;
-        pMgaEnt->refCount++;
--#ifdef USEMGAHAL
--       MGA_HAL(
--       if(pMgaEnt->refCount == 1) {
--	   CARD8 MiscCtlReg;
--	  pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--	  pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--	  pMga->pClientStruct->pMga = (MGAPtr) pMga;
--	  
--	  /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/
--          MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--	  MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	  outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--	  pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--	  MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--
--	  /* Detecting for type of display */
--	  if (pMga->pMgaHwInfo->ulCapsSecondOutput & MGAHWINFOCAPS_OUTPUT_TV) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "TV detected\n");
--	  }
--	  if (pMga->pMgaHwInfo->ulCapsFirstOutput &
--			MGAHWINFOCAPS_OUTPUT_DIGITAL) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
--				"Digital Screen detected\n");
--	  }
--	  if (pMga->pMgaHwInfo->ulCapsSecondOutput &
--			MGAHWINFOCAPS_OUTPUT_DIGITAL) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
--				"Digital Screen detected\n");
--	  }
--
--	  /* Now copy these to the entitystructure */
--	  pMgaEnt->pClientStruct = pMga->pClientStruct;
--	  pMgaEnt->pBoard = pMga->pBoard;
--	  pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo;
--       } else { /* Ref count is 2 */
--	  pMga->pClientStruct = pMgaEnt->pClientStruct;
--	  pMga->pBoard = pMgaEnt->pBoard;
--	  pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo;
--       }
--       );	/* MGA_HAL */
--#endif
-     } else {
--#ifdef USEMGAHAL
--	CARD8 MiscCtlReg;
--
--	  MGA_HAL(
--	  pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--	  pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--	  pMga->pClientStruct->pMga = (MGAPtr) pMga;
--
--	  MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--	  /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/
--	  MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	  outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--	  pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--	  MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--	  );	/* MGA_HAL */
--#endif
-     }
-     if (pMga->is_G200SE) {
- 	pScrn->videoRam = VRTemp;
- 	pMga->FbMapSize = FBTemp;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--	/* There is a problem in the HALlib: set soft reset bit */
--	/* MATROX: hint, hint. */
--	if (!pMga->Primary && !pMga->FBDev &&
--	    (SUBSYS_ID(pMga->PciInfo) == PCI_CARD_MILL_G200_SG)) {
--	    OUTREG(MGAREG_Reset, 1);
--	    usleep(200);
--	    OUTREG(MGAREG_Reset, 0);
--	}
--    );	/* MGA_HAL */
--#endif
- 
-     /* Initialise the MMIO vgahw functions */
-     vgaHWSetMmioFuncs(hwp, pMga->IOBase, PORT_OFFSET);
-@@ -3969,66 +3498,8 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- Bool
- MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- {
--#ifdef USEMGAHAL
--    char sCmdIn[256];
--    char sCmdOut[256];
--    FILE* fdIn;
--# ifdef MATROX_WRITEBACK
--    FILE* fdOut;
--# endif
--#endif
-  
-     if  (mode->Flags & 0x80000000) {
--#ifdef USEMGAHAL
--
--# ifdef MATROX_WRITEBACK
--#  define MWB(x) { x; }
--#  define MWB_COND(x) x
--# else
--#  define MWB(x)
--#  define MWB_COND(x) 1
--# endif
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--
--	MGA_HAL(
--	fdIn = fopen("/tmp/mgaDriverIn", "rt");
--	MWB(fdOut = fopen("/tmp/mgaDriverOut", "wt"))
--
--	if(fdIn && MWB_COND(fdOut))
--	{
-- 
--	    fgets(sCmdIn, 255, fdIn);
-- 
--	    if(sCmdIn)
--	    {
-- 
--		MGAExecuteEscCmd(xf86Screens[scrnIndex], sCmdIn, sCmdOut, mode);
-- 
--		/* Remove file and close file descriptor */
--		remove("/tmp/mgaDriverIn");
--		fclose(fdIn);
--		MWB(
--		    /* Write output data to output file for
--		       calling application */
--		    fputs(sCmdOut, fdOut);
--		    fclose(fdOut);
--		    )
--		mode->Flags &= 0x7FFFFFFF;
--		return TRUE;
--	    }
--	    else
--	    {
--		mode->Flags &= 0x7FFFFFFF;
--		return FALSE;
--	    }
--	}
--	else
--	{
--	    mode->Flags &= 0x7FFFFFFF;
--	    return FALSE;
--	}
--   )
--#endif
-  	return FALSE; 
-     }   else
- 	return MGAModeInit(xf86Screens[scrnIndex], mode);
-@@ -4040,28 +3511,6 @@ MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- void
- MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y)
- {
--#ifdef USEMGAHAL
--    MGA_HAL(
--	MGAPtr pMga = MGAPTR(pScrn);
--	MGAPtr pMga2;
--	int xg = 1;
--	int yg = 1;
--	if(pMga->pMgaModeInfo && pMga->pMgaModeInfo->ulPanXGran && pMga->pMgaModeInfo->ulPanYGran) {
--	    xg = pMga->pMgaModeInfo->ulPanXGran;
--	    yg = pMga->pMgaModeInfo->ulPanYGran;
--	}
--	if(pMga->pScrn2 && (pMga2 = MGAPTR(pMga->pScrn2)) ) {
--
--	    if(pMga2->pMgaModeInfo && pMga2->pMgaModeInfo->ulPanXGran && pMga2->pMgaModeInfo->ulPanYGran) {
--		xg = max(xg,pMga2->pMgaModeInfo->ulPanXGran);
--		yg = max(yg,pMga2->pMgaModeInfo->ulPanYGran);
--	    }
--	}
--	xg=16; /*ncoder: temporary */ 
--	*x -= *x % xg;
--	*y -= *y % yg;
--	); 
--#endif
- }
- 
- 
-@@ -4087,16 +3536,6 @@ MGAAdjustFrame(int scrnIndex, int x, int y, int flags)
-         /* wanted to improve panning granularity problems without risking
-          * compatibility issues. Existing code looked hardware dependent.
-          */
--#ifdef USEMGAHAL
--    MGA_HAL(
--	    pMga->HALGranularityOffX = x;
--	    pMga->HALGranularityOffY = y;
--        MGAAdjustGranularity(pScrn,&x,&y);
--	    pMga->HALGranularityOffX = pMga->HALGranularityOffX - x;
--	    pMga->HALGranularityOffY = pMga->HALGranularityOffY - y;
--        HALSetDisplayStart(pMga->pBoard,x,y,0);
--    );
--#endif
-     MGA_NOT_HAL(
-         if(pMga->ShowCache && y && pScrn->vtSema)
-             y += pScrn->virtualY - 1;
-@@ -4139,12 +3578,6 @@ MGAAdjustFrameCrtc2(int scrnIndex, int x, int y, int flags)
-     pScrn = xf86Screens[scrnIndex];
-     pMga = MGAPTR(pScrn);
-     pLayout = &pMga->CurrentLayout;
--#ifdef USEMGAHAL
--    MGA_HAL(
--        MGAAdjustGranularity(pScrn,&x,&y);
--        HALSetDisplayStart(pMga->pBoard,x,y,1);
--    );
--#endif
-     MGA_NOT_HAL(
-         if(pMga->ShowCache && y && pScrn->vtSema)
-             y += pScrn->virtualY - 1;
-@@ -4258,9 +3691,6 @@ MGALeaveVT(int scrnIndex, int flags)
-         DRILock(pScreen, 0);
-     }
- #endif
--#ifdef USEMGAHAL
--    MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); );
--#endif
- }
- 
- 
-@@ -4280,9 +3710,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGAEntPtr pMgaEnt = NULL;
- 
--#ifdef USEMGAHAL    
--    MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); );
--#endif
-     if (pMga->MergedFB)
-          MGACloseScreenMerged(scrnIndex, pScreen);
- 
-@@ -4311,37 +3738,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-        pMgaEnt->refCount--;
-    }
- 
--#ifdef USEMGAHAL
--   MGA_HAL(
--   if(pMga->DualHeadEnabled) {
--      if(pMgaEnt->refCount == 0) {
--	 /* Both boards have closed there screen */
--	 MGACloseLibrary(pMga->pBoard);
--
--	 if (pMga->pBoard)
--	   xfree(pMga->pBoard);
--	 if (pMga->pClientStruct)
--	   xfree(pMga->pClientStruct);
--	 if (pMga->pMgaModeInfo)
--	   xfree(pMga->pMgaModeInfo);
--	 if (pMga->pMgaHwInfo)
--	   xfree(pMga->pMgaHwInfo);
--      }
--   } else {
--      MGACloseLibrary(pMga->pBoard);
--
--      if (pMga->pBoard)
--	xfree(pMga->pBoard);
--      if (pMga->pClientStruct)
--	xfree(pMga->pClientStruct);
--      if (pMga->pMgaModeInfo)
--	xfree(pMga->pMgaModeInfo);
--      if (pMga->pMgaHwInfo)
--	xfree(pMga->pMgaHwInfo);
--   }
--   );	/* MGA_HAL */
--#endif
--
- #ifdef USE_XAA
-     if (pMga->AccelInfoRec)
- 	XAADestroyInfoRec(pMga->AccelInfoRec);
-diff --git a/src/mga_esc.c b/src/mga_esc.c
-index e811712..41b734a 100644
---- a/src/mga_esc.c
-+++ b/src/mga_esc.c
-@@ -10,782 +10,4 @@
- #include "config.h"
- #endif
- 
--#ifdef USEMGAHAL
--
--/* All drivers should typically include these */
--#include "xf86.h"
--#include "xf86_OSproc.h"
--
--/* All drivers need this */
--
--#include "compiler.h"
--
--/* Drivers for PCI hardware need this */
--#include "xf86PciInfo.h"
--
--/* Drivers that need to access the PCI config space directly need this */
--#include "xf86Pci.h"
--
--/* All drivers initialising the SW cursor need this */
--#include "mipointer.h"
--
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
--#include "micmap.h"
--
--#include "xf86DDC.h"
--#include "vbe.h"
--
--#include "fb.h"
--#include "dixstruct.h"
--
--#include "mga_reg.h"
--#include "mga.h"
--#include "mga_macros.h"
--
--/* ESC */
--LPMGAMODEINFO pMgaModeInfo[2] = {NULL};
--MGAMODEINFO   TmpMgaModeInfo[2] = {{0}};
--
--/* ESC Implementation */
--static void EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--
--static LPMGAMODEINFO  GetModeInfoPtr(ULONG ulScreen);
--static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult);
--static Bool convertNumber(unsigned long *pulNumber, char *sNumber);
--
--
--static MGAEscFuncRec FunctionTable[] = {
--    {"hal",  EscHal},
--    {"test",  EscTest},
--    {"read",  EscRead},
--	{"write", EscWrite},
--    {"left",  EscHLeft},
--    {"right", EscHRight},
--    {"down",  EscVDown},
--    {"up",    EscVUp},
--    {"h+",    EscHLarger},
--    {"h-",    EscHSmaller},
--    {"v+",    EscVTaller},
--    {"v-",    EscVSmaller},
--    {"refresh", EscRefresh},
--    {"undo",  EscRestoreVidParm},
--    {"merged", EscMerged},
--    {NULL,NULL}
--};
--
--
--void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo)
--{
--   pMode->Clock = pModeInfo->ulPixClock;
--
--   pMode->HDisplay = pModeInfo->ulDispWidth;
--   pMode->HSyncStart =  pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch;
--   pMode->HSyncEnd = pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch
--                        + pModeInfo->ulHSync;
--   pMode->HTotal = pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch
--                       + pModeInfo->ulHSync
--                       + pModeInfo->ulHBPorch;
--
--   pMode->VDisplay = pModeInfo->ulDispHeight;
--   pMode->VSyncStart =  pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch;
--   pMode->VSyncEnd = pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch
--                       + pModeInfo->ulVSync;
--   pMode->VTotal = pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch
--                       + pModeInfo->ulVSync
--                       + pModeInfo->ulVBPorch;
--
--   pMode->VRefresh = pModeInfo->ulRefreshRate;
--}
--
--static LPMGAMODEINFO  GetModeInfoPtr(ULONG ulScreen)
--{
--
--    if ( !TmpMgaModeInfo[ulScreen].ulDispWidth )
--    {
--        TmpMgaModeInfo[ulScreen] = *pMgaModeInfo[ulScreen];
--    }
--
--    return &TmpMgaModeInfo[ulScreen];
--}
--
--
--static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult)
--{
--    sprintf(sResult, "%d %d %d %d %d %d %d %d %d %d %d",
--            pModeInfo->ulDispWidth,
--            pModeInfo->ulDispHeight,
--            pModeInfo->ulBpp,
--            pModeInfo->ulPixClock,
--            pModeInfo->ulHFPorch,
--            pModeInfo->ulHSync,
--            pModeInfo->ulHBPorch,
--            pModeInfo->ulVFPorch,
--            pModeInfo->ulVSync,
--            pModeInfo->ulVBPorch,
--            pModeInfo->flSignalMode);
--}
--
--
--static float  GetVRefresh(LPMGAMODEINFO pModeInfo)
--{
--    ULONG ulHTotal;
--    ULONG ulVTotal;
--
--    ulHTotal =
--        pModeInfo->ulDispWidth +
--        pModeInfo->ulHFPorch +
--        pModeInfo->ulHSync +
--        pModeInfo->ulHBPorch;
--
--    ulVTotal =
--        pModeInfo->ulDispHeight +
--        pModeInfo->ulVFPorch    +
--        pModeInfo->ulVSync      +
--        pModeInfo->ulVBPorch;
--
--    return ((float)pModeInfo->ulPixClock * 1000.0) / (ulHTotal * ulVTotal);
--}
--
--static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--	MGAPtr pMGA = MGAPTR(pScrn);
--
--	if(pMGA->HALLoaded)
--		strcpy(sResult, "YES");
--	else
--		strcpy(sResult, "NO");
--
--}
--
--static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char
--*sResult, DisplayModePtr pMode)
--{
--	strcpy(sResult, "YES");
--}
--
--static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char
--*sResult, DisplayModePtr pMode)
--{
--	strcpy(sResult, "YES");
--}
--
--static void  EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    ULONG  ulSource, ulAddr, ulData;
--    UCHAR  ucIndex;
--
--    if ( (param[0] & 0xffff) < 2 )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--
--    ulSource = param[1] >> 16;
--    ulAddr = param[1] & 0xffff;
--
--
--    switch( ulSource )
--    {
--    case 0:
--        ulData = INREG(ulAddr);
--        sprintf(sResult, "MGA[%04X] = 0x%08X", ulAddr, ulData);
--        break;
--    case 1:
--        ucIndex = INREG8(0x3c00);
--        OUTREG8(0x3c00, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x3c0a);
--        OUTREG8(0x3c00, ucIndex);
--        sprintf(sResult, "DAC[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    case 2:
--        ucIndex = INREG8(0x1fd4);
--        OUTREG8(0x1fd4, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x1fd5);
--        OUTREG8(0x1fd4, ucIndex);
--        sprintf(sResult, "CRTC[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    case 3:
--        ucIndex = INREG8(0x1fde);
--        OUTREG8(0x1fde, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x1fdf);
--        OUTREG8(0x1fde, ucIndex);
--        sprintf(sResult, "CRTCEXT[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    default:
--        strcpy(sResult, "ERROR# 2");
--        break;
--    }
--}
--
--static void  EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    ULONG  ulSource, ulAddr, ulData;
--    UCHAR  ucIndex;
--
--    if ( (param[0] & 0xffff) < 3 )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    ulSource = param[1] >> 16;
--    ulAddr = param[1] & 0xffff;
--    ulData = param[2];
--
--
--    switch( ulSource )
--    {
--    case 0:
--        OUTREG(ulAddr, ulData);
--        strcpy(sResult, "OK");
--        break;
--    case 1:
--        ucIndex = INREG8(0x3c00);
--        OUTREG8(0x3c00, (UCHAR)ulAddr);
--        OUTREG8(0x3c0a, (UCHAR)ulData);
--        OUTREG8(0x3c00, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    case 2:
--        ucIndex = INREG8(0x1fd4);
--        OUTREG8(0x1fd4, (UCHAR)ulAddr);
--        OUTREG8(0x1fd5, (UCHAR)ulData);
--        OUTREG8(0x1fd4, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    case 3:
--        ucIndex = INREG8(0x1fde);
--        OUTREG8(0x1fde, (UCHAR)ulAddr);
--        OUTREG8(0x1fdf, (UCHAR)ulData);
--        OUTREG8(0x1fde, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    default:
--        strcpy(sResult, "ERROR# 2");
--        break;
--    }
--}
--
--static void  EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--
--    if (pModeInfo->ulHBPorch > (8 * param[1]) )
--    {
--        pModeInfo->ulHBPorch -=8 * param[1];
--        pModeInfo->ulHFPorch +=8 * param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void  EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulHFPorch > (8 * param[1]) )
--    {
--        pModeInfo->ulHFPorch -=8 * param[1];
--        pModeInfo->ulHBPorch +=8 * param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--
--static void  EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulVBPorch > (param[1]) )
--    {
--        pModeInfo->ulVBPorch -= param[1];
--        pModeInfo->ulVFPorch += param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void  EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulVFPorch >= (param[1]) )
--    {
--        pModeInfo->ulVFPorch -= param[1];
--        pModeInfo->ulVBPorch += param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1] * 8;
--    }
--    else
--    {
--
--        ulStep = 8;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    if (pModeInfo->ulHBPorch >= ulStep )
--    {
--        pModeInfo->ulHBPorch -= ulStep;
--    }
--    else
--    {
--        pModeInfo->ulHBPorch = 0;
--    }
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1] * 8;
--    }
--    else
--    {
--
--        ulStep = 8;
--    }
--
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulHBPorch += ulStep;
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1];
--    }
--    else
--    {
--
--        ulStep = 1;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--
--    if (pModeInfo->ulVBPorch >= ulStep )
--    {
--        pModeInfo->ulVBPorch -= ulStep;
--    }
--    else
--    {
--        pModeInfo->ulVBPorch = 0;
--    }
--
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1];
--    }
--    else
--    {
--
--        ulStep = 1;
--    }
--
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulVFPorch += ulStep;
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) < 2)
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulPixClock = (ULONG)( ((float)param[1] * fPixelClock) / fRefresh);
--
--    pModeInfo->ulRefreshRate = param[1];
--
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--
--    TmpMgaModeInfo[param[0] >> 16].ulDispWidth = 0;
--    MGASetMode(pMga->pBoard, pMgaModeInfo[param[0] >> 16]);
--
--    MGAFillDisplayModeStruct(pMode, pMgaModeInfo[param[0] >> 16]);
--
--    GetVideoParameterStr(pMgaModeInfo[param[0] >> 16], sResult);
--}
--
--static Bool convertNumber(unsigned long *pulNumber, char *sNumber)
--{
--    unsigned long i, ulDigit, shiftHex;
--    Bool bResult = TRUE;
--
--    if (sNumber == NULL)
--    {
--        return FALSE;
--    }
--
--
--    /* Convert number */
--    if ( (sNumber[0] == '0') && (sNumber[1] == 'x') )
--    {
--        shiftHex = 0;
--        *pulNumber = 0;
--
--        for (i = strlen(sNumber) - 1; i > 1; i--)
--        {
--            if (shiftHex > 28)
--            {
--                bResult = FALSE;
--                break;
--            }
--
--            if ( !isxdigit(sNumber[i]) )
--            {
--                bResult = FALSE;
--                break;
--            }
--
--            ulDigit = toupper(sNumber[i]) - '0';
--            if (ulDigit > 9)
--            {
--                ulDigit -= 7;
--            }
--            *pulNumber += ulDigit << shiftHex;
--            shiftHex += 4;
--        }
--    }
--    else
--    {
--        for (i = 0; i < strlen(sNumber); i++)
--        {
--            if ( !isdigit(sNumber[i]) )
--            {
--                bResult = FALSE;
--                break;
--            }
--        }
--        *pulNumber = atoi(sNumber);
--    }
--
--    return bResult;
--}
--
--static Bool GetEscCommand(char *cmdline, EscCmdStruct *escCmd)
--{
--    unsigned long i, paramIndex, ulHI;
--    Bool bResult;
--    char *pParameter, *function;
--
--    bResult = TRUE; /* success */
--
--    function = strtok(cmdline, " \t\n,");
--
--
--    escCmd->parameters[0] = 0;
--    if (function)
--    {
--        /* Find Screen */
--        if (function[1] == ':' )
--        {
--            escCmd->parameters[0] = (unsigned long)(function[0] - '0') << 16;
--            strncpy(escCmd->function, function+2, 32);
--        }
--        else
--        {
--            strncpy(escCmd->function, function, 32);
--        }
--
--    }
--    else
--    {
--        strcpy(escCmd->function, "#ERROR -1");
--        escCmd->parameters[0] = 0;
--        return FALSE;
--    }
--
--    paramIndex = 1;
--    while ( (pParameter = strtok(NULL, " \t\n,")) != NULL )
--    {
--        if (paramIndex > 31)
--        {
--            /* 32 parameters supported */
--            break;
--        }
--
--        i = 0;
--        while(pParameter[i] && pParameter[i] != ':')
--        {
--            i++;
--        }
--
--        if ( pParameter[i] )
--        {
--            pParameter[i] = '\0';
--            bResult  = convertNumber(&escCmd->parameters[paramIndex], &pParameter[i+1]);
--            bResult |= convertNumber(&ulHI, pParameter);
--            escCmd->parameters[paramIndex] &= 0xffff;
--            escCmd->parameters[paramIndex] += ulHI << 16;
--            pParameter[i] = ':';
--        }
--        else
--        {
--            bResult = convertNumber(&escCmd->parameters[paramIndex], pParameter);
--        }
--
--
--        if (!bResult)
--        {
--            break;
--        }
--        paramIndex++;
--    }
--
--    escCmd->parameters[0] += paramIndex;
--    return bResult;
--
--}
--
--void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode)
--{
--    int i = 0;
--    int ulScreen = 0;
--    MGAPtr pMga = MGAPTR(pScrn);
--    EscCmdStruct EscCmd;
--
--    if (pMga->SecondCrtc)
--    {
--	ulScreen = 1;
--    }
--    else
--    {
--	ulScreen = 0;
--    }
--
--
--    if (FunctionTable[0].function &&  GetEscCommand(cmdline,  &EscCmd) )
--    {
--        i = 0;
--
--        while ( FunctionTable[i].function && strcmp(FunctionTable[i].function, EscCmd.function) )
--        {
--            i++;
--        }
--
--        if (FunctionTable[i].function)
--        {
--	    EscCmd.parameters[0] &= 0xffff;
--	    EscCmd.parameters[0] |= ulScreen << 16;
--
--            FunctionTable[i].funcptr(pScrn, EscCmd.parameters, sResult, pMode);
--        }
--        else
--        {
--            strcpy(sResult, "error# -1");
--        }
--    }
--    else
--    {
--        strcpy(sResult, "error# -1");
--    }
--}
--#else
- int mga_foo;
--#endif
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index bffd063..130651d 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -74,18 +74,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \
- #define CHECK_DMA_QUIESCENT(pMGA, pScrn)
- #endif
- 
--#ifdef USEMGAHAL
--#define MGA_HAL(x) { \
--	MGAPtr pMga = MGAPTR(pScrn); \
--	if (pMga->HALLoaded && pMga->chip_attribs->HAL_chipset) { x; } \
--}
--#define MGA_NOT_HAL(x) { \
--	MGAPtr pMga = MGAPTR(pScrn); \
--	if (!pMga->HALLoaded || !pMga->chip_attribs->HAL_chipset) { x; } \
--}
--#else
- #define MGA_NOT_HAL(x) { x; }
--#endif
- 
- #define MGAISGx50(x) ((x)->is_Gx50)
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 1fd0572..2affe3b 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -236,9 +236,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     int i;
-     char* s;
-     ClockRangePtr clockRanges;
--#ifdef USEMGAHAL
--    ULONG status;
--#endif
-     MgaScrn2Rel Monitor2Pos;
- 
-     xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n");
-@@ -252,9 +249,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     }
- 
-     pMga = MGAPTR(pScrn);
--#ifdef USEMGAHAL
--    pMga->pMgaModeInfo = NULL; /*will be allocated later if NULL*/ 
--#endif
-     pMga1 = MGAPTR(pScrn1);
-     pMga1->pScrn2 = pScrn;
-   
-@@ -456,10 +450,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     clockRanges->clockIndex = -1;		/* programmable */
-     clockRanges->interlaceAllowed = TRUE;
-     clockRanges->doubleScanAllowed = TRUE;
--#ifdef USEMGAHAL
--    MGA_HAL(clockRanges->interlaceAllowed = FALSE);
--    MGA_HAL(clockRanges->doubleScanAllowed = FALSE);
--#endif
-     clockRanges->interlaceAllowed = FALSE; /*no interlace on CRTC2 */
- 
-     clockRanges->ClockMulFactor = 1;
-@@ -562,30 +552,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 	MGAFreeRec(pScrn);
- 	return FALSE;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--
--    pMga->pBoard = pMga1->pBoard;
--    pMga->pClientStruct = pMga1->pClientStruct;
--    pMga->pMgaHwInfo = pMga1->pMgaHwInfo;
--
--
--    MGAFillModeInfoStruct(pScrn,NULL);
--    /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable
--     * because no mode is given
--     */
--    pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY;
--    
--    if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGAValidateMode from HALlib found the mode to be invalid.\n"
--		   "\tError: 0x%lx\n", status);
--        return FALSE;
--    }
--    pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch;
--    );	/* MGA_HAL */
--#endif
- 
-     /*
-      * Set the CRTC parameters for all of the modes based on the type
-@@ -595,9 +561,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-      * driver and if the driver doesn't provide code to set them.  They
-      * are not pre-initialised at all.
-      */
--#ifdef USEMGAHAL
--    MGA_HAL(xf86SetCrtcForModes(pScrn, 0));
--#endif
-     MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V));
- 
-     /* Set the current mode to the first in the list */
---
-cgit v0.9.0.2-2-gbebe
-From ee09a9a340f8946f2d4a71a431b64189dbb5c256 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:22:09 +0000
-Subject: Remove xalloc/xcalloc/xrealloc/xfree
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_dga.c b/src/mga_dga.c
-index d43b96d..224e4ba 100644
---- a/src/mga_dga.c
-+++ b/src/mga_dga.c
-@@ -111,7 +111,7 @@ SECOND_PASS:
- 	    if(secondPitch)
- 		pitch = secondPitch; 
- 
--	    if(!(newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec))))
-+	    if(!(newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec))))
- 		break;
- 
- 	    modes = newmodes;
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 14f342f..957c6df 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -91,24 +91,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
-    case 16:
-       numConfigs = 8;
- 
--      pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig),
-+      pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig),
- 						numConfigs );
-       if ( !pConfigs ) {
- 	 return FALSE;
-       }
- 
--      pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec),
-+      pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec),
- 						 numConfigs );
-       if ( !pMGAConfigs ) {
--	 xfree( pConfigs );
-+	 free(pConfigs);
- 	 return FALSE;
-       }
- 
--      pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr),
-+      pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr),
- 						     numConfigs );
-       if ( !pMGAConfigPtrs ) {
--	 xfree( pConfigs );
--	 xfree( pMGAConfigs );
-+	 free(pConfigs);
-+	 free(pMGAConfigs);
- 	 return FALSE;
-       }
- 
-@@ -182,24 +182,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
-    case 32:
-       numConfigs = 8;
- 
--      pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig),
-+      pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig),
- 						numConfigs );
-       if ( !pConfigs ) {
- 	 return FALSE;
-       }
- 
--      pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec),
-+      pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec),
- 						 numConfigs );
-       if ( !pMGAConfigs ) {
--	 xfree( pConfigs );
-+	 free(pConfigs);
- 	 return FALSE;
-       }
- 
--      pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr),
-+      pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr),
- 						     numConfigs );
-       if ( !pMGAConfigPtrs ) {
--	 xfree( pConfigs );
--	 xfree( pMGAConfigs );
-+	 free(pConfigs);
-+	 free(pMGAConfigs);
- 	 return FALSE;
-       }
- 
-@@ -973,11 +973,11 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 
-         if (nbox>1) {
- 	    /* Keep ordering in each band, reverse order of bands */
--	    pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
-+	    pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
- 	    if (!pboxNew1) return;
--	    pptNew1 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
-+	    pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pptNew1) {
--	        xfree(pboxNew1);
-+	        free(pboxNew1);
- 	        return;
- 	    }
- 	    pboxBase = pboxNext = pbox+nbox-1;
-@@ -1008,14 +1008,14 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 
-         if (nbox > 1) {
- 	    /*reverse orderof rects in each band */
--	    pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
--	    pptNew2 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
-+	    pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
-+	    pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pboxNew2 || !pptNew2) {
--	        if (pptNew2) xfree(pptNew2);
--	        if (pboxNew2) xfree(pboxNew2);
-+	        if (pptNew2) free(pptNew2);
-+	        if (pboxNew2) free(pboxNew2);
- 	        if (pboxNew1) {
--		    xfree(pptNew1);
--		    xfree(pboxNew1);
-+		    free(pptNew1);
-+		    free(pboxNew1);
- 		}
- 	       return;
- 	    }
-@@ -1066,12 +1066,12 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
-     MGASelectBuffer(pScrn, MGA_FRONT);
- 
-     if (pboxNew2) {
--        xfree(pptNew2);
--        xfree(pboxNew2);
-+        free(pptNew2);
-+        free(pboxNew2);
-     }
-     if (pboxNew1) {
--        xfree(pptNew1);
--        xfree(pboxNew1);
-+        free(pptNew1);
-+        free(pboxNew1);
-     }
- 
-     pMga->AccelInfoRec->NeedToSync = TRUE;
-@@ -1150,7 +1150,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
-       pDRIInfo->busIdString = DRICreatePCIBusID(pMga->PciInfo);
-    } else {
--      pDRIInfo->busIdString = xalloc(64);
-+      pDRIInfo->busIdString = malloc(64);
-       sprintf( pDRIInfo->busIdString, "PCI:%d:%d:%d",
- #ifdef XSERVER_LIBPCIACCESS
- 	       ((pMga->PciInfo->domain << 8) | pMga->PciInfo->bus),
-@@ -1198,7 +1198,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
- 
-    pDRIInfo->SAREASize = SAREA_MAX;
- 
--   pMGADRI = (MGADRIPtr)xcalloc( sizeof(MGADRIRec), 1 );
-+   pMGADRI = (MGADRIPtr)calloc( sizeof(MGADRIRec), 1 );
-    if ( !pMGADRI ) {
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-@@ -1208,9 +1208,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    }
- 
-    pMGADRIServer = (MGADRIServerPrivatePtr)
--      xcalloc( sizeof(MGADRIServerPrivateRec), 1 );
-+      calloc( sizeof(MGADRIServerPrivateRec), 1 );
-    if ( !pMGADRIServer ) {
--      xfree( pMGADRI );
-+      free( pMGADRI );
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-       xf86DrvMsg( pScrn->scrnIndex, X_ERROR,
-@@ -1249,9 +1249,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
- 
-    if ( !DRIScreenInit( pScreen, pDRIInfo, &pMga->drmFD ) ) {
--      xfree( pMGADRIServer );
-+      free( pMGADRIServer );
-       pMga->DRIServerInfo = 0;
--      xfree( pDRIInfo->devPrivate );
-+      free( pDRIInfo->devPrivate );
-       pDRIInfo->devPrivate = 0;
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-@@ -1495,20 +1495,20 @@ void MGADRICloseScreen( ScreenPtr pScreen )
- 
-    if ( pMga->pDRIInfo ) {
-       if ( pMga->pDRIInfo->devPrivate ) {
--	 xfree( pMga->pDRIInfo->devPrivate );
-+	 free( pMga->pDRIInfo->devPrivate );
- 	 pMga->pDRIInfo->devPrivate = 0;
-       }
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-    }
-    if ( pMga->DRIServerInfo ) {
--      xfree( pMga->DRIServerInfo );
-+      free(pMga->DRIServerInfo);
-       pMga->DRIServerInfo = 0;
-    }
-    if ( pMga->pVisualConfigs ) {
--      xfree( pMga->pVisualConfigs );
-+      free(pMga->pVisualConfigs);
-    }
-    if ( pMga->pVisualConfigsPriv ) {
--      xfree( pMga->pVisualConfigsPriv );
-+      free( pMga->pVisualConfigsPriv );
-    }
- }
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d770031..d4ae346 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -646,7 +646,7 @@ MGAFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -813,7 +813,7 @@ MGAProbe(DriverPtr drv, int flags)
- 			            MGAChipsets, MGAPciChipsets, devSections,
- 			            numDevSections, drv, &usedChips);
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
- 	return FALSE;
- 
-@@ -971,7 +971,7 @@ MGAProbe(DriverPtr drv, int flags)
- 	    }
-         }
-     }
--    xfree(usedChips);
-+    free(usedChips);
- 
-     return foundScreen;
- }
-@@ -1715,7 +1715,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
-     }
- 
--    if (!(pMga->Options = xalloc(sizeof(MGAOptions))))
-+    if (!(pMga->Options = malloc(sizeof(MGAOptions))))
- 	return FALSE;
-     memcpy(pMga->Options, MGAOptions, sizeof(MGAOptions));
- 
-@@ -2384,7 +2384,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-         switch(pMga->Chipset) {
- 	case PCI_CHIP_MGA2064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches1));
-+		linePitches = malloc(sizeof(Pitches1));
- 		memcpy(linePitches, Pitches1, sizeof(Pitches1));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -2393,7 +2393,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	case PCI_CHIP_MGA2164_AGP:
- 	case PCI_CHIP_MGA1064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches2));
-+		linePitches = malloc(sizeof(Pitches2));
- 		memcpy(linePitches, Pitches2, sizeof(Pitches2));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -2431,7 +2431,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 			      LOOKUP_BEST_REFRESH);
-       
- 	if (linePitches)
--	   xfree(linePitches);
-+	   free(linePitches);
-     }
- 
-     if (i < 1 && pMga->FBDev) {
-@@ -3294,7 +3294,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pMga->ShadowFB) {
-  	pMga->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	pMga->ShadowPtr = xalloc(pMga->ShadowPitch * height);
-+	pMga->ShadowPtr = malloc(pMga->ShadowPitch * height);
- 	displayWidth = pMga->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-         FBStart = pMga->ShadowPtr;
-     } else {
-@@ -3745,21 +3745,21 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- #ifdef USE_EXA
-     if (pMga->ExaDriver) {
- 	exaDriverFini(pScreen);
--	xfree(pMga->ExaDriver);
-+	free(pMga->ExaDriver);
-     }
- #endif
-     if (pMga->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pMga->CursorInfoRec);
-     if (pMga->ShadowPtr)
--	xfree(pMga->ShadowPtr);
-+	free(pMga->ShadowPtr);
-     if (pMga->DGAModes)
--	xfree(pMga->DGAModes);
-+	free(pMga->DGAModes);
-     if (pMga->adaptor)
--	xfree(pMga->adaptor);
-+	free(pMga->adaptor);
-     if (pMga->portPrivate)
--	xfree(pMga->portPrivate);
-+	free(pMga->portPrivate);
-     if (pMga->ScratchBuffer)
--	xfree(pMga->ScratchBuffer);
-+	free(pMga->ScratchBuffer);
- 
-     pScrn->vtSema = FALSE;
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 2affe3b..e3216c9 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -70,9 +70,9 @@ CopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, DisplayModePtr i, DisplayM
-     DisplayModePtr mode;
-     int dx = 0,dy = 0;
-     /* start with first node */
--    mode = xalloc(sizeof(DisplayModeRec));
-+    mode = malloc(sizeof(DisplayModeRec));
-     memcpy(mode,i, sizeof(DisplayModeRec));
--    mode->Private = xalloc(sizeof(MergedDisplayModeRec));
-+    mode->Private = malloc(sizeof(MergedDisplayModeRec));
-     ((MergedDisplayModePtr)mode->Private)->Monitor1 = i;
-     ((MergedDisplayModePtr)mode->Private)->Monitor2 = j;
-     ((MergedDisplayModePtr)mode->Private)->Monitor2Pos = srel;
-@@ -239,7 +239,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     MgaScrn2Rel Monitor2Pos;
- 
-     xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n");
--    pScrn = xalloc(sizeof(ScrnInfoRec));
-+    pScrn = malloc(sizeof(ScrnInfoRec));
-     memcpy(pScrn,pScrn1,sizeof(ScrnInfoRec));
-    
-     pScrn->driverPrivate = NULL; 
-@@ -270,7 +270,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 
-     /* Set pScrn->monitor */
-     {
--        pScrn->monitor = xalloc(sizeof(MonRec));
-+        pScrn->monitor = malloc(sizeof(MonRec));
-         /* copy everything we don't care about */
-         memcpy(pScrn->monitor,pScrn1->monitor,sizeof(MonRec));
-         pScrn->monitor->DDC = NULL;   /*FIXME:have to try this */ 
-@@ -484,7 +484,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-         switch(pMga->Chipset) {
- 	case PCI_CHIP_MGA2064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches1));
-+		linePitches = malloc(sizeof(Pitches1));
- 		memcpy(linePitches, Pitches1, sizeof(Pitches1));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -493,7 +493,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 	case PCI_CHIP_MGA2164_AGP:
- 	case PCI_CHIP_MGA1064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches2));
-+		linePitches = malloc(sizeof(Pitches2));
- 		memcpy(linePitches, Pitches2, sizeof(Pitches2));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -529,7 +529,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 			      LOOKUP_BEST_REFRESH);
-         
- 	if (linePitches)
--	   xfree(linePitches);
-+	   free(linePitches);
-     }
- 
- 
-@@ -881,10 +881,10 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-     ScrnInfoPtr pScrn2 = pMga->pScrn2;
- 
-     if(pScrn2) {
--        xfree(pScrn2->monitor);
-+        free(pScrn2->monitor);
-         pScrn2->monitor = NULL;
- 
--        xfree(pScrn2);
-+        free(pScrn2);
-         pMga->pScrn2 = NULL;
-     }
- 
-@@ -893,8 +893,8 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-         do {
-             DisplayModePtr p = pScrn1->currentMode->next; 
-             if(pScrn1->currentMode->Private) 
--                xfree(pScrn1->currentMode->Private);
--            xfree(pScrn1->currentMode);
-+                free(pScrn1->currentMode->Private);
-+            free(pScrn1->currentMode);
-             pScrn1->currentMode = p;
-         }while( pScrn1->currentMode != pScrn1->modes);
-     }
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index db7fae7..f0e6194 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -583,7 +583,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
-     BoxRec AvailFBArea;
-     int i;
- 
--    pMga->ScratchBuffer = xalloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3);
-+    pMga->ScratchBuffer = malloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3);
-     if(!pMga->ScratchBuffer) return FALSE;
- 
-     pMga->AccelInfoRec = infoPtr = XAACreateInfoRec();
-diff --git a/src/mga_vga.c b/src/mga_vga.c
-index 9f00b3d..0ac8bf7 100644
---- a/src/mga_vga.c
-+++ b/src/mga_vga.c
-@@ -197,17 +197,17 @@ MGAG200SESaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save)
-     hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */
-     hwp->writeGr(hwp, 0x05, 0x00);  /* write mode 0, read mode 0 */
-     hwp->writeGr(hwp, 0x06, 0x05);  /* set graphics */
--    if (hwp->FontInfo1 || (hwp->FontInfo1 = xalloc(FONT_AMOUNT))) {
-+    if (hwp->FontInfo1 || (hwp->FontInfo1 = malloc(FONT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */
- 	hwp->writeGr(hwp, 0x04, 0x02);  /* read plane 2 */
- 	slowbcopy_frombus(hwp->Base, hwp->FontInfo1, FONT_AMOUNT);
-     }
--    if (hwp->FontInfo2 || (hwp->FontInfo2 = xalloc(FONT_AMOUNT))) {
-+    if (hwp->FontInfo2 || (hwp->FontInfo2 = malloc(FONT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */
- 	hwp->writeGr(hwp, 0x04, 0x03);  /* read plane 3 */
- 	slowbcopy_frombus(hwp->Base, hwp->FontInfo2, FONT_AMOUNT);
-     }
--    if (hwp->TextInfo || (hwp->TextInfo = xalloc(2 * TEXT_AMOUNT))) {
-+    if (hwp->TextInfo || (hwp->TextInfo = malloc(2 * TEXT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */
- 	hwp->writeGr(hwp, 0x04, 0x00);  /* read plane 0 */
- 	slowbcopy_frombus(hwp->Base, hwp->TextInfo, TEXT_AMOUNT);
-diff --git a/src/mga_video.c b/src/mga_video.c
-index a69c973..beb5a3c 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -131,8 +131,8 @@ void MGAInitVideo(ScreenPtr pScreen)
- 	    num_adaptors = 1;
- 	    adaptors = &newAdaptor;
- 	} else {
--	    newAdaptors =  /* need to free this someplace */
--		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+	    /* need to free this someplace */
-+	    newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
- 	    if(newAdaptors) {
- 		memcpy(newAdaptors, adaptors, num_adaptors * 
- 					sizeof(XF86VideoAdaptorPtr));
-@@ -147,7 +147,7 @@ void MGAInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
-@@ -231,10 +231,10 @@ MGAAllocAdaptor(ScrnInfoPtr pScrn, Bool doublebuffer)
-     if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
- 	return NULL;
- 
--    if(!(pPriv = xcalloc(1, sizeof(MGAPortPrivRec) + 
-+    if(!(pPriv = calloc(1, sizeof(MGAPortPrivRec) +
- 			(sizeof(DevUnion) * MGA_MAX_PORTS)))) 
-     {
--	xfree(adapt);
-+	free(adapt);
- 	return NULL;
-     }
- 
-@@ -1082,18 +1082,18 @@ MGAAllocateSurface(
-     surface->width = w;
-     surface->height = h;
- 
--    if(!(surface->pitches = xalloc(sizeof(int)))) {
-+    if(!(surface->pitches = malloc(sizeof(int)))) {
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
--    if(!(surface->offsets = xalloc(sizeof(int)))) {
--	xfree(surface->pitches);
-+    if(!(surface->offsets = malloc(sizeof(int)))) {
-+	free(surface->pitches);
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
--    if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
-+	free(surface->pitches);
-+	free(surface->offsets);
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
-@@ -1137,9 +1137,9 @@ MGAFreeSurface(
-     if(pPriv->isOn)
- 	MGAStopSurface(surface);
-     MGAFreeMemory(pScrn, pPriv->surface_memory);
--    xfree(surface->pitches);
--    xfree(surface->offsets);
--    xfree(surface->devPrivate.ptr);
-+    free(surface->pitches);
-+    free(surface->offsets);
-+    free(surface->devPrivate.ptr);
- 
-     return Success;
- }
-@@ -1231,7 +1231,7 @@ MGAInitOffscreenImages(ScreenPtr pScreen)
-     XF86OffscreenImagePtr offscreenImages;
- 
-     /* need to free this someplace */
--    if(!(offscreenImages = xalloc(num * sizeof(XF86OffscreenImageRec))))
-+    if(!(offscreenImages = malloc(num * sizeof(XF86OffscreenImageRec))))
- 	return;
- 
-     offscreenImages[0].image = &Images[0];
---
-cgit v0.9.0.2-2-gbebe
-From 1036e32e006d496023553ea566cb13ae93933719 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:35:48 +0000
-Subject: Remove if(E != NULL) checks around free(E)
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 957c6df..1454994 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -1011,8 +1011,8 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 	    pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
- 	    pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pboxNew2 || !pptNew2) {
--	        if (pptNew2) free(pptNew2);
--	        if (pboxNew2) free(pboxNew2);
-+	        free(pptNew2);
-+	        free(pboxNew2);
- 	        if (pboxNew1) {
- 		    free(pptNew1);
- 		    free(pboxNew1);
-@@ -1494,21 +1494,13 @@ void MGADRICloseScreen( ScreenPtr pScreen )
-    DRICloseScreen( pScreen );
- 
-    if ( pMga->pDRIInfo ) {
--      if ( pMga->pDRIInfo->devPrivate ) {
--	 free( pMga->pDRIInfo->devPrivate );
--	 pMga->pDRIInfo->devPrivate = 0;
--      }
-+      free(pMga->pDRIInfo->devPrivate);
-+      pMga->pDRIInfo->devPrivate = 0;
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-    }
--   if ( pMga->DRIServerInfo ) {
--      free(pMga->DRIServerInfo);
--      pMga->DRIServerInfo = 0;
--   }
--   if ( pMga->pVisualConfigs ) {
--      free(pMga->pVisualConfigs);
--   }
--   if ( pMga->pVisualConfigsPriv ) {
--      free( pMga->pVisualConfigsPriv );
--   }
-+   free(pMga->DRIServerInfo);
-+   pMga->DRIServerInfo = 0;
-+   free(pMga->pVisualConfigs);
-+   free(pMga->pVisualConfigsPriv);
- }
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d4ae346..dcbfabf 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -644,8 +644,6 @@ MGAGetRec(ScrnInfoPtr pScrn)
- void
- MGAFreeRec(ScrnInfoPtr pScrn)
- {
--    if (pScrn->driverPrivate == NULL)
--	return;
-     free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
-@@ -2430,8 +2428,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 			      pMga->FbMapSize,
- 			      LOOKUP_BEST_REFRESH);
-       
--	if (linePitches)
--	   free(linePitches);
-+	free(linePitches);
-     }
- 
-     if (i < 1 && pMga->FBDev) {
-@@ -3750,16 +3747,11 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- #endif
-     if (pMga->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pMga->CursorInfoRec);
--    if (pMga->ShadowPtr)
--	free(pMga->ShadowPtr);
--    if (pMga->DGAModes)
--	free(pMga->DGAModes);
--    if (pMga->adaptor)
--	free(pMga->adaptor);
--    if (pMga->portPrivate)
--	free(pMga->portPrivate);
--    if (pMga->ScratchBuffer)
--	free(pMga->ScratchBuffer);
-+    free(pMga->ShadowPtr);
-+    free(pMga->DGAModes);
-+    free(pMga->adaptor);
-+    free(pMga->portPrivate);
-+    free(pMga->ScratchBuffer);
- 
-     pScrn->vtSema = FALSE;
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index e3216c9..c1cf2eb 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -528,8 +528,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 			      pMga->FbMapSize,
- 			      LOOKUP_BEST_REFRESH);
-         
--	if (linePitches)
--	   free(linePitches);
-+	free(linePitches);
-     }
- 
- 
-@@ -892,8 +891,7 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-         pScrn1->currentMode = pScrn1->modes;
-         do {
-             DisplayModePtr p = pScrn1->currentMode->next; 
--            if(pScrn1->currentMode->Private) 
--                free(pScrn1->currentMode->Private);
-+            free(pScrn1->currentMode->Private);
-             free(pScrn1->currentMode);
-             pScrn1->currentMode = p;
-         }while( pScrn1->currentMode != pScrn1->modes);
-diff --git a/src/mga_video.c b/src/mga_video.c
-index beb5a3c..784e7b1 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -146,8 +146,7 @@ void MGAInitVideo(ScreenPtr pScreen)
-     if(num_adaptors)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
--    if(newAdaptors)
--	free(newAdaptors);
-+    free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
---
-cgit v0.9.0.2-2-gbebe
-From 560967b4ffdb103f95121c43708dd5fc680a5045 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:37:04 +0000
-Subject: Fix printf format specifier warning
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_exa.c b/src/mga_exa.c
-index f292327..e5eaa92 100644
---- a/src/mga_exa.c
-+++ b/src/mga_exa.c
-@@ -865,7 +865,7 @@ mgaExaInit(ScreenPtr pScreen)
- 
-     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "X %d Y %d bpp %d\n",
-                pScrn->virtualX, pScrn->virtualY, pScrn->bitsPerPixel);
--    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %x, osb %x\n",
-+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %lx, osb %lx\n",
-                pExa->memoryBase, pExa->memorySize, pExa->offScreenBase);
- 
-     /* In PW24 mode, we need to align to "3 64-bytes" */
---
-cgit v0.9.0.2-2-gbebe
-From 07792ef41f33aa5419168263637e34ee614f26e2 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:38:17 +0000
-Subject: Remove calls to xf86IsPc98()
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index dcbfabf..4af36ca 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2164,7 +2164,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     /*
-      * Reset card if it isn't primary one
-      */
--    if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() )
-+    if ( (!pMga->Primary && !pMga->FBDev) )
-         MGASoftReset(pScrn);
- 
-     if (pScrn->videoRam == 0) {
-@@ -2878,13 +2878,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	vgaHWProtect(pScrn, FALSE);
-     }
- 
--    if (xf86IsPc98()) {
--	if (pMga->Chipset == PCI_CHIP_MGA2064)
--	    outb(0xfac, 0x01);
--	else
--	    outb(0xfac, 0x02);
--    }
--
-     /* Reset tagfifo*/ 
- 	if (pMga->is_G200ER) 
-     {
-@@ -3680,8 +3673,6 @@ MGALeaveVT(int scrnIndex, int flags)
-     MGARestore(pScrn);
-     vgaHWLock(hwp);
- 
--    if (xf86IsPc98())
--	outb(0xfac, 0x00);
- #ifdef XF86DRI
-     if (pMga->directRenderingEnabled) {
-         pScreen = screenInfo.screens[scrnIndex];
-@@ -3755,9 +3746,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- 
-     pScrn->vtSema = FALSE;
- 
--    if (xf86IsPc98())
--	outb(0xfac, 0x00);
--
-     xf86ClearPrimInitDone(pScrn->entityList[0]);
- 
-     if(pMga->BlockHandler)
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index c1cf2eb..aec3443 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -385,7 +385,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     /*
-      * Reset card if it isn't primary one
-      */
--    if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() )
-+    if ( (!pMga->Primary && !pMga->FBDev) )
-         MGASoftReset(pScrn);
- 
-     
---
-cgit v0.9.0.2-2-gbebe
-From f9acf37be49844bea8165be9786afe37fd999229 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat, 29 Oct 2011 23:31:08 +0000
-Subject: Include <unistd.h> for usleep
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/mga_vga.c b/src/mga_vga.c
-index 0ac8bf7..8f52951 100644
---- a/src/mga_vga.c
-+++ b/src/mga_vga.c
-@@ -2,6 +2,8 @@
- #include "config.h"
- #endif
- 
-+#include <unistd.h>
-+
- #include "misc.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
---
-cgit v0.9.0.2-2-gbebe
-From d9cf07a4f424b2beb844ea1b3ec5d468e79a747c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat, 29 Oct 2011 23:34:41 +0000
-Subject: Include "xf86Modes.h" for xf86ModeBandwidth
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 4af36ca..d9f6ea4 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -52,6 +52,10 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
-+#ifdef HAVE_XF86MODEBANDWIDTH
-+#include "xf86Modes.h"
-+#endif
-+
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
- #include "xf86RAC.h"
---
-cgit v0.9.0.2-2-gbebe
-From 644ba5d11049e63ea61b5cc4fb889b0f840965ff Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Wed, 07 Dec 2011 20:42:39 +0000
-Subject: Add support for Video Memory greater then 8M
-
-Expand memory mapping of framebuffer from 8 to 16MB
-
-Fix segfault on redhat distibution
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d9f6ea4..ae36378 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2707,9 +2707,18 @@ MGAMapMem(ScrnInfoPtr pScrn)
- 	if (pMga->IOBase == NULL)
- 	    return FALSE;
- 
--	pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
--				     pMga->PciTag, pMga->FbAddress,
--				     pMga->FbMapSize);
-+    if (pMga->is_G200ER)
-+    {
-+        pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-+                         pMga->PciTag, pMga->FbAddress,
-+                         pMga->FbMapSize);
-+    }
-+    else
-+    {
-+        pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-+                         pMga->PciTag, pMga->FbAddress,
-+                         pMga->FbMapSize);
-+    }
- 	if (pMga->FbBase == NULL)
- 	    return FALSE;
- #endif
-@@ -3139,11 +3148,19 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     pMga = MGAPTR(pScrn);
-     MGAdac = &pMga->Dac;
- 
--    if (pMga->is_G200SE) {
--	VRTemp = pScrn->videoRam;
--	FBTemp = pMga->FbMapSize;
--	pScrn->videoRam = 8192;
--	pMga->FbMapSize = pScrn->videoRam * 1024;
-+    if (pMga->is_G200SE)
-+    {
-+        VRTemp = pScrn->videoRam;
-+        FBTemp = pMga->FbMapSize;
-+        if (pMga->reg_1e24 >= 0x01)
-+        {
-+            pScrn->videoRam = 16384;
-+        }
-+        else
-+        {
-+            pScrn->videoRam = 8192;
-+        }
-+        pMga->FbMapSize = pScrn->videoRam * 1024;
-     }
-     
- 
-@@ -3701,10 +3718,26 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGAEntPtr pMgaEnt = NULL;
-+    CARD32 VRTemp, FBTemp;
- 
-     if (pMga->MergedFB)
-          MGACloseScreenMerged(scrnIndex, pScreen);
- 
-+    if (pMga->is_G200SE)
-+    {
-+        VRTemp = pScrn->videoRam;
-+        FBTemp = pMga->FbMapSize;
-+        if (pMga->reg_1e24 >= 0x01)
-+        {
-+            pScrn->videoRam = 16384;
-+        }
-+        else
-+        {
-+            pScrn->videoRam = 8192;
-+        }
-+        pMga->FbMapSize = pScrn->videoRam * 1024;
-+    }
-+
-     if (pScrn->vtSema) {
- 	if (pMga->FBDev) {
- 	    fbdevHWRestore(pScrn);
-@@ -3716,6 +3749,13 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- 	    vgaHWUnmapMem(pScrn);
- 	}
-     }
-+
-+    if (pMga->is_G200SE)
-+    {
-+        pScrn->videoRam = VRTemp;
-+        pMga->FbMapSize = FBTemp;
-+    }
-+
- #ifdef XF86DRI
-    if (pMga->directRenderingEnabled) {
-        MGADRICloseScreen(pScreen);
---
-cgit v0.9.0.2-2-gbebe
-From cc9d2e808de20723c9035952242d966455d583b7 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Thu, 29 Dec 2011 03:44:40 +0000
-Subject: Check MGAAllocAdaptor() for memory allocation failure
-
-If it couldn't allocate memory, don't attempt to write a bunch of values
-to the NULL pointer before returning it, but just pass the NULL along
-right away.
-
-Resolves parfait warnings of the form:
-
-Error: Null pointer dereference (CWE 476)
-   Write to null pointer 'adapt'
-        at line 322 of src/mga_video.c in function 'MGASetupImageVideoTexture'.
-          Function 'MGAAllocAdaptor' may return constant 'NULL' at line 237, called at line 320.
-          Null pointer introduced at line 237 in function 'MGAAllocAdaptor'.
-
-repeated for every line writing to the adapt pointer in each function.
-
-[ This bug was found by the Parfait 0.4.2 bug checking tool.
-  For more information see http://labs.oracle.com/projects/parfait/ ]
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
----
-diff --git a/src/mga_video.c b/src/mga_video.c
-index 784e7b1..abce31f 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -269,6 +269,8 @@ MGASetupImageVideoOverlay(ScreenPtr pScreen)
-     XF86VideoAdaptorPtr adapt;
- 
-     adapt = MGAAllocAdaptor(pScrn, TRUE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-@@ -316,6 +318,8 @@ MGASetupImageVideoTexture(ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     adapt = MGAAllocAdaptor(pScrn, FALSE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = 0;
-@@ -1298,6 +1302,8 @@ MGASetupImageVideoILOAD(ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     adapt = MGAAllocAdaptor(pScrn, FALSE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = 0;
---
-cgit v0.9.0.2-2-gbebe
-From 9223c44a731f48c66c226eb88dcb6f9d574cb599 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Tue, 03 Jan 2012 22:35:18 +0000
-Subject: When we can't load the xaa or exa modules, use shadowfb instead
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index ae36378..00469e7 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2101,6 +2101,31 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-         }
-     }
- 
-+    /* Load XAA if needed */
-+    if (!pMga->NoAccel) {
-+#ifdef USE_EXA
-+	if (pMga->Exa) {
-+	    if (!xf86LoadSubModule(pScrn, "exa")) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+		           "Falling back to shadowfb\n");
-+		pMga->ShadowFB = TRUE;
-+		pMga->NoAccel = TRUE;
-+	    }
-+	} else {
-+#endif
-+#ifdef USE_XAA
-+	    if (!xf86LoadSubModule(pScrn, "xaa")) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+		           "Falling back to shadowfb\n");
-+		pMga->ShadowFB = TRUE;
-+		pMga->NoAccel = TRUE;
-+	    }
-+#endif
-+#ifdef USE_EXA
-+	}
-+#endif
-+    }
-+
-     switch (pMga->Chipset) {
-     case PCI_CHIP_MGA2064:
-     case PCI_CHIP_MGA2164:
-@@ -2596,27 +2621,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	return FALSE;
-     }
- 
--    /* Load XAA if needed */
--    if (!pMga->NoAccel) {
--#ifdef USE_EXA
--	if (pMga->Exa) {
--	    if (!xf86LoadSubModule(pScrn, "exa")) {
--		MGAFreeRec(pScrn);
--		return FALSE;
--	    }
--	} else {
--#endif
--#ifdef USE_XAA
--	    if (!xf86LoadSubModule(pScrn, "xaa")) {
--		MGAFreeRec(pScrn);
--		return FALSE;
--	    }
--#endif
--#ifdef USE_EXA
--	}
--#endif
--    }
--
-     /* Load ramdac if needed */
-     if (pMga->HWCursor) {
- 	if (!xf86LoadSubModule(pScrn, "ramdac")) {
---
-cgit v0.9.0.2-2-gbebe
-From 4c4beaf628c9c5dd531605e40696ed31db0e97b8 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 04 Jan 2012 05:15:07 +0000
-Subject: Untangle XF86DRI from the driver-specific DRI define
-
-XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
-itself does exactly nothing other than not fill in the CFLAGS
-and thus stop the driver from compiling.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/configure.ac b/configure.ac
-index 540c390..840ff3c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,8 +100,8 @@ AC_MSG_RESULT([$DRI])
- AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
- if test "x$DRI" = xyes; then
-         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
--        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-+        AC_DEFINE(MGADRI,1,[Enable DRI driver support])
-+        AC_DEFINE(MGADRI_DEVEL,1,[Enable developmental DRI driver support])
- fi
- 
- save_CFLAGS="$CFLAGS"
-diff --git a/src/mga.h b/src/mga.h
-index fced6aa..77406f1 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -28,7 +28,11 @@
- #include "xf86DDC.h"
- #include "xf86xv.h"
- 
--#ifdef XF86DRI
-+#ifndef XF86DRI
-+#undef MGADRI
-+#endif
-+
-+#ifdef MGADRI
- #include "xf86drm.h"
- 
- #define _XF86DRI_SERVER_
-@@ -589,7 +593,7 @@ typedef struct {
-     int			expandRemaining;
-     int			expandHeight;
-     int			expandY;
--#ifdef XF86DRI
-+#ifdef MGADRI
-     Bool 		directRenderingEnabled;
-     DRIInfoPtr 		pDRIInfo;
-     int 		drmFD;
-@@ -743,7 +747,7 @@ void MGAPointerMoved(int index, int x, int y);
- void MGAInitVideo(ScreenPtr pScreen);
- void MGAResetVideo(ScrnInfoPtr pScrn);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- 
- #define MGA_FRONT	0x1
- #define MGA_BACK	0x2
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 00469e7..af005f1 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -101,7 +101,7 @@
- #include "shadowfb.h"
- #include "fbdevhw.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "dri.h"
- #endif
- 
-@@ -1532,7 +1532,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     pMga = MGAPTR(pScrn);
-     /* Set here until dri is enabled */
--#ifdef XF86DRI
-+#ifdef MGADRI
-     pMga->haveQuiescense = 1;
- #endif
-     /* Get the entity, and make sure it is PCI. */
-@@ -1706,13 +1706,13 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     }
- 
-     if (pMga->DualHeadEnabled) {
--#ifdef XF86DRI
-+#ifdef MGADRI
-         pMga->GetQuiescence = MGAGetQuiescenceShared;
- #endif
-     } else {                                              /* single-head mode */
-         pMga->SecondCrtc = FALSE;
-         pMga->HWCursor = TRUE;
--#ifdef XF86DRI
-+#ifdef MGADRI
-         pMga->GetQuiescence = MGAGetQuiescence;
- #endif
-     }
-@@ -1942,7 +1942,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     if (pScrn->depth == 8)
- 	pScrn->rgbBits = 8;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     from = X_DEFAULT;
-     pMga->agpMode = MGA_DEFAULT_AGP_MODE;
- 
-@@ -2637,7 +2637,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     /* Load the dri module if requested. */
-     if (xf86ReturnOptValBool(pMga->Options, OPTION_DRI, FALSE)) {
-        xf86LoadSubModule(pScrn, "dri");
-@@ -2878,7 +2878,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     vgaReg = &hwp->ModeReg;
-     mgaReg = &pMga->ModeReg;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled) {
-        DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
-    }
-@@ -2989,7 +2989,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	pMga->M1currentMode = (DisplayModePtr)mode->Private;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled)
-      DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
- #endif
-@@ -3138,7 +3138,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     MGAEntPtr pMgaEnt = NULL;
-     int f;
-     CARD32 VRTemp, FBTemp;
--#ifdef XF86DRI
-+#ifdef MGADRI
-     MessageType driFrom = X_DEFAULT;
- #endif
-     DPMSSetProcPtr mga_dpms_set_proc = NULL;
-@@ -3317,7 +3317,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	FBStart = pMga->FbStart;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-      /*
-       * Setup DRI after visuals have been established.
-       *
-@@ -3473,7 +3473,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     MGAInitVideo(pScreen);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
-        /* Now that mi, drm and others have done their thing,
- 	* complete the DRI setup.
-@@ -3625,7 +3625,7 @@ MGAEnterVT(int scrnIndex, int flags)
- 
-     pMga = MGAPTR(pScrn);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
- 	if (pMga->irq) {
- 	    /* Need to make sure interrupts are enabled */
-@@ -3651,7 +3651,7 @@ static Bool
- MGAEnterVTFBDev(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--#ifdef XF86DRI
-+#ifdef MGADRI
-     ScreenPtr pScreen;
-     MGAPtr pMga;
- 
-@@ -3690,7 +3690,7 @@ MGALeaveVT(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
--#ifdef XF86DRI
-+#ifdef MGADRI
-     MGAPtr pMga = MGAPTR(pScrn);
-     ScreenPtr pScreen;
- #endif
-@@ -3698,7 +3698,7 @@ MGALeaveVT(int scrnIndex, int flags)
-     MGARestore(pScrn);
-     vgaHWLock(hwp);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
-         pScreen = screenInfo.screens[scrnIndex];
-         DRILock(pScreen, 0);
-@@ -3760,7 +3760,7 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-         pMga->FbMapSize = FBTemp;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled) {
-        MGADRICloseScreen(pScreen);
-        pMga->directRenderingEnabled=FALSE;
-diff --git a/src/mga_exa.c b/src/mga_exa.c
-index e5eaa92..ced6452 100644
---- a/src/mga_exa.c
-+++ b/src/mga_exa.c
-@@ -41,7 +41,7 @@
- #include "mga_macros.h"
- 
- #include "exa.h"
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "mga_dri.h"
- #endif
- 
-@@ -763,7 +763,7 @@ mgaWaitMarker(ScreenPtr pScreen, int marker)
-     while (INREG (MGAREG_Status) & 0x10000);
- }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- static void
- init_dri(ScrnInfoPtr pScrn)
- {
-@@ -837,7 +837,7 @@ init_dri(ScrnInfoPtr pScrn)
-                        MGA_BUFFER_ALIGN) & ~MGA_BUFFER_ALIGN;
-     dri->backPitch = widthBytes;
- }
--#endif /* XF86DRI */
-+#endif /* MGADRI */
- 
- Bool
- mgaExaInit(ScreenPtr pScreen)
-@@ -898,7 +898,7 @@ mgaExaInit(ScreenPtr pScreen)
-     pExa->UploadToScreen = mgaUploadToScreen;
-     pExa->DownloadFromScreen = mgaDownloadFromScreen;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled)
-         init_dri(pScrn);
- #endif
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index 130651d..d3b0d0e 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -17,7 +17,7 @@
- 
- #define RGBEQUAL(c) (!((((c) >> 8) ^ (c)) & 0xffff))
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #define MGA_SYNC_XTAG                 0x275f4200
- 
- #define MGABUSYWAIT() do { \
-@@ -64,7 +64,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \
- 	WAITFIFO(1); \
- 	OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #define CHECK_DMA_QUIESCENT(pMGA, pScrn) {	\
-    if (!pMGA->haveQuiescense) {			\
-       pMGA->GetQuiescence( pScrn );		\
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index aec3443..f355f76 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -316,7 +316,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     pMga->Chipset = pMga1->Chipset;
-     pMga->ChipRev = pMga1->ChipRev;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     pMga->agpMode = pMga1->agpMode;
- #endif
- 
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index f0e6194..7ac3ae0 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -24,7 +24,7 @@
- #include "miline.h"
- #include "servermd.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "GL/glxtokens.h"
- #endif
- 
-@@ -32,7 +32,7 @@
- #include "mga_reg.h"
- #include "mga_macros.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "mga_dri.h"
- #endif
- 
-@@ -797,7 +797,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
- 	break;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if ( pMga->directRenderingEnabled ) {
-        MGADRIServerPrivatePtr pMGADRIServer = pMga->DRIServerInfo;
-        BoxRec MemBox;
-@@ -899,7 +899,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
- 		   pMGADRIServer->textureOffset );
-     }
-     else
--#endif /* defined(XF86DRI) */
-+#endif /* defined(MGADRI) */
-     {
-        AvailFBArea.x1 = 0;
-        AvailFBArea.x2 = pScrn->displayWidth;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-neomagic/git-fixes.diff b/extra/xf86-video-neomagic/git-fixes.diff
deleted file mode 100644
index dafba0b2f..000000000
--- a/extra/xf86-video-neomagic/git-fixes.diff
+++ /dev/null
@@ -1,616 +0,0 @@
-From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 20:15:29 +0000
-Subject: config: upgrade to util-macros 1.8 for additional man page support
-
-Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
-The value of MAN_SUBST is the same for all X.Org packages.
----
-diff --git a/configure.ac b/configure.ac
-index 38cba3a..a80955b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,10 +34,10 @@ 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.
-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) < $< > $@
---
-cgit v0.9.0.2-2-gbebe
-From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 22:45:19 +0000
-Subject: config: update AC_PREREQ statement to 2.60
-
-Unrelated to the previous patches, the new value simply reflects
-the reality that the minimum level for autoconf to configure
-all x.org modules is 2.60 dated June 2006.
-
-ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index a80955b..1c7ff1a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         1.2.5,
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
---
-cgit v0.9.0.2-2-gbebe
-From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 23:41:31 +0000
-Subject: config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
-
-XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
-AC_PROG_C_C99. This sets gcc with -std=gnu99.
-If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1c7ff1a..aa17100 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
- # Checks for programs.
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
---
-cgit v0.9.0.2-2-gbebe
-From adb592292e40a5e5f032ca95f3371c6b77227c40 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 00:24:42 +0000
-Subject: config: remove unrequired AC_HEADER_STDC
-
-Autoconf says:
-"This macro is obsolescent, as current systems have conforming
-header files. New programs need not use this macro".
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index aa17100..30c0e86 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,8 +79,6 @@ 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])
---
-cgit v0.9.0.2-2-gbebe
-From 5759eca769091518fd54e0d70193edc3c099e9bb Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 01:44:57 +0000
-Subject: config: remove unrequired AC_SUBST([XORG_CFLAGS])
-
-This macro is called by PKG_CHECK_MODULES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 30c0e86..86f016f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,7 +86,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=neomagic
---
-cgit v0.9.0.2-2-gbebe
-From bcfba240265ecd633fcba051591b6c50b9373a53 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 13:27:42 +0000
-Subject: config: complete AC_INIT m4 quoting
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 86f016f..46cb0cc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,9 +22,9 @@
- 
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
--        1.2.5,
-+        [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-neomagic)
-+        [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_CONFIG_HEADER([config.h])
---
-cgit v0.9.0.2-2-gbebe
-From 2f60a6e4c3be390d4cf0648bdffbdbff67def7ee Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:05:22 +0000
-Subject: config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 46cb0cc..7261ed5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_INIT([xf86-video-neomagic],
-         [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
---
-cgit v0.9.0.2-2-gbebe
-From 8486ae164b462d50817b84340af13dccc26384ab Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:37:41 +0000
-Subject: config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 7261ed5..1d0a3d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
- AH_TOP([#include "xorg-server.h"])
- 
- 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"])
---
-cgit v0.9.0.2-2-gbebe
-From 5e0d301758b15fc1916dd0318f2a5549e3482ccf Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:07:00 +0000
-Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1d0a3d3..73dde93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,8 +91,9 @@ AC_SUBST([moduledir])
- DRIVER_NAME=neomagic
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
---
-cgit v0.9.0.2-2-gbebe
-From dd32df772bdf4462b816bfc2f98ccd18dbb4b930 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:49:04 +0000
-Subject: config: add comments for main statements
-
----
-diff --git a/configure.ac b/configure.ac
-index 73dde93..befac41 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,18 +20,18 @@
- #
- # Process this file with autoconf to produce a configure script
- 
-+# Initialize Autoconf
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-         [xf86-video-neomagic])
--
- AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
- # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
- XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
-             AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-@@ -53,14 +54,14 @@ AC_ARG_WITH(xorg-module-dir,
-             [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])
- 
- save_CFLAGS="$CFLAGS"
---
-cgit v0.9.0.2-2-gbebe
-From a9d69f6d0ab4f66b954949cca016ee7b5b6f7adf Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/neomagic.man b/man/neomagic.man
-index 9daffe5..af8181c 100644
---- a/man/neomagic.man
-+++ b/man/neomagic.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH NEOMAGIC __drivermansuffix__ __vendorversion__
---
-cgit v0.9.0.2-2-gbebe
-From c3cf7e328d7e9c276a3e237dbf9d1772b57a370e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:43:51 +0000
-Subject: Use malloc/calloc/realloc/free directly
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_dga.c b/src/neo_dga.c
-index 4227da6..3e2a02e 100644
---- a/src/neo_dga.c
-+++ b/src/neo_dga.c
-@@ -86,10 +86,10 @@ NEODGAInit(ScreenPtr pScreen)
- 
-    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/neo_driver.c b/src/neo_driver.c
-index b12c125..c51dad4 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -475,7 +475,7 @@ NEOFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -551,7 +551,7 @@ NEOProbe(DriverPtr drv, int flags)
- 		    foundScreen = TRUE;
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -584,11 +584,11 @@ NEOProbe(DriverPtr drv, int flags)
- 	    foundScreen = TRUE;
- 	}
-       }
--      xfree(usedChips);
-+      free(usedChips);
-     }
- #endif
- 
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 
-@@ -940,11 +940,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
-     /* Process the options */
-     if (nPtr->NeoChipset == NM2070) {
--	if (!(nPtr->Options = xalloc(sizeof(NEO_2070_Options))))
-+	if (!(nPtr->Options = malloc(sizeof(NEO_2070_Options))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEO_2070_Options, sizeof(NEO_2070_Options));
-     } else {
--	if (!(nPtr->Options = xalloc(sizeof(NEOOptions))))
-+	if (!(nPtr->Options = malloc(sizeof(NEOOptions))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions));
-     }
-@@ -1476,7 +1476,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     
-     if(nPtr->shadowFB) {
- 	nPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	nPtr->ShadowPtr = xalloc(nPtr->ShadowPitch * height);
-+	nPtr->ShadowPtr = malloc(nPtr->ShadowPitch * height);
- 	displayWidth = nPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	FBStart = nPtr->ShadowPtr;
-     } else {
-@@ -1789,7 +1789,7 @@ NEOCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     if (nPtr->CursorInfo)
- 	xf86DestroyCursorInfoRec(nPtr->CursorInfo);
-     if (nPtr->ShadowPtr)
--	xfree(nPtr->ShadowPtr);
-+	free(nPtr->ShadowPtr);
- 
-     pScrn->vtSema = FALSE;
-     pScreen->CloseScreen = nPtr->CloseScreen;
-@@ -2860,7 +2860,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     if (NeoNew->reg) {
- 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		   "Non-NULL reg in NeoInit: reg=%p\n", (void *)NeoNew->reg);
--	xfree(NeoNew->reg);
-+	free(NeoNew->reg);
- 	NeoNew->reg = NULL;
-     }
- 
-diff --git a/src/neo_video.c b/src/neo_video.c
-index a9e1e25..0edae30 100644
---- a/src/neo_video.c
-+++ b/src/neo_video.c
-@@ -99,7 +99,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	    numAdaptors = 1;
- 	    overlayAdaptors = &newAdaptor;
- 	} else {
--	    newAdaptors = xalloc((numAdaptors + 1) 
-+	    newAdaptors = malloc((numAdaptors + 1) 
- 				 * sizeof(XF86VideoAdaptorPtr*));
- 	    if (newAdaptors){
- 		memcpy(newAdaptors, overlayAdaptors, 
-@@ -114,7 +114,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	xf86XVScreenInit(pScreen, overlayAdaptors, numAdaptors);
- 
-     if (newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- static XF86VideoEncodingRec NEOVideoEncodings[] =
-@@ -211,7 +211,7 @@ NEOSetupVideo(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(pScrn->scrnIndex,X_INFO,"NEOSetupVideo\n");
- #endif
--    if ((overlayAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if ((overlayAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) +
- 			      sizeof(DevUnion) + 
- 			      sizeof(NEOPortRec))) == NULL){
- 	return (NULL);
-@@ -918,7 +918,7 @@ NEOInitOffscreenImages(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(xf86Screens[pScreen->myNum]->scrnIndex,X_INFO,"NEOInitOffscreenImages\n");
- #endif
--    if ((offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))) == NULL){
-+    if ((offscreenImages = malloc(sizeof(XF86OffscreenImageRec))) == NULL){
- 	return;
-     }
- 
-@@ -1017,19 +1017,19 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id,
- 
-     surface->width = width;
-     surface->height = height;
--    if ((surface->pitches = xalloc(sizeof(int))) == NULL){
-+    if ((surface->pitches = malloc(sizeof(int))) == NULL){
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
--    if ((surface->offsets = xalloc(sizeof(int))) == NULL){
--	xfree(surface->pitches);
-+    if ((surface->offsets = malloc(sizeof(int))) == NULL){
-+	free(surface->pitches);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
- 
--    if ((pPriv = xalloc(sizeof(NEOOffscreenRec))) == NULL){
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if ((pPriv = malloc(sizeof(NEOOffscreenRec))) == NULL){
-+	free(surface->pitches);
-+	free(surface->offsets);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
-@@ -1057,9 +1057,9 @@ NEOFreeSurface(XF86SurfacePtr surface)
- 	NEOStopSurface(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);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From f2a771c6d2a2308245a0d46301e579b50fb2b6bd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:45:11 +0000
-Subject: Include <stdlib.h> for abs()
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index c51dad4..f8bca2c 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -107,6 +107,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "scrnintstr.h"
- #include "servermd.h"
- 
-+#include <stdlib.h>
- #include <unistd.h>
- 
- /* Mandatory functions */
---
-cgit v0.9.0.2-2-gbebe
-From 07845a120a674380b6b499961e6c81accfdd6a2e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:50:28 +0000
-Subject: Fall back to shadowfb when XAA is unavailable
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index f8bca2c..a034f86 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -1089,6 +1089,18 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (nPtr->showcache)
- 	xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
- 		   "Show chache for debugging\n");
-+
-+    if (!xf86LoadSubModule(pScrn, "xaa")) {
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n");
-+	nPtr->shadowFB = 1;
-+    }
-+
-+    if (nPtr->shadowFB) {
-+	if (!xf86LoadSubModule(pScrn, "shadow")) {
-+	    RETURN;
-+	}
-+    }
-+
-     if (nPtr->shadowFB) {
-         nPtr->noAccel = TRUE;
-         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
-@@ -1314,15 +1326,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
- 	RETURN;
-     }
- 
--    if (!xf86LoadSubModule(pScrn, "xaa")) 
--        RETURN;
--
--    if (nPtr->shadowFB) {
--	if (!xf86LoadSubModule(pScrn, "shadow")) {
--	    RETURN;
--	}
--    }
--    
-     if (!nPtr->swCursor) {
- 	if (!xf86LoadSubModule(pScrn, "ramdac"))
- 	    RETURN;
---
-cgit v0.9.0.2-2-gbebe
-From 819c8f2119b8db10a6a9e4553cf88d66cff6eb8e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:51:31 +0000
-Subject: Fix for new vgahw ABI
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index a034f86..509a77f 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -660,6 +660,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (!vgaHWGetHWRec(pScrn))
- 	return FALSE;
-     hwp = VGAHWPTR(pScrn);
-+    vgaHWSetStdFuncs(hwp);
- 
-     /* Allocate the NeoRec driverPrivate */
-     if (!NEOGetRec(pScrn)) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-r128/git-fixes.patch b/extra/xf86-video-r128/git-fixes.patch
deleted file mode 100644
index 933e8fb2a..000000000
--- a/extra/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/extra/xf86-video-siliconmotion/smi-1.7.5-vga.patch b/extra/xf86-video-siliconmotion/smi-1.7.5-vga.patch
deleted file mode 100644
index ef353f0df..000000000
--- a/extra/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/extra/xf86-video-sis/git-f5dafa24.patch b/extra/xf86-video-sis/git-f5dafa24.patch
deleted file mode 100644
index 8c15b974b..000000000
--- a/extra/xf86-video-sis/git-f5dafa24.patch
+++ /dev/null
@@ -1,1654 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 33c0d65..62ad933 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"])
-@@ -103,8 +99,8 @@ AC_MSG_RESULT([$DRI])
- AM_CONDITIONAL(DRI, test x$DRI = xyes)
- if test "$DRI" = yes; then
-         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
--        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-+        AC_DEFINE(SISDRI,1,[Enable DRI driver support])
-+        AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support])
- fi
- 
- # technically this should be a configure flag.  meh.
-@@ -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..f2ca3a9 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
-@@ -173,7 +181,13 @@
- 
- #undef SISHAVEDRMWRITE
- #undef SISNEWDRI
--#ifdef XF86DRI
-+
-+/* if the server was built without DRI support, force-disable DRI */
-+#ifndef XF86DRI
-+#undef SISDRI
-+#endif
-+
-+#ifdef SISDRI
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,3,0)
- #define SISHAVEDRMWRITE
- #endif
-@@ -187,7 +201,7 @@
- #include "dri.h"
- #include "GL/glxint.h"
- #include "sis_dri.h"
--#endif /* XF86DRI */
-+#endif /* SISDRI */
- 
- /* Configurable stuff: ------------------------------------- */
- 
-@@ -251,7 +265,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 */
-@@ -805,7 +818,7 @@ typedef struct {
-     ScrnInfoPtr		pScrn_2;
-     UChar		*BIOS;
-     struct SiS_Private	*SiS_Pr;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     SISAGPHTYPE		agpHandle;
-     ULong		agpAddr;
-     UChar		*agpBase;
-@@ -971,7 +984,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
-@@ -1085,7 +1098,7 @@ typedef struct {
-     unsigned int	cmdQueueSize_div2;
-     unsigned int	cmdQueueSize_div4;
-     unsigned int	cmdQueueSize_4_3;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     SISAGPHTYPE		agpHandle;
-     ULong		agpAddr;
-     UChar 		*agpBase;
-@@ -1144,7 +1157,7 @@ typedef struct {
- 
-     /* DRI */
-     Bool		loadDRI;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     Bool		directRenderingEnabled;
-     DRIInfoPtr 		pDRIInfo;
-     int			drmSubFD;
-@@ -1348,7 +1361,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..7a5be4e 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"
- 
-@@ -86,11 +85,35 @@
- #include <X11/extensions/dpms.h>
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-+#include <inputstr.h> /* for inputInfo */
-+#endif
-+
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
- #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 +322,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 +335,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 +350,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 +376,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 +389,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 +403,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 +415,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 
-     if(pScrn->driverPrivate == NULL)
-         return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -501,7 +524,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 +600,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 +665,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 +728,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 +1158,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 +1246,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 +2154,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 +2170,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 +2196,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 +2222,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 +2235,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 +2257,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 +2278,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 +2295,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 +2335,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 +2345,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 +2355,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 +2365,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 +2375,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 +2385,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 +2416,7 @@ SiSXineramaResetProc(ExtensionEntry* extEntry)
- {
-     /* Called by CloseDownExtensions() */
-     if(SiSXineramadataPtr) {
--       Xfree(SiSXineramadataPtr);
-+       free(SiSXineramadataPtr);
-        SiSXineramadataPtr = NULL;
-     }
- }
-@@ -2454,7 +2481,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 +2520,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 +2929,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 +3083,7 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 		      }
- 		   }
- 	        }
--		xfree(mysisfbinfo);
-+		free(mysisfbinfo);
- 		mysisfbinfo = NULL;
- 	     }
- 	     close (fd);
-@@ -3216,7 +3243,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 +4105,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 +4200,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 +5586,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 +5619,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 +5666,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 +6043,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 +6052,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 +6097,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;
-        }
-@@ -6835,8 +6862,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- #ifdef SIS_USE_XAA
-        if(!pSiS->useEXA) {
- 	  if (!xf86LoadSubModule(pScrn, "xaa")) {
--	    SISErrorLog(pScrn, "Could not load xaa module\n");
--	    goto my_error_1;
-+	      xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+			 "Falling back to shadowfb\n");
-+	      pSiS->NoAccel = 1;
-+	      pSiS->ShadowFB = 1;
- 	  }
-        }
- #endif
-@@ -6855,7 +6884,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	  }
-        }
- #endif
--       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
-     }
- 
-     /* Load shadowfb (if needed) */
-@@ -6867,7 +6895,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     }
- 
-     /* Load the dri and glx modules if requested. */
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
-        if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
- 	  if(xf86LoadSubModule(pScrn, "dri")) {
-@@ -7454,7 +7482,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 +8703,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 {
-@@ -8703,7 +8731,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     pSiS->cmdQueueLen = 0; /* Force an EngineIdle() at start */
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
- #ifdef SISDUALHEAD
-        /* No DRI in dual head mode */
-@@ -8849,14 +8877,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;
- 	     }
-@@ -9016,7 +9044,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     }
- #endif
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
-        if(pSiS->directRenderingEnabled) {
-           /* Now that mi, drm and others have done their thing,
-@@ -9322,9 +9350,22 @@ SISMergedPointerMoved(int scrnIndex, int x, int y)
- 	}
-      }
-      if(doit) {
--	UpdateCurrentTime();
- 	sigstate = xf86BlockSIGIO();
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
-+        {
-+            double dx = x, dy = y;
-+            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
-+            x = (int)dx;
-+            y = (int)dy;
-+        }
-+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
-+	miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
-+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-+	miPointerSetPosition(inputInfo.pointer, x, y);
-+#else
-+	UpdateCurrentTime();
- 	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
-+#endif
- 	xf86UnblockSIGIO(sigstate);
- 	return;
-      }
-@@ -9737,7 +9778,7 @@ SISEnterVT(int scrnIndex, int flags)
- 
-     SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->directRenderingEnabled) {
-        DRIUnlock(screenInfo.screens[scrnIndex]);
-     }
-@@ -9763,7 +9804,7 @@ SISLeaveVT(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     SISPtr pSiS = SISPTR(pScrn);
--#ifdef XF86DRI
-+#ifdef SISDRI
-     ScreenPtr pScreen;
- 
-     if(pSiS->directRenderingEnabled) {
-@@ -9847,7 +9888,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-        SiSCtrlExtUnregister(pSiS, pScrn->scrnIndex);
-     }
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->directRenderingEnabled) {
-        SISDRICloseScreen(pScreen);
-        pSiS->directRenderingEnabled = FALSE;
-@@ -9941,7 +9982,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 +9995,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..3fa12c9 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));
- 
-@@ -480,7 +480,7 @@ SiSOptions(ScrnInfoPtr pScrn)
- #endif
-     pSiS->ShadowFB = FALSE;
-     pSiS->loadDRI = FALSE;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     pSiS->agpWantedPages = AGP_PAGES;
- #endif
-     pSiS->VESA = -1;
-@@ -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))) {
-@@ -2034,7 +2034,7 @@ SiSOptions(ScrnInfoPtr pScrn)
-        }
-     }
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     /* DRI */
-     from = X_DEFAULT;
-     if(xf86GetOptValBool(pSiS->Options, OPTION_DRI, &pSiS->loadDRI)) {
-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..a354ac4 100644
---- a/src/sispcirename.h
-+++ b/src/sispcirename.h
-@@ -29,11 +29,40 @@
- #ifndef SISPCIRENAME_H
- #define SISPCIRENAME_H
- 
-+#include <stdint.h>
-+
- enum region_type {
-     REGION_MEM,
-     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/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/extra/xf86-video-trident/trident-1.3.4-git.patch b/extra/xf86-video-trident/trident-1.3.4-git.patch
deleted file mode 100644
index 4e0cc27b2..000000000
--- a/extra/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/extra/xf86-video-vesa/git-fixes.patch b/extra/xf86-video-vesa/git-fixes.patch
deleted file mode 100644
index c4f442265..000000000
--- a/extra/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/extra/xfce4-power-manager/xfce4-power-manager-1.0.10-libnotify-0.7.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.0.10-libnotify-0.7.patch
deleted file mode 100644
index 60cdf27c5..000000000
--- a/extra/xfce4-power-manager/xfce4-power-manager-1.0.10-libnotify-0.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/xfpm-notify.c b/src/xfpm-notify.c
-index c93a843..311b0fd 100644
---- a/src/xfpm-notify.c
-+++ b/src/xfpm-notify.c
-@@ -233,9 +233,6 @@ xfpm_notify_new_notification_internal (const gchar *title, const gchar *message,
- #if !NOTIFY_CHECK_VERSION (0, 7, 0) 
-     if ( icon )
-     	notify_notification_attach_to_status_icon (n, icon);
--#else
--    if ( icon )
--    	notify_notification_attach_to_status_icon (n, icon);
- #endif
- #endif
- 	
diff --git a/extra/xfig/xfig-3.2.5-enable-Xaw3d.patch b/extra/xfig/xfig-3.2.5-enable-Xaw3d.patch
deleted file mode 100644
index f4d113808..000000000
--- a/extra/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/extra/xorg-server/revert-trapezoids.patch b/extra/xorg-server/revert-trapezoids.patch
deleted file mode 100644
index b9046c5cb..000000000
--- a/extra/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/extra/xorg-xpr/copyright.patch b/extra/xorg-xpr/copyright.patch
deleted file mode 100644
index 18e718246..000000000
--- a/extra/xorg-xpr/copyright.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 11569289123fb178e23fd1aa284e9fa10e6c1e8c Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 06 Aug 2010 22:09:48 +0000
-Subject: Fill in COPYING file with copyright notices from source code
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..0f9d8e0 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,53 @@
--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.
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Copyright (c) 1985, 1988  X Consortium
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+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:
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+The above copyright notice and this permission notice shall be included
-+in all copies or substantial portions of the Software.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-+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.
-+
-+Copyright 1986 by Marvin Solomon and the University of Wisconsin
-+
-+Permission to use, copy, modify, and distribute this
-+software and its documentation for any purpose and without
-+fee is hereby granted, 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 names of Marvin Solomon and
-+the University of Wisconsin not be used in
-+advertising or publicity pertaining to distribution of the
-+software without specific, written prior permission.
-+Neither Marvin Solomon nor the University of Wisconsin
-+makes any representations about the suitability of
-+this software for any purpose.  It is provided "as is"
-+without express or implied warranty.
-+
-+Copyright (c) 1988 by Hewlett-Packard Company
-+
-+Permission to use, copy, modify, and distribute this software
-+and its documentation for any purpose and without fee is hereby
-+granted, 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
-+Hewlett-Packard not be used in advertising or publicity
-+pertaining to distribution of the software without specific, written
-+prior permission.
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/zsh/svn-1.7.patch b/extra/zsh/svn-1.7.patch
deleted file mode 100644
index 5ef314cc9..000000000
--- a/extra/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/extra/zziplib/zziplib-0.13.60-ldflags.patch b/extra/zziplib/zziplib-0.13.60-ldflags.patch
deleted file mode 100644
index 3c95ff465..000000000
--- a/extra/zziplib/zziplib-0.13.60-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3175466&group_id=6389&atid=306389
-https://bugs.gentoo.org/354051
-
---- a/configure
-+++ b/configure
-@@ -292,7 +292,7 @@
- # ---------------------------------------------------------------
- AC_MSG_CHECKING([link options])
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-export-dynamic"
- RESOLVES=" # "
- case "$host_os" in mingw*)
-     ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
diff --git a/gnome-unstable/anjuta-extras/PKGBUILD b/gnome-unstable/anjuta-extras/PKGBUILD
deleted file mode 100644
index db0397844..000000000
--- a/gnome-unstable/anjuta-extras/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154749 2012-03-30 16:19:57Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=anjuta-extras
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('anjuta')
-makedepends=('intltool' 'gnome-doc-utils')
-install=anjuta-extras.install
-url="http://anjuta.sourceforge.net/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('e9aa21dfa7e182c85e15eb4c3f1d0db928826572350f0aaeeae8ee9c947440bd')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/anjuta-extras/anjuta-extras.install b/gnome-unstable/anjuta-extras/anjuta-extras.install
deleted file mode 100644
index a96048c1d..000000000
--- a/gnome-unstable/anjuta-extras/anjuta-extras.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/anjuta/PKGBUILD b/gnome-unstable/anjuta/PKGBUILD
deleted file mode 100644
index 843e84d19..000000000
--- a/gnome-unstable/anjuta/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 154802 2012-03-30 18:31:04Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgname=anjuta
-pkgver=3.4.0
-pkgrel=2
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://anjuta.sourceforge.net/"
-install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('c8175e04e797dc0e2aaede4ae73ee9cd7f37d3e59b158961703db546d4660abf')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package(){
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # j1: Race during linking
-  make -j1 DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-}
diff --git a/gnome-unstable/anjuta/anjuta.install b/gnome-unstable/anjuta/anjuta.install
deleted file mode 100644
index 59113c6f5..000000000
--- a/gnome-unstable/anjuta/anjuta.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall anjuta
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD
deleted file mode 100644
index 0c052f00a..000000000
--- a/gnome-unstable/at-spi2-atk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 154631 2012-03-30 13:23:44Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-atk
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
-makedepends=('intltool')
-install=at-spi2-atk.install
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf')
-
-build() {
-  cd $pkgname-$pkgver
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/at-spi2-atk/at-spi2-atk.install b/gnome-unstable/at-spi2-atk/at-spi2-atk.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/gnome-unstable/at-spi2-atk/at-spi2-atk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD
deleted file mode 100644
index 78ed23a55..000000000
--- a/gnome-unstable/at-spi2-core/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154625 2012-03-30 13:18:14Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-core
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d9d087efe528b392cb7ee27982798126df6ec8c18d5e30c557c8fcc55022c669')
-
-build() {
-  cd $pkgname-$pkgver
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/at-spi2-core --disable-xevie
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/atk/PKGBUILD b/gnome-unstable/atk/PKGBUILD
deleted file mode 100644
index ee4fe446b..000000000
--- a/gnome-unstable/atk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 154587 2012-03-30 11:27:50Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=atk
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="A library providing a set of interfaces for accessibility"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-url='http://www.gtk.org/'
-sha256sums=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/baobab/PKGBUILD b/gnome-unstable/baobab/PKGBUILD
deleted file mode 100644
index cc0149158..000000000
--- a/gnome-unstable/baobab/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154624 2012-03-30 13:16:34Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=baobab
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A graphical directory tree analyzer"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'libgtop')
-makedepends=('intltool' 'itstool')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0936bb2e1bb9a9a7518eaa2a29cffd0bd9b99ae9c33e4e99b5d11c6d150a08bd')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/baobab/baobab.install b/gnome-unstable/baobab/baobab.install
deleted file mode 100644
index 847019792..000000000
--- a/gnome-unstable/baobab/baobab.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/brasero/PKGBUILD b/gnome-unstable/brasero/PKGBUILD
deleted file mode 100644
index 529872315..000000000
--- a/gnome-unstable/brasero/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 154604 2012-03-30 12:28:34Z heftig $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=brasero
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A disc burning application for Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/projects/brasero"
-license=('GPL')
-options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf')
-optdepends=('libburn: alternative back-end'
-            'libisofs: libburn back-end'
-            'dvdauthor: video project'
-            'gstreamer0.10-bad-plugins: video project'
-            'vcdimager: video project')
-replaces=('nautilus-cd-burner')
-install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e35b739a7db54d21564232303bb9d12609a02976c36cdd8848ff4376a0809198')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-caches \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/gnome-unstable/brasero/brasero.install b/gnome-unstable/brasero/brasero.install
deleted file mode 100644
index b6c57055e..000000000
--- a/gnome-unstable/brasero/brasero.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/caribou/PKGBUILD b/gnome-unstable/caribou/PKGBUILD
deleted file mode 100644
index 058078cab..000000000
--- a/gnome-unstable/caribou/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154774 2012-03-30 16:48:17Z heftig $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Adam Hani Schakaki <krzd@krzd.net>
-
-pkgname=caribou
-pkgver=0.4.2
-pkgrel=1
-pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Caribou"
-license=('LGPL')
-depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool')
-install=caribou.install
-options=(!libtool !emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('bcc64498b20c368747c3630d501a66ccf904db15d855f33fd4f963b5b19723ad')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/caribou \
-    --disable-gtk2-module \
-    --disable-static \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/caribou/caribou.install b/gnome-unstable/caribou/caribou.install
deleted file mode 100644
index 22ca274a5..000000000
--- a/gnome-unstable/caribou/caribou.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pkgname=caribou
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD
deleted file mode 100644
index a86fa1db5..000000000
--- a/gnome-unstable/cheese/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 154614 2012-03-30 12:58:35Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cheese
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins'
-         'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' 'clutter-gtk' 'mx' 'libgee'
-         'gnome-video-effects' 'hicolor-icon-theme' 'dconf' 'cogl')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool'
-             'nautilus-sendto')
-optdepends=('nautilus-sendto: Send images')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/projects/cheese/"
-install=cheese.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('96b0eae8e366e4d44921e148239167fcb6965dbbcb40e406d6a118c75377b41a')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/cheese/cheese.install b/gnome-unstable/cheese/cheese.install
deleted file mode 100644
index c042fba42..000000000
--- a/gnome-unstable/cheese/cheese.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=cheese
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-   if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-       usr/sbin/gconfpkg --uninstall $pkgname
-   fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/clutter-gst/PKGBUILD b/gnome-unstable/clutter-gst/PKGBUILD
deleted file mode 100644
index eb9060df9..000000000
--- a/gnome-unstable/clutter-gst/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 152750 2012-03-09 13:58:48Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=clutter-gst
-pkgver=1.5.4
-pkgrel=1
-pkgdesc="GStreamer bindings for clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('LGPL')
-depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a137313ad134cd3737c018cc8f725ed1a4d1cf7d276012d75467b55f1f9859d7')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/clutter-gtk/PKGBUILD b/gnome-unstable/clutter-gtk/PKGBUILD
deleted file mode 100644
index cced49078..000000000
--- a/gnome-unstable/clutter-gtk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 154110 2012-03-23 11:50:43Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=clutter-gtk
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk3')
-makedepends=('gobject-introspection')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD
deleted file mode 100644
index b5337aa20..000000000
--- a/gnome-unstable/clutter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154069 2012-03-22 14:39:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=clutter
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('51659837c77009cd04d069e480e9131328d6557ad67d1ffdc0dc4ae65a73ee45')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-introspection
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/cogl/PKGBUILD b/gnome-unstable/cogl/PKGBUILD
deleted file mode 100644
index d4a2e7b14..000000000
--- a/gnome-unstable/cogl/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 153920 2012-03-20 18:18:34Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=cogl
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('GPL2')
-depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
-makedepends=('mesa' 'gobject-introspection')
-options=(!libtool !emptydirs)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('544b648cd5dc0a0ea438acd89d83727d82d6c29927db33a519ce2b28dc1ad07d')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/colord/PKGBUILD b/gnome-unstable/colord/PKGBUILD
deleted file mode 100644
index e1790b6c9..000000000
--- a/gnome-unstable/colord/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 153538 2012-03-15 18:02:11Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=colord
-pkgver=0.1.18
-pkgrel=1
-pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=('6127e723a9beb932aae7a43b6e6b5fdb84c39611')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static \
-    --with-systemdsystemunitdir=/lib/systemd/system
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD
deleted file mode 100644
index c06b4f085..000000000
--- a/gnome-unstable/dconf/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154522 2012-03-29 19:57:35Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=dconf
-pkgver=0.12.0
-pkgrel=1
-pkgdesc="A low-level configuration system."
-arch=(i686 x86_64)
-url="http://live.gnome.org/dconf"
-license=('LGPL2.1')
-depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3')
-optdepends=('gtk3: for dconf-editor')
-install=dconf.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/dconf
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/dconf/dconf.install b/gnome-unstable/dconf/dconf.install
deleted file mode 100644
index 75d713d64..000000000
--- a/gnome-unstable/dconf/dconf.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    gio-querymodules /usr/lib/gio/modules
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade(){
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/devhelp/PKGBUILD b/gnome-unstable/devhelp/PKGBUILD
deleted file mode 100644
index 7e53e6c00..000000000
--- a/gnome-unstable/devhelp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 154776 2012-03-30 16:49:28Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=devhelp
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="API documentation browser for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'libwebkit3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
-options=('!libtool' '!emptydirs')
-install=devhelp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('de7466250a433877abf562815eb1cc8dd663d80ae65cdf796285c0c5b05144e8')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/devhelp/devhelp.install b/gnome-unstable/devhelp/devhelp.install
deleted file mode 100644
index 4db5f6e5c..000000000
--- a/gnome-unstable/devhelp/devhelp.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=devhelp
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/empathy/PKGBUILD b/gnome-unstable/empathy/PKGBUILD
deleted file mode 100644
index 6a1dc5288..000000000
--- a/gnome-unstable/empathy/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 154438 2012-03-28 11:34:50Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=empathy
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'libwebkit3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
-makedepends=('intltool' 'itstool')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-sofiasip: SIP support'
-            'telepathy-haze: libpurple support')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dd04344638a5496fd108c4d299a6f6d2272dc521dc353de85f13995f399f8f1a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-schemas-compile
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/empathy/empathy.install b/gnome-unstable/empathy/empathy.install
deleted file mode 100644
index f8d2dfb1f..000000000
--- a/gnome-unstable/empathy/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_remove() {
-    post_upgrade
-}
diff --git a/gnome-unstable/eog-plugins/PKGBUILD b/gnome-unstable/eog-plugins/PKGBUILD
deleted file mode 100644
index 36add7fd0..000000000
--- a/gnome-unstable/eog-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154622 2012-03-30 13:10:37Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=eog-plugins
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Plugins for Eye of Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/"
-license=('GPL2')
-depends=('eog' 'libchamplain' 'libgdata')
-makedepends=('intltool')
-install=eog-plugins.install
-options=('!libtool')
-groups=(gnome-extra)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('21a63f8f6e3a5b30f2f05133edc46becd4c83343c0f462a345204326071bc139')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/eog-plugins/eog-plugins.install b/gnome-unstable/eog-plugins/eog-plugins.install
deleted file mode 100644
index 24072f316..000000000
--- a/gnome-unstable/eog-plugins/eog-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD
deleted file mode 100644
index 54b1df939..000000000
--- a/gnome-unstable/eog/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154620 2012-03-30 13:09:31Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool')
-install=eog.install
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0710479642078aebb576d07ccc599e9f5ae83f4c738b182867fda59aea359dd2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove it from Xfce menu that ships its own thingy
-  echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop
-}
diff --git a/gnome-unstable/eog/eog.install b/gnome-unstable/eog/eog.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/eog/eog.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/epiphany-extensions/PKGBUILD b/gnome-unstable/epiphany-extensions/PKGBUILD
deleted file mode 100644
index e53e46ca8..000000000
--- a/gnome-unstable/epiphany-extensions/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154632 2012-03-30 13:25:11Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany-extensions
-pkgver=3.4.0
-pkgrel=1
-url="http://www.gnome.org/projects/epiphany/"
-pkgdesc="Various extentions for the Epiphany web browser"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('epiphany' 'opensp' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
-options=('!libtool' '!emptydirs')
-install=epiphany-extensions.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/epiphany-extensions/epiphany-extensions.install b/gnome-unstable/epiphany-extensions/epiphany-extensions.install
deleted file mode 100644
index c0ed9a0d7..000000000
--- a/gnome-unstable/epiphany-extensions/epiphany-extensions.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD
deleted file mode 100644
index e9dd2e66c..000000000
--- a/gnome-unstable/epiphany/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 154630 2012-03-30 13:22:41Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany
-pkgver=3.4.0.1
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'seed')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
-options=('!libtool' '!emptydirs')
-groups=('gnome')
-url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('48acfa6efc806cc6b02f783dd92b36ba3bdf94d1e1ae02bed69886f45e400533')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper \
-      --enable-seed
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/epiphany/epiphany.install b/gnome-unstable/epiphany/epiphany.install
deleted file mode 100644
index 8b17fa3d4..000000000
--- a/gnome-unstable/epiphany/epiphany.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/epiphany/fix-infinite-loop b/gnome-unstable/epiphany/fix-infinite-loop
deleted file mode 100644
index 7322a0a4c..000000000
--- a/gnome-unstable/epiphany/fix-infinite-loop
+++ /dev/null
@@ -1,38 +0,0 @@
-From 087cb32d81fd8ef1cf3f493fce9e80e7217dbf04 Mon Sep 17 00:00:00 2001
-From: Xan Lopez <xan@igalia.com>
-Date: Wed, 21 Mar 2012 14:41:36 +0100
-Subject: [PATCH] profile-migrator: do not freak out if the history is empty
-
-If the old history file exists but has no actual visits we'll enter
-into an infinite loop.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=672547
----
- lib/ephy-profile-migrator.c |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
-index f7a3406..a37638c 100644
---- a/lib/ephy-profile-migrator.c
-+++ b/lib/ephy-profile-migrator.c
-@@ -594,11 +594,13 @@ migrate_history ()
-   g_input_stream_close (G_INPUT_STREAM (input), NULL, NULL);
-   g_object_unref (input);
- 
--  ephy_history_service_add_visits (history_service, parse_data.visits, NULL, (EphyHistoryJobCallback)visit_cb, NULL);
--  ephy_history_page_visit_list_free (parse_data.visits);
-+  if (parse_data.visits) {
-+    ephy_history_service_add_visits (history_service, parse_data.visits, NULL, (EphyHistoryJobCallback)visit_cb, NULL);
-+    ephy_history_page_visit_list_free (parse_data.visits);
- 
--  while (!all_done)
--    g_main_context_iteration (NULL, FALSE);
-+    while (!all_done)
-+      g_main_context_iteration (NULL, FALSE);
-+  }
- 
-   g_object_unref (history_service);
- }
--- 
-1.7.7.6
-
diff --git a/gnome-unstable/evince/PKGBUILD b/gnome-unstable/evince/PKGBUILD
deleted file mode 100644
index d1de9f3b0..000000000
--- a/gnome-unstable/evince/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154384 2012-03-27 11:56:28Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('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=('02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/evince/evince.install b/gnome-unstable/evince/evince.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/evince/evince.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/evolution-data-server/PKGBUILD b/gnome-unstable/evolution-data-server/PKGBUILD
deleted file mode 100644
index 735cbbbc0..000000000
--- a/gnome-unstable/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154366 2012-03-27 11:34:53Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-install=$pkgname.install
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7132aee89b73187155c8afec43b9b3cc5c97098a488aad3872f7fedd0552a6ac')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings \
-      --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 "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/evolution-data-server/evolution-data-server.install b/gnome-unstable/evolution-data-server/evolution-data-server.install
deleted file mode 100644
index 29a359805..000000000
--- a/gnome-unstable/evolution-data-server/evolution-data-server.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove () {
-    post_install
-}
diff --git a/gnome-unstable/evolution-ews/PKGBUILD b/gnome-unstable/evolution-ews/PKGBUILD
deleted file mode 100644
index 63b730d33..000000000
--- a/gnome-unstable/evolution-ews/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 154373 2012-03-27 11:38:10Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=evolution-ews
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="MS Exchange integration through Exchange Web Services"
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-url="http://www.gnome.org"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2bc20f65fc645f0a76d218d483650f9c9cc75ce3104ad849af6e7eec2d5a7f72')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/evolution-exchange/PKGBUILD b/gnome-unstable/evolution-exchange/PKGBUILD
deleted file mode 100644
index 414a126ac..000000000
--- a/gnome-unstable/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154369 2012-03-27 11:36:53Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.ximian.com"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7bfdf2fb44e691e7eb611aa0d1129cbacf43f7a2477fdae87f06368eecc89fb4')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static \
-      --with-libdb=/usr --with-krb5=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/evolution-exchange/evolution-exchange.install b/gnome-unstable/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/gnome-unstable/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/gnome-unstable/evolution-groupwise/PKGBUILD b/gnome-unstable/evolution-groupwise/PKGBUILD
deleted file mode 100644
index 7841c3f88..000000000
--- a/gnome-unstable/evolution-groupwise/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 154370 2012-03-27 11:37:28Z heftig $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=evolution-groupwise
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GroupWise connector for evolution"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/evolution/"
-license=(LGPL)
-depends=('evolution-data-server' 'gtkhtml4')
-makedepends=(intltool evolution)
-optdepends=('evolution: evolution plugin')
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/gnome-unstable/evolution/PKGBUILD b/gnome-unstable/evolution/PKGBUILD
deleted file mode 100644
index cb9d63ecb..000000000
--- a/gnome-unstable/evolution/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 154791 2012-03-30 18:08:40Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.4.0.1
-pkgrel=1
-pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
-optdepends=('bogofilter: possible junk filter plugin'
-            'spamassassin: possible junk filter plugin')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=evolution.install
-url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('364eacfc54912ba26738729d0f662a821140a712e3607cf569eb342f1dab4f7a')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --enable-nss=yes \
-      --with-openldap=yes \
-      --enable-smime=yes \
-      --with-krb5=/usr \
-      --disable-image-inline
-  
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-  make -C plugins/tnef-attachments
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-  make -C plugins/tnef-attachments DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/evolution/evolution.install b/gnome-unstable/evolution/evolution.install
deleted file mode 100644
index 500c5e2da..000000000
--- a/gnome-unstable/evolution/evolution.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gconfpkg --install evolution
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall evolution
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/farstream/PKGBUILD b/gnome-unstable/farstream/PKGBUILD
deleted file mode 100644
index da3042e7f..000000000
--- a/gnome-unstable/farstream/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154395 2012-03-27 14:04:54Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=farstream
-pkgver=0.1.2
-pkgrel=1
-pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
-depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
-makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2')
-conflicts=('farsight2')
-replaces=('farsight2')
-options=(!libtool)
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz
-        vp8.patch)
-md5sums=('5d6e561b3688d0d0c8906fec4f356df3'
-         'c4e76d03d678d29b872b610f9cff42cd')
-
-build() {
-  cd  "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/vp8.patch"
-  ./configure --prefix=/usr \
-    --with-package-name='Arch Linux farstream package' \
-    --with-package-origin='http://archlinux.org' \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/farstream/vp8.patch b/gnome-unstable/farstream/vp8.patch
deleted file mode 100644
index 67009a8ad..000000000
--- a/gnome-unstable/farstream/vp8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
---- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences	2012-03-20 12:12:22.644324485 +0100
-+++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences	2012-03-21 09:32:04.468634455 +0100
-@@ -41,6 +41,8 @@ feedback:nack/pli=
- [video/H263]
- feedback:nack/pli=
- 
-+[video/VP8-DRAFT-IETF-01]
-+
- [video/THEORA]
- #feedback:tfrc=
- feedback:nack/pli=
diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD
deleted file mode 100644
index 9a364682a..000000000
--- a/gnome-unstable/folks/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154640 2012-03-30 13:34:50Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=folks
-pkgver=0.6.8
-pkgrel=1
-pkgdesc="Library to aggregates people into metacontacts"
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
-makedepends=('gobject-introspection' 'intltool')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
-sha256sums=('4ee18ce808315f27ab6bf9f7d2b438dd4c1042a8ab6836bb5058b6dce167e0b1')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gcalctool/PKGBUILD b/gnome-unstable/gcalctool/PKGBUILD
deleted file mode 100644
index b14793211..000000000
--- a/gnome-unstable/gcalctool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154641 2012-03-30 13:36:41Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gcalctool
-pkgver=6.4.0
-pkgrel=1
-pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'dconf')
-makedepends=('intltool' 'yelp-tools')
-groups=('gnome-extra')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('cfc30d6002dc9c04598a17f729b60f2d6d37a500e88f10905c817da739fa2a85')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gcalctool/gcalctool.install b/gnome-unstable/gcalctool/gcalctool.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/gnome-unstable/gcalctool/gcalctool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/gconf/01_xml-gettext-domain.patch b/gnome-unstable/gconf/01_xml-gettext-domain.patch
deleted file mode 100644
index d1323f61f..000000000
--- a/gnome-unstable/gconf/01_xml-gettext-domain.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
-# Ubuntu: https://bugs.launchpad.net/bugs/123025
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
---- GConf-2.26.0/backends/markup-tree.c.gettext	2009-04-26 23:33:05.258484987 -0400
-+++ GConf-2.26.0/backends/markup-tree.c	2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
-   char       *schema_name;
-   char       *mod_user;
-   GTime       mod_time;
-+  const char *gettext_domain;
- };
- 
- static LocalSchemaInfo* local_schema_info_new  (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry     
-                              gconf_schema_get_type (schema));
-       gconf_schema_set_owner (current_schema,
-                               gconf_schema_get_owner (schema));
-+      gconf_schema_set_gettext_domain (current_schema,
-+                              gconf_schema_get_gettext_domain (schema));
-     }
- 
-   /* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
-       else if (c_local_schema && c_local_schema->long_desc)
-         gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
- 
-+      gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
-+
-       return retval;
-     }
- }
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
-   const char *ltype;
-   const char *list_type;
-   const char *owner;
-+
-   GConfValueType vtype;
--  const char *dummy1, *dummy2, *dummy3, *dummy4;
-+  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
-   
- #if 0
-   g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
-                           "muser", &dummy2,
-                           "mtime", &dummy3,
-                           "schema", &dummy4,
-+                          "gettext_domain", &dummy5,
- 
-                           NULL))
-     return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
-       const char *mtime;
-       const char *schema;
-       const char *type;
-+      const char *gettext_domain;
-       const char *dummy1, *dummy2, *dummy3, *dummy4;
-       const char *dummy5, *dummy6, *dummy7;
-       GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
-       mtime = NULL;
-       schema = NULL;
-       type = NULL;
-+      gettext_domain = NULL;
- 
-       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
-                               error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
-                               "mtime", &mtime,
-                               "schema", &schema,
-                               "type", &type,
-+                              "gettext_domain", &gettext_domain,
-                           
-                               /* These are allowed but we don't use them until
-                                * parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
-        */
-       if (schema)
-         entry->schema_name = g_strdup (schema);
-+
-+      if (gettext_domain)
-+        entry->gettext_domain = g_intern_string (gettext_domain);
-     }
-   else
-     {
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
-         GConfSchema *schema;
-         GConfValueType stype;
-         const char *owner;
-+        const char *gettext_domain;
-         
-         schema = gconf_value_get_schema (value);
- 
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
-             
-             g_free (s);
-           }
-+
-+        gettext_domain = gconf_schema_get_gettext_domain (schema);
-+        
-+        if (gettext_domain)
-+          {
-+            char *s;
-+
-+            s = g_markup_escape_text (gettext_domain, -1);
-+            
-+            if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
-+              {
-+                g_free (s);
-+                return FALSE;
-+              }
-+            
-+            g_free (s);
-+          }
-         
-         if (stype == GCONF_VALUE_LIST)
-           {
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- GConf-2.26.0/doc/gconf-1.0.dtd.gettext	2009-04-26 23:33:17.240736103 -0400
-+++ GConf-2.26.0/doc/gconf-1.0.dtd	2009-04-26 23:34:25.027700384 -0400
-@@ -7,7 +7,7 @@
- <!-- A single schema. What I am trying to say is "this set of
- elements, in any order". Duplicate elements (apart from <locale>) are
- not allowed). -->
--<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
-+<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
- 
- <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
- <!ELEMENT key     (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- GConf-2.26.0/gconf/gconf-internals.c.gettext	2009-04-26 23:34:10.994700035 -0400
-+++ GConf-2.26.0/gconf/gconf-internals.c	2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
-   cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
-   cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
-   cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
-+  cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
- 
-   {
-     gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
-         gconf_schema_set_owner(sc, cs->owner);
-     }
-       
-+  if (*cs->gettext_domain != '\0')
-+    {
-+      if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
-+        gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
-+      else
-+        gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
-+    }
-+      
-   {
-     GConfValue* val;
- 
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- GConf-2.26.0/gconf/gconf-schema.c.gettext	2009-04-26 23:33:26.787483545 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.c	2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
-   GConfValueType car_type; /* Pair car type of the described entry */
-   GConfValueType cdr_type; /* Pair cdr type of the described entry */
-   gchar* locale;       /* Schema locale */
--  gchar* owner;        /* Name of creating application */
-+  const gchar* owner;        /* Name of creating application */
-   gchar* short_desc;   /* 40 char or less description, no newlines */
-   gchar* long_desc;    /* could be a paragraph or so */
-+  const gchar* gettext_domain; /* description gettext domain */
-   GConfValue* default_value; /* Default value of the key */
- } GConfRealSchema;
- 
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
-   g_free (real->locale);
-   g_free (real->short_desc);
-   g_free (real->long_desc);
--  g_free (real->owner);
- 
-   if (real->default_value)
-     gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
- 
-   dest->long_desc = g_strdup (real->long_desc);
- 
--  dest->owner = g_strdup (real->owner);
-+  dest->gettext_domain = real->gettext_domain;
-+
-+  dest->owner = real->owner;
- 
-   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
-   
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
-     REAL_SCHEMA (sc)->locale = NULL;
- }
- 
-+void
-+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
-+{
-+  g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
-+  
-+  if (domain)
-+    REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
-+  else 
-+    REAL_SCHEMA (sc)->gettext_domain = NULL;
-+}
-+
- void          
- gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
- {
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
- {
-   g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
-   
--  if (REAL_SCHEMA (sc)->owner)
--    g_free (REAL_SCHEMA (sc)->owner);
--
-   if (owner)
--    REAL_SCHEMA (sc)->owner = g_strdup (owner);
-+    REAL_SCHEMA (sc)->owner = g_intern_string (owner);
-   else
-     REAL_SCHEMA (sc)->owner = NULL;
- }
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
-       return FALSE;
-     }
- 
-+  if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
-+    {
-+      g_set_error (err, GCONF_ERROR,
-+                   GCONF_ERROR_FAILED,
-+                   _("Schema contains invalid UTF-8"));
-+      return FALSE;
-+    }
-+
-   if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
-     {
-       g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
- }
- 
- const char*
-+gconf_schema_get_gettext_domain (const GConfSchema *schema)
-+{
-+  g_return_val_if_fail (schema != NULL, NULL);
-+
-+  return REAL_SCHEMA (schema)->gettext_domain;
-+}
-+
-+static inline const char *
-+schema_translate (const GConfSchema *schema,
-+                  const char        *string)
-+{
-+  if (REAL_SCHEMA (schema)->gettext_domain)
-+    {
-+      bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
-+      return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
-+    }
-+  else
-+    return string;
-+}
-+
-+const char*
- gconf_schema_get_short_desc (const GConfSchema *schema)
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->short_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
- }
- 
- const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->long_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
- }
- 
- const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- GConf-2.26.0/gconf/gconf-schema.h.gettext	2009-04-26 23:33:33.979744088 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.h	2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type          
-                                             GConfValueType  type);
- void gconf_schema_set_locale               (GConfSchema    *sc,
-                                             const gchar    *locale);
-+void gconf_schema_set_gettext_domain       (GConfSchema    *sc,
-+                                            const gchar    *domain);
- void gconf_schema_set_short_desc           (GConfSchema    *sc,
-                                             const gchar    *desc);
- void gconf_schema_set_long_desc            (GConfSchema    *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
- GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
- GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
- const char*    gconf_schema_get_locale        (const GConfSchema *schema);
-+const char*    gconf_schema_get_gettext_domain(const GConfSchema *schema);
- const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
- const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
- const char*    gconf_schema_get_owner         (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- GConf-2.26.0/gconf/gconftool.c.gettext	2009-04-26 23:33:41.907451190 -0400
-+++ GConf-2.26.0/gconf/gconftool.c	2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
-   GConfValueType cdr_type;
-   GConfValue* global_default;
-   GHashTable* hash;
-+  gchar* gettext_domain;
- };
- 
- static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
-               else
-                 g_printerr (_("WARNING: empty <applyto> node"));
-             }
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            {
-+              tmp = (char *)xmlNodeGetContent(iter);
-+              if (tmp)
-+                {
-+                  info->gettext_domain = g_strdup(tmp);
-+                  xmlFree(tmp);
-+                }
-+            }
-           else
-             g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
- 			iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
-   if (info->owner != NULL)
-     gconf_schema_set_owner(schema, info->owner);
- 
-+  if (info->gettext_domain != NULL)
-+    gconf_schema_set_gettext_domain(schema, info->gettext_domain);
-+
-   xmlFree(name);
- 
-   /* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
-   info.apply_to = NULL;
-   info.owner = NULL;
-   info.global_default = NULL;
-+  info.gettext_domain = NULL;
-   info.hash = g_hash_table_new(g_str_hash, g_str_equal);
-   
-   extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
-             ;  /* nothing */
-           else if (strcmp((char *)iter->name, "applyto") == 0)
-             ;  /* nothing */
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            ;  /* nothing */
-           else if (strcmp((char *)iter->name, "locale") == 0)
-             {
-               process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- GConf-2.26.0/gconf/GConfX.idl.gettext	2009-04-26 23:33:58.457483190 -0400
-+++ GConf-2.26.0/gconf/GConfX.idl	2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
-   string short_desc;
-   string long_desc;
-   string owner;
-+  string gettext_domain;
-   // Work around lack of recursive data types
-   string encoded_default_value;
- };
diff --git a/gnome-unstable/gconf/PKGBUILD b/gnome-unstable/gconf/PKGBUILD
deleted file mode 100644
index cdde6c01b..000000000
--- a/gnome-unstable/gconf/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 152975 2012-03-10 23:29:33Z ibiru $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gconf
-pkgver=3.2.5
-pkgrel=2
-pkgdesc="A configuration database system"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gconf.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
-        gconf-merge-schema
-        gconfpkg
-        gconf-reload.patch
-        01_xml-gettext-domain.patch)
-sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
-            'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
-            'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
-            '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
-            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
-
-build() {
-  cd "GConf-$pkgver"
-  # Patch from fedora - reloads gconf after installing schemas
-  patch -Np1 -i "$srcdir/gconf-reload.patch"
-  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
-  patch -Np1 -i "$srcdir/01_xml-gettext-domain.patch"
-
-  # Python2 fix
-  sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/GConf \
-      --disable-static --enable-defaults-service --with-gtk=3.0 \
-      --disable-orbit
-
-  make pkglibdir=/usr/lib/GConf
-}
-
-package() {
-  cd "GConf-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system"
-  install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/"
-  install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg"
-}
diff --git a/gnome-unstable/gconf/gconf-merge-schema b/gnome-unstable/gconf/gconf-merge-schema
deleted file mode 100755
index 992c162e6..000000000
--- a/gnome-unstable/gconf/gconf-merge-schema
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-if [ ! "$1" -a ! "$2" ]; then
-  echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]"
-  exit 1
-fi
-
-OUTFILE="$1"
-DOMAIN=""
-shift
-
-if [ "$1" = "--domain" ]; then
-  shift
-  DOMAIN=$1
-  shift
-fi
-
-echo '<?xml version="1.0"?>' > "$OUTFILE"
-echo '<gconfschemafile><schemalist>' >> "$OUTFILE"
-
-while [ "$1" ]; do
-  if [ -f "$1" ]; then
-    sed -e '/<?xml/d' \
-        -e 's|<gconfschemafile>||g' \
-	-e 's|</gconfschemafile>||g' \
-        -e 's|<schemalist>||g' \
-	-e 's|</schemalist>||g' "$1" >> "$OUTFILE"
-  fi
-  shift
-done
-  
-echo '</schemalist></gconfschemafile>' >> "$OUTFILE"
-if [ "$DOMAIN" != "" ]; then
-  sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
-fi
diff --git a/gnome-unstable/gconf/gconf-reload.patch b/gnome-unstable/gconf/gconf-reload.patch
deleted file mode 100644
index 910f0dae4..000000000
--- a/gnome-unstable/gconf/gconf-reload.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GConf-2.16.0/gconf/gconftool.c.orig	2006-10-14 17:37:14.000000000 +0000
-+++ GConf-2.16.0/gconf/gconftool.c	2006-10-14 17:39:27.000000000 +0000
-@@ -963,6 +963,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
-@@ -975,6 +977,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
diff --git a/gnome-unstable/gconf/gconf.install b/gnome-unstable/gconf/gconf.install
deleted file mode 100644
index f7945d165..000000000
--- a/gnome-unstable/gconf/gconf.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  ldconfig -r .
-  chmod 755 etc/gconf/gconf.xml.system
-  usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
-  ldconfig -r .
-  chmod 755 etc/gconf/gconf.xml.system
-  usr/bin/gio-querymodules usr/lib/gio/modules
-
-  PID=`pidof gconfd-2`
-  if [ ! -z "${PID}" ]; then
-    kill ${PID}
-  fi
-}
-
-post_remove() {
-    usr/bin/gio-querymodules usr/lib/gio/modules
-}
diff --git a/gnome-unstable/gconf/gconfpkg b/gnome-unstable/gconf/gconfpkg
deleted file mode 100755
index 72021e45e..000000000
--- a/gnome-unstable/gconf/gconfpkg
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-usage() {
-cat << _EOF
-Usage:
-  gconfpkg [OPTION] [PACKAGE] 
-
-  Help Options:
-    -?, --help            Show help options
-
-  Application Options:
-    --install             Install schemas for a given package
-    --uninstall           Uninstall schemas for a given package
-
-_EOF
-}
-
-install() {
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-}
-
-uninstall() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/usr/share/gconf/schemas/${pkgname}.schemas
-  elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
-  else
-    schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`
-  fi
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
-}
-
-if [ -z "$2" ]; then
-  usage
-else
-  pkgname="$2"
-  case "$1" in
-    --install)
-      install
-    ;;
-    --uninstall)
-      uninstall
-    ;;
-    *)
-    usage
-    ;;
-  esac
-fi
diff --git a/gnome-unstable/gcr/PKGBUILD b/gnome-unstable/gcr/PKGBUILD
deleted file mode 100644
index 73a5b7bab..000000000
--- a/gnome-unstable/gcr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154422 2012-03-28 10:47:07Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gcr
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A library for bits of crypto UI and parsing"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6cb92178a04b5ea335102b43027420c200fe6a053e5e2009ffae91914a268106')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --libexec=/usr/lib/gcr \
-    --disable-static \
-    --disable-update-mime \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gcr/gcr.install b/gnome-unstable/gcr/gcr.install
deleted file mode 100644
index 8677671c4..000000000
--- a/gnome-unstable/gcr/gcr.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-mime-database /usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gdk-pixbuf2/PKGBUILD b/gnome-unstable/gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index d864cfa95..000000000
--- a/gnome-unstable/gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 153922 2012-03-20 18:40:33Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gdk-pixbuf2
-pkgver=2.26.0
-pkgrel=1
-pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a5028d3a33710cbb6c6264bc561b6e252b37f067dff7b5b52473621e064f254d')
-
-build() {
-  cd "gdk-pixbuf-$pkgver"
-
-  ./configure --prefix=/usr \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "gdk-pixbuf-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install b/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 9a26e38dc..000000000
--- a/gnome-unstable/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/gnome-unstable/gdl/PKGBUILD b/gnome-unstable/gdl/PKGBUILD
deleted file mode 100644
index d81303ed8..000000000
--- a/gnome-unstable/gdl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 154799 2012-03-30 18:18:03Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="GNOME Docking Library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.gnome.org/"
-depends=('gtk3')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('82fedce869a40d36394faa441472318746f7431ae051d99ada6df206ba027f5e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD
deleted file mode 100644
index 860056a50..000000000
--- a/gnome-unstable/gdm/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 154798 2012-03-30 18:16:51Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdm
-pkgver=3.4.0.1
-pkgrel=1
-pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
-        'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
-groups=('gnome-extra')
-options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch
-        gdm-vt-allocation-hack.patch
-        gdm
-        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
-sha256sums=('08686e32f35f65fc5578b48db802fc5e5ca4ca3c3adbbe0d2488ddc1c6f279cd'
-            'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6'
-            '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
-            '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
-            'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
-            'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
-  patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gdm \
-      --localstatedir=/var \
-      --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-      --disable-scrollkeeper \
-      --disable-static \
-      --without-tcp-wrappers \
-      --disable-schemas-compile \
-      --with-systemd=no
-  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
-
-  for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do
-      install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}"
-  done
-
-  install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
-
-  chmod 1770 "$pkgdir/var/log/gdm"
-  chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
-  rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm"
-}
diff --git a/gnome-unstable/gdm/fix_external_program_directories.patch b/gnome-unstable/gdm/fix_external_program_directories.patch
deleted file mode 100644
index b3a0f0cf6..000000000
--- a/gnome-unstable/gdm/fix_external_program_directories.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c
---- gdm-3.3.92.orig/daemon/gdm-server.c	2012-03-19 22:30:05.311490006 +0000
-+++ gdm-3.3.92/daemon/gdm-server.c	2012-03-19 22:30:17.004732251 +0000
-@@ -139,7 +139,7 @@
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in
---- gdm-3.3.92.orig/data/gdm-shell.session.in	2012-03-19 22:30:05.311490006 +0000
-+++ gdm-3.3.92/data/gdm-shell.session.in	2012-03-19 22:30:17.004732251 +0000
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
-diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:05.304823391 +0000
-+++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:17.004732251 +0000
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/gnome-unstable/gdm/gdm b/gnome-unstable/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/gnome-unstable/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting GDM"
-    /usr/sbin/gdm &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      
-      add_daemon gdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GDM"
-    [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/gnome-unstable/gdm/gdm-autologin.pam b/gnome-unstable/gdm/gdm-autologin.pam
deleted file mode 100644
index c77c78917..000000000
--- a/gnome-unstable/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_permit.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-fingerprint.pam b/gnome-unstable/gdm/gdm-fingerprint.pam
deleted file mode 100644
index 5b74bf6d6..000000000
--- a/gnome-unstable/gdm/gdm-fingerprint.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_fprintd.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-password.pam b/gnome-unstable/gdm/gdm-password.pam
deleted file mode 100644
index aa4d4dd47..000000000
--- a/gnome-unstable/gdm/gdm-password.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_unix.so nullok
-auth            optional        pam_gnome_keyring.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_unix.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
diff --git a/gnome-unstable/gdm/gdm-smartcard.pam b/gnome-unstable/gdm/gdm-smartcard.pam
deleted file mode 100644
index baacb8bed..000000000
--- a/gnome-unstable/gdm/gdm-smartcard.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_pkcs11.so wait_for_card card_only
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_pkcs11.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch b/gnome-unstable/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;
diff --git a/gnome-unstable/gdm/gdm-welcome.pam b/gnome-unstable/gdm/gdm-welcome.pam
deleted file mode 100644
index cc3811c19..000000000
--- a/gnome-unstable/gdm/gdm-welcome.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth            required        pam_env.so
-auth            required        pam_permit.so
-
-account         required        pam_nologin.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
diff --git a/gnome-unstable/gdm/gdm.install b/gnome-unstable/gdm/gdm.install
deleted file mode 100644
index c48faf4ae..000000000
--- a/gnome-unstable/gdm/gdm.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=gdm
-
-post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  dconf update
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  dconf update
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  getent passwd gdm >/dev/null 2>&1 && userdel gdm
-  getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/gnome-unstable/gdm/gdm.pam b/gnome-unstable/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/gnome-unstable/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-auth            optional        pam_gnome_keyring.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
-password        required        pam_unix.so
diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD
deleted file mode 100644
index 05f9d6fda..000000000
--- a/gnome-unstable/gedit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 154586 2012-03-30 11:26:39Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a51bb8d60bfd9b37edf04228c7493d256e73a6b5f025f8b4900431673ac34e3f')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \
-      --enable-python
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gedit/gedit.install b/gnome-unstable/gedit/gedit.install
deleted file mode 100644
index 9d88a1341..000000000
--- a/gnome-unstable/gedit/gedit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/gedit.schemas ]; then
-        usr/sbin/gconfpkg --uninstall gedit
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/geoclue/PKGBUILD b/gnome-unstable/geoclue/PKGBUILD
deleted file mode 100644
index b00fd692d..000000000
--- a/gnome-unstable/geoclue/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154558 2012-03-30 08:55:09Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=geoclue
-pkgver=0.12.0
-pkgrel=4
-pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
-arch=('i686' 'x86_64')
-url="http://geoclue.freedesktop.org/"
-license=('LGPL')
-depends=('gconf' 'gtk2' 'libsoup-gnome' 'networkmanager')
-options=('!libtool')
-source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz
-        geoclue-gcc46.patch)
-md5sums=('33af8307f332e0065af056ecba65fec2'
-         '0cf8ecc350be702f623ed9a9715818c5')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../geoclue-gcc46.patch
-  sed -i 's/libnm_glib/libnm-glib/g' configure
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static --enable-skyhook=no
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/geoclue/geoclue-gcc46.patch b/gnome-unstable/geoclue/geoclue-gcc46.patch
deleted file mode 100644
index 11bf48547..000000000
--- a/gnome-unstable/geoclue/geoclue-gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 07 Mar 2011 23:46:15 +0000
-Subject: master: Fix warning with GCC 4.6
-
----
-diff --git a/src/master-provider.c b/src/master-provider.c
-index 790c043..e4ea053 100644
---- a/src/master-provider.c
-+++ b/src/master-provider.c
-@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider)
- static gboolean
- gc_master_provider_initialize (GcMasterProvider *provider)
- {
--	GcMasterProviderPrivate *priv;
--	 
--	priv = GET_PRIVATE (provider);
--	
- 	if (!gc_master_provider_initialize_interfaces (provider)) {
- 		return FALSE;
- 	}
---
-cgit v0.8.3-6-g21f6
diff --git a/gnome-unstable/ghex/PKGBUILD b/gnome-unstable/ghex/PKGBUILD
deleted file mode 100644
index 8fc8db2d9..000000000
--- a/gnome-unstable/ghex/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154616 2012-03-30 12:59:55Z heftig $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=ghex
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A simple binary editor for the Gnome desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Ghex"
-depends=('gtk3' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('59e409cc629fddeb06552c505b60be1d20274cea75eb22f1d65d7ca0aaf1e64d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/ghex/ghex.install b/gnome-unstable/ghex/ghex.install
deleted file mode 100644
index 084bc82ee..000000000
--- a/gnome-unstable/ghex/ghex.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=ghex
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/gjs/PKGBUILD b/gnome-unstable/gjs/PKGBUILD
deleted file mode 100644
index ab3aaa2af..000000000
--- a/gnome-unstable/gjs/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 154794 2012-03-30 18:11:31Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gjs
-pkgver=1.32.0
-pkgrel=1
-pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Gjs"
-license=('GPL')
-depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|python|python2|' scripts/make-tests
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/glade/PKGBUILD b/gnome-unstable/glade/PKGBUILD
deleted file mode 100644
index 52a8345c6..000000000
--- a/gnome-unstable/glade/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154638 2012-03-30 13:32:34Z heftig $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=glade
-pkgver=3.12.0
-pkgrel=1
-pkgdesc="User interface builder for GTK+ and GNOME."
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject')
-optdepends=('python2: Python widgets support')
-options=('!libtool')
-url="http://glade.gnome.org/"
-install=glade.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('70a820a0007fa3ed7761c92b011fe35ac1532038cab2f9ab30f4d29d5799d44d')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/glade/glade.install b/gnome-unstable/glade/glade.install
deleted file mode 100644
index bce670aff..000000000
--- a/gnome-unstable/glade/glade.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/glib-networking/PKGBUILD b/gnome-unstable/glib-networking/PKGBUILD
deleted file mode 100644
index d0f2077f0..000000000
--- a/gnome-unstable/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154603 2012-03-30 12:28:28Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.32.0
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3f399f8a8977bef5b07a89772ab473ee247773ac7362e4ebfb1f4643828838dc')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/glib-networking/glib-networking.install b/gnome-unstable/glib-networking/glib-networking.install
deleted file mode 100644
index e1b80c438..000000000
--- a/gnome-unstable/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  /usr/bin/gio-querymodules /usr/lib/gio/modules
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/glib2/PKGBUILD b/gnome-unstable/glib2/PKGBUILD
deleted file mode 100644
index 9ebdbc469..000000000
--- a/gnome-unstable/glib2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 154329 2012-03-26 12:37:42Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.32.0
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkgconfig' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-        glib2.sh
-        glib2.csh)
-sha256sums=('cde9d9f25ed648069c547e323897ad9379974e1f936b4477fa51bcf1bb261ae4'
-            '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
-            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
-
-build() {
-  cd glib-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-package() {
-  cd 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/gnome-unstable/glib2/glib2.csh b/gnome-unstable/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/gnome-unstable/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/gnome-unstable/glib2/glib2.sh b/gnome-unstable/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/gnome-unstable/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/gnome-unstable/glibmm/PKGBUILD b/gnome-unstable/glibmm/PKGBUILD
deleted file mode 100644
index 2dee92b68..000000000
--- a/gnome-unstable/glibmm/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 154814 2012-03-30 18:59:49Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.31.22
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-url="http://www.gtkmm.org/"
-sha256sums=('9941c75c8a6c89d25db5d612ac96da4ebbac0f0bbde6958fd8ea21d1e864bf4e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_glibmm() {
-  pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
-  depends=('glib2' 'libsigc++2.0')
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="$pkgdir" install
-}
-
-package_glibmm-docs() {
-  pkgdesc="Developer documentation for glibmm"
-  cd "$pkgbase-$pkgver/docs"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
deleted file mode 100644
index a76c1e73c..000000000
--- a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
-
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="udev-acl"
-LABEL="gnome_bluetooth_end"
diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD
deleted file mode 100644
index 88b883763..000000000
--- a/gnome-unstable/gnome-bluetooth/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 154777 2012-03-30 16:50:56Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-bluetooth
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeBluetooth"
-license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        61-gnome-bluetooth-rfkill.rules)
-sha256sums=('97a229e81997c14064899bdec2a62f94738d00d2f88cc18bcbeb2bdf0610e272'
-            'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-desktop-update \
-    --disable-icon-update \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \
-                     "$pkgdir/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
-}
diff --git a/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install b/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install
deleted file mode 100644
index 8c991877f..000000000
--- a/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/gnome-color-manager/PKGBUILD b/gnome-unstable/gnome-color-manager/PKGBUILD
deleted file mode 100644
index 2784ea104..000000000
--- a/gnome-unstable/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 154823 2012-03-30 19:11:45Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.4.0
-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' 'gnome-desktop')
-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=('fcca7292d14dcffea01463bb24833346b415ee189611821399ca96d6638d812d')
-
-build(){
-  cd $pkgname-$pkgver
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-color-manager/gnome-color-manager.install b/gnome-unstable/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/gnome-unstable/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/gnome-unstable/gnome-contacts/PKGBUILD b/gnome-unstable/gnome-contacts/PKGBUILD
deleted file mode 100644
index 029b4dab8..000000000
--- a/gnome-unstable/gnome-contacts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154597 2012-03-30 12:25:13Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-contacts
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Contacts Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
-makedepends=('intltool' 'vala')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('06d4d8fc22d72f67296ed98d35e3ee40f26d8344bcbd14affff4a720047ccd97')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-contacts/gnome-contacts.install b/gnome-unstable/gnome-contacts/gnome-contacts.install
deleted file mode 100644
index 326aa98a2..000000000
--- a/gnome-unstable/gnome-contacts/gnome-contacts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD
deleted file mode 100644
index c4a5437d5..000000000
--- a/gnome-unstable/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 154951 2012-03-31 20:30:25Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.4.0
-pkgrel=2
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
-         'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower'
-         'libsystemd' 'cheese')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'apg: adds password generation for user accounts'
-            'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        systemd-fallback.patch)
-sha256sums=('09dafad9afbb6e01bd29dd9186e990545ad58ede3873ba7eff7009c6ffddb254'
-            '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  patch -Np1 -i ../systemd-fallback.patch
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-control-center/gnome-control-center.install b/gnome-unstable/gnome-control-center/gnome-control-center.install
deleted file mode 100644
index 079e0fa34..000000000
--- a/gnome-unstable/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/gnome-control-center/systemd-fallback.patch b/gnome-unstable/gnome-control-center/systemd-fallback.patch
deleted file mode 100644
index 709e54019..000000000
--- a/gnome-unstable/gnome-control-center/systemd-fallback.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 9873a7536844f5c38c2a123be58175c2774e5dcc
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:12:11 2012 +0100
-
-    Fallback to CK if systemd is not available
-    
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index aee97ac..867f061 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  SYSTEMD=libsystemd-login
-+  SYSTEMD="libsystemd-login libsystemd-daemon"
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
- else
-   SYSTEMD=
-diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
-index f027754..5ebbe29 100644
---- a/panels/user-accounts/um-user.c
-+++ b/panels/user-accounts/um-user.c
-@@ -37,6 +37,11 @@
- 
- #include <gio/gunixoutputstream.h>
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-login.h>
-+#  include <systemd/sd-daemon.h>
-+#endif
-+
- #include "um-user.h"
- #include "um-account-type.h"
- #include "um-utils.h"
-@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser      *user,
-         }
- }
- 
--#ifdef HAVE_SYSTEMD
--
--#include <systemd/sd-login.h>
--
- gboolean
- um_user_is_logged_in (UmUser *user)
- {
--  int n_sessions;
--
--  n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
--
--  return n_sessions > 0;
--}
-+#ifdef HAVE_SYSTEMD
-+        if (sd_booted () > 0) {
-+                int n_sessions;
- 
--#else
-+                n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
- 
--gboolean
--um_user_is_logged_in (UmUser *user)
--{
-+                return n_sessions > 0;
-+        }
-+#endif
-         GVariant *result;
-         GVariantIter *iter;
-         gint n_sessions;
-@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
-         return n_sessions > 0;
- }
- 
--#endif
--
- void
- um_user_set_automatic_login (UmUser   *user,
-                              gboolean  enabled)
diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD
deleted file mode 100644
index df10b5539..000000000
--- a/gnome-unstable/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154383 2012-03-27 11:54:51Z heftig $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.4.0
-pkgrel=1
-epoch=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8b162ca977075c1dd806feef24e9db7ee0cbe42c0ef8d3fbc386265dcea2b08c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-gnome-distributor="Arch Linux"
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-dictionary/PKGBUILD b/gnome-unstable/gnome-dictionary/PKGBUILD
deleted file mode 100644
index 43d707f7b..000000000
--- a/gnome-unstable/gnome-dictionary/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154416 2012-03-28 10:37:52Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gnome-dictionary
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Look up words in dictionary sources"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'gnome-doc-utils')
-install=$pkgname.install
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-dictionary/gnome-dictionary.install b/gnome-unstable/gnome-dictionary/gnome-dictionary.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/gnome-unstable/gnome-dictionary/gnome-dictionary.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-disk-utility/PKGBUILD b/gnome-unstable/gnome-disk-utility/PKGBUILD
deleted file mode 100644
index 2c0e60377..000000000
--- a/gnome-unstable/gnome-disk-utility/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154502 2012-03-29 15:55:52Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Silvio Knizek (killermoehre)
-
-pkgname=gnome-disk-utility
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Disk Management Utility for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=('gtk3' 'udisks2' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1d5b7ba73ee2b5373ea8a087902ab05339723c72eab278670856375280e02f03')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install b/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install
deleted file mode 100644
index 71d138f2d..000000000
--- a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.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/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD
deleted file mode 100644
index 5898104d8..000000000
--- a/gnome-unstable/gnome-documents/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 154636 2012-03-30 13:29:57Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-documents
-pkgver=0.4.0.1
-pkgrel=1
-pkgdesc="Documents Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker')
-makedepends=('intltool')
-optdepends=('unoconv: Support for Libreoffice document types')
-options=('!libtool')
-install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('91e9051b0453fbf271c2a9bc4f40789ea47da5c5269689e2e6897eb1d30621ca')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/gnome-documents
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/gnome-documents/gnome-documents.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-font-viewer/PKGBUILD b/gnome-unstable/gnome-font-viewer/PKGBUILD
deleted file mode 100644
index 2bee1aeb1..000000000
--- a/gnome-unstable/gnome-font-viewer/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#  $Id: PKGBUILD 154499 2012-03-29 15:49:21Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-font-viewer
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME font viewer and thumbnailer"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'desktop-file-utils')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-font-viewer.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6311fc6e390b7ddfde4fbe5954452d0846a0b3991e9e52f179be3969e6033a76')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install b/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install
deleted file mode 100644
index e111ef946..000000000
--- a/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-games/PKGBUILD b/gnome-unstable/gnome-games/PKGBUILD
deleted file mode 100644
index de738e5c7..000000000
--- a/gnome-unstable/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 154648 2012-03-30 13:49:41Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9dc639e6f16904f7f4df1692630f2ea190f82692afd196b281eebf21b81e0837')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-schemas-compile \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "$pkgdir/var"
-
-  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
-}
diff --git a/gnome-unstable/gnome-games/gnome-games.install b/gnome-unstable/gnome-games/gnome-games.install
deleted file mode 100644
index aaa36a896..000000000
--- a/gnome-unstable/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,122 +0,0 @@
-_scores=(glines.Large.scores
-	glines.Medium.scores
-	glines.Small.scores
-	gnibbles.1.0.scores
-	gnibbles.1.1.scores
-	gnibbles.2.0.scores
-	gnibbles.2.1.scores
-	gnibbles.3.0.scores
-	gnibbles.3.1.scores
-	gnibbles.4.0.scores
-	gnibbles.4.1.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnomine.Custom.scores
-	gnomine.Large.scores
-	gnomine.Medium.scores
-	gnomine.Small.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.10.scores
-	gnotski.11.scores
-	gnotski.12.scores
-	gnotski.13.scores
-	gnotski.14.scores
-	gnotski.15.scores
-	gnotski.16.scores
-	gnotski.17.scores
-	gnotski.18.scores
-	gnotski.19.scores
-	gnotski.2.scores
-	gnotski.20.scores
-	gnotski.21.scores
-	gnotski.22.scores
-	gnotski.23.scores
-	gnotski.24.scores
-	gnotski.25.scores
-	gnotski.26.scores
-	gnotski.27.scores
-	gnotski.28.scores
-	gnotski.29.scores
-	gnotski.3.scores
-	gnotski.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gtali.Colors.scores
-	gtali.Regular.scores
-	mahjongg.bridges.scores
-	mahjongg.cloud.scores
-	mahjongg.confounding.scores
-	mahjongg.difficult.scores
-	mahjongg.dragon.scores
-	mahjongg.easy.scores
-	mahjongg.pyramid.scores
-	mahjongg.tictactoe.scores
-	mahjongg.ziggurat.scores
-	swell-foop.Large.scores
-	swell-foop.Medium.scores
-	swell-foop.Small.scores
-	quadrapassel.scores)
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    if [ -e "var/games/$score" ]; then
-      continue
-    fi
-
-    touch "var/games/$score"
-    chown root:games "var/games/$score"
-    chmod 664 "var/games/$score"
-  done
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    rm -f "var/games/$score"
-  done
-}
diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD
deleted file mode 100644
index 45a257fb3..000000000
--- a/gnome-unstable/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id: PKGBUILD 154423 2012-03-28 10:48:45Z heftig $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'gcr' 'libcap-ng')
-makedepends=('intltool')
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a3ea4ea71cdc5f25a4d72027ea6b775d20d9fead1ac71210d743e4cb2df3c3a2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-keyring/gnome-keyring.install b/gnome-unstable/gnome-keyring/gnome-keyring.install
deleted file mode 100644
index c351377a2..000000000
--- a/gnome-unstable/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/gnome-media/PKGBUILD b/gnome-unstable/gnome-media/PKGBUILD
deleted file mode 100644
index fb5115c2a..000000000
--- a/gnome-unstable/gnome-media/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 154822 2012-03-30 19:08:52Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-media
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME Media Tools"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=gnome-media.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-media \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  rm -rf "${pkgdir}/usr/share/sounds/"
-}
diff --git a/gnome-unstable/gnome-media/gnome-media.install b/gnome-unstable/gnome-media/gnome-media.install
deleted file mode 100644
index 97488b6d0..000000000
--- a/gnome-unstable/gnome-media/gnome-media.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-media
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD
deleted file mode 100644
index cd7abc27d..000000000
--- a/gnome-unstable/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154375 2012-03-27 11:39:53Z heftig $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
-depends=('glib2' 'python2-gobject')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        menus.patch)
-sha256sums=('199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
-      --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package(){
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
-}
diff --git a/gnome-unstable/gnome-menus/menus.patch b/gnome-unstable/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/gnome-unstable/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/gnome-unstable/gnome-nettool/PKGBUILD b/gnome-unstable/gnome-nettool/PKGBUILD
deleted file mode 100644
index 714cc0e7a..000000000
--- a/gnome-unstable/gnome-nettool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 153013 2012-03-11 07:52:22Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=gnome-nettool
-pkgver=3.1.1
-pkgrel=1
-pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'nmap' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1e0430c94084484f234864c160e6252552d54bb72c163d3e451641045429901c')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-nettool/gnome-nettool.install b/gnome-unstable/gnome-nettool/gnome-nettool.install
deleted file mode 100644
index e5dfaf4a5..000000000
--- a/gnome-unstable/gnome-nettool/gnome-nettool.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-online-accounts/PKGBUILD b/gnome-unstable/gnome-online-accounts/PKGBUILD
deleted file mode 100644
index ed45c4047..000000000
--- a/gnome-unstable/gnome-online-accounts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154563 2012-03-30 09:20:18Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-online-accounts
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME service to access online accounts"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-options=(!libtool)
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('306a6ebaf4a0349596d1729d263b98fdb8d27d788d61e27d727d03883dccea95')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install b/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install
deleted file mode 100644
index 525ecff63..000000000
--- a/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-panel/PKGBUILD b/gnome-unstable/gnome-panel/PKGBUILD
deleted file mode 100644
index e02ba0f71..000000000
--- a/gnome-unstable/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154382 2012-03-27 11:53:30Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.4.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('70020645ecac8f54164454e6d413b62183d58372a8d10d2b072fee69eb11fd91')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/gnome-panel/gnome-panel.install b/gnome-unstable/gnome-panel/gnome-panel.install
deleted file mode 100644
index 0f9324937..000000000
--- a/gnome-unstable/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
-  gconfpkg --install $pkgname
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/gnome-power-manager/PKGBUILD b/gnome-unstable/gnome-power-manager/PKGBUILD
deleted file mode 100644
index 987521b18..000000000
--- a/gnome-unstable/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 154518 2012-03-29 19:49:04Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Power management tools."
-arch=(i686 x86_64)
-url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=(!emptydirs)
-install=gnome-power-manager.install
-groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-power-manager \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-power-manager/gnome-power-manager.install b/gnome-unstable/gnome-power-manager/gnome-power-manager.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-screensaver/PKGBUILD b/gnome-unstable/gnome-screensaver/PKGBUILD
deleted file mode 100644
index 785e024dd..000000000
--- a/gnome-unstable/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 154748 2012-03-30 16:17:55Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-       gnome-screensaver.pam)
-sha256sums=('8d73e687f41975d66ee1fa56986d901a0bbdf4094f429cdbbed4a19016a38974'
-            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext --with-systemd
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver"
-}
diff --git a/gnome-unstable/gnome-screensaver/gnome-screensaver.install b/gnome-unstable/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index 3b0e06046..000000000
--- a/gnome-unstable/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgname=gnome-screensaver
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
diff --git a/gnome-unstable/gnome-screensaver/gnome-screensaver.pam b/gnome-unstable/gnome-screensaver/gnome-screensaver.pam
deleted file mode 100644
index 453dae646..000000000
--- a/gnome-unstable/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so nullok
-auth        optional     pam_gnome_keyring.so
diff --git a/gnome-unstable/gnome-screenshot/PKGBUILD b/gnome-unstable/gnome-screenshot/PKGBUILD
deleted file mode 100644
index fa3fcded3..000000000
--- a/gnome-unstable/gnome-screenshot/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154440 2012-03-28 11:37:35Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-screenshot
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Take pictures of your screen"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'libcanberra')
-makedepends=('intltool')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0d04ffdc927557745de03aeef84924b43f3469a445e0afc8ef6050834898ad9c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-screenshot/gnome-screenshot.install b/gnome-unstable/gnome-screenshot/gnome-screenshot.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/gnome-unstable/gnome-screenshot/gnome-screenshot.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-search-tool/PKGBUILD b/gnome-unstable/gnome-search-tool/PKGBUILD
deleted file mode 100644
index dca52d080..000000000
--- a/gnome-unstable/gnome-search-tool/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 154781 2012-03-30 16:53:50Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-search-tool
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Utility to search for files"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('gconf' 'gtk3' 'libsm')
-makedepends=('intltool' 'gnome-doc-utils')
-install=$pkgname.install
-options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6c4ed39ab1196d118e5e0d2a7faa07fbbb257831454ee92ff0c6f28c0942e69c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-schemas-install
-  make
-}
-
-package() {
-  cd "$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 $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-search-tool/gnome-search-tool.install b/gnome-unstable/gnome-search-tool/gnome-search-tool.install
deleted file mode 100644
index 9bc909b92..000000000
--- a/gnome-unstable/gnome-search-tool/gnome-search-tool.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-search-tool
-
-post_install() {
-    gconfpkg --install $pkgname
-}
-
-pre_upgrade() {
-    pre_remove
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    gconfpkg --uninstall $pkgname
-}
diff --git a/gnome-unstable/gnome-session/PKGBUILD b/gnome-unstable/gnome-session/PKGBUILD
deleted file mode 100644
index b02f009a8..000000000
--- a/gnome-unstable/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 154783 2012-03-30 16:57:19Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-session
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libsystemd' 'consolekit' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
-         'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
-         'startup-notification' 'upower')
-makedepends=('intltool' 'mesa' 'xtrans')
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bf8ba2ba9d61ad680df9e66ca38f05d6e3bf00c65634bb0dc5e41690862608e1')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-session/gnome-session.install b/gnome-unstable/gnome-session/gnome-session.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index 440aeae58..000000000
--- a/gnome-unstable/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 154567 2012-03-30 09:35:28Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('colord' 'dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libgnomekbd' 'libnotify'
-         'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        systemd-fallback.patch)
-sha256sums=('5639cbba28caa7b3e33990f49aeed11ed9325e78e76af2175d9ccd5ff298401d'
-            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008')
-
-build() {
-  cd $pkgname-$pkgver
-
-  patch -Np1 -i ../systemd-fallback.patch
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install b/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-settings-daemon/systemd-fallback.patch b/gnome-unstable/gnome-settings-daemon/systemd-fallback.patch
deleted file mode 100644
index da0496623..000000000
--- a/gnome-unstable/gnome-settings-daemon/systemd-fallback.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:52:54 2012 +0100
-
-    Fallback to CK if systemd is not available
-    
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index 3b4789f..d522852 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-   SESSION_TRACKING=systemd
- else
-diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
-index 5786300..83fe21e 100644
---- a/gnome-settings-daemon/gnome-settings-session.c
-+++ b/gnome-settings-daemon/gnome-settings-session.c
-@@ -30,6 +30,7 @@
- #include "gnome-settings-session.h"
- 
- #ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
- #include <systemd/sd-login.h>
- 
- typedef struct
-@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
- {
- #ifdef HAVE_SYSTEMD
-         GSource                   *sd_source;
--#else
-+#endif
- 	GDBusProxy		*proxy_session;
- 	GCancellable		*cancellable;
--#endif
- 	gchar			*session_id;
- 	GnomeSettingsSessionState state;
- };
-@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
-         return TRUE;
- }
- 
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
- 
- static void
- gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
- 	g_object_unref (proxy_manager);
- }
- 
--#endif /* HAVE_SYSTEMD */
--
- static void
- gnome_settings_session_init (GnomeSettingsSession *session)
- {
- 	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
- 
- #ifdef HAVE_SYSTEMD
--        sd_pid_get_session (getpid(), &session->priv->session_id);
-+        session->priv->sd_source = NULL;
-+
-+        if (sd_booted () > 0) {
-+                sd_pid_get_session (getpid(), &session->priv->session_id);
- 
--        session->priv->sd_source = sd_source_new ();
--        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
--        g_source_attach (session->priv->sd_source, NULL);
-+                session->priv->sd_source = sd_source_new ();
-+                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-+                g_source_attach (session->priv->sd_source, NULL);
- 
--        sessions_changed (session);
--#else
-+                sessions_changed (session);
-+                return;
-+        }
-+#endif
- 	session->priv->cancellable = g_cancellable_new ();
- 
- 	/* connect to ConsoleKit */
-@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
- 				  session->priv->cancellable,
- 				  got_manager_proxy_cb,
- 				  session);
--#endif
- }
- 
- static void
-@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
-         if (session->priv->sd_source != NULL) {
-                 g_source_destroy (session->priv->sd_source);
-                 g_source_unref (session->priv->sd_source);
-+                goto out;
-         }
--#else
-+#endif
-+
- 	g_cancellable_cancel (session->priv->cancellable);
- 
- 	if (session->priv->proxy_session != NULL)
- 		g_object_unref (session->priv->proxy_session);
- 	g_object_unref (session->priv->cancellable);
--#endif
- 
-+out:
- 	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
- }
- 
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 8db04e5..9883d76 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -2031,7 +2031,7 @@ systemd_stop (void)
-         g_object_unref (bus);
- }
- 
--#else
-+#endif
- 
- static void
- consolekit_stop_cb (GObject *source_object,
-@@ -2081,7 +2081,6 @@ consolekit_stop (void)
-                            consolekit_stop_cb, NULL);
-         g_object_unref (proxy);
- }
--#endif
- 
- static void
- upower_sleep_cb (GObject *source_object,
-@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
- #ifdef HAVE_SYSTEMD
--                systemd_stop ();
--#else
--                consolekit_stop ();
-+                if (sd_booted () > 0)
-+                        systemd_stop ();
-+                else
- #endif
-+                        consolekit_stop ();
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD
deleted file mode 100644
index 78fada2c8..000000000
--- a/gnome-unstable/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154583 2012-03-30 11:17:09Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6a706da199a99540a008a5fec609bbeff194b1a933e2fc73e51e667d4599a85')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-shell/gnome-shell.install b/gnome-unstable/gnome-shell/gnome-shell.install
deleted file mode 100644
index 27d70b19d..000000000
--- a/gnome-unstable/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-system-log/PKGBUILD b/gnome-unstable/gnome-system-log/PKGBUILD
deleted file mode 100644
index 08a39e474..000000000
--- a/gnome-unstable/gnome-system-log/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154500 2012-03-29 15:50:01Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-system-log
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="View your system logs"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'gnome-doc-utils')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7eea66e1cef32c0ad7f0027564d371123dfbfb1866fd172d9d498b5dd701528b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-system-log/gnome-system-log.install b/gnome-unstable/gnome-system-log/gnome-system-log.install
deleted file mode 100644
index 847019792..000000000
--- a/gnome-unstable/gnome-system-log/gnome-system-log.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-system-monitor/PKGBUILD b/gnome-unstable/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index c8104eb03..000000000
--- a/gnome-unstable/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154752 2012-03-30 16:28:08Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e62047983f423f4a178f01d860e9b362e8c9757d4bbeadad0f261b97b4433d12')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
deleted file mode 100644
index 70641526f..000000000
--- a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-system-monitor
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/gnome-terminal/PKGBUILD b/gnome-unstable/gnome-terminal/PKGBUILD
deleted file mode 100644
index 09f09aec5..000000000
--- a/gnome-unstable/gnome-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154430 2012-03-28 11:08:49Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.4.0.1
-pkgrel=1
-pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2')
-options=('!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1369298498d62993b075dc6d4b9669bbce1acb7ba1f670a0ba39e40a2a25a092')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/gnome-terminal/gnome-terminal.install b/gnome-unstable/gnome-terminal/gnome-terminal.install
deleted file mode 100644
index 1d8510f06..000000000
--- a/gnome-unstable/gnome-terminal/gnome-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
-  gconfpkg --install $pkgname
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 3a3001b60..000000000
--- a/gnome-unstable/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154504 2012-03-29 16:01:39Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-themes-standard
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6c85056db16b748a14c412554371a22f096b981d2eca3ae3d6922a435d43b0fd')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-user-share/PKGBUILD b/gnome-unstable/gnome-user-share/PKGBUILD
deleted file mode 100644
index 0c4c1d06d..000000000
--- a/gnome-unstable/gnome-user-share/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154054 2012-03-22 08:32:05Z heftig $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-user-share
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
-license=('GPL')
-depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus')
-options=('!emptydirs' '!libtool')
-install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-user-share \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain gnome-user-share ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/gnome-user-share/gnome-user-share.install b/gnome-unstable/gnome-user-share/gnome-user-share.install
deleted file mode 100644
index 3cc1b5286..000000000
--- a/gnome-unstable/gnome-user-share/gnome-user-share.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-user-share
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/gobject-introspection/PKGBUILD b/gnome-unstable/gobject-introspection/PKGBUILD
deleted file mode 100644
index 31a7d63de..000000000
--- a/gnome-unstable/gobject-introspection/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154792 2012-03-30 18:10:16Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gobject-introspection
-pkgver=1.32.0
-pkgrel=1
-pkgdesc="Introspection system for GObject-based libraries"
-url="http://live.gnome.org/GObjectInstrospection"
-arch=('x86_64' 'i686')
-license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
-makedepends=('cairo')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('346a729eb8a2a5dc49197d2195e71295167504cc2671298dfd92a32f8e5a01b3')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i '1s|#!/usr/bin/env python$|&2|' \
-    "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py
-}
diff --git a/gnome-unstable/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD
deleted file mode 100644
index b6d2f06f7..000000000
--- a/gnome-unstable/grilo-plugins/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 153710 2012-03-18 13:20:56Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=grilo-plugins
-pkgver=0.1.18
-pkgrel=3
-pkgdesc="Plugins for Grilo"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('grilo')
-makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt'
-             'rest' 'libtracker-sparql' 'gnome-common')
-optdepends=('gupnp-av: uPnP plugin'
-            'libgdata: Youtube plugin'
-            'libquvi: Youtube plugin'
-            'sqlite3: Podcasts plugin'
-            'gmime: Podcasts plugin'
-            'sqlite3: Bookmarks plugin'
-            'sqlite3: Metadata store plugin'
-            'libgcrypt: Vimeo plugin'
-            'rest: Blip.tv plugin'
-            'libtracker-sparql: Tracker plugin')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        tracker-0.14.patch)
-sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79'
-            'c48201ed1633e2b0eb5132ef823d7b060e9c2cddb808c6981fb546133cd4ea63')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  patch -Np1 -i ../tracker-0.14.patch
-
-  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/grilo-plugins/tracker-0.14.patch b/gnome-unstable/grilo-plugins/tracker-0.14.patch
deleted file mode 100644
index c9c79fe7c..000000000
--- a/gnome-unstable/grilo-plugins/tracker-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9e00790f40ee498a7359b00e0b11a7523fdd1b3e Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Thu, 19 Jan 2012 09:30:28 +0000
-Subject: build: Support build against tracker 0.13/0.14
-
-https://bugzilla.gnome.org/show_bug.cgi?id=667855
----
-diff --git a/configure.ac b/configure.ac
-index 1fd6743..71aceed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,11 +134,17 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6,
-                                                    HAVE_GMIME=yes,
-                                                    HAVE_GMIME=no)])
- 
--PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12,
-+PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.14,
-                                   HAVE_TRACKER_SPARQL=yes,
-                                   HAVE_TRACKER_SPARQL=no)
- 
- if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
-+   PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12,
-+                                     HAVE_TRACKER_SPARQL=yes,
-+                                     HAVE_TRACKER_SPARQL=no)
-+fi
-+
-+if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
-    PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11,
-                                      HAVE_TRACKER_SPARQL=yes,
-                                      HAVE_TRACKER_SPARQL=no)
---
-cgit v0.9.0.2
diff --git a/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD
deleted file mode 100644
index c19317215..000000000
--- a/gnome-unstable/gthumb/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 154337 2012-03-26 13:05:03Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=2.90.2
-pkgrel=1
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/gthumb"
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base')
-makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
-             'brasero' 'librsvg' 'libopenraw' 'liboauth')
-optdepends=('libopenraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'libsoup-gnome: web albums'
-            'liboauth: web albums')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('29a961ede929c172723cb5550977e4bf7cda4921228ed1ddafba09cc6bae4424')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-libchamplain --enable-libopenraw
-  
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gthumb/gthumb.install b/gnome-unstable/gthumb/gthumb.install
deleted file mode 100644
index 5d8005402..000000000
--- a/gnome-unstable/gthumb/gthumb.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.1) < 0 )); then
-    gconfpkg --uninstall gthumb
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gtk-vnc/PKGBUILD b/gnome-unstable/gtk-vnc/PKGBUILD
deleted file mode 100644
index 84b722449..000000000
--- a/gnome-unstable/gtk-vnc/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 152991 2012-03-11 06:25:12Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=gtk-vnc
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="A VNC viewer widget for GTK"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/gtk-vnc"
-license=('LGPL')
-depends=('libgcrypt' 'gtk3')
-optdepends=('gtk2: GTK2 widget')
-makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81')
-
-build() {
-  rm -rf gtk2-build gtk3-build
-  cp -a $pkgname-$pkgver gtk2-build
-  mv $pkgname-$pkgver gtk3-build
-
-  ( cd gtk2-build
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --with-python --disable-static --with-gtk=2.0
-    make )
-
-  ( cd gtk3-build
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --with-python --with-examples --disable-static --with-gtk=3.0
-    make )
-}
-
-package() {
-  make -C gtk2-build -j1 DESTDIR="${pkgdir}" install
-  make -C gtk3-build -j1 DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD
deleted file mode 100644
index 19a217713..000000000
--- a/gnome-unstable/gtk3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 154516 2012-03-29 19:47:27Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
-makedepends=('gobject-introspection')
-options=('!libtool')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-        settings.ini)
-sha256sums=('00af8be8bc60355e08a8f57e3e7503c916cec5cd5c6acb3eaedb01330b81f3e0'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
-build() {
-    cd "gtk+-$pkgver"
-    export CFLAGS+=" -g -O0"
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-}
-
-package() {
-    cd "gtk+-$pkgver"
-    make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}
diff --git a/gnome-unstable/gtk3/gtk3.install b/gnome-unstable/gtk3/gtk3.install
deleted file mode 100644
index ca20d2865..000000000
--- a/gnome-unstable/gtk3/gtk3.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-3.0 --update-cache
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/gtk3/settings.ini b/gnome-unstable/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/gnome-unstable/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/gnome-unstable/gtkhtml4/PKGBUILD b/gnome-unstable/gtkhtml4/PKGBUILD
deleted file mode 100644
index 67f5f4c9e..000000000
--- a/gnome-unstable/gtkhtml4/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154376 2012-03-27 11:40:53Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtkhtml4
-_pkgbasename=gtkhtml
-pkgver=4.4.0
-pkgrel=1
-pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('9c07260cd5d20c6dfba42fe1e784fffc98af3a82ff5b7d05be3174d6b0bffe9d')
-
-build() {
-    cd "$_pkgbasename-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gtkhtml4 \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "$_pkgbasename-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gtkmm3/PKGBUILD b/gnome-unstable/gtkmm3/PKGBUILD
deleted file mode 100644
index 91aa9d767..000000000
--- a/gnome-unstable/gtkmm3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 154820 2012-03-30 19:07:22Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.3.20
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://www.gtkmm.org/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('ae131bc37c158d136f61f8d01377c0ee348e3e832a22272ffa7efc530197b6b4')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc="C++ bindings for gtk3"
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd "$_pkgbasename-$pkgver"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="$pkgdir" install
-}
-
-package_gtkmm3-docs() {
-  pkgdesc="Developer documentation for gtkmm v3"
-
-  cd "$_pkgbasename-$pkgver"
-  make -C docs DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD
deleted file mode 100644
index 010c0aa69..000000000
--- a/gnome-unstable/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154574 2012-03-30 09:54:38Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'gobject-introspection' 'glade')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('a380b0aaace095568a5b485dd479b61f61f77941d0c02a00246ad4dfe956b655')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-glade-catalog
-  make
-}
-
-package() {
-  cd "$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gucharmap/PKGBUILD b/gnome-unstable/gucharmap/PKGBUILD
deleted file mode 100644
index 0e645ac3c..000000000
--- a/gnome-unstable/gucharmap/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154427 2012-03-28 10:55:55Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.4.0.1
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('dconf' 'gtk3' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eac2f2281cde5118544bc930b9ce90e68302a8c4ea09755f0db3e2e5e022b23c')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile  --enable-introspection
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gucharmap/gucharmap.install b/gnome-unstable/gucharmap/gucharmap.install
deleted file mode 100644
index 9a19b56fc..000000000
--- a/gnome-unstable/gucharmap/gucharmap.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD
deleted file mode 100644
index da6ddcbf6..000000000
--- a/gnome-unstable/gvfs/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 154541 2012-03-29 21:19:52Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.12.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('87ffb27fd884be65570d64530c3121f9e49848070b62a26e39cd363f6a6bd555')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/etc/bash_completion.d
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
-  optdepends=('gvfs-afc: AFC (mobile devices) support'
-              'gvfs-smb: SMB/CIFS (Windows client) support'
-              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support'
-              'gvfs-afp: Apple Filing Protocol (AFP) support')
-  install=gvfs.install
-
-  cd "$pkgbase-$pkgver"
-  sed -e 's/^am__append_4/#am__append_4/' \
-      -e 's/^am__append_5/#am__append_5/' \
-      -i monitor/Makefile
-  make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
-  install=gvfs-smb.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=$pkgver" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=$pkgver")
-  install=gvfs-module.install
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-}
diff --git a/gnome-unstable/gvfs/gvfs-module.install b/gnome-unstable/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/gnome-unstable/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/gnome-unstable/gvfs/gvfs-smb.install b/gnome-unstable/gvfs/gvfs-smb.install
deleted file mode 100644
index da6a2ab6d..000000000
--- a/gnome-unstable/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/gvfs/gvfs.install b/gnome-unstable/gvfs/gvfs.install
deleted file mode 100644
index 3482d99e3..000000000
--- a/gnome-unstable/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/libchamplain/PKGBUILD b/gnome-unstable/libchamplain/PKGBUILD
deleted file mode 100644
index 408eabd91..000000000
--- a/gnome-unstable/libchamplain/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 153051 2012-03-12 01:40:43Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Michael Kanis <mkanis@gmx.de>
-
-pkgname=libchamplain
-pkgver=0.12.2
-pkgrel=1
-pkgdesc="Gtk3 widget for displaying rasterized maps"
-url="http://projects.gnome.org/libchamplain/"
-license=('LGPL')
-arch=('i686' 'x86_64')
-options=('!libtool')
-depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3')
-makedepends=('gobject-introspection' 'gtk-doc' 'vala')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --disable-static --disable-debug --enable-vala
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libcroco/PKGBUILD b/gnome-unstable/libcroco/PKGBUILD
deleted file mode 100644
index 329e5b008..000000000
--- a/gnome-unstable/libcroco/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 154432 2012-03-28 11:15:41Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libcroco
-pkgver=0.6.5
-pkgrel=1
-pkgdesc="A CSS parsing library"
-arch=('x86_64' 'i686')
-depends=('glib2' 'libxml2')
-makedepends=('intltool')
-license=('LGPL')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
-url="http://www.gnome.org"
-sha256sums=('2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgda/PKGBUILD b/gnome-unstable/libgda/PKGBUILD
deleted file mode 100644
index f80ef08a4..000000000
--- a/gnome-unstable/libgda/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 154592 2012-03-30 12:11:32Z heftig $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libgda
-pkgver=5.0.3
-pkgrel=1
-pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
-         'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
-         'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
-         'iso-codes' 'openssl' 'libgcrypt' 'libldap')
-makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc' 'vala')
-options=('!libtool')
-url="http://www.gnome-db.org"
-install=libgda.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-bdb=/usr --with-bdb-libdir-name=lib \
-      --disable-static --enable-json
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/libgda/libgda.install b/gnome-unstable/libgda/libgda.install
deleted file mode 100644
index c317fbaca..000000000
--- a/gnome-unstable/libgda/libgda.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/libgdata/PKGBUILD b/gnome-unstable/libgdata/PKGBUILD
deleted file mode 100644
index 405af8293..000000000
--- a/gnome-unstable/libgdata/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 152813 2012-03-09 17:21:56Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgdata
-pkgver=0.11.0
-pkgrel=1
-pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'liboauth')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('819a077fab77cca9408409bf86da5b028699972c2c9bbf96e41755f801acea6b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgnome-keyring/PKGBUILD b/gnome-unstable/libgnome-keyring/PKGBUILD
deleted file mode 100644
index fb9e18af4..000000000
--- a/gnome-unstable/libgnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#$Id: PKGBUILD 154421 2012-03-28 10:46:14Z heftig $
-#Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=libgnome-keyring
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('dbus-core' 'glib2' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('60cc0728fd9c1c10c62b05abec24037ca616931e167b658ed78ec93ede2d3f7a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgnomekbd/PKGBUILD b/gnome-unstable/libgnomekbd/PKGBUILD
deleted file mode 100644
index ccb2415ba..000000000
--- a/gnome-unstable/libgnomekbd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154358 2012-03-27 10:44:52Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=3.4.0.2
-pkgrel=1
-pkgdesc="Gnome keyboard library"
-url="http://gswitchit.sourceforge.net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libxklavier' 'gtk3' 'dconf')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgnomekbd/libgnomekbd.install b/gnome-unstable/libgnomekbd/libgnomekbd.install
deleted file mode 100644
index a3d820459..000000000
--- a/gnome-unstable/libgnomekbd/libgnomekbd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/libgweather/PKGBUILD b/gnome-unstable/libgweather/PKGBUILD
deleted file mode 100644
index d67a3bb3e..000000000
--- a/gnome-unstable/libgweather/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 152744 2012-03-09 13:48:09Z ibiru $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-
-pkgname=libgweather
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/"
-install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gettext-not-xml.patch)
-sha256sums=('ee9c4d09f33ae2b066dd1e696aa3e483a689cba6d63bcd388cc2ef95df9b1b60'
-            '3808da5c27bad1152eee824db2cead21de599af198eca017a18e1b0adb366330')
-
-build() {
-    cd "$pkgname-$pkgver"
-
-    patch -Np1 -i "$srcdir/gettext-not-xml.patch"
-    gtkdocize
-    autoreconf -fi
-
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-    install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-    gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain libgweather "$pkgdir"/etc/gconf/schemas/*.schemas
-    rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/libgweather/gettext-not-xml.patch b/gnome-unstable/libgweather/gettext-not-xml.patch
deleted file mode 100644
index 46ea98f48..000000000
--- a/gnome-unstable/libgweather/gettext-not-xml.patch
+++ /dev/null
@@ -1,532 +0,0 @@
-diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac
---- libgweather-3.4.0.orig/configure.ac	2012-03-08 20:49:21.497783149 +0000
-+++ libgweather-3.4.0/configure.ac	2012-03-08 20:59:21.082941563 +0000
-@@ -43,19 +43,16 @@
- LT_PREREQ([2.2.6])
- LT_INIT([dlopen win32-dll disable-static])
- 
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- IT_PROG_INTLTOOL([0.40.6])
- PKG_PROG_PKG_CONFIG([0.19])
- 
- AC_PROG_CC
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- 
--AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AS_HELP_STRING([--enable-all-translations-in-one-xml],
--                        [Put all translations in a big Locations.xml file (slow to parse)])],
--        [enable_big_xml=yes],
--        [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
-         [AS_HELP_STRING([--enable-locations-compression],
-                         [Compress Locations.xml files])],
-@@ -178,7 +175,7 @@
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather-3.0.pc
- libgweather/gweather-3.0-uninstalled.pc
-@@ -187,12 +184,6 @@
- ])
- AC_OUTPUT
- 
--if test "x$enable_big_xml" = "xyes"; then
--	LOCATIONS_XML_TRANSLATIONS="one big file"
--else
--	LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary                                                     ***
- dnl ***************************************************************************
-@@ -203,6 +194,4 @@
- 	Source code location:		${srcdir}
- 	Compiler:			${CC}
- 	Introspection support:          ${found_introspection}
--	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
--	Locations.xml compression:	${enable_locations_compression}
- " >&2
-diff -Nur libgweather-3.4.0.orig/data/Makefile.am libgweather-3.4.0/data/Makefile.am
---- libgweather-3.4.0.orig/data/Makefile.am	2012-03-08 20:49:21.484449916 +0000
-+++ libgweather-3.4.0/data/Makefile.am	2012-03-08 21:00:28.359065326 +0000
-@@ -4,55 +4,23 @@
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
- 
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP = 
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
--	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
--		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
--	fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
- 
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
- 
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
- 
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
--	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
--	for pofile in $(PO_LOCATIONS); do \
--		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
--		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
--		rm -f $$locale/$(libgweatherlocations_data);		\
--		test -d $$locale && rmdir $$locale;			\
--		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
--			gzip --force Locations.$$locale.xml;		\
--		fi;							\
--	done &&								\
--	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
--	rm -f C/$(libgweatherlocations_data) &&				\
--	test -d C && rmdir C &&						\
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
--		gzip --force Locations.xml;				\
--	fi &&								\
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
-+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
-+	rm -f C/$(libgweatherlocations_DATA)
-+	test -d C && rmdir C
- 	touch $@
- 
--endif # USE_ONE_BIG_XML
--
- ### Locations.xml.in rebuild
- rebuild-locations: locationdb.sqlite update-locations.py
- 	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
-diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4.0/libgweather/gweather-location.c
---- libgweather-3.4.0.orig/libgweather/gweather-location.c	2012-03-08 20:49:21.487783240 +0000
-+++ libgweather-3.4.0/libgweather/gweather-location.c	2012-03-08 21:00:28.359065326 +0000
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -185,10 +188,20 @@
- 
- 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
- 	if (!strcmp (tagname, "name") && !loc->name) {
--	    value = gweather_parser_get_localized_value (parser);
-+	    char *context = NULL;
-+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+	   
-+	    value = gweather_parser_get_value (parser);
- 	    if (!value)
- 		goto error_out;
--	    loc->name = g_strdup (value);
-+
-+	    if (context != NULL) {
-+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+	    	xmlFree (context);
-+	    }
-+	    else
-+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+	    
- 	    xmlFree (value);
- 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- 	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -Nur libgweather-3.4.0.orig/libgweather/gweather-timezone.c libgweather-3.4.0/libgweather/gweather-timezone.c
---- libgweather-3.4.0.orig/libgweather/gweather-timezone.c	2012-03-08 20:49:21.487783240 +0000
-+++ libgweather-3.4.0/libgweather/gweather-timezone.c	2012-03-08 21:00:28.359065326 +0000
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -154,7 +155,7 @@
- parse_timezone (GWeatherParser *parser)
- {
-     GWeatherTimezone *zone = NULL;
--    char *id = NULL, *name = NULL;
-+    char *id = NULL, *name = NULL, *context = NULL;
-     int offset = 0, dst_offset = 0;
-     gboolean has_dst = FALSE;
- 
-@@ -177,27 +178,34 @@
- 		continue;
- 	    }
- 
--	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
--		name = gweather_parser_get_localized_value (parser);
-+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+		name = gweather_parser_get_value (parser);
-+	    }
- 	    else {
- 		if (xmlTextReaderNext (parser->xml) != 1)
- 		    break;
- 	    }
- 	}
-     }
--
-+	    
-     if (parse_tzdata (id, parser->year_start, parser->year_end,
- 		      &offset, &has_dst, &dst_offset)) {
- 	zone = g_slice_new0 (GWeatherTimezone);
- 	zone->ref_count = 1;
- 	zone->id = g_strdup (id);
--	zone->name = g_strdup (name);
-+	if (context != NULL)
-+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+	else
-+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- 	zone->offset = offset;
- 	zone->has_dst = has_dst;
- 	zone->dst_offset = dst_offset;
-     }
- 
-     xmlFree (id);
-+    if (context)
-+    	xmlFree (context);
-     if (name)
- 	xmlFree (name);
- 
-diff -Nur libgweather-3.4.0.orig/po-locations/LINGUAS libgweather-3.4.0/po-locations/LINGUAS
---- libgweather-3.4.0.orig/po-locations/LINGUAS	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.4.0/po-locations/LINGUAS	2012-03-08 21:00:28.359065326 +0000
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-diff -Nur libgweather-3.4.0.orig/po-locations/Makefile.in.in libgweather-3.4.0/po-locations/Makefile.in.in
---- libgweather-3.4.0.orig/po-locations/Makefile.in.in	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.4.0/po-locations/Makefile.in.in	2012-03-08 21:00:28.359065326 +0000
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions.  It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+	$(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+	file=`echo $* | sed 's,.*/,,'`.gmo \
-+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+	sed -f ../intl/po2msg.sed < $< > $*.msg \
-+	  && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+	$(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+	  $(mkdir_p) $$dir; \
-+	  if test -r $$lang.gmo; then \
-+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  else \
-+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $(srcdir)/$$lang.gmo as" \
-+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  fi; \
-+	  if test -r $$lang.gmo.m; then \
-+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	  else \
-+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	    else \
-+	      true; \
-+	    fi; \
-+	  fi; \
-+	done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+	done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+	rm -f missing notexist
-+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+	if [ -r missing -o -r notexist ]; then \
-+	  exit 1; \
-+	fi
-+
-+mostlyclean:
-+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+	rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+	rm -f Makefile Makefile.in POTFILES stamp-it
-+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+	dists="$(DISTFILES)"; \
-+	extra_dists="$(EXTRA_DISTFILES)"; \
-+	for file in $$extra_dists; do \
-+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+	done; \
-+	for file in $$dists; do \
-+	  test -f $$file || file="$(srcdir)/$$file"; \
-+	  ln $$file $(distdir) 2> /dev/null \
-+	    || cp -p $$file $(distdir); \
-+	done
-+
-+update-po: Makefile
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	tmpdir=`pwd`; \
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  echo "$$lang:"; \
-+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+	  if $$result; then \
-+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	      rm -f $$tmpdir/$$lang.new.po; \
-+            else \
-+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	        :; \
-+	      else \
-+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	        rm -f $$tmpdir/$$lang.new.po; \
-+	        exit 1; \
-+	      fi; \
-+	    fi; \
-+	  else \
-+	    echo "msgmerge for $$lang.gmo failed!"; \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  fi; \
-+	done
-+
-+Makefile POTFILES: stamp-it
-+	@if test ! -f $@; then \
-+	  rm -f stamp-it; \
-+	  $(MAKE) stamp-it; \
-+	fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+	       $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Nur libgweather-3.4.0.orig/po-locations/POTFILES.in libgweather-3.4.0/po-locations/POTFILES.in
---- libgweather-3.4.0.orig/po-locations/POTFILES.in	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.4.0/po-locations/POTFILES.in	2012-03-08 21:00:28.359065326 +0000
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/gnome-unstable/libgweather/libgweather.install b/gnome-unstable/libgweather/libgweather.install
deleted file mode 100644
index 0d646b872..000000000
--- a/gnome-unstable/libgweather/libgweather.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=libgweather
-
-post_install() {
-  gconfpkg --install $pkgname
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-}
diff --git a/gnome-unstable/libgxps/PKGBUILD b/gnome-unstable/libgxps/PKGBUILD
deleted file mode 100644
index 26c57a272..000000000
--- a/gnome-unstable/libgxps/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 153768 2012-03-19 16:31:07Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libgxps
-pkgver=0.2.2
-pkgrel=1
-pkgdesc="XPS Documents library"
-arch=(i686 x86_64)
-url="https://live.gnome.org/libgxps"
-license=('GPL2')
-depends=('cairo' 'libarchive' 'libjpeg-turbo' 'libtiff' 'lcms2')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/libimobiledevice/PKGBUILD b/gnome-unstable/libimobiledevice/PKGBUILD
deleted file mode 100644
index b2c328d8d..000000000
--- a/gnome-unstable/libimobiledevice/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154539 2012-03-29 21:10:42Z heftig $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libimobiledevice
-pkgver=1.1.1
-pkgrel=3
-pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
-url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt')
-makedepends=('python2' 'swig')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2
-        swig-version-check.patch)
-md5sums=('cdc13037e822d9ac2e109536701d153a'
-         '8bb215e36fe0e08a72332c108c7842cc')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # SWIG version check is wrong (still not fixed upstream)
-  patch -p1 -i ../swig-version-check.patch
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libimobiledevice/swig-version-check.patch b/gnome-unstable/libimobiledevice/swig-version-check.patch
deleted file mode 100644
index c56b095db..000000000
--- a/gnome-unstable/libimobiledevice/swig-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false
diff --git a/gnome-unstable/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch b/gnome-unstable/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
deleted file mode 100644
index e1c099aae..000000000
--- a/gnome-unstable/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 64c68ad42a9089c92dfa4e74f55b6c1b65b8f11c Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Sun, 4 Mar 2012 14:32:49 +0100
-Subject: [PATCH] Make sure gcc 4.7 can find usleep declaration
-
-Without this, compilation fails with:
-
-libmusicbrainz-4.0.0/src/Query.cc: In member function 'void MusicBrainz4::CQuery::WaitRequest() const':
-libmusicbrainz-4.0.0/src/Query.cc:295:19: error: 'usleep' was not declared in this scope
----
- src/Query.cc |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/Query.cc b/src/Query.cc
-index 5f5934f..9332346 100644
---- a/src/Query.cc
-+++ b/src/Query.cc
-@@ -33,6 +33,7 @@
- 
- #include <string.h>
- #include <sys/time.h>
-+#include <unistd.h>
- 
- #include <ne_uri.h>
- 
--- 
-1.7.7.6
-
diff --git a/gnome-unstable/libmusicbrainz4/PKGBUILD b/gnome-unstable/libmusicbrainz4/PKGBUILD
deleted file mode 100644
index eb7c4f826..000000000
--- a/gnome-unstable/libmusicbrainz4/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154808 2012-03-30 18:44:29Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Max Fehrm max.fehrm@gmail.com
-
-pkgname=libmusicbrainz4
-pkgver=4.0.0
-pkgrel=1
-pkgdesc="Library That Provides Access to the MusicBrainz Server  "
-url="http://musicbrainz.org/"
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-depends=('neon')
-makedepends=('cmake')
-source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz
-        0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch)
-md5sums=('21c33f5dd20b8bb945b800e2a964f27e'
-         'df1dfa423d32a7a1d08b3fc0114bf087')
-
-build() {
-  cd libmusicbrainz-$pkgver
-  patch -Np1 -i ../0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
-  cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr
-  make
-}
-
-package() {
-  cd libmusicbrainz-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD
deleted file mode 100644
index 95db0d5e3..000000000
--- a/gnome-unstable/libpeas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 154819 2012-03-30 19:07:20Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libpeas
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="A GObject-based plugins engine"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed' 'glade')
-optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-            'seed: gobject-based plugin engine - seed runtime loader')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var --enable-vala
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/libpeas/libpeas.install b/gnome-unstable/libpeas/libpeas.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/gnome-unstable/libpeas/libpeas.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/libplist/PKGBUILD b/gnome-unstable/libplist/PKGBUILD
deleted file mode 100644
index 2cfe2ca26..000000000
--- a/gnome-unstable/libplist/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154538 2012-03-29 21:09:37Z heftig $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libplist
-pkgver=1.8
-pkgrel=2
-pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
-url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-depends=('glib2' 'libxml2' 'python2')
-makedepends=('cmake' 'swig')
-source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../$pkgname-$pkgver \
-      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-      -DCMAKE_SKIP_RPATH=ON \
-      -DCMAKE_INSTALL_PREFIX:PATH=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/librsvg/PKGBUILD b/gnome-unstable/librsvg/PKGBUILD
deleted file mode 100644
index 24f3cd3a1..000000000
--- a/gnome-unstable/librsvg/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154429 2012-03-28 11:07:58Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=librsvg
-pkgver=2.36.0
-pkgrel=1
-pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2>=2.24.1-3' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection')
-optdepends=('gtk3: for rsvg-view-3')
-options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
-install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e6475e08c73e92c8bc58824e215551bd64ac5e9a492ff8c520b89c01a7ea510a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/librsvg/librsvg.install b/gnome-unstable/librsvg/librsvg.install
deleted file mode 100644
index 4d48b071f..000000000
--- a/gnome-unstable/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/gnome-unstable/libsocialweb/PKGBUILD b/gnome-unstable/libsocialweb/PKGBUILD
deleted file mode 100644
index 73b12078b..000000000
--- a/gnome-unstable/libsocialweb/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 152909 2012-03-10 16:35:46Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libsocialweb
-pkgver=0.25.20
-pkgrel=1
-pkgdesc="A personal social data server"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
-         'json-glib' 'networkmanager')
-makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/libsocialweb \
-    --enable-all-services=yes \
-    --with-online=networkmanager \
-    --enable-vala-bindings
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/libsoup/PKGBUILD b/gnome-unstable/libsoup/PKGBUILD
deleted file mode 100644
index 90acd664f..000000000
--- a/gnome-unstable/libsoup/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 154605 2012-03-30 12:29:55Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.38.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('8fc1470309aacfc45842ec774b5a5de1848d3d59f7c467efaca555b21bef96ad')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=$pkgver" 'libgnome-keyring')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-2.4"
-  rm -rf "$pkgdir/usr/share"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib"
-}
diff --git a/gnome-unstable/libwacom/PKGBUILD b/gnome-unstable/libwacom/PKGBUILD
deleted file mode 100644
index 81f45b294..000000000
--- a/gnome-unstable/libwacom/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 154378 2012-03-27 11:41:33Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libwacom
-pkgver=0.4
-pkgrel=1
-pkgdesc="Library to identify Wacom tablets and their features"
-arch=('x86_64' 'i686')
-depends=('glib2' 'udev')
-license=('LGPL')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-url="http://www.gnome.org"
-sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libwebkit/PKGBUILD b/gnome-unstable/libwebkit/PKGBUILD
deleted file mode 100644
index 7f7c4fe8f..000000000
--- a/gnome-unstable/libwebkit/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 154559 2012-03-30 09:02:12Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit libwebkit3)
-pkgver=1.8.0
-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' 'libgl'
-         'geoclue')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
-options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz)
-sha256sums=('8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc')
-
-build() {
-  cd "$srcdir/webkit-$pkgver"
-  mkdir build-gtk{2,3}
-
-  # clear makeflags: race during introspection.
-  # WebKit*.gir should be created before WebKit*.typelib, but isn't
-  MAKEFLAGS=
-  
-  ( 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/gnome-unstable/libwebkit/libwebkit.install b/gnome-unstable/libwebkit/libwebkit.install
deleted file mode 100644
index 24072f316..000000000
--- a/gnome-unstable/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/gnome-unstable/libwebkit/python.patch b/gnome-unstable/libwebkit/python.patch
deleted file mode 100644
index 71d0039c6..000000000
--- a/gnome-unstable/libwebkit/python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur webkit-1.7.91.orig/Tools/GNUmakefile.am webkit-1.7.91/Tools/GNUmakefile.am
---- webkit-1.7.91.orig/Tools/GNUmakefile.am	2012-03-08 12:37:34.221447643 +0000
-+++ webkit-1.7.91/Tools/GNUmakefile.am	2012-03-08 12:53:28.713523074 +0000
-@@ -326,7 +326,7 @@
- 	  fi; \
- 	fi
- endif
--	$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-+	$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
- 
- uninstall-local:
- 	@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/gnome-unstable/libwebkit/webkit-gtk-1.7.90-parallel-make-hack.patch b/gnome-unstable/libwebkit/webkit-gtk-1.7.90-parallel-make-hack.patch
deleted file mode 100644
index b632ca279..000000000
--- a/gnome-unstable/libwebkit/webkit-gtk-1.7.90-parallel-make-hack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Horrible failure of a hack to enable workaround for
-https://bugs.webkit.org/show_bug.cgi?id=79498
-
---- a/GNUmakefile.am
-+++ b/GNUmakefile.am
-@@ -285,6 +285,15 @@
- all-local: stamp-po
- 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
- 
-+# Horrible hack to enable workaround for parallel make failure
-+all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
-+
-+all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
-+
-+all-programs-local: GNUmakefile $(PROGRAMS)
-+
-+all-data-local: GNUmakefile $(DATA)
-+
- # remove built sources and program directories
- clean-local:
- 	-rm -rf $(GENPROGRAMS)
diff --git a/gnome-unstable/libwnck3/PKGBUILD b/gnome-unstable/libwnck3/PKGBUILD
deleted file mode 100644
index b350c8943..000000000
--- a/gnome-unstable/libwnck3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 154377 2012-03-27 11:40:55Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libwnck3
-_pkgbasename=libwnck
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Window Navigator Construction Kit (GTK+3)"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3' 'startup-notification' 'libxres')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad')
-
-build() {
-    cd "$_pkgbasename-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "$_pkgbasename-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libxklavier/PKGBUILD b/gnome-unstable/libxklavier/PKGBUILD
deleted file mode 100644
index c1dee53d2..000000000
--- a/gnome-unstable/libxklavier/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 152734 2012-03-09 12:31:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-
-pkgname=libxklavier
-pkgver=5.2.1
-pkgrel=2
-pkgdesc="High-level API for X Keyboard Extension"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
-makedepends=('gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://gswitchit.sourceforge.net"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/mash/PKGBUILD b/gnome-unstable/mash/PKGBUILD
deleted file mode 100644
index 13c99f00d..000000000
--- a/gnome-unstable/mash/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 154821 2012-03-30 19:08:27Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=mash
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="A small library for using 3D models within a Clutter scene"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter')
-makedepends=('gtk-doc' 'gobject-introspection')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/metacity/PKGBUILD b/gnome-unstable/metacity/PKGBUILD
deleted file mode 100644
index 66050d687..000000000
--- a/gnome-unstable/metacity/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 153930 2012-03-20 19:32:17Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=metacity
-pkgver=2.34.3
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra'  'libgtop' 'libsm' 'startup-notification' 'zenity')
-makedepends=('intltool' '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=('aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/metacity \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/metacity/metacity.install b/gnome-unstable/metacity/metacity.install
deleted file mode 100644
index ba0feffc1..000000000
--- a/gnome-unstable/metacity/metacity.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=metacity
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        /usr/sbin/gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/mousetweaks/PKGBUILD b/gnome-unstable/mousetweaks/PKGBUILD
deleted file mode 100644
index be243fcd6..000000000
--- a/gnome-unstable/mousetweaks/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> 
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mousetweaks
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
-arch=(i686 x86_64)
-license=('GPL3' 'FDL')
-depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=mousetweaks.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f44711d47fb6fb6286ca46c144bbdc791e39c5062f923b55e9e300844d317144')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/mousetweaks/mousetweaks.install b/gnome-unstable/mousetweaks/mousetweaks.install
deleted file mode 100644
index 1ae919322..000000000
--- a/gnome-unstable/mousetweaks/mousetweaks.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall mousetweaks
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD
deleted file mode 100644
index 813ed60c9..000000000
--- a/gnome-unstable/mutter/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154582 2012-03-30 11:15:42Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6aa8a91ec7f20eee20b8fd9f93a9529c5a530c21b607ec6656bb9c8b80190431')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/mutter \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/mutter/mutter.install b/gnome-unstable/mutter/mutter.install
deleted file mode 100644
index c47f1cef2..000000000
--- a/gnome-unstable/mutter/mutter.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=mutter
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        /usr/sbin/gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/mx/PKGBUILD b/gnome-unstable/mx/PKGBUILD
deleted file mode 100644
index bed61a97e..000000000
--- a/gnome-unstable/mx/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 152902 2012-03-10 16:21:01Z heftig $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Guenther Wutz <admin@wutzara.de>
-
-pkgname=mx
-pkgver=1.4.3
-pkgrel=2
-pkgdesc="A widget toolkit using Clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org"
-license=('LGPL')
-depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification')
-makedepends=('intltool' 'gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=("http://source.clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('d0c259a7bcaf130a17cef00ed4c7118287f05790a6b50bcffa02668130336eb5')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/nautilus-sendto/PKGBUILD b/gnome-unstable/nautilus-sendto/PKGBUILD
deleted file mode 100644
index 163f518c8..000000000
--- a/gnome-unstable/nautilus-sendto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154032 2012-03-21 18:44:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Tor Krill <tor@krill.nu>
-
-pkgname=nautilus-sendto
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64')
-url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool')
-options=('!libtool' '!emptydirs')
-install=nautilus-sendto.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/nautilus-sendto/nautilus-sendto.install b/gnome-unstable/nautilus-sendto/nautilus-sendto.install
deleted file mode 100644
index d33a1b261..000000000
--- a/gnome-unstable/nautilus-sendto/nautilus-sendto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/nautilus/PKGBUILD b/gnome-unstable/nautilus/PKGBUILD
deleted file mode 100644
index aed2375ac..000000000
--- a/gnome-unstable/nautilus/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 154562 2012-03-30 09:18:06Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('abdc8e84a42ab69158beedeec5b2b960a8bf899fb2b40ad162270223e1f243a3')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nautilus \
-      --disable-nst-extension \
-      --disable-update-mimedb \
-      --disable-packagekit \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/nautilus/nautilus.install b/gnome-unstable/nautilus/nautilus.install
deleted file mode 100644
index 631e38649..000000000
--- a/gnome-unstable/nautilus/nautilus.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall nautilus
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/network-manager-applet/PKGBUILD b/gnome-unstable/network-manager-applet/PKGBUILD
deleted file mode 100644
index 4e302ad76..000000000
--- a/gnome-unstable/network-manager-applet/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 154352 2012-03-27 10:39:59Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-
-pkgname=network-manager-applet
-pkgver=0.9.4.1
-pkgrel=1
-pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme'
-         'mobile-broadband-provider-info' 'gconf' 'iso-codes')
-makedepends=('intltool' 'gnome-bluetooth')
-optdepends=('gnome-bluetooth: for PAN/DUN support')
-options=('!libtool' '!emptydirs')
-install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/networkmanager \
-      --disable-static \
-      --disable-maintainer-mode
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/network-manager-applet/network-manager-applet.install b/gnome-unstable/network-manager-applet/network-manager-applet.install
deleted file mode 100644
index 9922d12b2..000000000
--- a/gnome-unstable/network-manager-applet/network-manager-applet.install
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=network-manager-applet
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/networkmanager-openconnect/PKGBUILD b/gnome-unstable/networkmanager-openconnect/PKGBUILD
deleted file mode 100644
index 6ecf8e0c2..000000000
--- a/gnome-unstable/networkmanager-openconnect/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154353 2012-03-27 10:40:52Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openconnect
-pkgver=0.9.4.0
-pkgrel=1
-pkgdesc="NetworkManager VPN integration for openconnect"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('60732587befd062fb8d979540c4410831f5e686b5d092ec24b0237ebd09e1084')
-
-build() {
-  cd NetworkManager-openconnect-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-openconnect-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/networkmanager-openconnect/networkmanager-openconnect.install b/gnome-unstable/networkmanager-openconnect/networkmanager-openconnect.install
deleted file mode 100644
index 7bd4d44f9..000000000
--- a/gnome-unstable/networkmanager-openconnect/networkmanager-openconnect.install
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=networkmanager-openconnect
-
-post_install() {
-  getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect
-  getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect
-  passwd -l nm-openconnect > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect
-  getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect
-}
diff --git a/gnome-unstable/networkmanager-openvpn/PKGBUILD b/gnome-unstable/networkmanager-openvpn/PKGBUILD
deleted file mode 100644
index b551229b6..000000000
--- a/gnome-unstable/networkmanager-openvpn/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154355 2012-03-27 10:41:36Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openvpn
-pkgver=0.9.4.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for OpenVPN"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-install=networkmanager-openvpn.install
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('d04870b10c2cd3a0671a4be645f595ad0362bcfd23cb849690b27bbac53683e0')
-
-build() {
-  cd NetworkManager-openvpn-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-openvpn-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/networkmanager-openvpn/networkmanager-openvpn.install b/gnome-unstable/networkmanager-openvpn/networkmanager-openvpn.install
deleted file mode 100644
index 931c0517c..000000000
--- a/gnome-unstable/networkmanager-openvpn/networkmanager-openvpn.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/networkmanager-pptp/PKGBUILD b/gnome-unstable/networkmanager-pptp/PKGBUILD
deleted file mode 100644
index b991d7ffa..000000000
--- a/gnome-unstable/networkmanager-pptp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154356 2012-03-27 10:42:21Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-pptp
-pkgver=0.9.4.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for pptp "
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
-sha256sums=('6fb772985a7273793296375d0ecba59362fe5575f70a8dd36da622db8a8d235d')
-
-build() {
-  cd NetworkManager-pptp-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-pptp-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/networkmanager-pptp/networkmanager-pptp.install b/gnome-unstable/networkmanager-pptp/networkmanager-pptp.install
deleted file mode 100644
index 931c0517c..000000000
--- a/gnome-unstable/networkmanager-pptp/networkmanager-pptp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/networkmanager-vpnc/PKGBUILD b/gnome-unstable/networkmanager-vpnc/PKGBUILD
deleted file mode 100644
index 8b0ff5d9f..000000000
--- a/gnome-unstable/networkmanager-vpnc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154357 2012-03-27 10:43:08Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-vpnc
-pkgver=0.9.4.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for vpnc"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-vpnc.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('1d52720ce39bd772753a40c879d0a654fc2efcc4ef7b49ec18f55ae2e82efc7d')
-
-build() {
-  cd NetworkManager-vpnc-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-vpnc-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/networkmanager-vpnc/networkmanager-vpnc.install b/gnome-unstable/networkmanager-vpnc/networkmanager-vpnc.install
deleted file mode 100644
index 931c0517c..000000000
--- a/gnome-unstable/networkmanager-vpnc/networkmanager-vpnc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/networkmanager/NetworkManager.conf b/gnome-unstable/networkmanager/NetworkManager.conf
deleted file mode 100644
index c37b59680..000000000
--- a/gnome-unstable/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD
deleted file mode 100644
index 3ade8e128..000000000
--- a/gnome-unstable/networkmanager/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 154351 2012-03-27 10:39:00Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinxu.org>
-# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
-
-pkgname=networkmanager
-_pkgname=NetworkManager
-pkgver=0.9.4.0
-pkgrel=1
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd'
-         'libsystemd' 'libsoup')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
-optdepends=('modemmanager: for modem management service'
-            'dhclient: alternative DHCP/DHCPv6 client'
-            'iptables: Connection sharing'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support'
-            'openresolv: openresolv support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-#source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch systemd-fallback.patch)
-sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            '5e9bbd8a84883037d27a71ea9969d0cb03f09ca238fa733381bcf136bbc340a5')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  patch -Np1 -i ../disable_set_hostname.patch
-  patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../systemd-fallback.patch
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -f -i
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-distro=arch \
-    --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/sbin/dhcpcd \
-    --with-iptables=/usr/sbin/iptables \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=systemd \
-    --with-wext=no \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-
-  rm -r "$pkgdir/var/run"
-}
diff --git a/gnome-unstable/networkmanager/disable_set_hostname.patch b/gnome-unstable/networkmanager/disable_set_hostname.patch
deleted file mode 100644
index ee95dd0e1..000000000
--- a/gnome-unstable/networkmanager/disable_set_hostname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */
diff --git a/gnome-unstable/networkmanager/dnsmasq-path.patch b/gnome-unstable/networkmanager/dnsmasq-path.patch
deleted file mode 100644
index c0e713266..000000000
--- a/gnome-unstable/networkmanager/dnsmasq-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c	2011-10-10 23:38:20.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c	2012-03-06 09:07:24.137460927 +0100
-@@ -52,8 +52,11 @@
- find_dnsmasq (void)
- {
- 	static const char *paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
-diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c	2011-04-19 07:06:22.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c	2012-03-06 09:07:58.603851818 +0100
-@@ -170,8 +170,11 @@
- nm_find_dnsmasq (void)
- {
- 	static const char *dnsmasq_binary_paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
diff --git a/gnome-unstable/networkmanager/networkmanager.install b/gnome-unstable/networkmanager/networkmanager.install
deleted file mode 100644
index de40c17ed..000000000
--- a/gnome-unstable/networkmanager/networkmanager.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-MSG
-  true
-}
diff --git a/gnome-unstable/networkmanager/systemd-fallback.patch b/gnome-unstable/networkmanager/systemd-fallback.patch
deleted file mode 100644
index f5acc9dc6..000000000
--- a/gnome-unstable/networkmanager/systemd-fallback.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac
---- NetworkManager-0.9.3.995/configure.ac	2012-03-02 01:05:21.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac	2012-03-06 16:55:58.294793902 +0100
-@@ -344,7 +344,7 @@
- case $with_session_tracking in
-     ck|none) ;;
-     systemd)
--        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-         ;;
-     *)
- 	AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
-diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c
---- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c	2012-02-27 16:57:16.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c	2012-03-06 16:55:01.285264295 +0100
-@@ -28,6 +28,10 @@
- #include <glib/gstdio.h>
- #include <systemd/sd-login.h>
- #include <stdlib.h>
-+#include <systemd/sd-daemon.h>
-+#include <sys/stat.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
- 
- #include "nm-session-utils.h"
- #include "nm-session-monitor.h"
-@@ -107,10 +111,20 @@
- 	return source;
- }
- 
-+/********************************************************************/
-+
-+#define CKDB_PATH "/var/run/ConsoleKit/database"
-+
- struct _NMSessionMonitor {
- 	GObject parent_instance;
- 
- 	GSource *sd_source;
-+
-+	GKeyFile *database;
-+	GFileMonitor *database_monitor;
-+	time_t database_mtime;
-+	GHashTable *sessions_by_uid;
-+	GHashTable *sessions_by_user;
- };
- 
- struct _NMSessionMonitorClass {
-@@ -130,6 +144,215 @@
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+typedef struct {
-+	char *user;
-+	uid_t uid;
-+	gboolean local;
-+	gboolean active;
-+} Session;
-+
-+static void
-+session_free (Session *s)
-+{
-+	g_free (s->user);
-+	memset (s, 0, sizeof (Session));
-+	g_free (s);
-+}
-+
-+static gboolean
-+check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error)
-+{
-+	if (g_key_file_has_key (keyfile, group, key, error))
-+		return TRUE;
-+
-+	if (!error) {
-+		g_set_error (error,
-+			         NM_SESSION_MONITOR_ERROR,
-+			         NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE,
-+			         "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key",
-+			         group, key);
-+	}
-+	return FALSE;
-+}
-+
-+static Session *
-+session_new (GKeyFile *keyfile, const char *group, GError **error)
-+{
-+	GError *local = NULL;
-+	Session *s;
-+	const char *uname = NULL;
-+
-+	s = g_new0 (Session, 1);
-+	g_assert (s);
-+
-+	s->uid = G_MAXUINT; /* paranoia */
-+	if (!check_key (keyfile, group, "uid", &local))
-+		goto error;
-+	s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_active", &local))
-+		goto error;
-+	s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_local", &local))
-+		goto error;
-+	s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!nm_session_uid_to_user (s->uid, &uname, error))
-+		return FALSE;
-+	s->user = g_strdup (uname);
-+
-+	return s;
-+
-+error:
-+	session_free (s);
-+	g_propagate_error (error, local);
-+	return NULL;
-+}
-+
-+static void
-+session_merge (Session *src, Session *dest)
-+{
-+	g_return_if_fail (src != NULL);
-+	g_return_if_fail (dest != NULL);
-+
-+	g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0);
-+	g_warn_if_fail (src->uid == dest->uid);
-+
-+	dest->local = (dest->local || src->local);
-+	dest->active = (dest->active || src->active);
-+}
-+
-+/********************************************************************/
-+
-+static void
-+free_database (NMSessionMonitor *self)
-+{
-+	if (self->database != NULL) {
-+		g_key_file_free (self->database);
-+		self->database = NULL;
-+	}
-+
-+	g_hash_table_remove_all (self->sessions_by_uid);
-+	g_hash_table_remove_all (self->sessions_by_user);
-+}
-+
-+static gboolean
-+reload_database (NMSessionMonitor *self, GError **error)
-+{
-+	struct stat statbuf;
-+	char **groups = NULL;
-+	gsize len = 0, i;
-+	Session *s;
-+
-+	free_database (self);
-+
-+	errno = 0;
-+	if (stat (CKDB_PATH, &statbuf) != 0) {
-+		g_set_error (error,
-+		             NM_SESSION_MONITOR_ERROR,
-+		             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		             "Error statting file " CKDB_PATH ": %s",
-+		             strerror (errno));
-+		goto error;
-+	}
-+	self->database_mtime = statbuf.st_mtime;
-+
-+	self->database = g_key_file_new ();
-+	if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error))
-+		goto error;
-+
-+	groups = g_key_file_get_groups (self->database, &len);
-+	if (!groups) {
-+		g_set_error_literal (error,
-+		                     NM_SESSION_MONITOR_ERROR,
-+		                     NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		                     "Could not load groups from " CKDB_PATH "");
-+		goto error;
-+	}
-+
-+	for (i = 0; i < len; i++) {
-+		Session *found;
-+
-+		if (!g_str_has_prefix (groups[i], "Session "))
-+			continue;
-+
-+		s = session_new (self->database, groups[i], error);
-+		if (!s)
-+			goto error;
-+
-+		found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user);
-+		if (found) {
-+			session_merge (s, found);
-+			session_free (s);
-+		} else {
-+			/* Entirely new user */
-+			g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
-+			g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
-+		}
-+	}
-+
-+	g_strfreev (groups);
-+	return TRUE;
-+
-+error:
-+	if (groups)
-+		g_strfreev (groups);
-+	free_database (self);
-+	return FALSE;
-+}
-+
-+static gboolean
-+ensure_database (NMSessionMonitor *self, GError **error)
-+{
-+	gboolean ret = FALSE;
-+
-+	if (self->database != NULL) {
-+		struct stat statbuf;
-+
-+		errno = 0;
-+		if (stat (CKDB_PATH, &statbuf) != 0) {
-+			g_set_error (error,
-+			             NM_SESSION_MONITOR_ERROR,
-+			             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+			             "Error statting file " CKDB_PATH " to check timestamp: %s",
-+			             strerror (errno));
-+			goto out;
-+		}
-+
-+		if (statbuf.st_mtime == self->database_mtime) {
-+			ret = TRUE;
-+			goto out;
-+		}
-+	}
-+
-+	ret = reload_database (self, error);
-+
-+out:
-+	return ret;
-+}
-+
-+static void
-+on_file_monitor_changed (GFileMonitor *    file_monitor,
-+                         GFile *           file,
-+                         GFile *           other_file,
-+                         GFileMonitorEvent event_type,
-+                         gpointer          user_data)
-+{
-+	NMSessionMonitor *self = NM_SESSION_MONITOR (user_data);
-+
-+	/* throw away cache */
-+	free_database (self);
-+
-+	g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
-+}
-+
- static gboolean
- sessions_changed (gpointer user_data)
- {
-@@ -143,9 +366,50 @@
- static void
- nm_session_monitor_init (NMSessionMonitor *monitor)
- {
--	monitor->sd_source = sd_source_new ();
--	g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--	g_source_attach (monitor->sd_source, NULL);
-+	if (sd_booted () > 0) {
-+		monitor->sd_source = sd_source_new ();
-+		g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+		g_source_attach (monitor->sd_source, NULL);
-+
-+		monitor->database_monitor = NULL;
-+		monitor->database = NULL;
-+	} else {
-+		monitor->sd_source = NULL;
-+
-+		GError *error = NULL;
-+		GFile *file;
-+
-+		/* Sessions-by-user is responsible for destroying the Session objects */
-+		monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal,
-+								NULL, (GDestroyNotify) session_free);
-+		monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal);
-+
-+
-+		error = NULL;
-+		if (!ensure_database (monitor, &error)) {
-+			/* Ignore the first error if the CK database isn't found yet */
-+			if (g_error_matches (error,
-+					     NM_SESSION_MONITOR_ERROR,
-+					     NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) {
-+				nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message);
-+			}
-+			g_error_free (error);
-+		}
-+
-+		error = NULL;
-+		file = g_file_new_for_path (CKDB_PATH);
-+		monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
-+		g_object_unref (file);
-+		if (monitor->database_monitor == NULL) {
-+			nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message);
-+			g_error_free (error);
-+		} else {
-+			g_signal_connect (monitor->database_monitor,
-+					  "changed",
-+					  G_CALLBACK (on_file_monitor_changed),
-+					  monitor);
-+		}
-+	}
- }
- 
- static void
-@@ -158,6 +422,12 @@
- 		g_source_unref (monitor->sd_source);
- 	}
- 
-+	if (monitor->database_monitor != NULL)
-+		g_object_unref (monitor->database_monitor);
-+
-+	if (monitor->database != NULL)
-+		free_database (monitor);
-+
- 	if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
- 		G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
- }
-@@ -206,15 +476,36 @@
-                                      uid_t *out_uid,
-                                      GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
- 
--	if (out_uid)
--		*out_uid = uid;
-+		if (out_uid)
-+			*out_uid = uid;
- 
--	return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+		return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
-+
-+		if (out_uid)
-+			*out_uid = s->uid;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -222,12 +513,31 @@
-                                 const char *username,
-                                 GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
-+
-+		return nm_session_monitor_uid_active (monitor, uid, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
- 
--	return nm_session_monitor_uid_active (monitor, uid, error);
-+		return s->active;
-+	}
- }
- 
- gboolean
-@@ -236,10 +546,31 @@
-                                     const char **out_user,
-                                     GError **error)
- {
--	if (!nm_session_uid_to_user (uid, out_user, error))
--		return FALSE;
-+	if (monitor->sd_source != NULL) {
-+		if (!nm_session_uid_to_user (uid, out_user, error))
-+			return FALSE;
- 
--	return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+		return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid %d",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		if (out_user)
-+			*out_user = s->user;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -247,5 +578,24 @@
-                                uid_t uid,
-                                GError **error)
- {
--	return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	if (monitor->sd_source != NULL)
-+		return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid '%d'",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		return s->active;
-+	}
- }
diff --git a/gnome-unstable/pango/PKGBUILD b/gnome-unstable/pango/PKGBUILD
deleted file mode 100644
index 0c10b2a0c..000000000
--- a/gnome-unstable/pango/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154759 2012-03-30 16:35:20Z heftig $ 
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pango
-pkgver=1.30.0
-pkgrel=1
-pkgdesc="A library for layout and rendering of text"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2')
-makedepends=('gobject-introspection' 'libxt' 'gtk-doc')
-options=('!libtool' '!emptydirs')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/pango/pango.install b/gnome-unstable/pango/pango.install
deleted file mode 100644
index 73b0f5bf1..000000000
--- a/gnome-unstable/pango/pango.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	usr/bin/pango-querymodules >etc/pango/pango.modules
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [ -f usr/etc/pango/pango.modules ]; then
-		rm usr/etc/pango/pango.modules
-	fi
-	post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-	rm etc/pango/pango.modules
-}
diff --git a/gnome-unstable/pidgin/PKGBUILD b/gnome-unstable/pidgin/PKGBUILD
deleted file mode 100644
index a9ae8efe5..000000000
--- a/gnome-unstable/pidgin/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 154399 2012-03-27 14:35:39Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pidgin.im/"
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
-             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10'
-             'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool'
-             'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        port-to-farstream-v3.patch)
-sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b'
-            '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Apply patch for farsight -> farstream transition
-  # http://developer.pidgin.im/ticket/14936
-  patch -Np1 -i "$srcdir/port-to-farstream-v3.patch"
-
-  # The farstream patch changes configure.ac
-  autoreconf -vi
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' */plugins/*.py \
-    libpurple/purple-{remote,notifications-example,url-handler}
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-schemas-install \
-    --disable-meanwhile \
-    --disable-gnutls \
-    --enable-cyrus-sasl \
-    --disable-doxygen \
-    --enable-nm \
-    --with-python=/usr/bin/python2 \
-    --with-system-ssl-certs=/etc/ssl/certs
-    make
-}
-
-package_pidgin(){
-  pkgdesc="Multi-protocol instant messaging client"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'gstreamer0.10' 'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction'
-              'ca-certificates: SSL CA certificates'
-              'gstreamer0.10-good-plugins: video and voice support'
-              'tk: Tcl/Tk scripting support')
-  install=pidgin.install
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C pidgin DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
-  rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
-  pkgdesc="IM library extracted from Pidgin"
-  depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss')
-  optdepends=('avahi: Bonjour protocol support'
-              'dbus-python: for purple-remote and purple-url-handler')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
-    make -C "$_dir" DESTDIR="$pkgdir" install
-  done
-}
-
-package_finch(){
-  pkgdesc="A ncurses-based messaging client"
-  depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'tk: Tcl/Tk scripting support')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C finch DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/pidgin/nm09-more.patch b/gnome-unstable/pidgin/nm09-more.patch
deleted file mode 100644
index 8c708df9a..000000000
--- a/gnome-unstable/pidgin/nm09-more.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
---- pidgin-2.7.11/libpurple/network.c.nm09more	2011-04-26 12:01:27.700085246 -0500
-+++ pidgin-2.7.11/libpurple/network.c	2011-05-24 13:13:28.185165657 -0500
-@@ -833,8 +833,20 @@ purple_network_is_available(void)
- 			purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
- 	}
- 
--	if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
--		return TRUE;
-+	switch (nm_state)
-+	{
-+		case NM_STATE_UNKNOWN:
-+#if NM_CHECK_VERSION(0,8,992)
-+		case NM_STATE_CONNECTED_LOCAL:
-+		case NM_STATE_CONNECTED_SITE:
-+		case NM_STATE_CONNECTED_GLOBAL:
-+#else
-+		case NM_STATE_CONNECTED:
-+#endif
-+			return TRUE;
-+		default:
-+			break;
-+	}
- 
- 	return FALSE;
- 
-@@ -1170,9 +1182,14 @@ purple_network_init(void)
- 		                                     NM_DBUS_SERVICE,
- 		                                     NM_DBUS_PATH,
- 		                                     NM_DBUS_INTERFACE);
-+		/* NM 0.6 signal */
- 		dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
- 		dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
- 		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
-+		/* NM 0.7 and later signal */
-+		dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
-+		dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
-+		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
- 
- 		dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
- 		                                       DBUS_SERVICE_DBUS,
-@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
- #ifdef HAVE_NETWORKMANAGER
- 	if (nm_proxy) {
- 		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
-+		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
- 		g_object_unref(G_OBJECT(nm_proxy));
- 	}
- 	if (dbus_proxy) {
diff --git a/gnome-unstable/pidgin/pidgin.install b/gnome-unstable/pidgin/pidgin.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/gnome-unstable/pidgin/pidgin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/pidgin/port-to-farstream-v2.patch b/gnome-unstable/pidgin/port-to-farstream-v2.patch
deleted file mode 100644
index 49ae60906..000000000
--- a/gnome-unstable/pidgin/port-to-farstream-v2.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
---- pidgin-2.10.1.orig/configure.ac	2011-12-06 10:44:32.000000000 +0200
-+++ pidgin-2.10.1/configure.ac	2012-03-10 18:21:12.000000000 +0200
-@@ -780,18 +780,18 @@ else
- fi
- 
- dnl #######################################################################
--dnl # Check for Farsight
-+dnl # Check for Farstream
- dnl #######################################################################
--AC_ARG_ENABLE(farsight,
--	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
--	enable_farsight="$enableval", enable_farsight="yes")
--if test "x$enable_farsight" != "xno"; then
--	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
--		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
--		AC_SUBST(FARSIGHT_CFLAGS)
--		AC_SUBST(FARSIGHT_LIBS)
-+AC_ARG_ENABLE(farstream,
-+	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
-+	enable_farstream="$enableval", enable_farstream="yes")
-+if test "x$enable_farstream" != "xno"; then
-+	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
-+		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
-+		AC_SUBST(FARSTREAM_CFLAGS)
-+		AC_SUBST(FARSTREAM_LIBS)
- 	], [
--		enable_farsight="no"
-+		enable_farstream="no"
- 	])
- fi
- 
-@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
- 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
- 	enable_vv="$enableval", enable_vv="yes")
- if test "x$enable_vv" != "xno"; then
--	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
-+	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
- 		AC_DEFINE(USE_VV, 1, [Use voice and video])
- 	else
- 		enable_vv="no"
- 		if test "x$force_deps" = "xyes"; then
- 			AC_MSG_ERROR([
- Dependencies for voice/video were not met.
--Install the necessary gstreamer and farsight packages first.
-+Install the necessary gstreamer and farstream packages first.
- Or use --disable-vv if you do not need voice/video support.
- 			])
- 		fi
- 	fi
- fi
--AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
-+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
- 
- dnl #######################################################################
- dnl # Check for Internationalized Domain Name support
-diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am
---- pidgin-2.10.1.orig/libpurple/Makefile.am	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/Makefile.am	2012-03-10 18:21:19.000000000 +0200
-@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \
- 	$(LIBXML_LIBS) \
- 	$(NETWORKMANAGER_LIBS) \
- 	$(INTLLIBS) \
--	$(FARSIGHT_LIBS) \
-+	$(FARSTREAM_LIBS) \
- 	$(GSTREAMER_LIBS) \
- 	$(GSTINTERFACES_LIBS) \
- 	$(IDN_LIBS) \
-@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
- 	$(DEBUG_CFLAGS) \
- 	$(DBUS_CFLAGS) \
- 	$(LIBXML_CFLAGS) \
--	$(FARSIGHT_CFLAGS) \
-+	$(FARSTREAM_CFLAGS) \
- 	$(GSTREAMER_CFLAGS) \
- 	$(GSTINTERFACES_CFLAGS) \
- 	$(IDN_CFLAGS) \
-diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c
---- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/media/backend-fs2.c	2012-03-10 18:21:19.000000000 +0200
-@@ -1,5 +1,5 @@
- /**
-- * @file backend-fs2.c Farsight 2 backend for media API
-+ * @file backend-fs2.c Farstream backend for media API
-  * @ingroup core
-  */
- 
-@@ -34,8 +34,9 @@
- #include "network.h"
- #include "media-gst.h"
- 
--#include <gst/farsight/fs-conference-iface.h>
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-conference.h>
-+#include <farstream/fs-element-added-notifier.h>
-+#include <farstream/fs-utils.h>
- 
- /** @copydoc _PurpleMediaBackendFs2Class */
- typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
-@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream
- 	gchar *participant;
- 	FsStream *stream;
- 
-+        gboolean supports_add;
-+
- 	GstElement *src;
- 	GstElement *tee;
- 	GstElement *volume;
-@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private
- 	FsConference *conference;
- 	gchar *conference_type;
- 
-+        FsElementAddedNotifier *notifier;
-+
- 	GHashTable *sessions;
- 	GHashTable *participants;
- 
-@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject
- 
- 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
- 
-+	if (priv->notifier) {
-+		g_object_unref(priv->notifier);
-+		priv->notifier = NULL;
-+	}
-+
- 	if (priv->confbin) {
- 		GstElement *pipeline;
- 
-@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus,
- 			priv->conference != FS_CONFERENCE(src))
- 		return;
- 
--	if (gst_structure_has_name(msg->structure, "farsight-error")) {
-+	if (gst_structure_has_name(msg->structure, "farstream-error")) {
- 		FsError error_no;
- 		gst_structure_get_enum(msg->structure, "error-no",
- 				FS_TYPE_ERROR, (gint*)&error_no);
-@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus,
- 						" strict."));
- 				purple_media_end(priv->media, NULL, NULL);
- 				break;
--			case FS_ERROR_UNKNOWN_CNAME:
--			/*
--			 * Unknown CName is only a problem for the
--			 * multicast transmitter which isn't used.
--			 * It is also deprecated.
--			 */
--				break;
- 			default:
- 				purple_debug_error("backend-fs2",
--						"farsight-error: %i: %s\n",
-+						"farstream-error: %i: %s\n",
- 						error_no,
- 					  	gst_structure_get_string(
- 						msg->structure, "error-msg"));
-@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus,
- 
- 		if (FS_ERROR_IS_FATAL(error_no)) {
- 			purple_media_error(priv->media, _("A non-recoverable "
--					"Farsight2 error has occurred."));
-+					"Farstream error has occurred."));
- 			purple_media_end(priv->media, NULL, NULL);
- 		}
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-local-candidate")) {
-+			"farstream-new-local-candidate")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus,
- 				session->id, name, candidate);
- 		g_object_unref(candidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-local-candidates-prepared")) {
-+			"farstream-local-candidates-prepared")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsParticipant *participant;
-@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus,
- 		g_signal_emit_by_name(self, "candidates-prepared",
- 				session->id, name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-active-candidate-pair")) {
-+			"farstream-new-active-candidate-pair")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus,
- 		g_object_unref(lcandidate);
- 		g_object_unref(rcandidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-recv-codecs-changed")) {
-+			"farstream-recv-codecs-changed")) {
- 		const GValue *value;
- 		GList *codecs;
- 		FsCodec *codec;
-@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus,
- 		codec = codecs->data;
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-recv-codecs-changed: %s\n",
-+				"farstream-recv-codecs-changed: %s\n",
- 				codec->encoding_name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-component-state-changed")) {
-+			"farstream-component-state-changed")) {
- 		const GValue *value;
- 		FsStreamState fsstate;
- 		guint component;
-@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus,
- 		}
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-component-state-changed: "
-+				"farstream-component-state-changed: "
- 				"component: %u state: %s\n",
- 				component, state);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-send-codec-changed")) {
-+			"farstream-send-codec-changed")) {
- 		const GValue *value;
- 		FsCodec *codec;
- 		gchar *codec_str;
-@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus,
- 		codec_str = fs_codec_to_string(codec);
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-send-codec-changed: codec: %s\n",
-+				"farstream-send-codec-changed: codec: %s\n",
- 				codec_str);
- 
- 		g_free(codec_str);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-codecs-changed")) {
-+			"farstream-codecs-changed")) {
- 		const GValue *value;
- 		FsSession *fssession;
- 		GList *sessions;
-@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl
- 				purple_media_is_initiator(media, sid, name))
- 			return;
- 
--		fs_stream_set_remote_candidates(stream->stream,
--				stream->remote_candidates, &err);
-+		if (stream->supports_add)
-+		  fs_stream_add_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
-+		else
-+		  fs_stream_force_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
- 
- 		if (err == NULL)
- 			return;
-@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s
- 	GstElement *pipeline;
- 	GstBus *bus;
- 	gchar *name;
-+	GKeyFile *default_props;
- 
- 	priv->conference = FS_CONFERENCE(
- 			gst_element_factory_make(priv->conference_type, NULL));
-@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s
- 		return FALSE;
- 	}
- 
-+	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
-+	if (default_props != NULL) {
-+		priv->notifier = fs_element_added_notifier_new();
-+		fs_element_added_notifier_add(priv->notifier,
-+					      GST_BIN(priv->confbin));
-+		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
-+	}
-+
- 	g_signal_connect(G_OBJECT(bus), "message",
- 			G_CALLBACK(gst_bus_cb), self);
- 	gst_object_unref(bus);
-@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se
- 	 * receiving the src-pad-added signal.
- 	 * Only works for non-multicast FsRtpSessions.
- 	 */
--	if (is_nice || !strcmp(transmitter, "rawudp"))
-+	if (!!strcmp(transmitter, "multicast"))
- 		g_object_set(G_OBJECT(session->session),
- 				"no-rtcp-timeout", 0, NULL);
- 
-@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2
- 	GError *err = NULL;
- 
- 	participant = fs_conference_new_participant(
--			priv->conference, name, &err);
-+			priv->conference, &err);
- 
- 	if (err) {
- 		purple_debug_error("backend-fs2",
-@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2
- 		return FALSE;
- 	}
- 
-+	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
-+					 "cname")) {
-+	  g_object_set(participant, "cname", &name, NULL);
-+	}
-+
-+
- 	if (!priv->participants) {
- 		purple_debug_info("backend-fs2",
- 				"Creating hash table for participants\n");
-@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel
- 		}
- 	}
- 
-+
-+	session = get_session(self, sess_id);
-+
-+	if (session == NULL) {
-+		purple_debug_error("backend-fs2",
-+				"Couldn't find session to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	participant = get_participant(self, who);
-+
-+	if (participant == NULL) {
-+		purple_debug_error("backend-fs2", "Couldn't find "
-+				"participant to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	fsstream = fs_session_new_stream(session->session, participant,
-+			initiator == TRUE ? type_direction :
-+			(type_direction & FS_DIRECTION_RECV), &err);
-+
-+	if (fsstream == NULL) {
-+		if (err) {
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream: %s\n",
-+					err && err->message ?
-+					err->message : "NULL");
-+			g_error_free(err);
-+		} else
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream\n");
-+		return FALSE;
-+	}
-+
- 	memcpy(_params, params, sizeof(GParameter) * num_params);
- 
- 	/* set the controlling mode parameter */
-@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel
- 		_num_params++;
- 	}
- 
--	session = get_session(self, sess_id);
- 
--	if (session == NULL) {
--		purple_debug_error("backend-fs2",
--				"Couldn't find session to create stream.\n");
--		return FALSE;
--	}
--
--	participant = get_participant(self, who);
--
--	if (participant == NULL) {
--		purple_debug_error("backend-fs2", "Couldn't find "
--				"participant to create stream.\n");
--		return FALSE;
-+	if(!fs_stream_set_transmitter(fsstream, transmitter,
-+				      _params, _num_params, &err)) {
-+	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
-+	     g_clear_error(&err);
-+	     g_free(_params);
-+	     return FALSE;
- 	}
--
--	fsstream = fs_session_new_stream(session->session, participant,
--			initiator == TRUE ? type_direction :
--			(type_direction & FS_DIRECTION_RECV), transmitter,
--			_num_params, _params, &err);
- 	g_free(_params);
- 
--	if (fsstream == NULL) {
--		if (err) {
--			purple_debug_error("backend-fs2",
--					"Error creating stream: %s\n",
--					err && err->message ?
--					err->message : "NULL");
--			g_error_free(err);
--		} else
--			purple_debug_error("backend-fs2",
--					"Error creating stream\n");
--		return FALSE;
--	}
- 
- 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
- 	stream->participant = g_strdup(who);
- 	stream->session = session;
- 	stream->stream = fsstream;
-+	stream->supports_add = !strcmp(transmitter, "nice");
- 
- 	priv->streams =	g_list_append(priv->streams, stream);
- 
-@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand
- 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
- 			purple_media_accepted(
- 			priv->media, sess_id, participant)) {
--		fs_stream_set_remote_candidates(stream->stream,
-+  	        if (stream->supports_add)
-+		     fs_stream_add_remote_candidates(stream->stream,
-+				stream->remote_candidates, &err);
-+		else
-+		     fs_stream_force_remote_candidates(stream->stream,
- 				stream->remote_candidates, &err);
- 
- 		if (err) {
-diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c
---- pidgin-2.10.1.orig/libpurple/media.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/media.c	2012-03-10 18:21:19.000000000 +0200
-@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med
- {
- #ifdef USE_VV
- 	PurpleMediaSession *session;
--	PurpleMediaStream *stream = NULL;
- 
- 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
- 
-@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med
- 	}
- 
- 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
--		stream = purple_media_insert_stream(session, who, initiator);
-+		purple_media_insert_stream(session, who, initiator);
- 
- 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
- 				0, PURPLE_MEDIA_STATE_NEW,
-diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c
---- pidgin-2.10.1.orig/libpurple/mediamanager.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/mediamanager.c	2012-03-10 18:27:05.000000000 +0200
-@@ -39,7 +39,7 @@
- #ifdef USE_VV
- #include <media/backend-fs2.h>
- 
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-element-added-notifier.h>
- #include <gst/interfaces/xoverlay.h>
- 
- /** @copydoc _PurpleMediaManagerPrivate */
diff --git a/gnome-unstable/pidgin/port-to-farstream-v3.patch b/gnome-unstable/pidgin/port-to-farstream-v3.patch
deleted file mode 100644
index 93e29af50..000000000
--- a/gnome-unstable/pidgin/port-to-farstream-v3.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
---- pidgin-2.10.1.orig/configure.ac	2011-12-06 10:44:32.000000000 +0200
-+++ pidgin-2.10.1/configure.ac	2012-03-10 18:21:12.000000000 +0200
-@@ -780,18 +780,18 @@ else
- fi
- 
- dnl #######################################################################
--dnl # Check for Farsight
-+dnl # Check for Farstream
- dnl #######################################################################
--AC_ARG_ENABLE(farsight,
--	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
--	enable_farsight="$enableval", enable_farsight="yes")
--if test "x$enable_farsight" != "xno"; then
--	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
--		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
--		AC_SUBST(FARSIGHT_CFLAGS)
--		AC_SUBST(FARSIGHT_LIBS)
-+AC_ARG_ENABLE(farstream,
-+	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
-+	enable_farstream="$enableval", enable_farstream="yes")
-+if test "x$enable_farstream" != "xno"; then
-+	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
-+		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
-+		AC_SUBST(FARSTREAM_CFLAGS)
-+		AC_SUBST(FARSTREAM_LIBS)
- 	], [
--		enable_farsight="no"
-+		enable_farstream="no"
- 	])
- fi
- 
-@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
- 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
- 	enable_vv="$enableval", enable_vv="yes")
- if test "x$enable_vv" != "xno"; then
--	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
-+	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
- 		AC_DEFINE(USE_VV, 1, [Use voice and video])
- 	else
- 		enable_vv="no"
- 		if test "x$force_deps" = "xyes"; then
- 			AC_MSG_ERROR([
- Dependencies for voice/video were not met.
--Install the necessary gstreamer and farsight packages first.
-+Install the necessary gstreamer and farstream packages first.
- Or use --disable-vv if you do not need voice/video support.
- 			])
- 		fi
- 	fi
- fi
--AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
-+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
- 
- dnl #######################################################################
- dnl # Check for Internationalized Domain Name support
-diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am
---- pidgin-2.10.1.orig/libpurple/Makefile.am	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/Makefile.am	2012-03-10 18:21:19.000000000 +0200
-@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \
- 	$(LIBXML_LIBS) \
- 	$(NETWORKMANAGER_LIBS) \
- 	$(INTLLIBS) \
--	$(FARSIGHT_LIBS) \
-+	$(FARSTREAM_LIBS) \
- 	$(GSTREAMER_LIBS) \
- 	$(GSTINTERFACES_LIBS) \
- 	$(IDN_LIBS) \
-@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
- 	$(DEBUG_CFLAGS) \
- 	$(DBUS_CFLAGS) \
- 	$(LIBXML_CFLAGS) \
--	$(FARSIGHT_CFLAGS) \
-+	$(FARSTREAM_CFLAGS) \
- 	$(GSTREAMER_CFLAGS) \
- 	$(GSTINTERFACES_CFLAGS) \
- 	$(IDN_CFLAGS) \
-diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c
---- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/media/backend-fs2.c	2012-03-10 18:21:19.000000000 +0200
-@@ -1,5 +1,5 @@
- /**
-- * @file backend-fs2.c Farsight 2 backend for media API
-+ * @file backend-fs2.c Farstream backend for media API
-  * @ingroup core
-  */
- 
-@@ -34,8 +34,9 @@
- #include "network.h"
- #include "media-gst.h"
- 
--#include <gst/farsight/fs-conference-iface.h>
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-conference.h>
-+#include <farstream/fs-element-added-notifier.h>
-+#include <farstream/fs-utils.h>
- 
- /** @copydoc _PurpleMediaBackendFs2Class */
- typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
-@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream
- 	gchar *participant;
- 	FsStream *stream;
- 
-+        gboolean supports_add;
-+
- 	GstElement *src;
- 	GstElement *tee;
- 	GstElement *volume;
-@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private
- 	FsConference *conference;
- 	gchar *conference_type;
- 
-+        FsElementAddedNotifier *notifier;
-+
- 	GHashTable *sessions;
- 	GHashTable *participants;
- 
-@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject
- 
- 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
- 
-+	if (priv->notifier) {
-+		g_object_unref(priv->notifier);
-+		priv->notifier = NULL;
-+	}
-+
- 	if (priv->confbin) {
- 		GstElement *pipeline;
- 
-@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus,
- 			priv->conference != FS_CONFERENCE(src))
- 		return;
- 
--	if (gst_structure_has_name(msg->structure, "farsight-error")) {
-+	if (gst_structure_has_name(msg->structure, "farstream-error")) {
- 		FsError error_no;
- 		gst_structure_get_enum(msg->structure, "error-no",
- 				FS_TYPE_ERROR, (gint*)&error_no);
-@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus,
- 						" strict."));
- 				purple_media_end(priv->media, NULL, NULL);
- 				break;
--			case FS_ERROR_UNKNOWN_CNAME:
--			/*
--			 * Unknown CName is only a problem for the
--			 * multicast transmitter which isn't used.
--			 * It is also deprecated.
--			 */
--				break;
- 			default:
- 				purple_debug_error("backend-fs2",
--						"farsight-error: %i: %s\n",
-+						"farstream-error: %i: %s\n",
- 						error_no,
- 					  	gst_structure_get_string(
- 						msg->structure, "error-msg"));
-@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus,
- 
- 		if (FS_ERROR_IS_FATAL(error_no)) {
- 			purple_media_error(priv->media, _("A non-recoverable "
--					"Farsight2 error has occurred."));
-+					"Farstream error has occurred."));
- 			purple_media_end(priv->media, NULL, NULL);
- 		}
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-local-candidate")) {
-+			"farstream-new-local-candidate")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus,
- 				session->id, name, candidate);
- 		g_object_unref(candidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-local-candidates-prepared")) {
-+			"farstream-local-candidates-prepared")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsParticipant *participant;
-@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus,
- 		g_signal_emit_by_name(self, "candidates-prepared",
- 				session->id, name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-new-active-candidate-pair")) {
-+			"farstream-new-active-candidate-pair")) {
- 		const GValue *value;
- 		FsStream *stream;
- 		FsCandidate *local_candidate;
-@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus,
- 		g_object_unref(lcandidate);
- 		g_object_unref(rcandidate);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-recv-codecs-changed")) {
-+			"farstream-recv-codecs-changed")) {
- 		const GValue *value;
- 		GList *codecs;
- 		FsCodec *codec;
-@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus,
- 		codec = codecs->data;
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-recv-codecs-changed: %s\n",
-+				"farstream-recv-codecs-changed: %s\n",
- 				codec->encoding_name);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-component-state-changed")) {
-+			"farstream-component-state-changed")) {
- 		const GValue *value;
- 		FsStreamState fsstate;
- 		guint component;
-@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus,
- 		}
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-component-state-changed: "
-+				"farstream-component-state-changed: "
- 				"component: %u state: %s\n",
- 				component, state);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-send-codec-changed")) {
-+			"farstream-send-codec-changed")) {
- 		const GValue *value;
- 		FsCodec *codec;
- 		gchar *codec_str;
-@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus,
- 		codec_str = fs_codec_to_string(codec);
- 
- 		purple_debug_info("backend-fs2",
--				"farsight-send-codec-changed: codec: %s\n",
-+				"farstream-send-codec-changed: codec: %s\n",
- 				codec_str);
- 
- 		g_free(codec_str);
- 	} else if (gst_structure_has_name(msg->structure,
--			"farsight-codecs-changed")) {
-+			"farstream-codecs-changed")) {
- 		const GValue *value;
- 		FsSession *fssession;
- 		GList *sessions;
-@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl
- 				purple_media_is_initiator(media, sid, name))
- 			return;
- 
--		fs_stream_set_remote_candidates(stream->stream,
--				stream->remote_candidates, &err);
-+		if (stream->supports_add)
-+		  fs_stream_add_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
-+		else
-+		  fs_stream_force_remote_candidates(stream->stream,
-+			  	stream->remote_candidates, &err);
- 
- 		if (err == NULL)
- 			return;
-@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s
- 	GstElement *pipeline;
- 	GstBus *bus;
- 	gchar *name;
-+	GKeyFile *default_props;
- 
- 	priv->conference = FS_CONFERENCE(
- 			gst_element_factory_make(priv->conference_type, NULL));
-@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s
- 		return FALSE;
- 	}
- 
-+	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
-+	if (default_props != NULL) {
-+		priv->notifier = fs_element_added_notifier_new();
-+		fs_element_added_notifier_add(priv->notifier,
-+					      GST_BIN(priv->confbin));
-+		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
-+	}
-+
- 	g_signal_connect(G_OBJECT(bus), "message",
- 			G_CALLBACK(gst_bus_cb), self);
- 	gst_object_unref(bus);
-@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se
- 	 * receiving the src-pad-added signal.
- 	 * Only works for non-multicast FsRtpSessions.
- 	 */
--	if (is_nice || !strcmp(transmitter, "rawudp"))
-+	if (!!strcmp(transmitter, "multicast"))
- 		g_object_set(G_OBJECT(session->session),
- 				"no-rtcp-timeout", 0, NULL);
- 
-@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2
- 	GError *err = NULL;
- 
- 	participant = fs_conference_new_participant(
--			priv->conference, name, &err);
-+			priv->conference, &err);
- 
- 	if (err) {
- 		purple_debug_error("backend-fs2",
-@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2
- 		return FALSE;
- 	}
- 
-+	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
-+					 "cname")) {
-+	  g_object_set(participant, "cname", name, NULL);
-+	}
-+
-+
- 	if (!priv->participants) {
- 		purple_debug_info("backend-fs2",
- 				"Creating hash table for participants\n");
-@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel
- 		}
- 	}
- 
-+
-+	session = get_session(self, sess_id);
-+
-+	if (session == NULL) {
-+		purple_debug_error("backend-fs2",
-+				"Couldn't find session to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	participant = get_participant(self, who);
-+
-+	if (participant == NULL) {
-+		purple_debug_error("backend-fs2", "Couldn't find "
-+				"participant to create stream.\n");
-+		return FALSE;
-+	}
-+
-+	fsstream = fs_session_new_stream(session->session, participant,
-+			initiator == TRUE ? type_direction :
-+			(type_direction & FS_DIRECTION_RECV), &err);
-+
-+	if (fsstream == NULL) {
-+		if (err) {
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream: %s\n",
-+					err && err->message ?
-+					err->message : "NULL");
-+			g_error_free(err);
-+		} else
-+			purple_debug_error("backend-fs2",
-+					"Error creating stream\n");
-+		return FALSE;
-+	}
-+
- 	memcpy(_params, params, sizeof(GParameter) * num_params);
- 
- 	/* set the controlling mode parameter */
-@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel
- 		_num_params++;
- 	}
- 
--	session = get_session(self, sess_id);
- 
--	if (session == NULL) {
--		purple_debug_error("backend-fs2",
--				"Couldn't find session to create stream.\n");
--		return FALSE;
--	}
--
--	participant = get_participant(self, who);
--
--	if (participant == NULL) {
--		purple_debug_error("backend-fs2", "Couldn't find "
--				"participant to create stream.\n");
--		return FALSE;
-+	if(!fs_stream_set_transmitter(fsstream, transmitter,
-+				      _params, _num_params, &err)) {
-+	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
-+	     g_clear_error(&err);
-+	     g_free(_params);
-+	     return FALSE;
- 	}
--
--	fsstream = fs_session_new_stream(session->session, participant,
--			initiator == TRUE ? type_direction :
--			(type_direction & FS_DIRECTION_RECV), transmitter,
--			_num_params, _params, &err);
- 	g_free(_params);
- 
--	if (fsstream == NULL) {
--		if (err) {
--			purple_debug_error("backend-fs2",
--					"Error creating stream: %s\n",
--					err && err->message ?
--					err->message : "NULL");
--			g_error_free(err);
--		} else
--			purple_debug_error("backend-fs2",
--					"Error creating stream\n");
--		return FALSE;
--	}
- 
- 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
- 	stream->participant = g_strdup(who);
- 	stream->session = session;
- 	stream->stream = fsstream;
-+	stream->supports_add = !strcmp(transmitter, "nice");
- 
- 	priv->streams =	g_list_append(priv->streams, stream);
- 
-@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand
- 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
- 			purple_media_accepted(
- 			priv->media, sess_id, participant)) {
--		fs_stream_set_remote_candidates(stream->stream,
-+  	        if (stream->supports_add)
-+		     fs_stream_add_remote_candidates(stream->stream,
-+				stream->remote_candidates, &err);
-+		else
-+		     fs_stream_force_remote_candidates(stream->stream,
- 				stream->remote_candidates, &err);
- 
- 		if (err) {
-diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c
---- pidgin-2.10.1.orig/libpurple/media.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/media.c	2012-03-10 18:21:19.000000000 +0200
-@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med
- {
- #ifdef USE_VV
- 	PurpleMediaSession *session;
--	PurpleMediaStream *stream = NULL;
- 
- 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
- 
-@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med
- 	}
- 
- 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
--		stream = purple_media_insert_stream(session, who, initiator);
-+		purple_media_insert_stream(session, who, initiator);
- 
- 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
- 				0, PURPLE_MEDIA_STATE_NEW,
-diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c
---- pidgin-2.10.1.orig/libpurple/mediamanager.c	2011-12-06 10:44:33.000000000 +0200
-+++ pidgin-2.10.1/libpurple/mediamanager.c	2012-03-10 18:27:05.000000000 +0200
-@@ -39,7 +39,7 @@
- #ifdef USE_VV
- #include <media/backend-fs2.h>
- 
--#include <gst/farsight/fs-element-added-notifier.h>
-+#include <farstream/fs-element-added-notifier.h>
- #include <gst/interfaces/xoverlay.h>
- 
- /** @copydoc _PurpleMediaManagerPrivate */
diff --git a/gnome-unstable/polkit/PKGBUILD b/gnome-unstable/polkit/PKGBUILD
deleted file mode 100644
index bac254696..000000000
--- a/gnome-unstable/polkit/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 152307 2012-03-06 15:17:55Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=polkit
-pkgver=0.104
-pkgrel=2
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat' 'libsystemd')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam systemd-fallback.patch)
-md5sums=('e380b4c6fb1e7bccf854e92edc0a8ce1'
-         '6564f95878297b954f0572bc1610dd15'
-         '3c89d97a329ab0ea3a9248c68c3ab000')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../systemd-fallback.patch
-  autoreconf -f -i
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --disable-static --enable-gtk-doc --enable-systemd
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
-}
diff --git a/gnome-unstable/polkit/polkit.pam b/gnome-unstable/polkit/polkit.pam
deleted file mode 100644
index 04f53e0db..000000000
--- a/gnome-unstable/polkit/polkit.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
diff --git a/gnome-unstable/polkit/systemd-fallback.patch b/gnome-unstable/polkit/systemd-fallback.patch
deleted file mode 100644
index f89ce10ae..000000000
--- a/gnome-unstable/polkit/systemd-fallback.patch
+++ /dev/null
@@ -1,1571 +0,0 @@
-diff -u -rN polkit-0.104/configure.ac polkit-0.104-systemd-fallback/configure.ac
---- polkit-0.104/configure.ac	2012-01-03 17:25:49.000000000 +0100
-+++ polkit-0.104-systemd-fallback/configure.ac	2012-03-06 15:45:55.275860194 +0100
-@@ -160,14 +160,14 @@
-               [enable_systemd=auto])
- if test "$enable_systemd" != "no"; then
-   PKG_CHECK_MODULES(SYSTEMD,
--                    [libsystemd-login],
-+                    [libsystemd-login libsystemd-daemon],
-                     have_systemd=yes,
-                     have_systemd=no)
-   if test "$have_systemd" = "yes"; then
-     SESSION_TRACKING=systemd
-   else
-     if test "$enable_systemd" = "yes"; then
--      AC_MSG_ERROR([systemd support requested but libsystemd-login1 library not found])
-+      AC_MSG_ERROR([systemd support requested but systemd libraries not found])
-     fi
-   fi
- fi
-diff -u -rN polkit-0.104/src/polkit/Makefile.am polkit-0.104-systemd-fallback/src/polkit/Makefile.am
---- polkit-0.104/src/polkit/Makefile.am	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkit/Makefile.am	2012-03-06 15:19:25.108853325 +0100
-@@ -79,15 +79,8 @@
- 	polkitimplicitauthorization.c		polkitimplicitauthorization.h		\
- 	polkittemporaryauthorization.c		polkittemporaryauthorization.h		\
- 	polkitpermission.c			polkitpermission.h			\
--        $(NULL)
--
--if HAVE_SYSTEMD
--libpolkit_gobject_1_la_SOURCES += \
--	polkitunixsession-systemd.c		polkitunixsession.h
--else
--libpolkit_gobject_1_la_SOURCES += \
- 	polkitunixsession.c			polkitunixsession.h
--endif
-+        $(NULL)
- 
- libpolkit_gobject_1_la_CFLAGS =                                        	\
-         -D_POLKIT_COMPILATION                                  		\
-diff -u -rN polkit-0.104/src/polkit/polkitunixsession.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c
---- polkit-0.104/src/polkit/polkitunixsession.c	2011-10-18 19:02:27.000000000 +0200
-+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c	2012-03-06 15:17:29.829788021 +0100
-@@ -23,12 +23,18 @@
- #  include "config.h"
- #endif
- 
-+#include <stdlib.h>
- #include <string.h>
- #include "polkitunixsession.h"
- #include "polkitsubject.h"
- #include "polkiterror.h"
- #include "polkitprivate.h"
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-daemon.h>
-+#  include <systemd/sd-login.h>
-+#endif
-+
- /**
-  * SECTION:polkitunixsession
-  * @title: PolkitUnixSession
-@@ -364,34 +370,44 @@
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
-   GDBusConnection *connection;
-   GVariant *result;
--  gboolean ret;
--
--  ret = FALSE;
-+  gboolean ret = FALSE;
- 
--  connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
--  if (connection == NULL)
--    goto out;
--
--  result = g_dbus_connection_call_sync (connection,
--                                        "org.freedesktop.ConsoleKit",           /* name */
--                                        session->session_id,                    /* object path */
--                                        "org.freedesktop.ConsoleKit.Session",   /* interface name */
--                                        "GetUser",                              /* method */
--                                        NULL, /* parameters */
--                                        G_VARIANT_TYPE ("(u)"),
--                                        G_DBUS_CALL_FLAGS_NONE,
--                                        -1,
--                                        cancellable,
--                                        error);
--  if (result == NULL)
--    goto out;
-+#ifdef HAVE_SYSTEMD
-+  uid_t uid;
-+  
-+  if (sd_booted () > 0)
-+    {
-+      if (sd_session_get_uid (session->session_id, &uid) == 0)
-+        ret = TRUE;
-+    }
-+  else
-+#endif
-+    {
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            session->session_id,                    /* object path */
-+                                            "org.freedesktop.ConsoleKit.Session",   /* interface name */
-+                                            "GetUser",                              /* method */
-+                                            NULL, /* parameters */
-+                                            G_VARIANT_TYPE ("(u)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
- 
--  ret = TRUE;
--  g_variant_unref (result);
-+      ret = TRUE;
-+      g_variant_unref (result);
- 
-- out:
--  if (connection != NULL)
--    g_object_unref (connection);
-+     out:
-+      if (connection != NULL)
-+        g_object_unref (connection);
-+    }
-   return ret;
- }
- 
-@@ -470,12 +486,9 @@
-                                    GError       **error)
- {
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
--  GDBusConnection *connection;
-+  GDBusConnection *connection = NULL;
-   GVariant *result;
--  gboolean ret;
--
--  connection = NULL;
--  ret = FALSE;
-+  gboolean ret = FALSE;
- 
-   if (session->session_id != NULL)
-     {
-@@ -484,33 +497,56 @@
-       goto out;
-     }
- 
--  connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
--  if (connection == NULL)
--    goto out;
-+#ifdef HAVE_SYSTEMD
-+  char *s;
-+  
-+  if (sd_booted () > 0)
-+    {
-+      if (sd_pid_get_session (session->pid, &s) == 0)
-+        {
-+          session->session_id = g_strdup (s);
-+          free (s);
-+          ret = TRUE;
-+          goto out;
-+        }
-+      
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "No session for pid %d",
-+                   (gint) session->pid);
-+    }
-+  else
-+#endif
-+    { 
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            "/org/freedesktop/ConsoleKit/Manager",  /* object path */
-+                                            "org.freedesktop.ConsoleKit.Manager",   /* interface name */
-+                                            "GetSessionForUnixProcess",             /* method */
-+                                            g_variant_new ("(u)", session->pid),    /* parameters */
-+                                            G_VARIANT_TYPE ("(o)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
- 
--  result = g_dbus_connection_call_sync (connection,
--                                        "org.freedesktop.ConsoleKit",           /* name */
--                                        "/org/freedesktop/ConsoleKit/Manager",  /* object path */
--                                        "org.freedesktop.ConsoleKit.Manager",   /* interface name */
--                                        "GetSessionForUnixProcess",             /* method */
--                                        g_variant_new ("(u)", session->pid),    /* parameters */
--                                        G_VARIANT_TYPE ("(o)"),
--                                        G_DBUS_CALL_FLAGS_NONE,
--                                        -1,
--                                        cancellable,
--                                        error);
--  if (result == NULL)
--    goto out;
-+      g_variant_get (result, "(o)", &session->session_id);
-+      g_variant_unref (result);
- 
--  g_variant_get (result, "(o)", &session->session_id);
--  g_variant_unref (result);
-+      ret = TRUE;
-+    }
- 
--  ret = TRUE;
- 
-  out:
-   if (connection != NULL)
-     g_object_unref (connection);
--
-   return ret;
- }
- 
-diff -u -rN polkit-0.104/src/polkit/polkitunixsession-systemd.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c
---- polkit-0.104/src/polkit/polkitunixsession-systemd.c	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,481 +0,0 @@
--/*
-- * Copyright (C) 2011 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * 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
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: Matthias Clasen
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include "config.h"
--#endif
--
--#include <string.h>
--#include "polkitunixsession.h"
--#include "polkitsubject.h"
--#include "polkiterror.h"
--#include "polkitprivate.h"
--
--#include <systemd/sd-login.h>
--
--/**
-- * SECTION:polkitunixsession
-- * @title: PolkitUnixSession
-- * @short_description: Unix sessions
-- *
-- * An object that represents an user session.
-- *
-- * The session id is an opaque string obtained from ConsoleKit.
-- */
--
--/**
-- * PolkitUnixSession:
-- *
-- * The #PolkitUnixSession struct should not be accessed directly.
-- */
--struct _PolkitUnixSession
--{
--  GObject parent_instance;
--
--  gchar *session_id;
--
--  gint pid;
--};
--
--struct _PolkitUnixSessionClass
--{
--  GObjectClass parent_class;
--};
--
--enum
--{
--  PROP_0,
--  PROP_SESSION_ID,
--  PROP_PID,
--};
--
--static void subject_iface_init        (PolkitSubjectIface *subject_iface);
--static void initable_iface_init       (GInitableIface *initable_iface);
--static void async_initable_iface_init (GAsyncInitableIface *async_initable_iface);
--
--G_DEFINE_TYPE_WITH_CODE (PolkitUnixSession, polkit_unix_session, G_TYPE_OBJECT,
--                         G_IMPLEMENT_INTERFACE (POLKIT_TYPE_SUBJECT, subject_iface_init)
--                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
--                         G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
--                         );
--
--static void
--polkit_unix_session_init (PolkitUnixSession *session)
--{
--}
--
--static void
--polkit_unix_session_finalize (GObject *object)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
--
--  g_free (session->session_id);
--
--  if (G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize != NULL)
--    G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize (object);
--}
--
--static void
--polkit_unix_session_get_property (GObject    *object,
--                                  guint       prop_id,
--                                  GValue     *value,
--                                  GParamSpec *pspec)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
--
--  switch (prop_id)
--    {
--    case PROP_SESSION_ID:
--      g_value_set_string (value, session->session_id);
--      break;
--
--    default:
--      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--      break;
--    }
--}
--
--static void
--polkit_unix_session_set_property (GObject      *object,
--                                  guint         prop_id,
--                                  const GValue *value,
--                                  GParamSpec   *pspec)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
--
--  switch (prop_id)
--    {
--    case PROP_SESSION_ID:
--      polkit_unix_session_set_session_id (session, g_value_get_string (value));
--      break;
--
--    case PROP_PID:
--      session->pid = g_value_get_int (value);
--      break;
--
--    default:
--      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--      break;
--    }
--}
--
--static void
--polkit_unix_session_class_init (PolkitUnixSessionClass *klass)
--{
--  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
--
--  gobject_class->finalize     = polkit_unix_session_finalize;
--  gobject_class->get_property = polkit_unix_session_get_property;
--  gobject_class->set_property = polkit_unix_session_set_property;
--
--  /**
--   * PolkitUnixSession:session-id:
--   *
--   * The UNIX session id.
--   */
--  g_object_class_install_property (gobject_class,
--                                   PROP_SESSION_ID,
--                                   g_param_spec_string ("session-id",
--                                                        "Session ID",
--                                                        "The UNIX session ID",
--                                                        NULL,
--                                                        G_PARAM_CONSTRUCT |
--                                                        G_PARAM_READWRITE |
--                                                        G_PARAM_STATIC_NAME |
--                                                        G_PARAM_STATIC_BLURB |
--                                                        G_PARAM_STATIC_NICK));
--
--
--  /**
--   * PolkitUnixSession:pid:
--   *
--   * The UNIX process id to look up the session.
--   */
--  g_object_class_install_property (gobject_class,
--                                   PROP_PID,
--                                   g_param_spec_int ("pid",
--                                                     "Process ID",
--                                                     "Process ID to use for looking up the session",
--                                                     0,
--                                                     G_MAXINT,
--                                                     0,
--                                                     G_PARAM_CONSTRUCT_ONLY |
--                                                     G_PARAM_WRITABLE |
--                                                     G_PARAM_STATIC_NAME |
--                                                     G_PARAM_STATIC_BLURB |
--                                                     G_PARAM_STATIC_NICK));
--
--}
--
--/**
-- * polkit_unix_session_get_session_id:
-- * @session: A #PolkitUnixSession.
-- *
-- * Gets the session id for @session.
-- *
-- * Returns: The session id for @session. Do not free this string, it
-- * is owned by @session.
-- **/
--const gchar *
--polkit_unix_session_get_session_id (PolkitUnixSession *session)
--{
--  g_return_val_if_fail (POLKIT_IS_UNIX_SESSION (session), NULL);
--  return session->session_id;
--}
--
--/**
-- * polkit_unix_session_set_session_id:
-- * @session: A #PolkitUnixSession.
-- * @session_id: The session id.
-- *
-- * Sets the session id for @session to @session_id.
-- **/
--void
--polkit_unix_session_set_session_id (PolkitUnixSession *session,
--                                    const gchar       *session_id)
--{
--  g_return_if_fail (POLKIT_IS_UNIX_SESSION (session));
--  /*g_return_if_fail (session_id != NULL);*/
--  g_free (session->session_id);
--  session->session_id = g_strdup (session_id);
--}
--
--/**
-- * polkit_unix_session_new:
-- * @session_id: The session id.
-- *
-- * Creates a new #PolkitUnixSession for @session_id.
-- *
-- * Returns: (transfer full): A #PolkitUnixSession. Free with g_object_unref().
-- **/
--PolkitSubject *
--polkit_unix_session_new (const gchar *session_id)
--{
--  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_SESSION,
--                                       "session-id", session_id,
--                                       NULL));
--}
--
--/**
-- * polkit_unix_session_new_for_process:
-- * @pid: The process id of the process to get the session for.
-- * @cancellable: (allow-none): A #GCancellable or %NULL.
-- * @callback: A #GAsyncReadyCallback to call when the request is satisfied
-- * @user_data: The data to pass to @callback.
-- *
-- * Asynchronously creates a new #PolkitUnixSession object for the
-- * process with process id @pid.
-- *
-- * When the operation is finished, @callback will be invoked in the
-- * <link linkend="g-main-context-push-thread-default">thread-default
-- * main loop</link> of the thread you are calling this method
-- * from. You can then call
-- * polkit_unix_session_new_for_process_finish() to get the result of
-- * the operation.
-- *
-- * This method constructs the object asynchronously, for the synchronous and blocking version
-- * use polkit_unix_session_new_for_process_sync().
-- **/
--void
--polkit_unix_session_new_for_process (gint                pid,
--                                     GCancellable       *cancellable,
--                                     GAsyncReadyCallback callback,
--                                     gpointer            user_data)
--{
--  g_async_initable_new_async (POLKIT_TYPE_UNIX_SESSION,
--                              G_PRIORITY_DEFAULT,
--                              cancellable,
--                              callback,
--                              user_data,
--                              "pid", pid,
--                              NULL);
--}
--
--/**
-- * polkit_unix_session_new_for_process_finish:
-- * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to polkit_unix_session_new_for_process().
-- * @error: (allow-none): Return location for error.
-- *
-- * Finishes constructing a #PolkitSubject for a process id.
-- *
-- * Returns: (transfer full) (allow-none): A #PolkitUnixSession for the @pid passed to
-- *     polkit_unix_session_new_for_process() or %NULL if @error is
-- *     set. Free with g_object_unref().
-- **/
--PolkitSubject *
--polkit_unix_session_new_for_process_finish (GAsyncResult   *res,
--                                            GError        **error)
--{
--  GObject *object;
--  GObject *source_object;
--
--  source_object = g_async_result_get_source_object (res);
--  g_assert (source_object != NULL);
--
--  object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
--                                        res,
--                                        error);
--  g_object_unref (source_object);
--
--  if (object != NULL)
--    return POLKIT_SUBJECT (object);
--  else
--    return NULL;
--}
--
--
--/**
-- * polkit_unix_session_new_for_process_sync:
-- * @pid: The process id of the process to get the session for.
-- * @cancellable: (allow-none): A #GCancellable or %NULL.
-- * @error: (allow-none): Return location for error.
-- *
-- * Creates a new #PolkitUnixSession for the process with process id @pid.
-- *
-- * This is a synchronous call - the calling thread is blocked until a
-- * reply is received. For the asynchronous version, see
-- * polkit_unix_session_new_for_process().
-- *
-- * Returns: (allow-none) (transfer full): A #PolkitUnixSession for
-- * @pid or %NULL if @error is set. Free with g_object_unref().
-- **/
--PolkitSubject *
--polkit_unix_session_new_for_process_sync (gint           pid,
--                                          GCancellable  *cancellable,
--                                          GError       **error)
--{
--  return POLKIT_SUBJECT (g_initable_new (POLKIT_TYPE_UNIX_SESSION,
--                                         cancellable,
--                                         error,
--                                         "pid", pid,
--                                         NULL));
--}
--
--static guint
--polkit_unix_session_hash (PolkitSubject *subject)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
--
--  return g_str_hash (session->session_id);
--}
--
--static gboolean
--polkit_unix_session_equal (PolkitSubject *a,
--                           PolkitSubject *b)
--{
--  PolkitUnixSession *session_a;
--  PolkitUnixSession *session_b;
--
--  session_a = POLKIT_UNIX_SESSION (a);
--  session_b = POLKIT_UNIX_SESSION (b);
--
--  return g_strcmp0 (session_a->session_id, session_b->session_id) == 0;
--}
--
--static gchar *
--polkit_unix_session_to_string (PolkitSubject *subject)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
--
--  return g_strdup_printf ("unix-session:%s", session->session_id);
--}
--
--static gboolean
--polkit_unix_session_exists_sync (PolkitSubject   *subject,
--                                    GCancellable    *cancellable,
--                                    GError         **error)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
--  gboolean ret;
--  uid_t uid;
--
--  ret = FALSE;
--
--  if (!sd_session_get_uid (session->session_id, &uid))
--    ret = FALSE;
--
--  return ret;
--}
--
--static void
--exists_in_thread_func (GSimpleAsyncResult *res,
--                       GObject            *object,
--                       GCancellable       *cancellable)
--{
--  GError *error;
--  error = NULL;
--  if (!polkit_unix_session_exists_sync (POLKIT_SUBJECT (object),
--                                        cancellable,
--                                        &error))
--    {
--      g_simple_async_result_set_from_error (res, error);
--      g_error_free (error);
--    }
--}
--
--static void
--polkit_unix_session_exists (PolkitSubject       *subject,
--                            GCancellable        *cancellable,
--                            GAsyncReadyCallback  callback,
--                            gpointer             user_data)
--{
--  GSimpleAsyncResult *simple;
--
--  g_return_if_fail (POLKIT_IS_UNIX_SESSION (subject));
--
--  simple = g_simple_async_result_new (G_OBJECT (subject),
--                                      callback,
--                                      user_data,
--                                      polkit_unix_session_exists);
--  g_simple_async_result_run_in_thread (simple,
--                                       exists_in_thread_func,
--                                       G_PRIORITY_DEFAULT,
--                                       cancellable);
--  g_object_unref (simple);
--}
--
--static gboolean
--polkit_unix_session_exists_finish (PolkitSubject  *subject,
--                                      GAsyncResult   *res,
--                                      GError        **error)
--{
--  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
--  gboolean ret;
--
--  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == polkit_unix_session_exists);
--
--  ret = FALSE;
--
--  if (g_simple_async_result_propagate_error (simple, error))
--    goto out;
--
--  ret = g_simple_async_result_get_op_res_gboolean (simple);
--
-- out:
--  return ret;
--}
--
--static void
--subject_iface_init (PolkitSubjectIface *subject_iface)
--{
--  subject_iface->hash          = polkit_unix_session_hash;
--  subject_iface->equal         = polkit_unix_session_equal;
--  subject_iface->to_string     = polkit_unix_session_to_string;
--  subject_iface->exists        = polkit_unix_session_exists;
--  subject_iface->exists_finish = polkit_unix_session_exists_finish;
--  subject_iface->exists_sync   = polkit_unix_session_exists_sync;
--}
--
--static gboolean
--polkit_unix_session_initable_init (GInitable     *initable,
--                                   GCancellable  *cancellable,
--                                   GError       **error)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
--  gboolean ret;
--
--  ret = FALSE;
--
--  if (session->session_id != NULL)
--    {
--      /* already set, nothing to do */
--      ret = TRUE;
--      goto out;
--    }
--
--  if (!sd_pid_get_session (session->pid, &session->session_id))
--    ret = TRUE;
--
--out:
--  return ret;
--}
--
--static void
--initable_iface_init (GInitableIface *initable_iface)
--{
--  initable_iface->init = polkit_unix_session_initable_init;
--}
--
--static void
--async_initable_iface_init (GAsyncInitableIface *async_initable_iface)
--{
--  /* use default implementation to run GInitable code in a thread */
--}
-diff -u -rN polkit-0.104/src/polkitbackend/Makefile.am polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am
---- polkit-0.104/src/polkitbackend/Makefile.am	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am	2012-03-06 15:44:15.380014886 +0100
-@@ -41,15 +41,8 @@
- 	polkitbackendconfigsource.h		polkitbackendconfigsource.c		\
- 	polkitbackendactionlookup.h		polkitbackendactionlookup.c		\
- 	polkitbackendlocalauthorizationstore.h	polkitbackendlocalauthorizationstore.c	\
--        $(NULL)
--
--if HAVE_SYSTEMD
--libpolkit_backend_1_la_SOURCES += \
--	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor-systemd.c
--else
--libpolkit_backend_1_la_SOURCES += \
- 	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor.c
--endif
-+        $(NULL)
- 
- libpolkit_backend_1_la_CFLAGS =                                        	\
-         -D_POLKIT_COMPILATION                                  		\
-diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c
---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c	2011-10-18 19:02:27.000000000 +0200
-+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c	2012-03-06 15:43:49.353562242 +0100
-@@ -26,6 +26,12 @@
- #include <string.h>
- #include <glib/gstdio.h>
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-daemon.h>
-+#  include <systemd/sd-login.h>
-+#  include <stdlib.h>
-+#endif
-+
- #include <polkit/polkit.h>
- #include "polkitbackendsessionmonitor.h"
- 
-@@ -39,6 +45,88 @@
-  * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions.
-  */
- 
-+#ifdef HAVE_SYSTEMD
-+typedef struct
-+{
-+  GSource source;
-+  GPollFD pollfd;
-+  sd_login_monitor *monitor;
-+} SdSource;
-+
-+static gboolean
-+sd_source_prepare (GSource *source,
-+                   gint    *timeout)
-+{
-+  *timeout = -1;
-+  return FALSE;
-+}
-+
-+static gboolean
-+sd_source_check (GSource *source)
-+{
-+  SdSource *sd_source = (SdSource *)source;
-+
-+  return sd_source->pollfd.revents != 0;
-+}
-+
-+static gboolean
-+sd_source_dispatch (GSource     *source,
-+                    GSourceFunc  callback,
-+                    gpointer     user_data)
-+
-+{
-+  SdSource *sd_source = (SdSource *)source;
-+  gboolean ret;
-+
-+  g_warn_if_fail (callback != NULL);
-+
-+  ret = (*callback) (user_data);
-+
-+  sd_login_monitor_flush (sd_source->monitor);
-+
-+  return ret;
-+}
-+
-+static void
-+sd_source_finalize (GSource *source)
-+{
-+  SdSource *sd_source = (SdSource*)source;
-+
-+  sd_login_monitor_unref (sd_source->monitor);
-+}
-+
-+static GSourceFuncs sd_source_funcs = {
-+  sd_source_prepare,
-+  sd_source_check,
-+  sd_source_dispatch,
-+  sd_source_finalize
-+};
-+
-+static GSource *
-+sd_source_new (void)
-+{
-+  GSource *source;
-+  SdSource *sd_source;
-+  int ret;
-+
-+  source = g_source_new (&sd_source_funcs, sizeof (SdSource));
-+  sd_source = (SdSource *)source;
-+
-+  if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0)
-+    {
-+      g_printerr ("Error getting login monitor: %d", ret);
-+    }
-+  else
-+    {
-+      sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor);
-+      sd_source->pollfd.events = G_IO_IN;
-+      g_source_add_poll (source, &sd_source->pollfd);
-+    }
-+
-+  return source;
-+}
-+#endif /* HAVE_SYSTEMD */
-+
- struct _PolkitBackendSessionMonitor
- {
-   GObject parent_instance;
-@@ -48,6 +136,10 @@
-   GKeyFile *database;
-   GFileMonitor *database_monitor;
-   time_t database_mtime;
-+  
-+#ifdef HAVE_SYSTEMD
-+  GSource *sd_source;
-+#endif
- };
- 
- struct _PolkitBackendSessionMonitorClass
-@@ -162,6 +254,18 @@
-   g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
- }
- 
-+#ifdef HAVE_SYSTEMD
-+static gboolean
-+sessions_changed (gpointer user_data)
-+{
-+  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
-+
-+  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
-+
-+  return TRUE;
-+}
-+#endif
-+
- static void
- polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
- {
-@@ -176,31 +280,47 @@
-       g_error_free (error);
-     }
- 
--  error = NULL;
--  if (!ensure_database (monitor, &error))
--    {
--      g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
--      g_error_free (error);
--    }
-+#ifdef HAVE_SYSTEMD
-+  monitor->sd_source = NULL;
-+  
-+  if (sd_booted () > 0)
-+    {
-+      monitor->sd_source = sd_source_new ();
-+      g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+      g_source_attach (monitor->sd_source, NULL);
- 
--  error = NULL;
--  file = g_file_new_for_path (CKDB_PATH);
--  monitor->database_monitor = g_file_monitor_file (file,
--                                                   G_FILE_MONITOR_NONE,
--                                                   NULL,
--                                                   &error);
--  g_object_unref (file);
--  if (monitor->database_monitor == NULL)
--    {
--      g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
--      g_error_free (error);
-+      monitor->database = NULL;
-+      monitor->database_monitor = NULL;
-     }
-   else
-+#endif
-     {
--      g_signal_connect (monitor->database_monitor,
--                        "changed",
--                        G_CALLBACK (on_file_monitor_changed),
--                        monitor);
-+      error = NULL;
-+      if (!ensure_database (monitor, &error))
-+        {
-+          g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+
-+      error = NULL;
-+      file = g_file_new_for_path (CKDB_PATH);
-+      monitor->database_monitor = g_file_monitor_file (file,
-+                                                       G_FILE_MONITOR_NONE,
-+                                                       NULL,
-+                                                       &error);
-+      g_object_unref (file);
-+      if (monitor->database_monitor == NULL)
-+        {
-+          g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+      else
-+        {
-+          g_signal_connect (monitor->database_monitor,
-+                            "changed",
-+                            G_CALLBACK (on_file_monitor_changed),
-+                            monitor);
-+        }
-     }
- }
- 
-@@ -212,6 +332,14 @@
-   if (monitor->system_bus != NULL)
-     g_object_unref (monitor->system_bus);
- 
-+#ifdef HAVE_SYSTEMD
-+  if (monitor->sd_source != NULL)
-+    {
-+      g_source_destroy (monitor->sd_source);
-+      g_source_unref (monitor->sd_source);
-+    }
-+#endif
-+
-   if (monitor->database_monitor != NULL)
-     g_object_unref (monitor->database_monitor);
- 
-@@ -328,22 +456,38 @@
-     }
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
--      if (!ensure_database (monitor, error))
-+#ifdef HAVE_SYSTEMD
-+      if (monitor->sd_source != NULL)
-         {
--          g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
--          goto out;
-+          if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+            {
-+              g_set_error (error,
-+                           POLKIT_ERROR,
-+                           POLKIT_ERROR_FAILED,
-+                           "Error getting uid for session");
-+              goto out;
-+            }
-         }
--
--      group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
--      local_error = NULL;
--      uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
--      if (local_error != NULL)
-+      else
-+#endif
-         {
--          g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
-+          if (!ensure_database (monitor, error))
-+            {
-+              g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
-+              goto out;
-+            }
-+
-+          group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
-+          local_error = NULL;
-+          uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
-+          if (local_error != NULL)
-+            {
-+              g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
-+              g_free (group);
-+              goto out;
-+            }
-           g_free (group);
--          goto out;
-         }
--      g_free (group);
- 
-       ret = polkit_unix_user_new (uid);
-     }
-@@ -373,29 +517,46 @@
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      const gchar *session_id;
--      GVariant *result;
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.ConsoleKit",
--                                            "/org/freedesktop/ConsoleKit/Manager",
--                                            "org.freedesktop.ConsoleKit.Manager",
--                                            "GetSessionForUnixProcess",
--                                            g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
--                                            G_VARIANT_TYPE ("(o)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(&o)", &session_id);
--      session = polkit_unix_session_new (session_id);
--      g_variant_unref (result);
-+#ifdef HAVE_SYSTEMD
-+      if (monitor->sd_source != NULL)
-+        {
-+          gchar *session_id;
-+          pid_t pid;
-+
-+          pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+            goto out;
-+
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+        }
-+      else
-+#endif
-+        {
-+          const gchar *session_id;
-+          GVariant *result;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                                -1, /* timeout_msec */
-+                                                NULL, /* GCancellable */
-+                                                error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
-     {
-       guint32 pid;
--      const gchar *session_id;
-+      gchar *session_id;
-       GVariant *result;
- 
-       result = g_dbus_connection_call_sync (monitor->system_bus,
-@@ -414,22 +575,35 @@
-       g_variant_get (result, "(u)", &pid);
-       g_variant_unref (result);
- 
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.ConsoleKit",
--                                            "/org/freedesktop/ConsoleKit/Manager",
--                                            "org.freedesktop.ConsoleKit.Manager",
--                                            "GetSessionForUnixProcess",
--                                            g_variant_new ("(u)", pid),
--                                            G_VARIANT_TYPE ("(o)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(&o)", &session_id);
--      session = polkit_unix_session_new (session_id);
--      g_variant_unref (result);
-+#ifdef HAVE_SYSTEMD
-+      if (monitor->sd_source != NULL)
-+        {
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+            goto out;
-+
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+        }
-+      else
-+#endif
-+        {
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", pid),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                                -1, /* timeout_msec */
-+                                                NULL, /* GCancellable */
-+                                                error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else
-     {
-@@ -490,7 +664,22 @@
- polkit_backend_session_monitor_is_session_local  (PolkitBackendSessionMonitor *monitor,
-                                                   PolkitSubject               *session)
- {
--  return get_boolean (monitor, session, "is_local");
-+#ifdef HAVE_SYSTEMD
-+  if (monitor->sd_source != NULL)
-+    {
-+      char *seat;
-+
-+      if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
-+        {
-+          free (seat);
-+          return TRUE;
-+        }
-+
-+      return FALSE;
-+    }
-+  else
-+#endif
-+    return get_boolean (monitor, session, "is_local");
- }
- 
- 
-@@ -498,6 +687,11 @@
- polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
-                                                   PolkitSubject               *session)
- {
--  return get_boolean (monitor, session, "is_active");
-+#ifdef HAVE_SYSTEMD
-+  if (monitor->sd_source != NULL)
-+    return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  else
-+#endif
-+    return get_boolean (monitor, session, "is_active");
- }
- 
-diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,414 +0,0 @@
--/*
-- * Copyright (C) 2011 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * 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
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: Matthias Clasen
-- */
--
--#include "config.h"
--#include <errno.h>
--#include <pwd.h>
--#include <grp.h>
--#include <string.h>
--#include <glib/gstdio.h>
--#include <systemd/sd-login.h>
--#include <stdlib.h>
--
--#include <polkit/polkit.h>
--#include "polkitbackendsessionmonitor.h"
--
--/* <internal>
-- * SECTION:polkitbackendsessionmonitor
-- * @title: PolkitBackendSessionMonitor
-- * @short_description: Monitor sessions
-- *
-- * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions.
-- */
--
--typedef struct
--{
--  GSource source;
--  GPollFD pollfd;
--  sd_login_monitor *monitor;
--} SdSource;
--
--static gboolean
--sd_source_prepare (GSource *source,
--                   gint    *timeout)
--{
--  *timeout = -1;
--  return FALSE;
--}
--
--static gboolean
--sd_source_check (GSource *source)
--{
--  SdSource *sd_source = (SdSource *)source;
--
--  return sd_source->pollfd.revents != 0;
--}
--
--static gboolean
--sd_source_dispatch (GSource     *source,
--                    GSourceFunc  callback,
--                    gpointer     user_data)
--
--{
--  SdSource *sd_source = (SdSource *)source;
--  gboolean ret;
--
--  g_warn_if_fail (callback != NULL);
--
--  ret = (*callback) (user_data);
--
--  sd_login_monitor_flush (sd_source->monitor);
--
--  return ret;
--}
--
--static void
--sd_source_finalize (GSource *source)
--{
--  SdSource *sd_source = (SdSource*)source;
--
--  sd_login_monitor_unref (sd_source->monitor);
--}
--
--static GSourceFuncs sd_source_funcs = {
--  sd_source_prepare,
--  sd_source_check,
--  sd_source_dispatch,
--  sd_source_finalize
--};
--
--static GSource *
--sd_source_new (void)
--{
--  GSource *source;
--  SdSource *sd_source;
--  int ret;
--
--  source = g_source_new (&sd_source_funcs, sizeof (SdSource));
--  sd_source = (SdSource *)source;
--
--  if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0)
--    {
--      g_printerr ("Error getting login monitor: %d", ret);
--    }
--  else
--    {
--      sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor);
--      sd_source->pollfd.events = G_IO_IN;
--      g_source_add_poll (source, &sd_source->pollfd);
--    }
--
--  return source;
--}
--
--struct _PolkitBackendSessionMonitor
--{
--  GObject parent_instance;
--
--  GDBusConnection *system_bus;
--
--  GSource *sd_source;
--};
--
--struct _PolkitBackendSessionMonitorClass
--{
--  GObjectClass parent_class;
--
--  void (*changed) (PolkitBackendSessionMonitor *monitor);
--};
--
--
--enum
--{
--  CHANGED_SIGNAL,
--  LAST_SIGNAL,
--};
--
--static guint signals[LAST_SIGNAL] = {0};
--
--G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TYPE_OBJECT);
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--static gboolean
--sessions_changed (gpointer user_data)
--{
--  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
--
--  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
--
--  return TRUE;
--}
--
--
--static void
--polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
--{
--  GError *error;
--
--  error = NULL;
--  monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
--  if (monitor->system_bus == NULL)
--    {
--      g_printerr ("Error getting system bus: %s", error->message);
--      g_error_free (error);
--    }
--
--  monitor->sd_source = sd_source_new ();
--  g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--  g_source_attach (monitor->sd_source, NULL);
--}
--
--static void
--polkit_backend_session_monitor_finalize (GObject *object)
--{
--  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (object);
--
--  if (monitor->system_bus != NULL)
--    g_object_unref (monitor->system_bus);
--
--  if (monitor->sd_source != NULL)
--    {
--      g_source_destroy (monitor->sd_source);
--      g_source_unref (monitor->sd_source);
--    }
--
--  if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL)
--    G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object);
--}
--
--static void
--polkit_backend_session_monitor_class_init (PolkitBackendSessionMonitorClass *klass)
--{
--  GObjectClass *gobject_class;
--
--  gobject_class = G_OBJECT_CLASS (klass);
--
--  gobject_class->finalize = polkit_backend_session_monitor_finalize;
--
--  /**
--   * PolkitBackendSessionMonitor::changed:
--   * @monitor: A #PolkitBackendSessionMonitor
--   *
--   * Emitted when something changes.
--   */
--  signals[CHANGED_SIGNAL] = g_signal_new ("changed",
--                                          POLKIT_BACKEND_TYPE_SESSION_MONITOR,
--                                          G_SIGNAL_RUN_LAST,
--                                          G_STRUCT_OFFSET (PolkitBackendSessionMonitorClass, changed),
--                                          NULL,                   /* accumulator      */
--                                          NULL,                   /* accumulator data */
--                                          g_cclosure_marshal_VOID__VOID,
--                                          G_TYPE_NONE,
--                                          0);
--}
--
--PolkitBackendSessionMonitor *
--polkit_backend_session_monitor_new (void)
--{
--  PolkitBackendSessionMonitor *monitor;
--
--  monitor = POLKIT_BACKEND_SESSION_MONITOR (g_object_new (POLKIT_BACKEND_TYPE_SESSION_MONITOR, NULL));
--
--  return monitor;
--}
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--GList *
--polkit_backend_session_monitor_get_sessions (PolkitBackendSessionMonitor *monitor)
--{
--  /* TODO */
--  return NULL;
--}
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--/**
-- * polkit_backend_session_monitor_get_user:
-- * @monitor: A #PolkitBackendSessionMonitor.
-- * @subject: A #PolkitSubject.
-- * @error: Return location for error.
-- *
-- * Gets the user corresponding to @subject or %NULL if no user exists.
-- *
-- * Returns: %NULL if @error is set otherwise a #PolkitUnixUser that should be freed with g_object_unref().
-- */
--PolkitIdentity *
--polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor  *monitor,
--                                                     PolkitSubject                *subject,
--                                                     GError                      **error)
--{
--  PolkitIdentity *ret;
--  guint32 uid;
--
--  ret = NULL;
--
--  if (POLKIT_IS_UNIX_PROCESS (subject))
--    {
--      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
--      if ((gint) uid == -1)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Unix process subject does not have uid set");
--          goto out;
--        }
--      ret = polkit_unix_user_new (uid);
--    }
--  else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
--    {
--      GVariant *result;
--
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.DBus",
--                                            "/org/freedesktop/DBus",
--                                            "org.freedesktop.DBus",
--                                            "GetConnectionUnixUser",
--                                            g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))),
--                                            G_VARIANT_TYPE ("(u)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(u)", &uid);
--      g_variant_unref (result);
--
--      ret = polkit_unix_user_new (uid);
--    }
--  else if (POLKIT_IS_UNIX_SESSION (subject))
--    {
--
--      if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Error getting uid for session");
--          goto out;
--        }
--
--      ret = polkit_unix_user_new (uid);
--    }
--
-- out:
--  return ret;
--}
--
--/**
-- * polkit_backend_session_monitor_get_session_for_subject:
-- * @monitor: A #PolkitBackendSessionMonitor.
-- * @subject: A #PolkitSubject.
-- * @error: Return location for error.
-- *
-- * Gets the session corresponding to @subject or %NULL if no session exists.
-- *
-- * Returns: %NULL if @error is set otherwise a #PolkitUnixSession that should be freed with g_object_unref().
-- */
--PolkitSubject *
--polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMonitor *monitor,
--                                                        PolkitSubject               *subject,
--                                                        GError                     **error)
--{
--  PolkitSubject *session;
--
--  session = NULL;
--
--  if (POLKIT_IS_UNIX_PROCESS (subject))
--    {
--      gchar *session_id;
--      pid_t pid;
--
--      pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
--
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
--    }
--  else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
--    {
--      guint32 pid;
--      gchar *session_id;
--      GVariant *result;
--
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.DBus",
--                                            "/org/freedesktop/DBus",
--                                            "org.freedesktop.DBus",
--                                            "GetConnectionUnixProcessID",
--                                            g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))),
--                                            G_VARIANT_TYPE ("(u)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(u)", &pid);
--      g_variant_unref (result);
--
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
--
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
--    }
--  else
--    {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_NOT_SUPPORTED,
--                   "Cannot get user for subject of type %s",
--                   g_type_name (G_TYPE_FROM_INSTANCE (subject)));
--    }
--
-- out:
--
--  return session;
--}
--
--gboolean
--polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor,
--                                                 PolkitSubject               *session)
--{
--  char *seat;
--
--  if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
--    {
--      free (seat);
--      return TRUE;
--    }
--
--  return FALSE;
--}
--
--
--gboolean
--polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
--                                                  PolkitSubject               *session)
--{
--  return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
--}
--
diff --git a/gnome-unstable/pygobject/PKGBUILD b/gnome-unstable/pygobject/PKGBUILD
deleted file mode 100644
index 95a432728..000000000
--- a/gnome-unstable/pygobject/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 154414 2012-03-28 10:29:14Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.2.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3')
-
-build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
-
-  cd "python2-build"
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
-}
-
-package_pygobject-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  cd "devel"
-  mkdir -p "$pkgdir"/usr/{include,lib}
-  mv include "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-}
diff --git a/gnome-unstable/rhythmbox/PKGBUILD b/gnome-unstable/rhythmbox/PKGBUILD
deleted file mode 100644
index 3e32c0a2d..000000000
--- a/gnome-unstable/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 153026 2012-03-11 10:35:34Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.96
-pkgrel=1
-pkgdesc="An iTunes-like music playback and management application"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3'
-         'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
-options=('!libtool' '!emptydirs')
-install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('3f93c74b2f7f8d7e1002e288db9abf8f182684277dec0a106d5e38415084b2b6')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/rhythmbox \
-      --localstatedir=/var --disable-static \
-      --enable-daap --enable-python \
-      --with-mdns=avahi --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/rhythmbox/rhythmbox.install b/gnome-unstable/rhythmbox/rhythmbox.install
deleted file mode 100644
index e02ee2c16..000000000
--- a/gnome-unstable/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/seahorse/PKGBUILD b/gnome-unstable/seahorse/PKGBUILD
deleted file mode 100644
index 7a8c42201..000000000
--- a/gnome-unstable/seahorse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 154434 2012-03-28 11:19:48Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Michel Brabants <michel.linux@tiscali.be>
-
-pkgname=seahorse
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://projects.gnome.org/seahorse/"
-depends=('gtk3' 'gcr' 'libgnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('libldap' 'intltool' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm')
-optdepends=('openssh: SSH support')
-provides=('x11-ssh-askpass')
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        seahorse-ssh-askpass.sh)
-sha256sums=('6bb7a7952c3d39a6023ddb493d9e31c4ed99ef3da1062d5dfd4b47d1d4ca2cc9'
-            '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-ldap --enable-hkp \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \
-    "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh"
-}
diff --git a/gnome-unstable/seahorse/seahorse-ssh-askpass.sh b/gnome-unstable/seahorse/seahorse-ssh-askpass.sh
deleted file mode 100644
index 04f79d8f2..000000000
--- a/gnome-unstable/seahorse/seahorse-ssh-askpass.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then
-  export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass
-fi
diff --git a/gnome-unstable/seahorse/seahorse.install b/gnome-unstable/seahorse/seahorse.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/seahorse/seahorse.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/sound-juicer/PKGBUILD b/gnome-unstable/sound-juicer/PKGBUILD
deleted file mode 100644
index 6b7777099..000000000
--- a/gnome-unstable/sound-juicer/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154809 2012-03-30 18:46:04Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-pkgname=sound-juicer
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A cd ripper application"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libmusicbrainz4' 'libdiscid' 'gtk3' 'gstreamer0.10-base-plugins'
-         'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=(!emptydirs)
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-groups=('gnome-extra')
-install=sound-juicer.install
-sha256sums=('49805cc73617e745ee09b62fec46979387e5713d39e5f75320b91ee8f0c44f12')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain sound-juicer ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/sound-juicer/sound-juicer.install b/gnome-unstable/sound-juicer/sound-juicer.install
deleted file mode 100644
index 5286a0055..000000000
--- a/gnome-unstable/sound-juicer/sound-juicer.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=sound-juicer
-
-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/gnome-unstable/sushi/PKGBUILD b/gnome-unstable/sushi/PKGBUILD
deleted file mode 100644
index 1617104ea..000000000
--- a/gnome-unstable/sushi/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 154797 2012-03-30 18:13:47Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=sushi
-pkgver=0.4.0
-pkgrel=1
-pkgdesc="A quick previewer for Nautilus"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('75a72d442674fa63d817f70bdb2b9559752509f9bd8a2f6ff854f800eab1e9e7')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/sushi
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/telepathy-farstream/PKGBUILD b/gnome-unstable/telepathy-farstream/PKGBUILD
deleted file mode 100644
index 22dee4611..000000000
--- a/gnome-unstable/telepathy-farstream/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 153928 2012-03-20 19:10:21Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=telepathy-farstream
-pkgver=0.2.3
-pkgrel=1
-pkgdesc="A telepathy-backend to use stream engine."
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'farstream')
-makedepends=('libxslt' 'gstreamer0.10-python' 'python2-gobject2')
-conflicts=('telepathy-farsight')
-replaces=('telepathy-farsight')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('9a5de84f1f4bb4505cc982b4a7fea539')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/telepathy \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/telepathy-gabble/PKGBUILD b/gnome-unstable/telepathy-gabble/PKGBUILD
deleted file mode 100644
index 01c35e54f..000000000
--- a/gnome-unstable/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154108 2012-03-23 11:21:48Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.15.5
-pkgrel=1
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
-makedepends=('libxslt' 'python2')
-options=('!libtool' '!emptydirs')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-install=telepathy-gabble.install
-md5sums=('89b21ac2f29d632efd1cc50e0c2cd933')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console"
-}
diff --git a/gnome-unstable/telepathy-gabble/telepathy-gabble.install b/gnome-unstable/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/gnome-unstable/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/telepathy-glib/PKGBUILD b/gnome-unstable/telepathy-glib/PKGBUILD
deleted file mode 100644
index 1fdf1f246..000000000
--- a/gnome-unstable/telepathy-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154106 2012-03-23 11:02:16Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-
-pkgname=telepathy-glib
-pkgver=0.17.7
-pkgrel=1
-pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-options=('!libtool' '!emptydirs')
-depends=('dbus-glib')
-makedepends=('libxslt' 'vala' 'gobject-introspection')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('92e776d375cfe0ef6af4aff600a5150e')
-
-build() {
-    cd "$pkgname-$pkgver"
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-        --libexecdir=/usr/lib/telepathy \
-        --enable-vala-bindings \
-        --enable-static=no
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/telepathy-haze/PKGBUILD b/gnome-unstable/telepathy-haze/PKGBUILD
deleted file mode 100644
index e043226ad..000000000
--- a/gnome-unstable/telepathy-haze/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 152830 2012-03-09 18:52:51Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-pkgname=telepathy-haze
-pkgver=0.5.0
-pkgrel=2
-pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('GPL')
-depends=('telepathy-glib' 'libpurple')
-makedepends=('libxslt')
-replaces=('telepathy-butterfly')
-install=telepathy-haze.install
-groups=('telepathy')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('4378726d61e1e5df789a05760a94d172')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
-  make
-}
-
-package(){
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/telepathy-haze/telepathy-haze.install b/gnome-unstable/telepathy-haze/telepathy-haze.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/gnome-unstable/telepathy-haze/telepathy-haze.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/telepathy-mission-control/PKGBUILD b/gnome-unstable/telepathy-mission-control/PKGBUILD
deleted file mode 100644
index e1ae84be9..000000000
--- a/gnome-unstable/telepathy-mission-control/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 152824 2012-03-09 18:36:37Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Contributor: Andreas Zwinkau <beza1e1@web.de>
-
-pkgname=telepathy-mission-control
-pkgver=5.11.0
-pkgrel=1
-pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org/wiki/Mission Control"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgnome-keyring' 'dconf')
-makedepends=('libxslt' 'python2')
-install=telepathy-mission-control.install
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('f7503d52cb432e03ba7b4ad5bb6165c6')
-
-build() {
-    cd "$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy \
-	--enable-gnome-keyring \
-        --disable-schemas-compile
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/tomboy/PKGBUILD b/gnome-unstable/tomboy/PKGBUILD
deleted file mode 100644
index ac52cf630..000000000
--- a/gnome-unstable/tomboy/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 154578 2012-03-30 11:03:16Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=tomboy
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="Desktop note-taking application for Linux and Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/tomboy/"
-depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
-options=('!libtool' '!emptydirs' '!makeflags')
-groups=('gnome-extra')
-install=tomboy.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a0f6550560c03aabb311584694bc2a729e688ad94c5d9999137081edaba0c714')
-
-build() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-update-mimedb
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/tomboy/tomboy.install b/gnome-unstable/tomboy/tomboy.install
deleted file mode 100644
index f8e2e4a07..000000000
--- a/gnome-unstable/tomboy/tomboy.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=tomboy
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
diff --git a/gnome-unstable/totem-plparser/PKGBUILD b/gnome-unstable/totem-plparser/PKGBUILD
deleted file mode 100644
index ed5fd875a..000000000
--- a/gnome-unstable/totem-plparser/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154784 2012-03-30 16:58:27Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=totem-plparser
-pkgver=3.4.0
-pkgrel=1
-url="http://www.gnome.org"
-pkgdesc="Totem playlist parser library"
-license=('LGPL')
-arch=(i686 x86_64)
-depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('a9c9dd1c815f0a407546dd209c209284a846ae2978a82faf2b8d72e86a3b8cc7')
-
-build() {
-  cd totem-pl-parser-$pkgver
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
-  make
-}
-
-package(){
-  cd totem-pl-parser-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD
deleted file mode 100644
index fc66766cf..000000000
--- a/gnome-unstable/totem/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 154785 2012-03-30 17:01:20Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('GPL2' 'custom')
-depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
-         'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
-         'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
-         'clutter-gtk' 'mx' 'python2-gobject' 'pylint')
-makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils'
-             'libepc' 'bluez' 'vala' 'grilo')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        browser-plugins.ini)
-sha256sums=('683209ea6eeffa39c277bab02567e4ae8250f00719ef8dd3f30e5f4bdf1f0f9c'
-            'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/totem \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-python \
-    --enable-nautilus
-  make
-}
-
-package_totem() {
-  groups=('gnome-extra')
-  install=totem.install
-  optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-              'gstreamer0.10-bad-plugins: Extra media codecs'
-              'gstreamer0.10-ffmpeg: Extra media codecs'
-              'lirc-utils: Infrared Remote Control plugin'
-              'libepc: Publish Playlist plugin'
-              'libgdata: YouTube Browser plugin'
-              'bluez: Bemused plugin'
-              'grilo-plugins: Browse sidebar (remote media)'
-              'pyxdg: opensubtitles plugin')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir/usr/lib/mozilla"
-  rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
-
-  sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
-    $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
-  pkgdesc="Totem plugin for web browsers"
-  depends=("totem=$pkgver")
-  backup=(etc/totem/browser-plugins.ini)
-
-  cd "$pkgbase-$pkgver"
-  make -C browser-plugin \
-    plugindir=/usr/lib/mozilla/plugins \
-    xptdir=/usr/lib/mozilla/plugins \
-    DESTDIR="$pkgdir" install
-  
-  install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
-}
diff --git a/gnome-unstable/totem/browser-plugins.ini b/gnome-unstable/totem/browser-plugins.ini
deleted file mode 100644
index cf3014997..000000000
--- a/gnome-unstable/totem/browser-plugins.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Plugins]
-application/x-shockwave-flash.disabled=true
diff --git a/gnome-unstable/totem/totem.install b/gnome-unstable/totem/totem.install
deleted file mode 100644
index 7f0fc704b..000000000
--- a/gnome-unstable/totem/totem.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/tracker/PKGBUILD b/gnome-unstable/tracker/PKGBUILD
deleted file mode 100644
index d8d38ade8..000000000
--- a/gnome-unstable/tracker/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 152889 2012-03-10 15:40:02Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.14.0
-_tver=${pkgver%.*}
-pkgrel=1
-pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
-             'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
-             'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
-             'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
-url="http://www.gnome.org"
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('78e432c5c14b9d186ccca3c382accdcdb4f07c2c6e25989fda48401b4a68f7d4')
-
-build() {
-  cd $pkgbase-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
-              'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
-              'libvorbis: Vorbis metadata extractor'
-              'flac: FLAC metadata extractor'
-              'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" install
-
-### Split libtracker-sparql
-
-  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
-
-  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
-    "$srcdir/sparql/usr/lib/tracker-$_tver"
-
-  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
-    "$srcdir/sparql/usr/share/vala/vapi"
-
-  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/gnome-unstable/tracker/tracker.install b/gnome-unstable/tracker/tracker.install
deleted file mode 100644
index 95114273e..000000000
--- a/gnome-unstable/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/gnome-unstable/udisks2/PKGBUILD b/gnome-unstable/udisks2/PKGBUILD
deleted file mode 100644
index 0bbf3c109..000000000
--- a/gnome-unstable/udisks2/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 152271 2012-03-06 12:56:19Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=udisks2
-pkgver=1.93.0
-pkgrel=1
-pkgdesc="Disk Management Service, version 2"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL2')
-depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
-optdepends=('parted: partition management'
-            'gptfdisk: GUID partition table support')
-options=(!libtool)
-source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('e2264d06bbf5399d243b0f91628881fa1d95d1a512b2af26f5ab074caf6327d7')
-
-build() {
-  cd "udisks-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-systemdsystemunitdir=/lib/systemd/system \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "udisks-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/upower/PKGBUILD b/gnome-unstable/upower/PKGBUILD
deleted file mode 100644
index 98fbfd8ca..000000000
--- a/gnome-unstable/upower/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 154254 2012-03-24 22:31:59Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=upower
-pkgver=0.9.15
-pkgrel=2
-pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
-arch=('i686' 'x86_64')
-url="http://upower.freedesktop.org"
-license=('GPL')
-depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
-options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-sha256sums=('d5941480f32dcee47401b3f650485c71f70e7eb0d92537bf4b62410248a6238c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/upower --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/vala/PKGBUILD b/gnome-unstable/vala/PKGBUILD
deleted file mode 100644
index 36a7223b2..000000000
--- a/gnome-unstable/vala/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 154571 2012-03-30 09:41:07Z heftig $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-
-pkgname=vala
-pkgver=0.16.0
-pkgrel=1
-pkgdesc="Compiler for the GObject type system"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Vala"
-license=('LGPL')
-depends=('glib2')
-makedepends=('libxslt')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr --enable-vapigen
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/vinagre/PKGBUILD b/gnome-unstable/vinagre/PKGBUILD
deleted file mode 100644
index 6d6977345..000000000
--- a/gnome-unstable/vinagre/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 154611 2012-03-30 12:44:52Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=vinagre
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/vinagre/"
-install=vinagre.install
-depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
-optdepends=('openssh: SSH plugin'
-            'rdesktop: RDP plugin')
-makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool')
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0379e679204e9ddf63670acc9a902e70d7c3d26eb5070ceb5826a6fbbfdf1489')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/vinagre/vinagre.install b/gnome-unstable/vinagre/vinagre.install
deleted file mode 100644
index 68158ac80..000000000
--- a/gnome-unstable/vinagre/vinagre.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91-2) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vinagre
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/vino/PKGBUILD b/gnome-unstable/vino/PKGBUILD
deleted file mode 100644
index 98680df7e..000000000
--- a/gnome-unstable/vino/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 154610 2012-03-30 12:42:19Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-options=(!emptydirs)
-install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a6b5c3bc185d29ff9861c3519b97973321d1465c8f9e5aa7f93f007cac9d67da')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --enable-gnome-keyring \
-      --enable-avahi \
-      --disable-http-server
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/vino/vino.install b/gnome-unstable/vino/vino.install
deleted file mode 100644
index 469266843..000000000
--- a/gnome-unstable/vino/vino.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vino
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/vte3/PKGBUILD b/gnome-unstable/vte3/PKGBUILD
deleted file mode 100644
index b7cea2fd1..000000000
--- a/gnome-unstable/vte3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 153806 2012-03-19 18:57:12Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=vte3
-pkgname=(vte3 vte-common)
-pkgver=0.32.0
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-makedepends=('intltool' 'gobject-introspection' 'gtk3')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz
-make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199)
-sha256sums=('9fda2576265d9cad43f96dd55f5889b4bb9a2c80a4ff870a1219fd3e171b0583'
-            '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3')
-
-build() {
-  cd "vte-$pkgver"
-  patch -Np1 -R -i "$srcdir/make_alt_work.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection
-  make
-}
-
-package_vte3(){
-  depends=('gtk3' 'vte-common')
-  cd "vte-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm "$pkgdir"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte-common() {
-  pkgdesc="Common files used by vte and vte3"
-  cd "vte-$pkgver"
-
-  make -C gnome-pty-helper DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/xdg-user-dirs-gtk/PKGBUILD b/gnome-unstable/xdg-user-dirs-gtk/PKGBUILD
deleted file mode 100644
index af6e91430..000000000
--- a/gnome-unstable/xdg-user-dirs-gtk/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-#  $Id: PKGBUILD 153255 2012-03-12 15:48:09Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=xdg-user-dirs-gtk
-pkgver=0.8
-pkgrel=1
-pkgdesc="Creates user dirs and asks to relocalize them"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk2' 'xdg-user-dirs')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2
-        lxde.patch)
-sha256sums=('971e5cd121606c437c2b07e189c8f34791ae0c4d81e155266d71acc7b263ad32'
-            '5db6a2fd5bb293deff0322e9f20a383130e05df2d35d64568a47b5fe63d6ebf4')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../lxde.patch
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/xdg-user-dirs-gtk/lxde.patch b/gnome-unstable/xdg-user-dirs-gtk/lxde.patch
deleted file mode 100644
index c5520475c..000000000
--- a/gnome-unstable/xdg-user-dirs-gtk/lxde.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in
---- xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde	2010-02-13 23:52:49.130115833 -0500
-+++ xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in	2010-02-13 23:54:57.574114211 -0500
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- Exec=xdg-user-dirs-gtk-update
- _Name=User folders update
- _Comment=Update common folders names to match current locale
- Terminal=false
--OnlyShowIn=GNOME;
-+OnlyShowIn=GNOME;LXDE;
- Type=Application
- StartupNotify=false
- X-KDE-autostart-after=panel
diff --git a/gnome-unstable/yelp/PKGBUILD b/gnome-unstable/yelp/PKGBUILD
deleted file mode 100644
index 456c80d2c..000000000
--- a/gnome-unstable/yelp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154600 2012-03-30 12:26:25Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=yelp
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
-depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2'
-         'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gtk-doc' 'itstool')
-groups=('gnome')
-license=('GPL')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d79f4084c38410b79ad3833ad886eb38cda1fd9ee604daed1d92c58ed89fd348')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/yelp/yelp.install b/gnome-unstable/yelp/yelp.install
deleted file mode 100644
index 2a1cb91e9..000000000
--- a/gnome-unstable/yelp/yelp.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/zenity/PKGBUILD b/gnome-unstable/zenity/PKGBUILD
deleted file mode 100644
index dbdfc0091..000000000
--- a/gnome-unstable/zenity/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 154336 2012-03-26 12:57:11Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=zenity
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5cf068597c649b5adee60c5948abdf383dbfb16a6c6d57c2ec42ced136730baf')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/calligra/calligra-tables.install b/kde-unstable/calligra/calligra-tables.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/calligra/calligra-tables.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/libre/aufs2-libre/PKGBUILD b/libre/aufs2-libre/PKGBUILD
deleted file mode 100644
index bd177ef9c..000000000
--- a/libre/aufs2-libre/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 110689 2011-02-21 15:30:22Z tpowa $
-# Maintainer: Paul Mattal <pjmattal@elys.com>
-
-pkgname=aufs2-libre
-pkgver=2.6.38_20110314
-pkgrel=4
-#_kernver=${pkgver%_*}-LIBRE
-_kernver=2.6.38-LIBRE
-pkgdesc="Another Unionfs Implementation for the Linux-Libre kernel"
-arch=('i686' 'x86_64')
-url="http://aufs.sourceforge.net/"
-license=('GPL2')
-depends=('kernel26-libre>=2.6.38' 'kernel26-libre<2.6.39')
-makedepends=('kernel26-libre-headers>=2.6.38' 'kernel26-libre-headers<2.6.39')
-replaces=('aufs' 'aufs2')
-conflicts=('aufs2')
-provides=("aufs2=$pkgver")
-install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname%-libre}-${pkgver}.tar.gz")
-options=('!makeflags' '!strip')
-md5sums=('60649fa47d3f499dfbb4b68a2afde47c')
-
-build() {
-  cd ${srcdir}/${pkgname%-libre}-${pkgver}
-  #patch -Np1 -i ../aufs2-module-2.6.36.patch
-  sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
-     config.mk || return 1
-  sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
-     config.mk || return 1
-  if [ "${CARCH}" = "x86_64" ]; then
-    inot64=" y"
-  else
-    inot64=""
-  fi
-  sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \
-     config.mk 
-  # build, sed fixes are from gentoo portage build
-  sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
-  sed -i "s:__user::g" include/linux/aufs_type.h
-  make KDIR=/usr/src/linux-${_kernver}
-}
-
-package() {
-  cd ${srcdir}/${pkgname%-libre}-${pkgver}
-  install -D -m644 fs/aufs/aufs.ko \
-    $pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko 
-  # tweak the install script for the right kernel version
-  sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    $startdir/$pkgname.install
-  # install include files
-  install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/include/linux/aufs_type.h
-  # gzip -9 all modules to safe 100MB
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-}
diff --git a/libre/aufs2-libre/aufs2-libre.install b/libre/aufs2-libre/aufs2-libre.install
deleted file mode 100644
index 883882a54..000000000
--- a/libre/aufs2-libre/aufs2-libre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  KERNEL_VERSION=2.6.38-LIBRE
-  depmod $KERNEL_VERSION
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/aufs2-libre/aufs2-module-2.6.36.patch b/libre/aufs2-libre/aufs2-module-2.6.36.patch
deleted file mode 100644
index 3b43f7aed..000000000
--- a/libre/aufs2-libre/aufs2-module-2.6.36.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/ubuntu/aufs/branch.c b/ubuntu/aufs/branch.c
-index cd4463c..ff6b158 100644
---- a/fs/aufs/branch.c
-+++ b/fs/aufs/branch.c
-@@ -22,6 +22,8 @@
- 
- #include <linux/file.h>
- #include <linux/statfs.h>
-+#include <linux/lglock.h>
-+#include <linux/percpu.h>
- #include "aufs.h"
- 
- /*
-@@ -851,7 +853,8 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
- 		goto out;
- 
- 	/* no need file_list_lock() since sbinfo is locked? defered? */
--	list_for_each_entry(file, &sb->s_files, f_u.fu_list) {
-+        lg_global_lock(files_lglock);
-+	do_file_list_for_each_entry(sb, file) {
- 		if (special_file(file->f_dentry->d_inode->i_mode))
- 			continue;
- 
-@@ -861,6 +864,7 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
- 			err = -EBUSY;
- 			FiMustNoWaiters(file);
- 			fi_read_unlock(file);
-+			lg_global_unlock(files_lglock);
- 			goto out_free;
- 		}
- 
-@@ -889,10 +893,13 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
- 			if (p) {
- 				a = p;
- 				a[n++] = hf;
--			} else
-+			} else {
-+				lg_global_unlock(files_lglock);
- 				goto out_free;
-+			}
- 		}
--	}
-+	} while_file_list_for_each_entry;
-+	lg_global_unlock(files_lglock);
- 
- 	err = 0;
- 	if (n)
diff --git a/libre/aufs2-libre/create-tarball.sh b/libre/aufs2-libre/create-tarball.sh
deleted file mode 100644
index 6801f00bd..000000000
--- a/libre/aufs2-libre/create-tarball.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-AUFS2VERSION="-38"
-KERNELVERSION=2.6.38
-GITSNAPSHOT=20110314
-# aufs2 (no -xx) for the latest -rc version.
-git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
-cd aufs2-standalone.git
-#git checkout origin/aufs2.1${AUFS2VERSION}
-git checkout origin/aufs2.1
-#*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
-cd ..
-rm -rf aufs2-${KERNELVERSION}_${GITSNAPSHOT}
-cp -a aufs2-standalone.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
-tar -czf aufs2-${KERNELVERSION}_${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
diff --git a/libre/aufs3-libre/PKGBUILD b/libre/aufs3-libre/PKGBUILD
deleted file mode 100644
index 5b2dafdfa..000000000
--- a/libre/aufs3-libre/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Paul Mattal <pjmattal@elys.com>
-# Maintainer: Calimero <calimeroteknik@free.fr>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-pkgname=aufs3-libre
-pkgver=3.2_20120109
-pkgrel=1
-
-# Set to whatever the tree of your aufs-libre-friendly kernel is, and set the right dependency.
-#_kernver=${pkgver%_*}-LIBRE
-#depends=('aufs_friendly')
-
-_kernver=3.2-LIBRE-AUFS_FRIENDLY
-depends=('linux-libre-aufs_friendly')
-
-pkgdesc="Another UnionFS implementation"
-arch=('i686' 'x86_64')
-url="http://aufs.sourceforge.net/"
-license=('GPL2')
-replaces=('aufs' 'aufs2' 'aufs3')
-conflicts=('aufs3')
-provides=("aufs3=$pkgver")
-install=aufs3-libre.install
-source=("http://calimeroteknik.free.fr/src/aufs3-${pkgver}.tar.gz")
-options=('!makeflags' '!strip')
-md5sums=('35dd55adc3f403f532ebe6d8fb354c77')
-
-build() {
-  cd "${srcdir}/aufs3-${pkgver}"
-  sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
-     config.mk
-  sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
-     config.mk
-  sed -i 's|CONFIG_AUFS_EXPORT =.*|CONFIG_AUFS_EXPORT = y|' \
-     config.mk
-  sed -i 's|CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
-     config.mk
-  sed -i 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
-     config.mk
-  sed -i 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
-     config.mk
-  sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \
-     config.mk
-  if [ "${CARCH}" = "x86_64" ]; then
-    inot64=" y"
-  else
-    inot64=""
-  fi
-  sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \
-     config.mk
-  # build, sed fixes are from gentoo portage build
-  sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
-  sed -i "s:__user::g" include/linux/aufs_type.h
-  make KDIR="/usr/src/linux-$(</lib/modules/extramodules-${_kernver}/version)"
-}
-
-package() {
-  cd "${srcdir}/aufs3-${pkgver}"
-  install -D -m644 fs/aufs/aufs.ko \
-    "${pkgdir}/lib/modules/extramodules-${_kernver}/aufs.ko"
-    #"${pkgdir}/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko"
-  # tweak the install script for the right kernel version
-  sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    "${startdir}/aufs3.install"
-  # install include file
-  install -D -m 644 include/linux/aufs_type.h "${pkgdir}/usr/include/linux/aufs_type.h"
-  # gzip -9 the module
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
diff --git a/libre/aufs3-libre/aufs3-libre.install b/libre/aufs3-libre/aufs3-libre.install
deleted file mode 100644
index e08b76b54..000000000
--- a/libre/aufs3-libre/aufs3-libre.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  KERNEL_VERSION=3.2-LIBRE-AUFS_FRIENDLY
-  depmod $(cat /lib/modules/extramodules-$KERNEL_VERSION/version)
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD
deleted file mode 100644
index 41c332dca..000000000
--- a/libre/ffmpeg-libre/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 85265 2010-07-11 10:15:18Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer for Parabola GNU/Linux: Omar Botta <omarbotta@gnulinuxlibre.net>
-
-pkgname=ffmpeg-libre
-pkgver=20110330
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix. Libre version without faac"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg')
-makedepends=('yasm' 'git')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
-md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
-#source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-provides=("ffmpeg=$pkgver")
-conflicts=('ffmpeg')
-replaces=('ffmpeg')
-
-build() {
-  cd "$srcdir/${pkgname%-libre}"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-gpl \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --disable-libfaac \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-version3 \
-    --disable-nonfree \
-    --enable-runtime-cpudetect \
-    --disable-debug  # libfaac is nonfree
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-
-  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/libre/icecat-i18n/.directory b/libre/icecat-i18n/.directory
deleted file mode 100644
index 98ec279ed..000000000
--- a/libre/icecat-i18n/.directory
+++ /dev/null
@@ -1,2 +0,0 @@
-[Dolphin]
-Timestamp=2012,3,2,21,19,19
diff --git a/libre/icecat/Makefile.in b/libre/icecat/Makefile.in
deleted file mode 100644
index bd662ba85..000000000
--- a/libre/icecat/Makefile.in
+++ /dev/null
@@ -1,451 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <bsmedberg@covad.net>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = browser/locales
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/config.mk
-
-vpath %.xml @srcdir@/en-US/searchplugins
-vpath %.xml $(LOCALE_SRCDIR)/searchplugins
-
-ifdef LOCALE_MERGEDIR
-vpath crashreporter%.ini $(LOCALE_MERGEDIR)/browser/crashreporter
-endif
-vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter
-ifdef LOCALE_MERGEDIR
-vpath crashreporter%.ini @srcdir@/en-US/crashreporter
-endif
-ifdef LOCALE_MERGEDIR
-vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
-endif
-vpath book%.inc $(LOCALE_SRCDIR)/profile
-ifdef LOCALE_MERGEDIR
-vpath book%.inc @srcdir@/en-US/profile
-endif
-
-
-run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
-_ABS_DIST := $(shell cd $(DIST) && pwd)
-
-ifdef MOZ_BRANDING_DIRECTORY
-SUBMAKEFILES += \
-	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
-	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
-	$(NULL)
-endif
-
-# This makefile uses variable overrides from the libs-% target to
-# build non-default locales to non-default dist/ locations. Be aware!
-
-AB = $(firstword $(subst -, ,$(AB_CD)))
-
-APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
-
-PWD := $(shell pwd)
-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))
-
-# These are defaulted to be compatible with the files the wget-en-US target
-# pulls. You may override them if you provide your own files. You _must_
-# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
-# work in that case.
-ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
-WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
-
-DEFINES += \
-	-DAB_CD=$(AB_CD) \
-	-DMOZ_LANGPACK_EID=langpack-$(AB_CD)@gnuzilla.gnu.org \
-	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-	-DLOCALE_SRCDIR=$(call core_abspath,$(LOCALE_SRCDIR)) \
-	-DPKG_BASENAME="$(PKG_BASENAME)" \
-	-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
-	$(NULL)
-
-ifndef MOZ_BRANDING_DIRECTORY
-DEFINES += -DMOZ_USE_GENERIC_BRANDING
-endif
-
-ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS)))
-DEFINES += -DEXTENSION_PREF
-endif
-
-PREF_JS_EXPORTS = $(LOCALE_SRCDIR)/firefox-l10n.js
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-#	@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
-#	  $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
-#	    $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \
-#	fi
-install::
-#	@if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
-#	  $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
-#	    $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(DESTDIR)$(mozappdir)/defaults/existing-profile-defaults.js; \
-#	fi
-
-README_FILES = \
-	README.txt \
-	$(NULL)
-
-PROFILE_FILES = \
-	localstore.rdf \
-	mimeTypes.rdf \
-	$(NULL)
-
-PROFILE_CHROME = userChrome-example.css userContent-example.css
-
-libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES))
-ifeq ($(OS_ARCH),WINNT)
-	$(EXIT_ON_ERROR) \
-	for file in $^; do \
-	  $(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $$file > $(FINAL_TARGET)/`basename $$file`; \
-	done
-else
-ifneq ($(OS_ARCH),OS2)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
-endif
-endif
-
-NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
-
-%/defaults/profile/bookmarks.html: bookmarks.inc generic/profile/bookmarks.html.in
-	$(SYSINSTALL) -D $(dir $@)
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
-	  -I $< \
-	  -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
-	  $(srcdir)/generic/profile/bookmarks.html.in \
-	  > $@
-
-libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
-
-libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
-
-libs:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
-
-install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
-
-install:: $(addprefix generic/profile/,$(PROFILE_FILES))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-
-install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
-
-SEARCH_PLUGINS = $(shell cat $(LOCALE_SRCDIR)/searchplugins/list.txt)
-
-libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
-
-install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
-
-tests:
-ifneq (en-US, $(AB_CD))
-	@echo "Verifying $(AB_CD) installer variable usage"
-	@$(PERL) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/check-locales.pl $(LOCALE_SRCDIR)/installer
-endif
-
-clobber-%:
-	$(RM) -rf $(DIST)/xpi-stage/locale-$*
-
-libs-%:
-	$(NSINSTALL) -D $(DIST)/install
-	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
-	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
-	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
-ifdef MOZ_BRANDING_DIRECTORY
-	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
-endif
-	@$(MAKE) tests AB_CD=$*
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
-MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
-MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
-MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
-endif
-
-PACKAGER_NO_LIBS = 1
-include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
-
-repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
-repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
-	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
-ifdef MOZ_BRANDING_DIRECTORY
-	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
-else
-	$(MAKE) -C ../installer/windows export
-endif
-	if test ! -d $(_ABS_DIST)/$(PKG_INST_PATH); then \
-	  $(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH); \
-	fi
-	$(RM) -rf l10n-stage
-	$(NSINSTALL) -D l10n-stage
-	$(CYGWIN_WRAPPER) 7z x -ol10n-stage $(WIN32_INSTALLER_IN)
-	$(RM) -r l10n-stage/localized
-	$(RM) l10n-stage/setup.exe
-# copy xpi-stage over, but not install.rdf and chrome.manifest,
-# those are just for language packs
-	cp -r $(DIST)/xpi-stage/locale-$(AB_CD) l10n-stage/localized
-	$(RM) l10n-stage/localized/install.rdf l10n-stage/localized/chrome.manifest
-	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
-	cp ../installer/windows/l10ngen/setup.exe l10n-stage
-	$(NSINSTALL) -D l10n-stage/localized/uninstall
-	cp ../installer/windows/l10ngen/helper.exe l10n-stage/localized/uninstall
-	rm -f app.7z
-	cd l10n-stage && \
-	  $(CYGWIN_WRAPPER) 7z a -r -t7z ../app.7z -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3
-	cat ../installer/windows/l10ngen/7zSD.sfx \
-	    $(topsrcdir)/browser/installer/windows/app.tag \
-	    app.7z > $(WIN32_INSTALLER_OUT)
-	chmod 0755 $(WIN32_INSTALLER_OUT)
-
-ifeq (WINNT,$(OS_ARCH))
-repackage-win32-installer-%: $(WIN32_INSTALLER_IN) libs-%
-	@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN)
-else
-repackage-win32-installer-%: ;
-endif
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS
-else
-STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
-endif
-
-$(STAGEDIST): AB_CD:=en-US
-$(STAGEDIST): UNPACKAGE=$(ZIP_IN)
-$(STAGEDIST): $(ZIP_IN)
-# only mac needs to remove the parent of STAGEDIST...
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-	if test -d $(DIST)/l10n-stage; then \
-	  $(RM) -r -v $(DIST)/l10n-stage; \
-	fi
-else
-# ... and windows doesn't like removing STAGEDIST itself, remove all children
-	if test -d $(DIST)/l10n-stage; then \
-	  find $(STAGEDIST) -maxdepth 1 -print0 | xargs -0 $(RM) -r ; \
-	fi
-endif
-	$(NSINSTALL) -D $(DIST)/l10n-stage
-	cd $(DIST)/l10n-stage && \
-	  $(UNMAKE_PACKAGE)
-	make clobber-zip AB_CD=en-US
-
-clobber-zip:
-	$(RM) $(STAGEDIST)/chrome/$(AB_CD).jar \
-	  $(STAGEDIST)/chrome/$(AB_CD).manifest \
-	  $(STAGEDIST)/defaults/pref/firefox-l10n.js
-	$(RM) -rf  $(STAGEDIST)/searchplugins \
-	  $(STAGEDIST)/dictionaries \
-	  $(STAGEDIST)/defaults/profile \
-	  $(STAGEDIST)/chrome/$(AB_CD)
-
-unpack: $(STAGEDIST)
-	@echo done unpacking
-
-repackage-zip: ZIP_OUT="$(_ABS_DIST)/$(PACKAGE)"
-repackage-zip: UNPACKAGE="$(ZIP_IN)"
-repackage-zip:
-ifeq (WINNT,$(OS_ARCH))
-	$(RM) -r $(STAGEDIST)/uninstall
-	$(NSINSTALL) -D $(STAGEDIST)/uninstall
-	cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall
-endif
-# copy xpi-stage over, but not install.rdf and chrome.manifest,
-# those are just for language packs
-	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
-	  tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
-ifneq (en,$(AB))
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj
-endif
-endif
-	$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
-	cd $(DIST)/l10n-stage; \
-	  $(MAKE_PACKAGE)
-ifdef MOZ_MAKE_COMPLETE_MAR
-	$(MAKE) -C $(DEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
-	  MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
-	  PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \
-	  DIST="$(_ABS_DIST)"
-endif
-# packaging done, undo l10n stuff
-ifneq (en,$(AB))
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj
-endif
-endif
-	$(MAKE) clobber-zip AB_CD=$(AB_CD)
-	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-	mv -f "$(DIST)/l10n-stage/$(PACKAGE)" "$(DIST)/$(PACKAGE)"
-
-repackage-zip-%: $(ZIP_IN) $(STAGEDIST) libs-%
-	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
-
-langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
-langpack-%: AB_CD=$*
-langpack-%: XPI_NAME=locale-$*
-langpack-%: libs-%
-	@echo "Making langpack $(LANGPACK_FILE)"
-	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
-#	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf
-	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
-	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest -x chrome/$(AB_CD).manifest
-
-langpack: langpack-$(AB_CD)
-
-# This is a generic target that will make a langpack, repack ZIP (+tarball)
-# builds, and repack an installer if applicable. It is called from the
-# tinderbox scripts. Alter it with caution.
-
-installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
-	@echo "repackaging done"
-
-ifdef MOZ_UPDATER
-libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini)
-ifeq ($(OS_ARCH),WINNT)
-	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
-	  sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \
-	  sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
-	  $(FINAL_TARGET)/updater.ini
-else
-	cat $< | \
-	  sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \
-	  sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
-	  $(FINAL_TARGET)/updater.ini
-endif
-endif
-
-ifdef MOZ_CRASHREPORTER
-libs:: crashreporter-override.ini
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
-endif
-
-# This variable is to allow the wget-en-US target to know which ftp server to download from
-ifndef EN_US_BINARY_URL 
-EN_US_BINARY_URL = $(error You must set EN_US_BINARY_URL)
-endif
-
-# This make target allows us to wget the latest en-US binary from a specified website
-# The make installers-% target needs the en-US binary in dist/
-# and for the windows repackages we need the .installer.exe in dist/sea
-wget-en-US:
-ifndef WGET
-	$(error Wget not installed)
-endif
-	(cd $(_ABS_DIST) && $(WGET) -nv -N  $(EN_US_BINARY_URL)/$(PACKAGE))
-	@echo "Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PACKAGE)"
-ifeq ($(OS_ARCH), WINNT)
-	$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH)
-	(cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) -nv -N "$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe")
-	@echo "Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
-endif
-
-ident:
-	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(STAGEDIST)/application.ini App SourceStamp
-
-#These make targets call prepare-repackages by setting different UPLOAD_DIR
-prepare-upload-latest-%:
-	@$(MAKE) prepare-repackages-$* UPLOAD_DIR=$(DIST)/upload/latest
-
-prepare-upload-dated-%:
-	@$(MAKE) prepare-repackages-$* UPLOAD_DIR=$(DIST)/upload/`date "+%Y-%m-%d-%H"`-$(MOZ_PKG_APPNAME)$(MOZ_APP_VERSION)-l10n
-
-#Each platform uploads their xpi files to different folders
-ifeq (Linux, $(OS_ARCH))
-XPI_DESTINATION = linux-xpi
-endif
-ifeq (Darwin, $(OS_ARCH))
-XPI_DESTINATION = mac-xpi
-endif
-ifeq (WINNT, $(OS_ARCH))
-XPI_DESTINATION = windows-xpi
-endif
-
-# This target will generate a UPLOAD_DIR folder with
-# l10n repackages in the way that we offer l10n nightlies
-#  1) ./ the binary
-#  2) ./{linux,mac,windows}-xpi/locale.xpi
-prepare-repackages-%:
-ifndef XPI_DESTINATION
-	$(error XPI_DESTINATION not defined; \
-	This is the folder where the xpi files will be moved to)
-endif
-ifndef UPLOAD_DIR
-	$(error UPLOAD_DIR not defined)
-endif
-	$(NSINSTALL) -D $(UPLOAD_DIR)
-	$(NSINSTALL) -D $(UPLOAD_DIR)/$(XPI_DESTINATION)
-# Move the langpack
-	mv $(DIST)/install/firefox-$(MOZ_APP_VERSION).$*.langpack.xpi \
-	   $(UPLOAD_DIR)/$(XPI_DESTINATION)/$*.xpi
-# Move the repackage
-	mv $(DIST)/firefox-$(MOZ_APP_VERSION).$*.* \
-	   $(UPLOAD_DIR)/.
-# Move the windows installer
-ifeq (WINNT, $(OS_ARCH))
-	mv $(DIST)/install/sea/firefox-$(MOZ_APP_VERSION).$*.win32.installer.exe \
-	   $(UPLOAD_DIR)/.
-endif
-# Set the permissions that the folders will have in ftp once uploaded
-	chmod -vR 775 $(UPLOAD_DIR)
-
-l10n-upload-%: AB_CD=$*
-l10n-upload-%:
-	$(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) "$(DIST)/$(PACKAGE)" $(DIST)/$(LANGPACK)
-ifdef MOZ_MAKE_COMPLETE_MAR
-	$(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) $(DIST)/$(COMPLETE_MAR)
-endif
-ifeq (WINNT, $(OS_ARCH))
-	$(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) "$(INSTALLER_PACKAGE)"
-endif
-
-
-merge-%:
-ifdef LOCALE_MERGEDIR
-	$(RM) -rf $(LOCALE_MERGEDIR)
-	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
-endif
-	@echo
diff --git a/libre/icecat/duck-duck-go-lite.xml b/libre/icecat/duck-duck-go-lite.xml
deleted file mode 100644
index 3142d3410..000000000
--- a/libre/icecat/duck-duck-go-lite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Duck Duck Go (Lite)</os:ShortName>
-<os:Description>Search Duck Duck Go (Lite)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/icecat/duck-duck-go-ssl.xml b/libre/icecat/duck-duck-go-ssl.xml
deleted file mode 100644
index 4fb1391ab..000000000
--- a/libre/icecat/duck-duck-go-ssl.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Duck Duck Go (SSL)</os:ShortName>
-<os:Description>Search Duck Duck Go (SSL)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch
deleted file mode 100644
index 8b2d74896..000000000
--- a/libre/icecat/firefox-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2011-09-30 08:45:28.858668017 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2011-09-30 08:51:01.548314685 +0000
-@@ -43,6 +43,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+MOZ_APP_VERSION="10.0"
-+
- include $(topsrcdir)/config/rules.mk
- 
- MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
diff --git a/libre/icecat/firefox.js b/libre/icecat/firefox.js
deleted file mode 100644
index 2300e65ce..000000000
--- a/libre/icecat/firefox.js
+++ /dev/null
@@ -1,1072 +0,0 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is 
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or 
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-// XXX Toolkit-specific preferences should be moved into toolkit.js
-
-#filter substitution
-
-# SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
-#  The first character after a period must be alphabetic.
-
-#ifdef XP_UNIX
-#ifndef XP_MACOSX
-#define UNIX_BUT_NOT_MAC
-#endif
-#endif
-
-pref("general.startup.browser", true);
-
-pref("browser.chromeURL","chrome://browser/content/");
-pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
-
-// Enables some extra Extension System Logging (can reduce performance)
-pref("extensions.logging.enabled", false);
-
-// Preferences for AMO integration
-pref("extensions.getAddons.cache.enabled", true);
-pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
-// Blocklist preferences
-pref("extensions.blocklist.enabled", true);
-pref("extensions.blocklist.interval", 86400);
-// Controls what level the blocklist switches from warning about items to forcibly
-// blocking them.
-pref("extensions.blocklist.level", 2);
-pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
-pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
-
-pref("extensions.update.autoUpdateDefault", true);
-
-// Dictionary download preference
-pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org");
-
-// Update Timer Manager preferences
-// Interval: When all registered timers should be checked (in milliseconds)
-//           default=10 minutes
-pref("app.update.timer", 600000);
-
-// App-specific update preferences
-
-// The interval to check for updates (app.update.interval) is defined in
-// firefox-branding.js
-
-// Alternative windowtype for an application update user interface window. When
-// a window with this windowtype is open the application update service won't
-// open the normal application update user interface window.
-pref("app.update.altwindowtype", "Browser:About");
-
-// Enables some extra Application Update Logging (can reduce performance)
-pref("app.update.log", false);
-
-// The number of general background check failures to allow before notifying the
-// user of the failure. User initiated update checks always notify the user of
-// the failure.
-pref("app.update.backgroundMaxErrors", 10);
-
-// When |app.update.cert.requireBuiltIn| is true or not specified the
-// final certificate and all certificates the connection is redirected to before
-// the final certificate for the url specified in the |app.update.url|
-// preference must be built-in.
-pref("app.update.cert.requireBuiltIn", true);
-
-// When |app.update.cert.checkAttributes| is true or not specified the
-// certificate attributes specified in the |app.update.certs.| preference branch
-// are checked against the certificate for the url specified by the
-// |app.update.url| preference.
-pref("app.update.cert.checkAttributes", true);
-
-// The number of certificate attribute check failures to allow for background
-// update checks before notifying the user of the failure. User initiated update
-// checks always notify the user of the certificate attribute check failure.
-pref("app.update.cert.maxErrors", 5);
-
-// The |app.update.certs.| preference branch contains branches that are
-// sequentially numbered starting at 1 that contain attribute name / value
-// pairs for the certificate used by the server that hosts the update xml file
-// as specified in the |app.update.url| preference. When these preferences are
-// present the following conditions apply for a successful update check:
-// 1. the uri scheme must be https
-// 2. the preference name must exist as an attribute name on the certificate and
-//    the value for the name must be the same as the value for the attribute name
-//    on the certificate.
-// If these conditions aren't met it will be treated the same as when there is
-// no update available. This validation will not be performed when using the
-// |app.update.url.override| preference for update checking.
-pref("app.update.certs.1.issuerName", "OU=Equifax Secure Certificate Authority,O=Equifax,C=US");
-pref("app.update.certs.1.commonName", "aus3.mozilla.org");
-
-pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US");
-pref("app.update.certs.2.commonName", "aus3.mozilla.org");
-
-// Whether or not app updates are enabled
-pref("app.update.enabled", false);
-
-// This preference turns on app.update.mode and allows automatic download and
-// install to take place. We use a separate boolean toggle for this to make
-// the UI easier to construct.
-pref("app.update.auto", false);
-
-// Defines how the Application Update Service notifies the user about updates:
-//
-// AUM Set to:        Minor Releases:     Major Releases:
-// 0                  download no prompt  download no prompt
-// 1                  download no prompt  download no prompt if no incompatibilities
-// 2                  download no prompt  prompt
-//
-// See chart in nsUpdateService.js source for more details
-//
-pref("app.update.mode", 1);
-
-// If set to true, the Update Service will present no UI for any event.
-pref("app.update.silent", false);
-
-// Update service URL:
-pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
-// app.update.url.manual is in branding section
-// app.update.url.details is in branding section
-
-// User-settable override to app.update.url for testing purposes.
-//pref("app.update.url.override", "");
-
-// app.update.interval is in branding section
-
-// Interval: Time before prompting the user again to restart to install the
-//           latest download (in seconds) default=1 day
-pref("app.update.nagTimer.restart", 86400);
-
-// Give the user x seconds to react before showing the big UI. default=12 hours
-pref("app.update.promptWaitTime", 43200);
-// Show the Update Checking/Ready UI when the user was idle for x seconds
-pref("app.update.idletime", 60);
-
-// Whether or not we show a dialog box informing the user that the update was
-// successfully applied. This is off in Firefox by default since we show a 
-// upgrade start page instead! Other apps may wish to show this UI, and supply
-// a whatsNewURL field in their brand.properties that contains a link to a page
-// which tells users what's new in this new update.
-pref("app.update.showInstalledUI", false);
-
-// 0 = suppress prompting for incompatibilities if there are updates available
-//     to newer versions of installed addons that resolve them.
-// 1 = suppress prompting for incompatibilities only if there are VersionInfo
-//     updates available to installed addons that resolve them, not newer
-//     versions.
-pref("app.update.incompatible.mode", 0);
-
-// Symmetric (can be overridden by individual extensions) update preferences.
-// e.g.
-//  extensions.{GUID}.update.enabled
-//  extensions.{GUID}.update.url
-//  .. etc ..
-//
-pref("extensions.update.enabled", true);
-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%");
-pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
-                                            // Themes every day
-// Non-symmetric (not shared by extensions) extension-specific [update] preferences
-pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons");
-pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
-pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
-pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
-                                                // restart.
-
-pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties");
-pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
-
-pref("xpinstall.whitelist.add", "addons.mozilla.org");
-pref("xpinstall.whitelist.add.36", "getpersonas.com");
-
-pref("lightweightThemes.update.enabled", true);
-
-pref("keyword.enabled", true);
-// Override the default keyword.URL. Empty value means
-// "use the search service's default engine"
-pref("keyword.URL", "");
-
-pref("general.useragent.locale", "@AB_CD@");
-pref("general.skins.selectedSkin", "classic/1.0");
-pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@ (like Firefox/@APP_VERSION@)");
-pref("general.smoothScroll", false);
-#ifdef UNIX_BUT_NOT_MAC
-pref("general.autoScroll", false);
-#else
-pref("general.autoScroll", true);
-#endif
-
-// Whether or not the application should check at startup each time if it 
-// is the default browser.
-pref("browser.shell.checkDefaultBrowser", true);
-
-// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
-// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
-pref("browser.startup.page",                1);
-pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
-
-// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
-// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-// repackager of this code using an alternate snippet url, please keep your users safe
-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
-
-pref("browser.enable_automatic_image_resizing", true);
-pref("browser.chrome.site_icons", true);
-pref("browser.chrome.favicons", true);
-// browser.warnOnQuit == false will override all other possible prompts when quitting or restarting
-pref("browser.warnOnQuit", true);
-pref("browser.warnOnRestart", false);
-// browser.showQuitWarning specifically controls the quit warning dialog. We
-// might still show the window closing dialog with showQuitWarning == false.
-pref("browser.showQuitWarning", false);
-pref("browser.fullscreen.autohide", true);
-pref("browser.fullscreen.animateUp", 1);
-pref("browser.overlink-delay", 70);
-
-#ifdef UNIX_BUT_NOT_MAC
-pref("browser.urlbar.clickSelectsAll", false);
-#else
-pref("browser.urlbar.clickSelectsAll", true);
-#endif
-#ifdef UNIX_BUT_NOT_MAC
-pref("browser.urlbar.doubleClickSelectsAll", true);
-#else
-pref("browser.urlbar.doubleClickSelectsAll", false);
-#endif
-pref("browser.urlbar.autoFill", false);
-// 0: Match anywhere (e.g., middle of words)
-// 1: Match on word boundaries and then try matching anywhere
-// 2: Match only on word boundaries (e.g., after / or .)
-// 3: Match at the beginning of the url or title
-pref("browser.urlbar.matchBehavior", 1);
-pref("browser.urlbar.filter.javascript", true);
-
-// the maximum number of results to show in autocomplete when doing richResults
-pref("browser.urlbar.maxRichResults", 12);
-// The amount of time (ms) to wait after the user has stopped typing
-// before starting to perform autocomplete.  50 is the default set in
-// autocomplete.xml.
-pref("browser.urlbar.delay", 50);
-
-// The special characters below can be typed into the urlbar to either restrict
-// the search to visited history, bookmarked, tagged pages; or force a match on
-// just the title text or url.
-pref("browser.urlbar.restrict.history", "^");
-pref("browser.urlbar.restrict.bookmark", "*");
-pref("browser.urlbar.restrict.tag", "+");
-pref("browser.urlbar.restrict.openpage", "%");
-pref("browser.urlbar.restrict.typed", "~");
-pref("browser.urlbar.match.title", "#");
-pref("browser.urlbar.match.url", "@");
-
-// The default behavior for the urlbar can be configured to use any combination
-// of the restrict or match filters with each additional filter restricting
-// more (intersection). Add the following values to set the behavior as the
-// default: 1: history, 2: bookmark, 4: tag, 8: title, 16: url, 32: typed,
-//          64: javascript, 128: tabs
-// E.g., 0 = show all results (no filtering), 1 = only visited pages in history,
-// 2 = only bookmarks, 3 = visited bookmarks, 1+16 = history matching in the url
-pref("browser.urlbar.default.behavior", 0);
-
-// Number of milliseconds to wait for the http headers (and thus
-// the Content-Disposition filename) before giving up and falling back to 
-// picking a filename without that info in hand so that the user sees some
-// feedback from their action.
-pref("browser.download.saveLinkAsFilenameTimeout", 1000);
-
-pref("browser.download.useDownloadDir", true);
-
-#ifdef WINCE
-pref("browser.download.folderList", 2);
-pref("browser.download.dir", "\\Storage Card");
-#else
-pref("browser.download.folderList", 1);
-#endif
-pref("browser.download.manager.showAlertOnComplete", true);
-pref("browser.download.manager.showAlertInterval", 2000);
-pref("browser.download.manager.retention", 2);
-pref("browser.download.manager.showWhenStarting", true);
-pref("browser.download.manager.closeWhenDone", false);
-pref("browser.download.manager.focusWhenStarting", false);
-pref("browser.download.manager.flashCount", 2);
-pref("browser.download.manager.addToRecentDocs", true);
-pref("browser.download.manager.quitBehavior", 0);
-pref("browser.download.manager.scanWhenDone", true);
-pref("browser.download.manager.resumeOnWakeDelay", 10000);
-
-// search engines URL
-pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
-
-// pointer to the default engine name
-pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-
-// disable logging for the search service by default
-pref("browser.search.log", false);
-
-// Ordering of Search Engines in the Engine list. 
-pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
-pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
-pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
-
-// search bar results always open in a new tab
-pref("browser.search.openintab", false);
-
-// send ping to the server to update
-pref("browser.search.update", true);
-
-// disable logging for the search service update system by default
-pref("browser.search.update.log", false);
-
-// Check whether we need to perform engine updates every 6 hours
-pref("browser.search.update.interval", 21600);
-
-// Whether or not microsummary and generator updates are enabled
-pref("browser.microsummary.enabled", true);
-pref("browser.microsummary.updateGenerators", true);
-
-// enable search suggestions by default
-pref("browser.search.suggest.enabled", true);
-
-pref("browser.sessionhistory.max_entries", 50);
-
-// handle links targeting new windows
-// 0=default window, 1=current window/tab, 2=new window, 3=new tab in most recent window
-pref("browser.link.open_newwindow", 3);
-
-// 0: no restrictions - divert everything
-// 1: don't divert window.open at all
-// 2: don't divert window.open with features
-pref("browser.link.open_newwindow.restriction", 2);
-
-// Tabbed browser
-#ifndef WINCE
-pref("browser.tabs.autoHide", false);
-#else
-pref("browser.tabs.autoHide", true);
-#endif
-pref("browser.tabs.closeWindowWithLastTab", true);
-pref("browser.tabs.insertRelatedAfterCurrent", true);
-pref("browser.tabs.warnOnClose", true);
-pref("browser.tabs.warnOnOpen", true);
-pref("browser.tabs.maxOpenBeforeWarn", 15);
-pref("browser.tabs.loadInBackground", true);
-pref("browser.tabs.opentabfor.middleclick", true);
-pref("browser.tabs.loadDivertedInBackground", false);
-pref("browser.tabs.loadBookmarksInBackground", false);
-pref("browser.tabs.tabClipWidth", 140);
-pref("browser.tabs.animate", true);
-pref("browser.tabs.drawInTitlebar", true);
-
-// Where to show tab close buttons:
-// 0  on active tab only
-// 1  on all tabs until tabClipWidth is reached, then active tab only
-// 2  no close buttons at all
-// 3  at the end of the tabstrip
-pref("browser.tabs.closeButtons", 1);
-
-// When tabs opened by links in other tabs via a combination of 
-// browser.link.open_newwindow being set to 3 and target="_blank" etc are
-// closed:
-// true   return to the tab that opened this tab (its owner)
-// false  return to the adjacent tab (old default)
-pref("browser.tabs.selectOwnerOnClose", true);
-
-pref("browser.allTabs.previews", false);
-pref("browser.ctrlTab.previews", false);
-pref("browser.ctrlTab.recentlyUsedLimit", 7);
-
-// By default, do not export HTML at shutdown.
-// If true, at shutdown the bookmarks in your menu and toolbar will
-// be exported as HTML to the bookmarks.html file.
-pref("browser.bookmarks.autoExportHTML",          false);
-
-// The maximum number of daily bookmark backups to 
-// keep in {PROFILEDIR}/bookmarkbackups. Special values:
-// -1: unlimited
-//  0: no backups created (and deletes all existing backups)
-pref("browser.bookmarks.max_backups",             10);
-
-// Scripts & Windows prefs
-pref("dom.disable_open_during_load",              true);
-pref("javascript.options.showInConsole",          true);
-#ifdef DEBUG
-pref("general.warnOnAboutConfig",                 false);
-#endif
-
-#ifdef WINCE
-// Set the threshold higher to avoid some slow script warnings
-pref("dom.max_script_run_time",                   20);
-#endif
-
-// This is the pref to control the location bar, change this to true to 
-// force this - this makes the origin of popup windows more obvious to avoid
-// spoofing. We would rather not do it by default because it affects UE for web
-// applications, but without it there isn't a really good way to prevent chrome
-// spoofing, see bug 337344
-pref("dom.disable_window_open_feature.location",  true);
-// prevent JS from setting status messages
-pref("dom.disable_window_status_change",          true);
-// allow JS to move and resize existing windows
-pref("dom.disable_window_move_resize",            false);
-// prevent JS from monkeying with window focus, etc
-pref("dom.disable_window_flip",                   true);
-
-// popups.policy 1=allow,2=reject
-pref("privacy.popups.policy",               1);
-pref("privacy.popups.usecustom",            true);
-pref("privacy.popups.showBrowserMessage",   true);
-
-pref("privacy.item.cookies",                false);
-
-pref("privacy.clearOnShutdown.history",     true);
-pref("privacy.clearOnShutdown.formdata",    true);
-pref("privacy.clearOnShutdown.passwords",   false);
-pref("privacy.clearOnShutdown.downloads",   true);
-pref("privacy.clearOnShutdown.cookies",     true);
-pref("privacy.clearOnShutdown.cache",       true);
-pref("privacy.clearOnShutdown.sessions",    true);
-pref("privacy.clearOnShutdown.offlineApps", false);
-pref("privacy.clearOnShutdown.siteSettings", false);
-
-pref("privacy.cpd.history",                 true);
-pref("privacy.cpd.formdata",                true);
-pref("privacy.cpd.passwords",               false);
-pref("privacy.cpd.downloads",               true);
-pref("privacy.cpd.cookies",                 true);
-pref("privacy.cpd.cache",                   true);
-pref("privacy.cpd.sessions",                true);
-pref("privacy.cpd.offlineApps",             false);
-pref("privacy.cpd.siteSettings",            false);
-
-// What default should we use for the time span in the sanitizer:
-// 0 - Clear everything
-// 1 - Last Hour
-// 2 - Last 2 Hours
-// 3 - Last 4 Hours
-// 4 - Today
-pref("privacy.sanitize.timeSpan", 1);
-pref("privacy.sanitize.sanitizeOnShutdown", false);
-
-pref("privacy.sanitize.migrateFx3Prefs",    false);
-
-pref("network.proxy.share_proxy_settings",  false); // use the same proxy settings for all protocols
-
-// simple gestures support
-pref("browser.gesture.swipe.left", "Browser:BackOrBackDuplicate");
-pref("browser.gesture.swipe.right", "Browser:ForwardOrForwardDuplicate");
-pref("browser.gesture.swipe.up", "cmd_scrollTop");
-pref("browser.gesture.swipe.down", "cmd_scrollBottom");
-#ifdef XP_MACOSX
-pref("browser.gesture.pinch.latched", true);
-pref("browser.gesture.pinch.threshold", 150);
-#else
-pref("browser.gesture.pinch.latched", false);
-pref("browser.gesture.pinch.threshold", 25);
-#endif
-pref("browser.gesture.pinch.out", "");
-pref("browser.gesture.pinch.in", "");
-pref("browser.gesture.pinch.out.shift", "");
-pref("browser.gesture.pinch.in.shift", "");
-pref("browser.gesture.twist.latched", false);
-pref("browser.gesture.twist.threshold", 25);
-pref("browser.gesture.twist.right", "");
-pref("browser.gesture.twist.left", "");
-pref("browser.gesture.tap", "cmd_fullZoomReset");
-
-// 0=lines, 1=pages, 2=history , 3=text size
-#ifdef XP_MACOSX
-// On OS X, if the wheel has one axis only, shift+wheel comes through as a
-// horizontal scroll event. Thus, we can't assign anything other than normal
-// scrolling to shift+wheel.
-pref("mousewheel.withshiftkey.action",0);
-pref("mousewheel.withshiftkey.sysnumlines",true);
-pref("mousewheel.withshiftkey.numlines",1);
-pref("mousewheel.withaltkey.action",2);
-pref("mousewheel.withaltkey.sysnumlines",false);
-pref("mousewheel.withaltkey.numlines",1);
-pref("mousewheel.withmetakey.action",0);
-pref("mousewheel.withmetakey.sysnumlines",false);
-pref("mousewheel.withmetakey.numlines",1);
-#else
-pref("mousewheel.withshiftkey.action",2);
-pref("mousewheel.withshiftkey.sysnumlines",false);
-pref("mousewheel.withshiftkey.numlines",1);
-pref("mousewheel.withaltkey.action",0);
-pref("mousewheel.withaltkey.sysnumlines",false);
-pref("mousewheel.withaltkey.numlines",1);
-pref("mousewheel.withmetakey.action",0);
-pref("mousewheel.withmetakey.sysnumlines",true);
-pref("mousewheel.withmetakey.numlines",1);
-#endif
-pref("mousewheel.withcontrolkey.action",3);
-pref("mousewheel.withcontrolkey.sysnumlines",false);
-pref("mousewheel.withcontrolkey.numlines",1);
-
-pref("profile.allow_automigration", false);   // setting to false bypasses automigration in the profile code
-
-// Customizable toolbar stuff
-pref("custtoolbar.personal_toolbar_folder", "");
-
-// pref to control the alert notification 
-pref("alerts.slideIncrement", 1);
-pref("alerts.slideIncrementTime", 10);
-pref("alerts.totalOpenTime", 4000);
-
-pref("browser.xul.error_pages.enabled", true);
-pref("browser.xul.error_pages.expert_bad_cert", false);
-
-// Work Offline is best manually managed by the user.
-pref("network.manage-offline-status", false);
-
-// We want to make sure mail URLs are handled externally...
-pref("network.protocol-handler.external.mailto", true); // for mail
-pref("network.protocol-handler.external.news", true);   // for news
-pref("network.protocol-handler.external.snews", true);  // for secure news
-pref("network.protocol-handler.external.nntp", true);   // also news
-// ...without warning dialogs
-pref("network.protocol-handler.warn-external.mailto", false);
-pref("network.protocol-handler.warn-external.news", false);
-pref("network.protocol-handler.warn-external.snews", false);
-pref("network.protocol-handler.warn-external.nntp", false);
-
-// By default, all protocol handlers are exposed.  This means that
-// the browser will respond to openURL commands for all URL types.
-// It will also try to open link clicks inside the browser before
-// failing over to the system handlers.
-pref("network.protocol-handler.expose-all", true);
-pref("network.protocol-handler.expose.mailto", false);
-pref("network.protocol-handler.expose.news", false);
-pref("network.protocol-handler.expose.snews", false);
-pref("network.protocol-handler.expose.nntp", false);
-
-// Default security warning dialogs to show once.
-pref("security.warn_entering_secure.show_once", false);
-pref("security.warn_entering_weak.show_once", true);
-pref("security.warn_leaving_secure.show_once", false);
-pref("security.warn_viewing_mixed.show_once", true);
-pref("security.warn_submit_insecure.show_once", false);
-
-pref("accessibility.typeaheadfind", false);
-pref("accessibility.typeaheadfind.timeout", 5000);
-pref("accessibility.typeaheadfind.linksonly", false);
-pref("accessibility.typeaheadfind.flashBar", 1);
-
-// plugin finder service url
-pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
-// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
-pref("plugins.hide_infobar_for_missing_plugin", false);
-pref("plugins.hide_infobar_for_outdated_plugin", false);
-
-#ifdef XP_MACOSX
-pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
-#endif
-
-pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/");
-pref("plugins.update.notifyUser", false);
-
-#ifdef XP_WIN
-pref("browser.preferences.instantApply", false);
-#else
-pref("browser.preferences.instantApply", true);
-#endif
-#ifdef XP_MACOSX
-pref("browser.preferences.animateFadeIn", true);
-#else
-pref("browser.preferences.animateFadeIn", false);
-#endif
-
-pref("browser.download.show_plugins_in_list", true);
-pref("browser.download.hide_plugins_without_extensions", true);
-
-// Backspace and Shift+Backspace behavior
-// 0 goes Back/Forward
-// 1 act like PgUp/PgDown
-// 2 and other values, nothing
-#ifdef UNIX_BUT_NOT_MAC
-pref("browser.backspace_action", 2);
-#else
-pref("browser.backspace_action", 0);
-#endif
-
-// this will automatically enable inline spellchecking (if it is available) for
-// editable elements in HTML
-// 0 = spellcheck nothing
-// 1 = check multi-line controls [default]
-// 2 = check multi/single line controls
-pref("layout.spellcheckDefault", 1);
-
-pref("browser.send_pings", false);
-
-/* initial web feed readers list */
-pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
-pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
-pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
-pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
-pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
-pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
-pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
-
-pref("browser.feeds.handler", "ask");
-pref("browser.videoFeeds.handler", "ask");
-pref("browser.audioFeeds.handler", "ask");
-
-// At startup, if the handler service notices that the version number in the
-// region.properties file is newer than the version number in the handler
-// service datastore, it will add any new handlers it finds in the prefs (as
-// seeded by this file) to its datastore.  
-pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
-
-// The default set of web-based protocol handlers shown in the application
-// selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
-// per protocol, but if some locale wants more than that (or defaults for some
-// protocol not currently listed here), we should go ahead and add those.
-
-// webcal
-pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-
-// mailto
-pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-
-// irc
-pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-
-// ircs
-pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
-pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-
-// By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
-pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
-
-#ifdef MOZ_SAFE_BROWSING
-// Safe browsing does nothing unless this pref is set
-pref("browser.safebrowsing.enabled", true);
-
-// Prevent loading of pages identified as malware
-pref("browser.safebrowsing.malware.enabled", true);
-
-// Non-enhanced mode (local url lists) URL list to check for updates
-pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
-
-pref("browser.safebrowsing.dataProvider", 0);
-
-// Does the provider name need to be localizable?
-pref("browser.safebrowsing.provider.0.name", "Google");
-pref("browser.safebrowsing.provider.0.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client={moz:client}&appver={moz:version}&pver=2.2");
-pref("browser.safebrowsing.provider.0.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
-pref("browser.safebrowsing.provider.0.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client={moz:client}&appver={moz:version}&pver=2.2");
-
-// HTML report pages
-pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportErrorURL", "http://{moz:locale}.phish-error.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportPhishURL", "http://{moz:locale}.phish-report.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.malware-report.mozilla.com/?hl={moz:locale}");
-pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}");
-
-// FAQ URLs
-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/phishing-protection/");
-pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/geolocation/");
-
-// Name of the about: page contributed by safebrowsing to handle display of error
-// pages on phishing/malware hits.  (bug 399233)
-pref("urlclassifier.alternate_error_page", "blocked");
-
-// The number of random entries to send with a gethash request.
-pref("urlclassifier.gethashnoise", 4);
-
-// The list of tables that use the gethash request to confirm partial results.
-pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar");
-
-// If an urlclassifier table has not been updated in this number of seconds,
-// a gethash request will be forced to check that the result is still in
-// the database.
-pref("urlclassifier.confirm-age", 2700);
-
-#ifdef MOZ_WIDGET_GTK2
-#define RESTRICT_CACHEMAX
-#endif
-#ifdef XP_OS2
-#define RESTRICT_CACHEMAX
-#endif
-
-// Maximum size of the sqlite3 cache during an update, in bytes
-#ifdef RESTRICT_CACHEMAX
-pref("urlclassifier.updatecachemax", 104857600);
-#else
-pref("urlclassifier.updatecachemax", -1);
-#endif
-
-// URL for checking the reason for a malware warning.
-pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
-
-#endif
-
-pref("browser.EULA.version", 3);
-pref("browser.rights.version", 3);
-pref("browser.rights.3.shown", false);
-
-#ifdef DEBUG
-// Don't show the about:rights notification in debug builds.
-pref("browser.rights.override", true);
-#endif
-
-#ifdef WINCE
-pref("browser.sessionstore.resume_from_crash", false);
-#else
-pref("browser.sessionstore.resume_from_crash", true);
-#endif
-pref("browser.sessionstore.resume_session_once", false);
-
-// minimal interval between two save operations in milliseconds
-pref("browser.sessionstore.interval", 15000);
-// maximum amount of POSTDATA to be saved in bytes per history entry (-1 = all of it)
-// (NB: POSTDATA will be saved either entirely or not at all)
-pref("browser.sessionstore.postdata", 0);
-// on which sites to save text data, POSTDATA and cookies
-// 0 = everywhere, 1 = unencrypted sites, 2 = nowhere
-pref("browser.sessionstore.privacy_level", 0);
-// the same as browser.sessionstore.privacy_level, but for saving deferred session data
-pref("browser.sessionstore.privacy_level_deferred", 1);
-// how many tabs can be reopened (per window)
-pref("browser.sessionstore.max_tabs_undo", 10);
-// how many windows can be reopened (per session) - on non-OS X platforms this
-// pref may be ignored when dealing with pop-up windows to ensure proper startup
-pref("browser.sessionstore.max_windows_undo", 3);
-// number of crashes that can occur before the about:sessionrestore page is displayed
-// (this pref has no effect if more than 6 hours have passed since the last crash)
-pref("browser.sessionstore.max_resumed_crashes", 1);
-// The number of tabs that can restore concurrently:
-// < 0 = All tabs can restore at the same time
-//   0 = Only the selected tab in each window will be restored
-//       Other tabs won't be restored until they are selected
-//   N = The number of tabs to restore at the same time
-pref("browser.sessionstore.max_concurrent_tabs", 3);
-
-// allow META refresh by default
-pref("accessibility.blockautorefresh", false);
-
-// Whether history is enabled or not.
-pref("places.history.enabled", true);
-
-// The percentage of system memory that the Places database can use.  Out of the
-// allowed cache size it will at most use the size of the database file.
-// Changes to this value are effective after an application restart.
-// Acceptable values are between 0 and 50.
-pref("places.database.cache_to_memory_percentage", 6);
-
-// the (maximum) number of the recent visits to sample
-// when calculating frecency
-pref("places.frecency.numVisits", 10);
-
-// buckets (in days) for frecency calculation
-pref("places.frecency.firstBucketCutoff", 4);
-pref("places.frecency.secondBucketCutoff", 14);
-pref("places.frecency.thirdBucketCutoff", 31);
-pref("places.frecency.fourthBucketCutoff", 90);
-
-// weights for buckets for frecency calculations
-pref("places.frecency.firstBucketWeight", 100);
-pref("places.frecency.secondBucketWeight", 70);
-pref("places.frecency.thirdBucketWeight", 50);
-pref("places.frecency.fourthBucketWeight", 30);
-pref("places.frecency.defaultBucketWeight", 10);
-
-// bonus (in percent) for visit transition types for frecency calculations
-pref("places.frecency.embedVisitBonus", 0);
-pref("places.frecency.framedLinkVisitBonus", 0);
-pref("places.frecency.linkVisitBonus", 100);
-pref("places.frecency.typedVisitBonus", 2000);
-pref("places.frecency.bookmarkVisitBonus", 75);
-pref("places.frecency.downloadVisitBonus", 0);
-pref("places.frecency.permRedirectVisitBonus", 0);
-pref("places.frecency.tempRedirectVisitBonus", 0);
-pref("places.frecency.defaultVisitBonus", 0);
-
-// bonus (in percent) for place types for frecency calculations
-pref("places.frecency.unvisitedBookmarkBonus", 140);
-pref("places.frecency.unvisitedTypedBonus", 200);
-
-// Controls behavior of the "Add Exception" dialog launched from SSL error pages
-// 0 - don't pre-populate anything
-// 1 - pre-populate site URL, but don't fetch certificate
-// 2 - pre-populate site URL and pre-fetch certificate
-pref("browser.ssl_override_behavior", 2);
-
-// Controls the display of domain in the identity box for SSL connections.
-// 0 - do not show domain
-// 1 - show effectiveTLD + 1 (e.g. mozilla.org)
-// 2 - show full domain (e.g. bugzilla.mozilla.org)
-pref("browser.identity.ssl_domain_display", 1);
-
-// True if the user should be prompted when a web application supports
-// offline apps.
-pref("browser.offline-apps.notify", true);
-
-// if true, use full page zoom instead of text zoom
-pref("browser.zoom.full", true);
-
-// Whether or not to save and restore zoom levels on a per-site basis.
-pref("browser.zoom.siteSpecific", true);
-
-// Whether or not to update background tabs to the current zoom level.
-pref("browser.zoom.updateBackgroundTabs", true);
-
-// The breakpad report server to link to in about:crashes
-pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
-
-// base URL for web-based support pages
-pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/");
-
-// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
-pref("security.alternate_certificate_error_page", "certerror");
-
-// Whether to start the private browsing mode at application startup
-pref("browser.privatebrowsing.autostart", false);
-
-// Whether we should skip prompting before starting the private browsing mode
-pref("browser.privatebrowsing.dont_prompt_on_enter", false);
-
-// Don't try to alter this pref, it'll be reset the next time you use the
-// bookmarking dialog
-pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
-
-// base url for the wifi geolocation network provider
-pref("geo.wifi.uri", "http://geomena.org");
-pref("geo.wifi.protocol", 0);
-
-#ifdef WINCE
-
-// tweak awesomebar -- increase the delay until a search happens.
-pref("browser.urlbar.delay", 250);
-
-// disable safe browsing, due to perf hit
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-// don't check for default browser
-pref("browser.shell.checkDefaultBrowser", false);
-
-// disable bfcache for memory
-pref("browser.sessionhistory.max_total_viewers", 0);
-
-pref("browser.sessionhistory.optimize_eviction", false);
-
-// tweak default content sink prefs
-pref("content.sink.interactive_deflect_count", 10); /* default 0 */
-pref("content.sink.perf_deflect_count", 50); /* default 200 */
-pref("content.sink.interactive_parse_time", 5000); /* default 3000 */
-pref("content.sink.perf_parse_time", 150000); /* default 360000 */
-pref("content.sink.pending_event_mode", 0); /* default 1 */
-pref("content.sink.event_probe_rate", 1); /* default 1 */
-pref("content.sink.interactive_time", 750000); /* default 750000 */
-pref("content.sink.initial_perf_time", 500000); /* default 2000000 */
-pref("content.sink.enable_perf_mode", 0); /* default 0; 0 == switch, 1 == stay interactive, 2 == stay perf */
-
-// Write sessionstore.js less often
-pref("browser.sessionstore.interval", 60000);
-
-#endif /* WINCE */
-
-// Whether to use a panel that looks like an OS X sheet for customization
-#ifdef XP_MACOSX
-pref("toolbar.customization.usesheet", true);
-#else
-pref("toolbar.customization.usesheet", false);
-#endif
-
-// The default for this pref reflects whether the build is capable of IPC.
-// (Turning it on in a no-IPC build will have no effect.)
-#ifdef XP_MACOSX
-// i386 ipc preferences
-pref("dom.ipc.plugins.enabled.i386", false);
-pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true);
-pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true);
-// x86_64 ipc preferences
-pref("dom.ipc.plugins.enabled.x86_64", true);
-#elifdef MOZ_IPC
-pref("dom.ipc.plugins.enabled", true);
-#else
-pref("dom.ipc.plugins.enabled", false);
-#endif
-
-#ifdef XP_WIN
-#ifndef WINCE
-pref("browser.taskbar.previews.enable", false);
-pref("browser.taskbar.previews.max", 20);
-pref("browser.taskbar.previews.cachetime", 5);
-pref("browser.taskbar.lists.enabled", true);
-pref("browser.taskbar.lists.frequent.enabled", true);
-pref("browser.taskbar.lists.recent.enabled", false);
-pref("browser.taskbar.lists.maxListItemCount", 7);
-pref("browser.taskbar.lists.tasks.enabled", true);
-pref("browser.taskbar.lists.refreshInSeconds", 120);
-#endif
-#endif
-
-#ifdef MOZ_SERVICES_SYNC
-// The sync engines to use.
-pref("services.sync.registerEngines", "Bookmarks,Form,History,Password,Prefs,Tab");
-// Preferences to be synced by default
-pref("services.sync.prefs.sync.accessibility.blockautorefresh", true);
-pref("services.sync.prefs.sync.accessibility.browsewithcaret", true);
-pref("services.sync.prefs.sync.accessibility.typeaheadfind", true);
-pref("services.sync.prefs.sync.accessibility.typeaheadfind.linksonly", true);
-pref("services.sync.prefs.sync.app.update.mode", true);
-pref("services.sync.prefs.sync.browser.download.manager.closeWhenDone", true);
-pref("services.sync.prefs.sync.browser.download.manager.retention", true);
-pref("services.sync.prefs.sync.browser.download.manager.scanWhenDone", true);
-pref("services.sync.prefs.sync.browser.download.manager.showWhenStarting", true);
-pref("services.sync.prefs.sync.browser.formfill.enable", true);
-pref("services.sync.prefs.sync.browser.link.open_newwindow", true);
-pref("services.sync.prefs.sync.browser.offline-apps.notify", true);
-pref("services.sync.prefs.sync.browser.safebrowsing.enabled", true);
-pref("services.sync.prefs.sync.browser.safebrowsing.malware.enabled", true);
-pref("services.sync.prefs.sync.browser.search.selectedEngine", true);
-pref("services.sync.prefs.sync.browser.search.update", true);
-pref("services.sync.prefs.sync.browser.startup.homepage", true);
-pref("services.sync.prefs.sync.browser.startup.page", true);
-pref("services.sync.prefs.sync.browser.tabs.autoHide", true);
-pref("services.sync.prefs.sync.browser.tabs.closeButtons", true);
-pref("services.sync.prefs.sync.browser.tabs.loadInBackground", true);
-pref("services.sync.prefs.sync.browser.tabs.warnOnClose", true);
-pref("services.sync.prefs.sync.browser.tabs.warnOnOpen", true);
-pref("services.sync.prefs.sync.browser.urlbar.autocomplete.enabled", true);
-pref("services.sync.prefs.sync.browser.urlbar.autoFill", true);
-pref("services.sync.prefs.sync.browser.urlbar.default.behavior", true);
-pref("services.sync.prefs.sync.browser.urlbar.maxRichResults", true);
-pref("services.sync.prefs.sync.dom.disable_open_during_load", true);
-pref("services.sync.prefs.sync.dom.disable_window_flip", true);
-pref("services.sync.prefs.sync.dom.disable_window_move_resize", true);
-pref("services.sync.prefs.sync.dom.event.contextmenu.enabled", true);
-pref("services.sync.prefs.sync.extensions.personas.current", true);
-pref("services.sync.prefs.sync.extensions.update.enabled", true);
-pref("services.sync.prefs.sync.general.smoothScroll", true);
-pref("services.sync.prefs.sync.intl.accept_languages", true);
-pref("services.sync.prefs.sync.javascript.enabled", true);
-pref("services.sync.prefs.sync.layout.spellcheckDefault", true);
-pref("services.sync.prefs.sync.lightweightThemes.isThemeSelected", true);
-pref("services.sync.prefs.sync.lightweightThemes.usedThemes", true);
-pref("services.sync.prefs.sync.network.cookie.cookieBehavior", true);
-pref("services.sync.prefs.sync.network.cookie.lifetimePolicy", true);
-pref("services.sync.prefs.sync.permissions.default.image", true);
-pref("services.sync.prefs.sync.pref.advanced.images.disable_button.view_image", true);
-pref("services.sync.prefs.sync.pref.advanced.javascript.disable_button.advanced", true);
-pref("services.sync.prefs.sync.pref.downloads.disable_button.edit_actions", true);
-pref("services.sync.prefs.sync.pref.privacy.disable_button.cookie_exceptions", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.cache", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.cookies", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.downloads", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.formdata", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.history", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.offlineApps", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.passwords", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.sessions", true);
-pref("services.sync.prefs.sync.privacy.clearOnShutdown.siteSettings", true);
-pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true);
-pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true);
-pref("services.sync.prefs.sync.security.OCSP.disable_button.managecrl", true);
-pref("services.sync.prefs.sync.security.OCSP.enabled", true);
-pref("services.sync.prefs.sync.security.OCSP.require", true);
-pref("services.sync.prefs.sync.security.default_personal_cert", true);
-pref("services.sync.prefs.sync.security.enable_ssl3", true);
-pref("services.sync.prefs.sync.security.enable_tls", true);
-pref("services.sync.prefs.sync.security.warn_entering_secure", true);
-pref("services.sync.prefs.sync.security.warn_entering_weak", true);
-pref("services.sync.prefs.sync.security.warn_leaving_secure", true);
-pref("services.sync.prefs.sync.security.warn_submit_insecure", true);
-pref("services.sync.prefs.sync.security.warn_viewing_mixed", true);
-pref("services.sync.prefs.sync.signon.rememberSignons", true);
-pref("services.sync.prefs.sync.spellchecker.dictionary", true);
-pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
-#endif
-
-// Disable the error console and inspector
-pref("devtools.errorconsole.enabled", false);
-pref("devtools.inspector.enabled", false);
-
-// The last Web Console height. This is initially 0 which means that the Web
-// Console will use the default height next time it shows.
-// Change to -1 if you do not want the Web Console to remember its last height.
-pref("devtools.hud.height", 0);
-
-// Whether the character encoding menu is under the main Firefox button. This
-// preference is a string so that localizers can alter it.
-pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties");
-
-// Allow using tab-modal prompts when possible.
-pref("prompts.tab_modal.enabled", true);
-// Whether the Panorama should animate going in/out of tabs
-pref("browser.panorama.animate_zoom", true);
diff --git a/libre/icecat/internet-archive.xml b/libre/icecat/internet-archive.xml
deleted file mode 100644
index 1556a2d8c..000000000
--- a/libre/icecat/internet-archive.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Internet Archive</os:ShortName>
-<os:Description>Search www.archive.org</os:Description>
-<os:InputEncoding>ISO-8859-1</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.src</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.gif</IconUpdateUrl>
-<SearchForm>http://www.archive.org/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.archive.org/search.php?sourceid=Mozilla-search&amp;query={searchTerms}&amp;sort=-%2Fadditional%2Fitem%2Fdownloads">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/icecat/jamendo-en.xml b/libre/icecat/jamendo-en.xml
deleted file mode 100644
index 91d6df6e4..000000000
--- a/libre/icecat/jamendo-en.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Jamendo (en)</os:ShortName>
-<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg==</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico</IconUpdateUrl>
-<SearchForm>http://www.jamendo.com/en</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search/all/{searchTerms}">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/icecat/logless-search.xml b/libre/icecat/logless-search.xml
deleted file mode 100644
index 1538d1ef0..000000000
--- a/libre/icecat/logless-search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Logless Search</os:ShortName>
-<os:Description>Use logless.com to search the Internet in privacy, with no search logs.</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</os:Image>
-<os:Url type="text/html" method="GET" template="http://www.logless.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/icecat/mozilla-firefox-1.0-lang.patch b/libre/icecat/mozilla-firefox-1.0-lang.patch
deleted file mode 100644
index f0f7325a5..000000000
--- a/libre/icecat/mozilla-firefox-1.0-lang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/browser/app/profile/firefox.js.lang	2005-01-13 15:32:03.509282726 +0100
-+++ mozilla/browser/app/profile/firefox.js	2005-01-13 15:33:40.220914789 +0100
-@@ -253,6 +253,9 @@
- pref("font.language.group", "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
- 
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- pref("mousewheel.withcontrolkey.action",3);
- pref("mousewheel.withshiftkey.action",2);
diff --git a/libre/icecat/region.properties b/libre/icecat/region.properties
deleted file mode 100644
index 2e980987e..000000000
--- a/libre/icecat/region.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default search engine
-browser.search.defaultenginename=Duck Duck Go (SSL)
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Duck Duck Go (SSL)
-browser.search.order.2=Duck Duck Go (Lite)
-
-
-# Keyword URL (for location bar searches)
-keyword.URL=https://duckduckgo.com/?q=
-
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
-
-# increment this number when anything gets changed in the list below.  This will
-# cause Firefox to re-read these prefs and inject any new handlers into the 
-# profile database.  Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so 
-# don't make any spelling errors here.
-#gecko.handlerService.defaultHandlersVersion=3
diff --git a/libre/icecat/scroogle-ssl-english.xml b/libre/icecat/scroogle-ssl-english.xml
deleted file mode 100644
index f817dce40..000000000
--- a/libre/icecat/scroogle-ssl-english.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Scroogle SSL English</os:ShortName>
-<os:Description>Scroogle SSL English</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico</IconUpdateUrl>
-<SearchForm>https://ssl.scroogle.org/scrapen8.html</SearchForm>
-<os:Url type="text/html" method="GET" template="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi">
-  <os:Param name="Gw" value="{searchTerms}"/>
-  <os:Param name="l" value="en"/>
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch
deleted file mode 100644
index b42bd76c8..000000000
--- a/libre/icecat/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- browser/app/Makefile.in~	2008-10-02 10:11:42.000000000 +0200
-+++ browser/app/Makefile.in	2008-10-02 10:12:06.000000000 +0200
-@@ -414,7 +414,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/libre/icecat/yacy.xml b/libre/icecat/yacy.xml
deleted file mode 100644
index 61201ad20..000000000
--- a/libre/icecat/yacy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>YaCy</os:ShortName>
-<os:Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer 'kupferhammer-keller'.</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00</os:Image>
-<os:Url type="text/html" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.html?query={searchTerms}">
-</os:Url><os:Url type="application/rss+xml" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.rss?query={searchTerms}&amp;maximumRecords=10&amp;verify=false">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/kdelibs-libre/fix-knotify-filepath.patch b/libre/kdelibs-libre/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/libre/kdelibs-libre/fix-knotify-filepath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
-index 88d18b6..0e76658 100644
---- a/knotify/config/knotifyconfigactionswidget.cpp
-+++ b/knotify/config/knotifyconfigactionswidget.cpp
-@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
- 	KUrl soundURL = m_ui.Sound_select->url();
- 	if ( soundURL.isRelative() )
- 	{
--		QString soundString = soundURL.toLocalFile();
-+		QString soundString = m_ui.Sound_select->text();
- 		// we need a way to get the application name in order to ba able to do this :
- 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
- 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/libre/linux-libre-aufs_friendly/CVE-2012-0056.patch b/libre/linux-libre-aufs_friendly/CVE-2012-0056.patch
deleted file mode 100644
index 6a83fef1c..000000000
--- a/libre/linux-libre-aufs_friendly/CVE-2012-0056.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From e268337dfe26dfc7efd422a804dbb27977a3cccc Mon Sep 17 00:00:00 2001
-From: Linus Torvalds <torvalds@linux-foundation.org>
-Date: Tue, 17 Jan 2012 15:21:19 -0800
-Subject: [PATCH] proc: clean up and fix /proc/<pid>/mem handling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Jüri Aedla reported that the /proc/<pid>/mem handling really isn't very
-robust, and it also doesn't match the permission checking of any of the
-other related files.
-
-This changes it to do the permission checks at open time, and instead of
-tracking the process, it tracks the VM at the time of the open.  That
-simplifies the code a lot, but does mean that if you hold the file
-descriptor open over an execve(), you'll continue to read from the _old_
-VM.
-
-That is different from our previous behavior, but much simpler.  If
-somebody actually finds a load where this matters, we'll need to revert
-this commit.
-
-I suspect that nobody will ever notice - because the process mapping
-addresses will also have changed as part of the execve.  So you cannot
-actually usefully access the fd across a VM change simply because all
-the offsets for IO would have changed too.
-
-Reported-by: Jüri Aedla <asd@ut.ee>
-Cc: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- fs/proc/base.c |  145 +++++++++++++++-----------------------------------------
- 1 files changed, 39 insertions(+), 106 deletions(-)
-
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 5485a53..662ddf2 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -198,65 +198,7 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
- 	return result;
- }
- 
--static struct mm_struct *__check_mem_permission(struct task_struct *task)
--{
--	struct mm_struct *mm;
--
--	mm = get_task_mm(task);
--	if (!mm)
--		return ERR_PTR(-EINVAL);
--
--	/*
--	 * A task can always look at itself, in case it chooses
--	 * to use system calls instead of load instructions.
--	 */
--	if (task == current)
--		return mm;
--
--	/*
--	 * If current is actively ptrace'ing, and would also be
--	 * permitted to freshly attach with ptrace now, permit it.
--	 */
--	if (task_is_stopped_or_traced(task)) {
--		int match;
--		rcu_read_lock();
--		match = (ptrace_parent(task) == current);
--		rcu_read_unlock();
--		if (match && ptrace_may_access(task, PTRACE_MODE_ATTACH))
--			return mm;
--	}
--
--	/*
--	 * No one else is allowed.
--	 */
--	mmput(mm);
--	return ERR_PTR(-EPERM);
--}
--
--/*
-- * If current may access user memory in @task return a reference to the
-- * corresponding mm, otherwise ERR_PTR.
-- */
--static struct mm_struct *check_mem_permission(struct task_struct *task)
--{
--	struct mm_struct *mm;
--	int err;
--
--	/*
--	 * Avoid racing if task exec's as we might get a new mm but validate
--	 * against old credentials.
--	 */
--	err = mutex_lock_killable(&task->signal->cred_guard_mutex);
--	if (err)
--		return ERR_PTR(err);
--
--	mm = __check_mem_permission(task);
--	mutex_unlock(&task->signal->cred_guard_mutex);
--
--	return mm;
--}
--
--struct mm_struct *mm_for_maps(struct task_struct *task)
-+static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
- {
- 	struct mm_struct *mm;
- 	int err;
-@@ -267,7 +209,7 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
- 
- 	mm = get_task_mm(task);
- 	if (mm && mm != current->mm &&
--			!ptrace_may_access(task, PTRACE_MODE_READ)) {
-+			!ptrace_may_access(task, mode)) {
- 		mmput(mm);
- 		mm = ERR_PTR(-EACCES);
- 	}
-@@ -276,6 +218,11 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
- 	return mm;
- }
- 
-+struct mm_struct *mm_for_maps(struct task_struct *task)
-+{
-+	return mm_access(task, PTRACE_MODE_READ);
-+}
-+
- static int proc_pid_cmdline(struct task_struct *task, char * buffer)
- {
- 	int res = 0;
-@@ -752,38 +699,39 @@ static const struct file_operations proc_single_file_operations = {
- 
- static int mem_open(struct inode* inode, struct file* file)
- {
--	file->private_data = (void*)((long)current->self_exec_id);
-+	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-+	struct mm_struct *mm;
-+
-+	if (!task)
-+		return -ESRCH;
-+
-+	mm = mm_access(task, PTRACE_MODE_ATTACH);
-+	put_task_struct(task);
-+
-+	if (IS_ERR(mm))
-+		return PTR_ERR(mm);
-+
- 	/* OK to pass negative loff_t, we can catch out-of-range */
- 	file->f_mode |= FMODE_UNSIGNED_OFFSET;
-+	file->private_data = mm;
-+
- 	return 0;
- }
- 
- static ssize_t mem_read(struct file * file, char __user * buf,
- 			size_t count, loff_t *ppos)
- {
--	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-+	int ret;
- 	char *page;
- 	unsigned long src = *ppos;
--	int ret = -ESRCH;
--	struct mm_struct *mm;
-+	struct mm_struct *mm = file->private_data;
- 
--	if (!task)
--		goto out_no_task;
-+	if (!mm)
-+		return 0;
- 
--	ret = -ENOMEM;
- 	page = (char *)__get_free_page(GFP_TEMPORARY);
- 	if (!page)
--		goto out;
--
--	mm = check_mem_permission(task);
--	ret = PTR_ERR(mm);
--	if (IS_ERR(mm))
--		goto out_free;
--
--	ret = -EIO;
-- 
--	if (file->private_data != (void*)((long)current->self_exec_id))
--		goto out_put;
-+		return -ENOMEM;
- 
- 	ret = 0;
-  
-@@ -810,13 +758,7 @@ static ssize_t mem_read(struct file * file, char __user * buf,
- 	}
- 	*ppos = src;
- 
--out_put:
--	mmput(mm);
--out_free:
- 	free_page((unsigned long) page);
--out:
--	put_task_struct(task);
--out_no_task:
- 	return ret;
- }
- 
-@@ -825,27 +767,15 @@ static ssize_t mem_write(struct file * file, const char __user *buf,
- {
- 	int copied;
- 	char *page;
--	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
- 	unsigned long dst = *ppos;
--	struct mm_struct *mm;
-+	struct mm_struct *mm = file->private_data;
- 
--	copied = -ESRCH;
--	if (!task)
--		goto out_no_task;
-+	if (!mm)
-+		return 0;
- 
--	copied = -ENOMEM;
- 	page = (char *)__get_free_page(GFP_TEMPORARY);
- 	if (!page)
--		goto out_task;
--
--	mm = check_mem_permission(task);
--	copied = PTR_ERR(mm);
--	if (IS_ERR(mm))
--		goto out_free;
--
--	copied = -EIO;
--	if (file->private_data != (void *)((long)current->self_exec_id))
--		goto out_mm;
-+		return -ENOMEM;
- 
- 	copied = 0;
- 	while (count > 0) {
-@@ -869,13 +799,7 @@ static ssize_t mem_write(struct file * file, const char __user *buf,
- 	}
- 	*ppos = dst;
- 
--out_mm:
--	mmput(mm);
--out_free:
- 	free_page((unsigned long) page);
--out_task:
--	put_task_struct(task);
--out_no_task:
- 	return copied;
- }
- 
-@@ -895,11 +819,20 @@ loff_t mem_lseek(struct file *file, loff_t offset, int orig)
- 	return file->f_pos;
- }
- 
-+static int mem_release(struct inode *inode, struct file *file)
-+{
-+	struct mm_struct *mm = file->private_data;
-+
-+	mmput(mm);
-+	return 0;
-+}
-+
- static const struct file_operations proc_mem_operations = {
- 	.llseek		= mem_lseek,
- 	.read		= mem_read,
- 	.write		= mem_write,
- 	.open		= mem_open,
-+	.release	= mem_release,
- };
- 
- static ssize_t environ_read(struct file *file, char __user *buf,
--- 
-1.7.6.5
-
diff --git a/libre/linux-libre-aufs_friendly/Kbuild b/libre/linux-libre-aufs_friendly/Kbuild
deleted file mode 100644
index 8a9d7dceb..000000000
--- a/libre/linux-libre-aufs_friendly/Kbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Fail on warnings - also for files referenced in subdirs
-# -Werror can be disabled for specific files using:
-# CFLAGS_<file.o> := -Wno-error
-subdir-ccflags-y := -Wno-error
-
-# platform specific definitions
-include arch/mips/Kbuild.platforms
-obj-y := $(platform-y)
-
-# make clean traverses $(obj-) without having included .config, so
-# everything ends up here
-obj- := $(platform-)
-
-# mips object files
-# The object files are linked as core-y files would be linked
-
-obj-y += kernel/
-obj-y += mm/
-obj-y += math-emu/
diff --git a/libre/linux-libre-aufs_friendly/Kbuild.platforms b/libre/linux-libre-aufs_friendly/Kbuild.platforms
deleted file mode 100644
index 90a226888..000000000
--- a/libre/linux-libre-aufs_friendly/Kbuild.platforms
+++ /dev/null
@@ -1,6 +0,0 @@
-# All platforms listed in alphabetic order
-
-platforms += loongson
-
-# include the platform specific files
-include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/libre/linux-libre-aufs_friendly/PKGBUILD b/libre/linux-libre-aufs_friendly/PKGBUILD
deleted file mode 100644
index 49b0adba1..000000000
--- a/libre/linux-libre-aufs_friendly/PKGBUILD
+++ /dev/null
@@ -1,386 +0,0 @@
-# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer: Calimero <calimeroteknik@free.fr>
-# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-
-# In order to just get linux-libre as it used to be, with the exported symbols for AUFS-libre:
-
-# Uncomment these lines
-# pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
-# pkgname=linux-custom       # Build kernel with a different name
-# pkgbase=linux-libre
-
-# Comment this line
-pkgname=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') # Build stock -LIBRE kernel with AUFS-libre support
-
-_kernelname=${pkgname#linux-libre}
-_basekernel=3.2
-_sublevel=9
-pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://linux-libre.fsfla.org/"
-license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl')
-options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
-        # the main kernel config files
-        'config.i686' 'config.x86_64'
-        # patches exporting symbols for the aufs module (reason for this package)
-        'aufs3-libre-base.patch' 'aufs3-libre-standalone.patch'
-        # standard config files for mkinitcpio ramdisk
-        "${pkgname}.preset"
-        'Kbuild'
-        'Kbuild.platforms'
-        'boot-logo.patch'
-        'change-default-console-loglevel.patch'
-        'i915-fix-ghost-tv-output.patch'
-        'i915-gpu-finish.patch'
-        'ext4-options.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
-md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         '8e601878ccdd37111cc84500ebd81387'
-         '1e5dd328dbf4e68072a22c05c18813c7'
-         '6f9df3879268e0f07f535db2b6197475'
-         '44a5461daf301a46adf20c475069aaa7'
-         '9c1d9e47a0991b9d3d1f1ede01171c04'
-         '318ce8b3b64e4923a840817b91035753'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '263725f20c0b9eb9c353040792d644e5'
-         '4cd79aa147825837dc8bc9f6b736c0a0'
-         'f36222e7ce20c8e4dc27376f9be60f6c'
-         '690e6201d219638544d2fba3996dc822')
-if [ "$CARCH" != "mips64el" ]; then
-    # Don't use the Loongson-specific patches on non-mips64el arches.
-    unset source[${#source[@]}-1]
-    unset md5sums[${#md5sums[@]}-1]
-fi
-
-build() {
-  cd "${srcdir}/linux-${_basekernel}"
-
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
-  fi
-
-  # Add freedo as boot logo
-  patch -Np1 -i "${srcdir}/boot-logo.patch"
-
-  # fix FS#27883
-  # drm/i915: Only clear the GPU domains upon a successful finish
-  patch -Np1 -i "${srcdir}/i915-gpu-finish.patch"
-
-  # Some chips detect a ghost TV output
-  # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
-  # Arch Linux bug report: FS#19234
-  #
-  # It is unclear why this patch wasn't merged upstream, it was accepted,
-  # then dropped because the reasoning was unclear. However, it is clearly
-  # needed.
-  patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
-
-  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
-  # remove this when a Kconfig knob is made available by upstream
-  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
-  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
-
-  msg 'AUFS3-libre patches'
-  patch -p1 -i "${srcdir}/aufs3-libre-base.patch"
-  patch -p1 -i "${srcdir}/aufs3-libre-standalone.patch"
-
-  # fix ext4 module to mount ext3/2 correct
-  # https://bugs.archlinux.org/task/28653
-  patch -Np1 -i "${srcdir}/ext4-options.patch"
-
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
-    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
-        < "${srcdir}/lxo-config.patch" > lxo-config.patch
-    msg2 "Adding loongson-community patches"
-    patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -i lxo-config.patch
-
-# ensure N32, add localversion, remove uevent helper as per
-# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-# and make USB storage support builtin (e.g. for booting from USB
-# disks without slowly loading an initramfs)
-    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-        -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
-        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
-        ./.config
-  else
-    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
-  fi
-
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-  fi
-
-  # set extraversion to pkgrel
-  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
-
-  # get kernel version
-  make prepare
-
-  # load configuration
-  # Configure the kernel. Replace the line below with one of your choice.
-  #make menuconfig # CLI menu for configuration
-  #make nconfig # new CLI menu for configuration
-  #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
-  # ... or manually edit .config
-
-  ####################
-  # stop here
-  # this is useful to configure the kernel
-  #msg "Stopping build"
-  #return 1
-  ####################
-
-  yes "" | make config
-
-  # build!
-  if [ "$CARCH" == "mips64el" ]; then
-    # The build system passes it directly to linker, disable to avoid
-    # having unknown -Wl,... options.
-    export LDFLAGS=""
-    # bzImage is arch-specific and not supported on mips; vmlinux is
-    # useful for oprofile.
-    make ${MAKEFLAGS} vmlinux vmlinuz modules
-  else
-    make ${MAKEFLAGS} bzImage modules
-  fi
-}
-
-package_linux-libre-aufs_friendly() {
-  pkgdesc="The Linux-libre Kernel and modules, with symbols exported for AUFS3-libre"
-  depends=('coreutils' 'module-init-tools>=3.16')
-  optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26-aufs_friendly' "linux-aufs_friendly=$pkgver")
-  conflicts=('kernel26-aufs_friendly' 'kernel26-libre-aufs_friendly' 'linux-aufs_friendly')
-  replaces=('kernel26-aufs_friendly' 'kernel26-libre-aufs_friendly' 'linux-aufs_friendly')
-  backup=("etc/mkinitcpio.d/${pkgname}.preset")
-  install=${pkgname}.install
-  if [ "$CARCH" = "mips64el" ]; then
-      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
-      conflicts+=('mkinitcpio<0.7')
-  else
-      depends+=('mkinitcpio>=0.7')
-  fi
-
-  cd "${srcdir}/linux-${_basekernel}"
-
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
-
-  # get kernel version
-  _kernver="$(make kernelrelease)"
-
-  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
-  make INSTALL_MOD_PATH="${pkgdir}" modules_install
-
-  if [ "$CARCH" == "mips64el" ]; then
-    cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
-    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
-  else
-    cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
-  fi
-
-  # add vmlinux
-  install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
-
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
-
-  # set correct depmod command for install
-  sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    -i "${startdir}/${pkgname}.install"
-  sed \
-    -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgname}\"|g" \
-    -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \
-    -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
-    -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
-
-# mkinitcpio 0.7 relies on bzImage to find the kernel version
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|g" \
-        -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
-  fi
-
-  # remove build and source links
-  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
-  # remove the firmware
-  rm -rf "${pkgdir}/lib/firmware"
-  # gzip -9 all modules to save 100MB of space
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-  # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
-  # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
-}
-
-package_linux-libre-aufs_friendly-headers() {
-  pkgdesc="Header files and scripts for building modules for linux-libre-aufs_friendly kernel"
-  provides=('kernel26-aufs_friendly-headers' "linux-aufs_friendly-headers=${pkgver}")
-  conflicts=('kernel26-aufs_friendly-headers' 'kernel26-libre-aufs_friendly-headers' 'linux-aufs_friendly-headers')
-  replaces=('kernel26-aufs_friendly-headers' 'kernel26-libre-aufs_friendly-headers' 'linux-aufs_friendly-headers')
-
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
-
-# In case of repackaging this is empty
-  if [ -z "${_kernver}" ]; then
-    cd "${srcdir}/linux-${_basekernel}"
-    _kernver="$(make kernelrelease)"
-  fi
-
-  mkdir -p "${pkgdir}/lib/modules/${_kernver}"
-
-  cd "${pkgdir}/lib/modules/${_kernver}"
-  ln -sf ../../../usr/src/linux-${_kernver} build
-
-  cd "${srcdir}/linux-${_basekernel}"
-  install -D -m644 Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
-  install -D -m644 kernel/Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
-  install -D -m644 .config \
-    "${pkgdir}/usr/src/linux-${_kernver}/.config"
-
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
-
-  for i in acpi asm-generic config crypto drm generated linux math-emu \
-    media net pcmcia scsi sound trace video xen; do
-    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
-  done
-
-  # copy arch includes for external modules
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
-  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-
-  # copy files necessary for later builds
-  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
-
-  if [ "$CARCH" = "mips64el" ]; then
-    cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
-  fi
-
-  # fix permissions on scripts dir
-  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
-
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
-
-  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-
-  if [ "${CARCH}" = "i686" ]; then
-    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-  fi
-
-  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
-
-  # add headers for lirc package
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
-  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-  done
-
-  # add docbook makefile
-  install -D -m644 Documentation/DocBook/Makefile \
-    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
-
-  # add dm headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-
-  # add inotify.h
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
-  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
-
-  # add wireless headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-
-  # add dvb headers for external modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/9912
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
-  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
-  # and...
-  # http://bugs.archlinux.org/task/11194
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-
-  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-  # in reference to:
-  # http://bugs.archlinux.org/task/13146
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-
-  # add dvb headers
-  # in reference to:
-  # http://bugs.archlinux.org/task/20402
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
-  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
-  cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
-  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
-
-  # add xfs and shmem for aufs building
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
-  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
-
-  # copy in Kconfig files
-  for i in `find . -name "Kconfig*"`; do
-    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
-    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
-  done
-
-  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
-  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
-
-  # 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-sharedlib*) # Libraries (.so)
-        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
-      *application/x-archive*) # Libraries (.a)
-        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
-      *application/x-executable*) # Binaries
-        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
-    esac
-  done
-
-  # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
-  if [ "$CARCH" = "mips64el" ]; then
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
-  else
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
-  fi
-}
-
diff --git a/libre/linux-libre-aufs_friendly/aufs3-libre-base.patch b/libre/linux-libre-aufs_friendly/aufs3-libre-base.patch
deleted file mode 100644
index ac30c8db9..000000000
--- a/libre/linux-libre-aufs_friendly/aufs3-libre-base.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-aufs3.2 base patch
-
-diff --git a/fs/namei.c b/fs/namei.c
-index 5008f01..4cc94cf 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
-  * needs parent already locked. Doesn't follow mounts.
-  * SMP-safe.
-  */
--static struct dentry *lookup_hash(struct nameidata *nd)
-+struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-diff --git a/fs/splice.c b/fs/splice.c
-index fa2defa..e3569b0 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
-  * Attempt to initiate a splice from pipe to file.
-  */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
--			   loff_t *ppos, size_t len, unsigned int flags)
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+		    loff_t *ppos, size_t len, unsigned int flags)
- {
- 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
- 				loff_t *, size_t, unsigned int);
-@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-  */
--static long do_splice_to(struct file *in, loff_t *ppos,
--			 struct pipe_inode_info *pipe, size_t len,
--			 unsigned int flags)
-+long do_splice_to(struct file *in, loff_t *ppos,
-+		  struct pipe_inode_info *pipe, size_t len,
-+		  unsigned int flags)
- {
- 	ssize_t (*splice_read)(struct file *, loff_t *,
- 			       struct pipe_inode_info *, size_t, unsigned int);
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index ffc0213..ef35a31 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
- extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
- 		int (*open)(struct inode *, struct file *));
- 
-+extern struct dentry *lookup_hash(struct nameidata *nd);
- extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
- 
- extern int follow_down_one(struct path *);
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 26e5b61..3ffef2f 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
- extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
- 
- extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
-+
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+			   loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+			 struct pipe_inode_info *pipe, size_t len,
-+			 unsigned int flags);
- #endif
diff --git a/libre/linux-libre-aufs_friendly/aufs3-libre-standalone.patch b/libre/linux-libre-aufs_friendly/aufs3-libre-standalone.patch
deleted file mode 100644
index ae897f388..000000000
--- a/libre/linux-libre-aufs_friendly/aufs3-libre-standalone.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-aufs3.2 standalone patch
-
-diff --git a/fs/file_table.c b/fs/file_table.c
-index c322794..2aad244 100644
---- a/fs/file_table.c
-+++ b/fs/file_table.c
-@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file)
- 	}
- }
- 
-+EXPORT_SYMBOL(file_sb_list_del);
-+
- #ifdef CONFIG_SMP
- 
- /*
-diff --git a/fs/inode.c b/fs/inode.c
-index ee4e66b..728042b 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
- static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
- 
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
-+EXPORT_SYMBOL(inode_sb_list_lock);
- 
- /*
-  * Empty aops. Can be used for the cases where the user does not
-diff --git a/fs/namei.c b/fs/namei.c
-index 4cc94cf..af19e30 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
- {
- 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
-+EXPORT_SYMBOL(lookup_hash);
- 
- /**
-  * lookup_one_len - filesystem helper to lookup single pathname component
-diff --git a/fs/namespace.c b/fs/namespace.c
-index cfc6d44..173d15a 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL(iterate_mounts);
- 
- static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
- {
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 63fc294..6f4adca 100644
---- a/fs/notify/group.c
-+++ b/fs/notify/group.c
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
- #include <linux/rculist.h>
- #include <linux/wait.h>
-+#include <linux/module.h>
- 
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
- 	if (atomic_dec_and_test(&group->refcnt))
- 		fsnotify_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_put_group);
- 
- /*
-  * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
- 
- 	return group;
- }
-+EXPORT_SYMBOL(fsnotify_alloc_group);
-diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index e14587d..be6533b 100644
---- a/fs/notify/mark.c
-+++ b/fs/notify/mark.c
-@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
- 	if (atomic_dec_and_test(&mark->refcnt))
- 		mark->free_mark(mark);
- }
-+EXPORT_SYMBOL(fsnotify_put_mark);
- 
- /*
-  * Any time a mark is getting freed we end up here.
-@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
- 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
- 		fsnotify_final_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_destroy_mark);
- 
- void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
- {
-@@ -276,6 +278,7 @@ err:
- 
- 	return ret;
- }
-+EXPORT_SYMBOL(fsnotify_add_mark);
- 
- /*
-  * clear any marks in a group in which mark->flags & flags is true
-@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
- 	atomic_set(&mark->refcnt, 1);
- 	mark->free_mark = free_mark;
- }
-+EXPORT_SYMBOL(fsnotify_init_mark);
- 
- static int fsnotify_mark_destroy(void *ignored)
- {
-diff --git a/fs/open.c b/fs/open.c
-index 22c41b5..33b4033 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
- 	mutex_unlock(&dentry->d_inode->i_mutex);
- 	return ret;
- }
-+EXPORT_SYMBOL(do_truncate);
- 
- static long do_sys_truncate(const char __user *pathname, loff_t length)
- {
-diff --git a/fs/splice.c b/fs/splice.c
-index e3569b0..9dc07b7 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
- 
- 	return splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_from);
- 
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
- 
- 	return splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_to);
- 
- /**
-  * splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/security/commoncap.c b/security/commoncap.c
-index ee4f848..611fd70 100644
---- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(cap_file_mmap);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 4450fbe..bc94175 100644
---- a/security/device_cgroup.c
-+++ b/security/device_cgroup.c
-@@ -7,6 +7,7 @@
- #include <linux/device_cgroup.h>
- #include <linux/cgroup.h>
- #include <linux/ctype.h>
-+#include <linux/export.h>
- #include <linux/list.h>
- #include <linux/uaccess.h>
- #include <linux/seq_file.h>
-@@ -500,6 +501,7 @@ found:
- 
- 	return -EPERM;
- }
-+EXPORT_SYMBOL(__devcgroup_inode_permission);
- 
- int devcgroup_inode_mknod(int mode, dev_t dev)
- {
-diff --git a/security/security.c b/security/security.c
-index e2f684a..892000c 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_rmdir(dir, dentry);
- }
-+EXPORT_SYMBOL(security_path_rmdir);
- 
- int security_path_unlink(struct path *dir, struct dentry *dentry)
- {
-@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
- 		return 0;
- 	return security_ops->path_symlink(dir, dentry, old_name);
- }
-+EXPORT_SYMBOL(security_path_symlink);
- 
- int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		       struct dentry *new_dentry)
-@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
- 		return 0;
- 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
- }
-+EXPORT_SYMBOL(security_path_link);
- 
- int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 			 struct path *new_dir, struct dentry *new_dentry)
-@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path)
- 		return 0;
- 	return security_ops->path_truncate(path);
- }
-+EXPORT_SYMBOL(security_path_truncate);
- 
- int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 			mode_t mode)
-@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- 		return 0;
- 	return security_ops->path_chmod(dentry, mnt, mode);
- }
-+EXPORT_SYMBOL(security_path_chmod);
- 
- int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- {
-@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
- 		return 0;
- 	return security_ops->path_chown(path, uid, gid);
- }
-+EXPORT_SYMBOL(security_path_chown);
- 
- int security_path_chroot(struct path *path)
- {
-@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry)
- 		return 0;
- 	return security_ops->inode_readlink(dentry);
- }
-+EXPORT_SYMBOL(security_inode_readlink);
- 
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask)
- 		return 0;
- 	return security_ops->inode_permission(inode, mask);
- }
-+EXPORT_SYMBOL(security_inode_permission);
- 
- int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
- {
-@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask)
- 
- 	return fsnotify_perm(file, mask);
- }
-+EXPORT_SYMBOL(security_file_permission);
- 
- int security_file_alloc(struct file *file)
- {
-@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
- 		return ret;
- 	return ima_file_mmap(file, prot);
- }
-+EXPORT_SYMBOL(security_file_mmap);
- 
- int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
- 			    unsigned long prot)
diff --git a/libre/linux-libre-aufs_friendly/boot-logo.patch b/libre/linux-libre-aufs_friendly/boot-logo.patch
deleted file mode 100644
index c392928a5..000000000
--- a/libre/linux-libre-aufs_friendly/boot-logo.patch
+++ /dev/null
@@ -1,23163 +0,0 @@
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_clut224.ppm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,1604 +1,861 @@
- P3
--# Standard 224-color Linux logo
--80 80
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 23 30 36 44 54 65 57 72 88 44 54 65 6 12 15 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 31 41 52 
-+103 134 161 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 
-+82 108 129 8 14 16 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 17 24 30 126 162 196 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 161 203 243 92 119 140 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 154 195 235 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 138 174 208 21 27 33 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 70 96 117 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 49 59 70 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 3 6 52 62 74 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 
-+82 108 129 149 191 231 170 212 252 170 212 252 170 212 252 129 165 199 82 108 129 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 37 48 59 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 21 13 4 31 23 12 0 2 0 0 2 0 105 75 32 155 111 43 23 15 7 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 6 9 3 10 13 146 188 228 170 212 252 170 212 252 170 212 252 157 198 239 0 6 9 
-+0 2 0 52 62 74 170 212 252 170 212 252 154 195 235 0 6 9 0 2 0 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 151 193 233 17 24 30 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+10 12 8 23 15 7 139 99 44 206 148 61 67 49 21 0 2 0 125 92 35 206 148 61 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 96 127 154 170 212 252 170 212 252 170 212 252 170 212 252 92 119 140 21 22 20 
-+10 12 8 53 68 84 170 212 252 170 212 252 92 119 140 10 12 8 7 10 5 53 68 84 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+0 6 9 0 3 6 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 22 20 
-+62 64 61 38 40 37 0 2 0 34 26 8 212 153 66 64 46 18 0 2 0 170 124 49 
-+180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 65 87 102 115 117 114 
-+43 44 42 88 115 136 170 212 252 170 212 252 68 83 99 108 110 107 60 62 59 88 115 136 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+80 98 121 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 10 12 8 56 58 55 95 96 94 178 180 177 215 217 214 198 200 197 
-+158 160 156 138 140 137 82 83 81 0 2 0 64 46 18 228 167 73 23 15 7 41 31 10 
-+250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 
-+0 2 0 126 162 196 170 212 252 170 212 252 57 72 88 0 2 0 0 2 0 126 162 196 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 8 14 16 0 6 9 0 2 0 45 47 44 195 197 194 192 194 191 38 40 37 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 192 194 191 234 236 233 176 178 175 118 120 117 143 145 142 176 178 175 
-+215 217 214 234 236 233 234 236 233 104 106 103 0 2 0 142 101 40 134 100 43 0 2 0 
-+164 119 51 170 124 49 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 115 152 185 8 14 16 
-+49 59 70 166 207 248 170 212 252 170 212 252 119 150 178 8 14 16 55 66 77 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 0 2 0 200 202 199 254 255 252 254 255 252 244 246 243 
-+40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 38 40 37 234 236 233 234 236 233 234 236 233 135 137 134 215 217 214 171 173 170 
-+141 142 139 138 140 137 138 140 137 135 137 134 31 32 30 3 6 2 212 153 66 15 9 7 
-+78 58 25 248 178 79 41 31 10 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 3 6 21 27 33 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 163 205 246 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 154 195 235 0 6 9 82 83 81 254 255 252 254 255 252 254 255 252 254 255 252 
-+188 190 187 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 62 64 61 234 236 233 234 236 233 234 236 233 198 200 197 131 133 130 198 200 197 
-+232 234 231 234 236 233 234 236 233 234 236 233 152 154 151 0 2 0 147 105 44 67 49 21 
-+23 15 7 250 179 73 158 114 46 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 61 76 92 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 154 195 235 103 134 161 80 98 121 
-+52 62 74 18 22 24 0 2 0 3 10 13 38 45 51 80 98 121 151 193 233 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+226 228 225 65 66 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 43 44 42 234 236 233 234 236 233 234 236 233 234 236 233 131 133 130 192 194 191 
-+152 154 151 141 142 139 141 142 139 141 142 139 158 160 156 3 6 2 82 62 28 129 95 39 
-+0 2 0 206 148 61 248 178 79 21 13 4 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 96 115 138 
-+170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 18 22 24 0 2 0 0 2 0 
-+34 26 8 75 55 22 114 83 33 95 68 30 55 39 17 7 0 0 0 6 9 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 84 103 125 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 171 173 170 
-+0 2 0 0 2 0 0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 18 20 17 234 236 233 234 236 233 234 236 233 234 236 233 138 140 137 178 180 177 
-+226 228 225 234 236 233 234 236 233 234 236 233 231 233 230 45 47 44 23 15 7 190 136 56 
-+0 2 0 147 105 44 250 179 73 64 46 18 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 126 162 196 0 2 0 26 20 13 190 136 56 245 175 76 
-+250 179 73 161 117 49 164 119 51 245 175 76 250 179 73 206 148 61 75 55 22 0 2 0 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 68 83 99 0 2 0 252 254 250 254 255 252 254 255 252 254 255 252 71 73 70 
-+8 14 16 88 115 136 17 24 30 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 232 234 231 234 236 233 234 236 233 234 236 233 215 217 214 148 150 147 
-+183 185 181 141 142 139 135 137 134 135 137 134 141 142 139 87 89 86 0 2 0 202 145 58 
-+3 6 2 88 66 26 250 179 73 109 79 35 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 157 198 239 
-+170 212 252 170 212 252 166 207 248 26 33 39 26 20 13 224 163 69 250 179 73 250 179 73 
-+250 179 73 197 142 62 202 145 58 250 179 73 250 179 73 250 179 73 234 172 70 21 13 4 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 52 62 74 21 22 20 254 255 252 254 255 252 254 255 252 254 255 252 21 22 20 
-+49 59 70 170 212 252 166 207 248 91 123 149 8 14 16 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 215 217 214 234 236 233 234 236 233 234 236 233 234 236 233 123 125 122 
-+188 190 187 229 231 228 234 236 233 234 236 233 222 224 221 118 120 117 0 2 0 168 123 54 
-+34 26 8 67 49 21 250 179 73 134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 34 41 47 170 212 252 
-+170 212 252 170 212 252 85 112 133 0 2 0 164 119 51 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 129 95 39 
-+0 2 0 138 174 208 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 44 55 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 24 22 25 
-+52 62 74 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 178 180 177 234 236 233 234 236 233 234 236 233 234 236 233 141 142 139 
-+198 200 197 148 150 147 135 137 134 135 137 134 148 150 147 123 125 122 0 2 0 190 136 56 
-+21 13 4 78 58 25 250 179 73 129 95 39 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 23 30 36 58 42 19 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 147 105 44 
-+0 2 0 139 181 221 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 34 41 47 45 47 44 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 
-+25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 10 16 18 0 6 9 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 91 93 90 234 236 233 234 236 233 234 236 233 234 236 233 126 127 125 
-+169 171 168 222 224 221 234 236 233 229 231 228 178 180 177 71 73 70 0 2 0 212 153 66 
-+0 2 0 95 68 30 250 179 73 119 87 37 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 138 174 208 170 212 252 
-+170 212 252 154 195 235 0 2 0 125 92 35 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 119 87 37 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 7 10 5 252 254 250 254 255 252 254 255 252 254 255 252 95 96 94 
-+0 6 9 166 207 248 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 8 14 16 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 7 10 5 222 224 221 234 236 233 234 236 233 234 236 233 141 142 139 
-+183 185 181 138 140 137 131 133 130 141 142 139 192 194 191 102 104 101 0 2 0 224 163 69 
-+0 2 0 105 75 32 250 179 73 55 39 17 7 0 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 21 27 33 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 180 132 57 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 10 12 8 
-+38 45 51 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 82 108 129 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 158 160 156 
-+0 2 0 92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 141 142 139 234 236 233 234 236 233 234 236 233 131 133 130 
-+185 187 183 231 233 230 222 224 221 158 160 156 138 140 137 48 50 48 3 6 2 250 179 73 
-+134 100 43 206 148 61 218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 75 94 116 170 212 252 170 212 252 
-+170 212 252 92 119 140 0 2 0 224 163 69 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 87 61 23 7 0 0 
-+134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 109 141 168 0 2 0 178 180 177 254 255 252 254 255 252 254 255 252 252 254 250 
-+39 43 45 10 16 18 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+88 115 136 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 45 47 44 234 236 233 234 236 233 234 236 233 131 133 130 
-+148 150 147 138 140 137 148 150 147 210 212 209 152 154 151 26 27 25 29 21 8 250 179 73 
-+250 179 73 234 172 70 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 170 212 252 
-+170 212 252 103 134 161 0 2 0 202 145 58 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 238 175 73 75 55 22 0 2 0 75 102 123 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 140 177 211 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 
-+183 185 181 0 2 0 75 94 116 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 57 72 88 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 162 164 161 234 236 233 234 236 233 135 137 134 
-+226 228 225 198 200 197 104 106 103 15 17 14 0 2 0 15 9 7 147 105 44 250 179 73 
-+248 178 79 55 39 17 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 21 27 33 170 212 252 170 212 252 170 212 252 
-+170 212 252 122 159 192 0 2 0 175 129 54 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 250 179 73 202 145 58 55 39 17 0 2 0 82 108 129 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 12 17 20 60 62 59 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 69 71 68 0 6 9 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 159 201 241 26 33 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 162 164 161 215 217 214 95 96 94 
-+56 58 55 0 2 0 0 2 0 0 2 0 61 44 16 238 175 73 250 179 73 250 179 73 
-+218 158 64 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 88 115 136 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 185 225 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 212 153 66 95 68 30 0 2 0 8 14 16 103 134 161 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 68 83 99 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 210 212 209 0 6 9 53 68 84 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 126 162 196 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 23 15 7 250 179 73 250 179 73 250 179 73 
-+250 179 73 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 166 207 248 0 2 0 52 36 13 158 114 46 180 132 57 161 117 49 119 87 37 
-+41 31 10 0 2 0 0 2 0 72 87 103 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 115 152 185 0 2 0 152 154 151 254 255 252 238 241 237 85 87 84 
-+229 231 228 254 255 252 99 101 98 0 2 0 126 162 196 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 63 78 94 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 
-+250 179 73 105 75 32 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 32 39 45 0 2 0 57 72 88 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 85 112 133 12 17 20 0 2 0 0 2 0 0 2 0 0 2 0 
-+34 41 47 92 110 133 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 6 12 15 71 73 70 254 255 252 229 231 228 0 2 0 
-+141 142 139 254 255 252 231 233 230 10 12 8 34 44 55 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 154 195 235 6 12 15 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 125 92 35 250 179 73 250 179 73 
-+250 179 73 180 132 57 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 68 83 99 
-+129 165 199 85 112 133 0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 126 162 196 119 156 189 134 170 204 149 191 231 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 57 72 88 3 6 2 242 244 240 254 255 252 35 37 34 
-+78 80 77 254 255 252 254 255 252 128 130 127 0 2 0 105 137 164 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 91 123 149 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 55 39 17 250 179 73 250 179 73 
-+250 179 73 245 175 76 7 10 5 0 2 0 44 54 65 103 134 161 161 203 243 170 212 252 
-+170 212 252 21 27 33 25 32 38 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 61 76 92 0 2 0 242 244 240 254 255 252 102 104 101 
-+10 12 8 231 233 230 254 255 252 244 246 243 26 27 25 21 27 33 159 201 241 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 32 39 45 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 218 158 64 250 179 73 
-+250 179 73 250 179 73 75 55 22 0 2 0 161 203 243 170 212 252 170 212 252 170 212 252 
-+115 147 174 0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 159 201 241 146 188 228 
-+140 177 211 134 170 204 146 188 228 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 17 24 30 62 64 61 254 255 252 254 255 252 215 217 214 
-+0 2 0 102 104 101 254 255 252 254 255 252 166 168 165 0 2 0 72 87 103 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 129 165 199 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 75 32 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 
-+49 59 70 3 10 13 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 166 207 248 109 141 168 65 87 102 28 35 41 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 28 35 41 70 96 117 138 174 208 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 102 104 101 254 255 252 254 255 252 254 255 252 
-+102 104 101 0 2 0 192 194 191 254 255 252 254 255 252 78 80 77 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 34 44 55 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 61 76 92 154 195 235 0 6 9 29 21 8 250 179 73 
-+250 179 73 250 179 73 224 163 69 0 2 0 68 83 99 170 212 252 170 212 252 143 179 213 
-+0 2 0 72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 96 115 138 17 24 30 0 2 0 0 2 0 45 47 44 102 104 101 123 125 122 
-+138 140 137 143 145 142 115 117 114 82 83 81 43 44 42 0 2 0 0 2 0 32 39 45 
-+126 162 196 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 0 2 0 85 87 84 254 255 252 254 255 252 254 255 252 
-+242 244 240 27 29 27 35 37 34 254 255 252 254 255 252 231 233 230 10 12 8 21 27 33 
-+159 201 241 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 6 9 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 44 54 65 170 212 252 170 212 252 34 44 55 0 2 0 82 62 28 
-+109 79 35 224 163 69 250 179 73 52 36 13 15 20 22 170 212 252 170 212 252 75 89 106 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 134 170 204 
-+25 32 38 0 2 0 40 41 39 155 157 153 238 241 237 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 115 117 114 18 20 17 
-+0 2 0 68 83 99 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 52 62 74 7 10 5 234 236 233 254 255 252 254 255 252 
-+254 255 252 195 197 194 102 104 101 254 255 252 254 255 252 254 255 252 162 164 161 0 2 0 
-+72 87 103 170 212 252 170 212 252 170 212 252 170 212 252 119 156 189 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 115 147 174 170 212 252 91 123 149 0 2 0 0 2 0 6 12 15 
-+0 2 0 15 9 7 197 142 62 125 92 35 0 2 0 115 152 185 113 145 172 3 6 2 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 113 145 172 0 6 9 
-+10 12 8 155 157 153 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 232 234 231 
-+87 89 86 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 115 152 185 0 2 0 138 140 137 254 255 252 254 255 252 
-+254 255 252 254 255 252 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 65 66 64 
-+0 2 0 122 159 192 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 154 195 235 170 212 252 143 179 213 88 115 136 149 191 231 170 212 252 
-+126 162 196 3 6 2 64 46 18 202 145 58 0 2 0 0 2 0 0 2 0 0 2 0 
-+92 119 140 170 212 252 170 212 252 170 212 252 170 212 252 143 179 213 3 10 13 27 29 27 
-+215 217 214 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 155 157 153 0 2 0 32 39 45 154 195 235 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 23 30 36 27 29 27 249 251 248 254 255 252 
-+254 255 252 188 190 187 7 10 5 226 228 225 254 255 252 254 255 252 254 255 252 231 233 230 
-+7 10 5 21 27 33 159 201 241 170 212 252 103 134 161 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 55 66 77 11 4 3 250 179 73 24 17 10 0 2 0 0 2 0 0 2 0 
-+143 185 225 170 212 252 170 212 252 170 212 252 159 201 241 28 35 41 7 10 5 200 202 199 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 155 157 153 0 2 0 55 66 77 170 212 252 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 96 127 154 0 2 0 158 160 156 254 255 252 
-+254 255 252 192 194 191 0 2 0 176 178 175 254 255 252 254 255 252 254 255 252 254 255 252 
-+141 142 139 0 2 0 72 87 103 129 165 199 0 6 9 0 6 9 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 6 9 12 17 20 143 185 225 170 212 252 170 212 252 170 212 252 170 212 252 
-+138 174 208 17 24 30 29 21 8 250 179 73 101 72 28 0 2 0 0 2 0 32 39 45 
-+170 212 252 170 212 252 170 212 252 170 212 252 57 72 88 0 2 0 152 154 151 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 108 110 107 0 2 0 115 152 185 170 212 252 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 18 22 24 40 41 39 254 255 252 
-+254 255 252 232 234 231 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 10 12 8 0 2 0 8 14 16 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 6 9 41 51 62 61 76 92 34 44 55 3 10 13 
-+0 2 0 11 4 3 164 119 51 250 179 73 175 129 54 0 2 0 0 2 0 82 108 129 
-+170 212 252 170 212 252 170 212 252 98 129 156 0 2 0 95 96 94 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 238 241 237 18 20 17 25 32 38 166 207 248 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 85 112 133 0 2 0 188 190 187 
-+254 255 252 254 255 252 198 200 197 242 244 240 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 120 122 119 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 0 2 0 0 6 9 7 0 0 
-+31 23 12 202 145 58 250 179 73 250 179 73 238 175 73 0 2 0 0 2 0 122 159 192 
-+170 212 252 170 212 252 170 212 252 28 35 41 31 32 30 244 246 243 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 85 112 133 170 212 252 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 138 174 208 0 2 0 148 150 147 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 222 224 221 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+7 0 0 234 172 70 250 179 73 250 179 73 250 179 73 34 26 8 0 2 0 149 191 231 
-+170 212 252 170 212 252 129 165 199 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 48 50 48 3 10 13 146 188 228 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 157 198 239 0 2 0 118 120 117 
-+254 255 252 254 255 252 254 255 252 169 171 168 231 233 230 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 170 124 49 250 179 73 250 179 73 250 179 73 48 33 15 6 12 15 170 212 252 
-+170 212 252 170 212 252 65 87 102 0 2 0 222 224 221 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 195 197 194 0 2 0 84 103 125 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 3 10 13 85 87 84 
-+254 255 252 254 255 252 234 236 233 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 99 101 98 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 95 68 30 250 179 73 250 179 73 250 179 73 34 26 8 34 44 55 170 212 252 
-+170 212 252 163 205 246 8 14 16 62 64 61 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 35 37 34 34 44 55 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 26 33 39 60 62 59 
-+254 255 252 254 255 252 238 241 237 0 2 0 108 110 107 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 158 160 156 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 23 15 7 248 178 79 250 179 73 245 175 76 0 2 0 63 78 94 170 212 252 
-+170 212 252 109 141 168 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 104 106 103 0 2 0 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 69 71 68 
-+254 255 252 254 255 252 244 246 243 0 2 0 91 93 90 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 215 217 214 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 197 142 62 250 179 73 212 153 66 0 2 0 92 110 133 170 212 252 
-+170 212 252 80 98 121 0 2 0 231 233 230 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 176 178 175 0 2 0 
-+105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 8 14 16 87 89 86 
-+254 255 252 254 255 252 254 255 252 40 41 39 21 22 20 252 254 250 254 255 252 254 255 252 
-+254 255 252 254 255 252 252 254 250 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 125 92 35 250 179 73 170 124 49 0 2 0 113 145 172 170 212 252 
-+170 212 252 53 68 84 15 17 14 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 242 244 240 0 2 0 
-+63 78 94 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 0 2 0 104 106 103 
-+254 255 252 254 255 252 254 255 252 123 125 122 0 2 0 166 168 165 254 255 252 254 255 252 
-+254 255 252 254 255 252 234 236 233 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 52 36 13 250 179 73 129 95 39 0 2 0 143 179 213 170 212 252 
-+170 212 252 32 39 45 48 50 48 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 60 62 59 
-+18 22 24 170 212 252 170 212 252 170 212 252 170 212 252 163 205 246 0 2 0 102 104 101 
-+254 255 252 254 255 252 254 255 252 226 228 225 15 17 14 10 12 8 215 217 214 254 255 252 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 88 66 26 29 21 8 0 2 0 166 207 248 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 123 125 122 
-+0 2 0 149 191 231 170 212 252 170 212 252 170 212 252 170 212 252 21 27 33 56 58 55 
-+254 255 252 254 255 252 254 255 252 254 255 252 178 180 177 0 2 0 38 40 37 238 241 237 
-+254 255 252 254 255 252 210 212 209 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 7 0 0 0 2 0 161 203 243 170 212 252 
-+149 191 231 0 2 0 123 125 122 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 141 142 139 
-+0 2 0 143 179 213 170 212 252 170 212 252 170 212 252 170 212 252 66 80 97 0 2 0 
-+210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 120 122 119 0 2 0 21 22 20 
-+143 145 142 244 246 243 219 221 218 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 149 191 231 170 212 252 
-+129 165 199 0 2 0 158 160 156 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 155 157 153 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 143 185 225 0 6 9 
-+69 71 68 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 71 73 70 0 2 0 
-+0 2 0 0 2 0 40 41 39 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 170 212 252 
-+129 165 199 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 169 171 168 
-+0 2 0 119 156 189 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 75 94 116 
-+0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 134 170 204 170 212 252 
-+134 170 204 0 2 0 152 154 151 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 
-+0 2 0 113 145 172 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 166 207 248 
-+44 54 65 0 2 0 162 164 161 254 255 252 254 255 252 254 255 252 35 37 34 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 126 162 196 170 212 252 
-+138 174 208 0 2 0 143 145 142 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 198 200 197 
-+0 2 0 103 134 161 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+157 198 239 28 35 41 0 2 0 188 190 187 254 255 252 252 254 250 3 6 2 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 115 152 185 170 212 252 
-+143 179 213 0 2 0 135 137 134 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 210 212 209 
-+0 2 0 91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 146 188 228 0 6 9 26 27 25 242 244 240 176 178 175 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 170 212 252 
-+143 185 225 0 2 0 128 130 127 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 185 187 183 
-+0 2 0 105 137 164 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 163 205 246 0 2 0 0 2 0 102 104 101 60 62 59 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 80 98 121 170 212 252 
-+149 191 231 0 2 0 118 120 117 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 143 145 142 
-+0 2 0 134 170 204 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 143 179 213 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 44 54 65 170 212 252 
-+170 212 252 3 10 13 85 87 84 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 108 110 107 
-+0 2 0 157 198 239 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 115 152 185 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 3 10 13 170 212 252 
-+170 212 252 34 44 55 43 44 42 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 69 71 68 
-+15 20 22 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+170 212 252 75 94 116 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 139 181 221 
-+170 212 252 63 78 94 3 6 2 249 251 248 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 31 32 30 
-+41 51 62 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+161 203 243 6 12 15 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 105 137 164 
-+170 212 252 88 115 136 0 2 0 210 212 209 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 249 251 248 0 2 0 
-+68 83 99 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+96 127 154 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 61 76 92 
-+170 212 252 119 150 178 0 2 0 169 171 168 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 183 185 181 0 2 0 
-+91 123 149 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 
-+28 35 41 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 6 9 
-+146 188 228 143 185 225 0 2 0 126 127 125 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 85 87 84 0 6 9 
-+154 195 235 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 98 129 156 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+72 90 112 170 212 252 18 22 24 56 58 55 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 238 241 237 7 10 5 55 66 77 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 122 159 192 0 6 9 
-+0 6 9 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 122 159 192 72 87 103 0 2 0 229 231 228 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 152 154 151 0 2 0 113 145 172 
-+170 212 252 170 212 252 170 212 252 170 212 252 170 212 252 139 181 221 8 14 16 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 18 22 24 109 141 168 0 2 0 148 150 147 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 56 58 55 12 17 20 166 207 248 
-+170 212 252 170 212 252 170 212 252 170 212 252 146 188 228 23 30 36 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 101 72 28 202 145 58 
-+180 132 57 0 2 0 38 45 51 3 10 13 69 71 68 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 200 202 199 0 2 0 75 89 106 170 212 252 
-+170 212 252 170 212 252 170 212 252 109 141 168 8 14 16 0 2 0 21 13 4 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 7 0 0 0 2 0 101 72 28 218 158 64 250 179 73 250 179 73 
-+250 179 73 139 99 44 0 2 0 8 14 16 0 2 0 238 241 237 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 244 246 243 38 40 37 3 10 13 139 181 221 170 212 252 
-+170 212 252 161 203 243 66 80 97 0 2 0 31 23 12 191 142 60 248 183 74 180 132 57 
-+44 34 15 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 23 15 7 190 136 56 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 150 108 46 0 2 0 0 2 0 82 83 81 222 224 221 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 102 104 101 0 2 0 98 129 156 170 212 252 163 205 246 
-+98 129 156 23 30 36 0 2 0 82 62 28 234 172 70 248 183 74 248 183 74 248 183 74 
-+248 183 74 158 114 46 29 21 8 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 64 46 18 109 79 35 150 108 46 224 163 69 250 179 73 
-+250 179 73 250 179 73 250 179 73 158 114 46 0 2 0 0 2 0 3 6 2 115 117 114 
-+234 236 233 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 176 178 175 0 2 0 57 72 88 146 188 228 80 98 121 8 14 16 
-+0 2 0 24 17 10 158 114 46 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 242 178 77 58 42 19 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 0 2 0 67 49 21 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 228 167 73 95 68 30 0 2 0 0 2 0 
-+0 2 0 52 54 51 108 110 107 162 164 161 219 221 218 254 255 252 254 255 252 254 255 252 
-+254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 254 255 252 252 254 250 
-+219 221 218 178 180 177 18 20 17 6 12 15 26 33 39 0 2 0 0 2 0 52 36 13 
-+164 119 51 242 178 77 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 242 178 77 
-+187 138 56 175 129 54 158 114 46 82 62 28 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 78 58 25 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 234 172 70 142 101 40 
-+44 34 15 10 12 8 0 2 0 0 2 0 0 2 0 18 20 17 60 62 59 71 73 70 
-+82 83 81 95 96 94 104 106 103 118 120 117 115 117 114 78 80 77 40 41 39 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 44 34 15 105 75 32 191 142 60 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 105 75 32 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 187 138 56 250 179 73 
-+250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 250 179 73 142 101 40 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 206 148 61 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 161 117 49 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 228 167 73 250 179 73 
-+238 175 73 190 136 56 158 114 46 234 172 70 250 179 73 250 179 73 250 179 73 250 179 73 
-+250 179 73 147 105 44 0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 67 49 21 248 183 74 248 183 74 248 183 74 
-+248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 248 183 74 
-+31 23 12 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 10 5 21 13 4 
-+0 2 0 0 2 0 0 2 0 147 105 44 250 179 73 250 179 73 250 179 73 250 179 73 
-+134 100 43 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 155 111 43 248 183 74 248 183 74 
-+248 183 74 248 183 74 224 163 69 55 39 17 64 46 18 164 119 51 242 178 77 248 183 74 
-+75 55 22 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 202 145 58 250 179 73 250 179 73 228 167 73 88 66 26 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 168 123 54 248 183 74 
-+248 183 74 248 183 74 158 114 46 0 2 0 7 0 0 0 2 0 10 12 8 44 34 15 
-+15 9 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 250 179 73 250 179 73 158 114 46 15 14 3 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 7 0 0 0 2 0 175 129 54 
-+248 183 74 248 183 74 114 83 33 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 29 21 8 147 105 44 58 42 19 0 2 0 7 0 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+105 75 32 218 158 64 23 15 7 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 7 0 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
-+
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_mono.pbm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,203 +1,159 @@
--P1
--# Standard black and white Linux logo
--80 80
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 1 1 1 0 0 1 1 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 1 1 1 0 1 1 1 1 0 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 0 1 1 1 0 1 1 1 1 0 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1
--1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 1 1 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 0 0 1 0 0 0 0 0 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 1
--1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 0 0 0 0 0 0 0 0 0 1 1 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 1 1 0 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 0 1 0 0 0 0 0 0 0 0 1 1 0 0 0 1
--1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1
--0 0 0 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 0 1 1 1 1 1 1 1 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 0 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 1 1 1 1 1 1
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1
--1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 1 0 0 0 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 1 1 1 1 1 1 1 1 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 1 1 1 1 1 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
--1 1 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
--1 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 0 0 0 0 0 0 0 0 0 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
--1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
-+P2
-+80  78
-+255 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 255 255 255 0 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 
-+255 0 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 255 255 255 255 255 255 255 255 255 255 0 0 255 0 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 
-+255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 0 255 255 0 0 255 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 255 255 255 0 0 255 
-+255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 255 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 0 0 255 255 255 0 0 
-+255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 
-+0 255 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 
-+0 0 255 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 255 255 255 
-+255 0 0 255 255 255 255 255 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 255 0 0 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 
-+255 0 0 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 0 0 255 0 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 255 255 255 
-+255 255 0 0 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 255 255 255 255 0 255 255 255 
-+255 255 255 0 0 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 255 255 255 0 255 255 255 
-+255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 255 255 
-+255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 0 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 255 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 255 255 255 255 0 0 
-+255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 0 
-+0 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 0 0 255 255 255 255 255 255 
-+0 0 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 0 0 255 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 255 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 255 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 255 255 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 255 255 255 0 0 0 255 255 255 255 255 255 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 255 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 255 255 255 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-+0 0 0 0 0 0 0 0 0 0 
-diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm
---- linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm	2011-06-02 21:34:20.000000000 -0300
-+++ linux-2.6.39-LIBRE/drivers/video/logo/logo_linux_vga16.ppm	2011-06-22 13:42:06.000000000 -0300
-@@ -1,1604 +1,18724 @@
- P3
--# Standard 16-color Linux logo
--80 80
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170  85  85  85   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170 170 170 170 255 255 255 255 255 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 170 170 170 170 170 170
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255 170 170 170   0   0   0  85  85  85
--170 170 170 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--170 170 170   0   0   0   0   0   0 170 170 170
-- 85  85  85  85  85  85  85  85  85  85  85  85
--255 255 255  85  85  85   0   0   0   0   0   0
-- 85  85  85 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 170 170 170 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170 170 170 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
-- 85  85  85 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170   0   0   0
--  0   0   0   0   0   0 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85 170 170 170 170 170 170 170 170 170
--255 255 255 255 255 255 255 255 255 170 170 170
--170 170 170 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 170 170 170 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 170 170 170 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
--170 170 170 170 170 170 170 170 170  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170 170 170
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170 170 170
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0 170 170 170
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--  0   0   0  85  85  85 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170   0   0   0  85  85  85
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0  85  85  85
--  0   0   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0  85  85  85   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0  85  85  85   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0  85  85  85   0   0   0   0   0   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  85  85  85  85  85  85   0   0   0
--  0   0   0  85  85  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0  85  85  85 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0  85  85  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170 170 170 170 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
-- 85  85  85 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 170 170 170  85  85  85 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85  85  85  85  85  85  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 170 170 170
-- 85  85  85   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
--  0   0   0   0   0   0   0   0   0 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170 170 170 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--170 170 170  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0 170 170 170 255 255 255 255 255 255
--255 255 255 255 255 255 255 255 255 255 255 255
--255 255 255 255 255 255 170 170 170  85  85  85
-- 85  85  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  85  85  85 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85  85  85  85
-- 85  85  85  85  85  85  85  85  85   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 255 255  85 170  85   0
--170  85   0 170  85   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 255 255  85 170  85   0
--255 255  85 170  85   0 170  85   0 170  85   0
-- 85  85  85  85  85  85  85  85  85  85  85  85
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  85  85  85
-- 85  85  85  85  85  85  85  85  85 170  85   0
--170  85   0 170  85   0 170  85   0 255 255  85
--170  85   0 255 255  85 170  85   0 170  85   0
--170  85   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0 170  85   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--170  85   0 170  85   0 170  85   0 170  85   0
--170  85   0 170  85   0 170  85   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+170
-+170
-+170
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+85
-+85
-+255
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+170
-+170
-+170
-+0
-+0
-+0
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+255
-+255
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+170
-+170
-+170
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+255
-+170
-+170
-+170
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+85
-+85
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+85
-+85
-+85
-+255
-+255
-+85
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
-+0
diff --git a/libre/linux-libre-aufs_friendly/change-default-console-loglevel.patch b/libre/linux-libre-aufs_friendly/change-default-console-loglevel.patch
deleted file mode 100644
index 63435d84f..000000000
--- a/libre/linux-libre-aufs_friendly/change-default-console-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
---- linux-3.0.orig/kernel/printk.c	2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0/kernel/printk.c	2011-07-27 14:43:07.000000000 +0300
-@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
- 
- /* We show everything that is MORE important than this.. */
- #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
--#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
-+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
- 
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- 
diff --git a/libre/linux-libre-aufs_friendly/config.i686 b/libre/linux-libre-aufs_friendly/config.i686
deleted file mode 100644
index 220956bb0..000000000
--- a/libre/linux-libre-aufs_friendly/config.i686
+++ /dev/null
@@ -1,5879 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.6-1 Kernel Configuration
-#
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_AUDIT_ARCH is not set
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_X86_HT=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_KTIME_SCALAR=y
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-LIBRE-AUFS_FRIENDLY"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_FHANDLE is not set
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_SMP=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_X86_32_IRIS=m
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=y
-CONFIG_CMPXCHG_DOUBLE=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_NR_CPUS=8
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_CLEANCACHE=y
-# CONFIG_HIGHPTE is not set
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-CONFIG_X86_APM_BOOT=y
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-CONFIG_APM_DO_ENABLE=y
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# x86 CPU frequency scaling drivers
-#
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_GX_SUSPMOD=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_INTEL_IDLE=y
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_OLPC=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_PCI_LABEL=y
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-CONFIG_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-CONFIG_OLPC_XO15_SCI=y
-CONFIG_ALIX=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_RAPIDIO=y
-CONFIG_RAPIDIO_TSI721=y
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_DROP_MONITOR=y
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_PN544_NFC=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=y
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_AMD76XROM is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_ESB2ROM is not set
-# CONFIG_MTD_CK804XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_DOCG3=m
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-CONFIG_PROC_DEVICETREE=y
-CONFIG_OF_PROMTREE=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_I2C=m
-CONFIG_OF_NET=y
-CONFIG_OF_SPI=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_TI_DAC7512=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-# CONFIG_PCH_PHUB is not set
-CONFIG_USB_SWITCH_FSA9480=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_7000FASST=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
-# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_ISAPNP=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_QDI=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_WINBOND_VLB=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IFB=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_CAIF_HSI=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_LANCE=m
-CONFIG_PCNET32=m
-CONFIG_DEPCA=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NI65=m
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_CS89x0=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_EWRK3=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_AT1700=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_ETH16I=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_APRICOT=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_LP486E=m
-CONFIG_NI52=m
-CONFIG_ZNET=m
-CONFIG_IP1000=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_EL2=m
-CONFIG_AC3200=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_E2100=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_ULTRA=m
-CONFIG_WD80x3=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC9194=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DEBUG_FS is not set
-# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_TR is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_B43=m
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWLWIFI_LEGACY=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-CONFIG_P54_SPI_DEFAULT_EEPROM=y
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
-CONFIG_WL12XX=m
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# CONFIG_WAN is not set
-CONFIG_VMXNET3=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_INPORT=m
-# CONFIG_MOUSE_ATIXL is not set
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_HTCPEN=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_WM831X=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_PCAP=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_DW=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_XILINX_PS_UART=m
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_DTLK=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-CONFIG_SONYPI=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_INTEL_MID=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PXA=m
-CONFIG_I2C_PXA_PCI=y
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-CONFIG_I2C_EG20T=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_ISA=m
-# CONFIG_I2C_STUB is not set
-CONFIG_SCx200_ACB=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=y
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_TPS65912=m
-CONFIG_GPIO_WM831X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=y
-CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_OLPC=m
-CONFIG_BATTERY_BQ20Z75=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_BQ27X00_I2C=y
-CONFIG_BATTERY_BQ27X00_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_GPIO=m
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM831X=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM831X_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_SPI=y
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM831X=y
-CONFIG_MFD_WM831X_SPI=y
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_AB8500_GPADC=y
-CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM831X=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_TPS6524X=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-CONFIG_VIDEO_ADP1653=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_STUB_POULSBO=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
-CONFIG_FB_VIRTUAL=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_WM831X=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_LOGO is not set
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_MSND_PINNACLE=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_TEA575X=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CA0132=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_SPEAKERS=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RENESAS_USBHS_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-CONFIG_USB_RENESAS_USBHS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
-CONFIG_USB_SERIAL_SSU100=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_FUSB300=m
-CONFIG_USB_R8A66597=m
-CONFIG_USB_GADGET_DWC3=m
-CONFIG_USB_M66592=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_CI13XXX_PCI=m
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2280=m
-CONFIG_USB_GOKU=m
-CONFIG_USB_LANGWELL=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_SUPERSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_NET5501=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_E7XXX=m
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82875P=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_R82600=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM831X=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_PCAP is not set
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_STAGING=y
-CONFIG_ET131X=m
-CONFIG_SLICOSS=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_ISA_DRIVERS=m
-CONFIG_COMEDI_ACL7225B=m
-CONFIG_COMEDI_PCL711=m
-CONFIG_COMEDI_PCL724=m
-CONFIG_COMEDI_PCL725=m
-CONFIG_COMEDI_PCL726=m
-CONFIG_COMEDI_PCL730=m
-CONFIG_COMEDI_PCL812=m
-CONFIG_COMEDI_PCL816=m
-CONFIG_COMEDI_PCL818=m
-CONFIG_COMEDI_PCM3724=m
-CONFIG_COMEDI_PCM3730=m
-CONFIG_COMEDI_RTI800=m
-CONFIG_COMEDI_RTI802=m
-CONFIG_COMEDI_DAS16M1=m
-CONFIG_COMEDI_DAS16=m
-CONFIG_COMEDI_DAS800=m
-CONFIG_COMEDI_DAS1800=m
-CONFIG_COMEDI_DAS6402=m
-CONFIG_COMEDI_DT2801=m
-CONFIG_COMEDI_DT2811=m
-CONFIG_COMEDI_DT2814=m
-CONFIG_COMEDI_DT2815=m
-CONFIG_COMEDI_DT2817=m
-CONFIG_COMEDI_DT282X=m
-CONFIG_COMEDI_DMM32AT=m
-CONFIG_COMEDI_FL512=m
-CONFIG_COMEDI_AIO_AIO12_8=m
-CONFIG_COMEDI_AIO_IIRO_16=m
-CONFIG_COMEDI_C6XDIGIO=m
-CONFIG_COMEDI_MPC624=m
-CONFIG_COMEDI_ADQ12B=m
-CONFIG_COMEDI_NI_AT_A2150=m
-CONFIG_COMEDI_NI_AT_AO=m
-CONFIG_COMEDI_NI_ATMIO=m
-CONFIG_COMEDI_NI_ATMIO16D=m
-CONFIG_COMEDI_PCMAD=m
-CONFIG_COMEDI_PCMDA12=m
-CONFIG_COMEDI_PCMMIO=m
-CONFIG_COMEDI_PCMUIO=m
-CONFIG_COMEDI_MULTIQ3=m
-CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_ADDI_APCI_035=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
-# CONFIG_COMEDI_CB_PCIMDAS is not set
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_FC=m
-CONFIG_FB_OLPC_DCON=m
-CONFIG_FB_OLPC_DCON_1=y
-CONFIG_FB_OLPC_DCON_1_5=y
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
-CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_XVMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_USB_ENESTORAGE=m
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
-CONFIG_DRM_PSB_MRST=y
-CONFIG_DRM_PSB_MFLD=y
-CONFIG_DRM_PSB_CDV=y
-CONFIG_INTEL_MEI=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
-CONFIG_DVB_CXD2099=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_DT3155_STREAMING=y
-CONFIG_EASYCAP=m
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
-CONFIG_SOLO6X10=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
-CONFIG_LIRC_ZILOG=m
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_TC1100_WMI=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_XO1_RFKILL=m
-CONFIG_XO15_EBOOK=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-# CONFIG_PM_DEVFREQ is not set
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
-CONFIG_SIGMA=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_NFS_USE_NEW_IDMAPPER is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CEPH_FS=m
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_VERBOSE is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_TEST_KSTRTOX=m
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_LGUEST=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
-CONFIG_CORDIC=m
diff --git a/libre/linux-libre-aufs_friendly/config.x86_64 b/libre/linux-libre-aufs_friendly/config.x86_64
deleted file mode 100644
index 6fe3c37d0..000000000
--- a/libre/linux-libre-aufs_friendly/config.x86_64
+++ /dev/null
@@ -1,5638 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.6-1 Kernel Configuration
-#
-CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-# CONFIG_KTIME_SCALAR is not set
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-LIBRE-AUFS_FRIENDLY"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_FHANDLE is not set
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=64
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_SMP=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MEMTEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
-CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=y
-CONFIG_CMPXCHG_DOUBLE=y
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DIRECT_GBPAGES=y
-CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y 
-CONFIG_CLEANCACHE=y
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_KEXEC_JUMP=y
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# x86 CPU frequency scaling drivers
-#
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_IOAPIC=y
-CONFIG_PCI_LABEL=y
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_RAPIDIO=y
-CONFIG_RAPIDIO_TSI721=y
-CONFIG_RAPIDIO_DISC_TIMEOUT=30
-# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
-CONFIG_RAPIDIO_DEBUG=y
-CONFIG_RAPIDIO_TSI57X=y
-CONFIG_RAPIDIO_CPS_XX=y
-CONFIG_RAPIDIO_TSI568=y
-CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=y
-CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=m
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_FIB_TRIE_STATS=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_HAVE_BPF_JIT=y
-CONFIG_BPF_JIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_DROP_MONITOR=y
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-CONFIG_CAIF=m
-# CONFIG_CAIF_DEBUG is not set
-CONFIG_CAIF_NETDEV=m
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_NCI=m
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_PN544_NFC=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=y
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_TS5500=m
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_AMD76XROM is not set
-# CONFIG_MTD_ICHXROM is not set
-# CONFIG_MTD_ESB2ROM is not set
-# CONFIG_MTD_CK804XROM is not set
-CONFIG_MTD_SCB2_FLASH=m
-# CONFIG_MTD_NETtel is not set
-# CONFIG_MTD_L440GX is not set
-CONFIG_MTD_PCI=m
-# CONFIG_MTD_PCMCIA is not set
-# CONFIG_MTD_GPIO_ADDR is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-# CONFIG_MTD_PMC551_BUGFIX is not set
-# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_DOCG3=m
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_MISC_DEVICES=y
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_TI_DAC7512=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_MII=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-CONFIG_IFB=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_SUNGEM_PHY=m
-# CONFIG_ARCNET is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_CAIF_HSI=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ZNET=m
-CONFIG_IP1000=m
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DEBUG_FS is not set
-# CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_TR is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-# CONFIG_ATH6KL_DEBUG is not set
-CONFIG_B43=m
-CONFIG_B43_SSB=y
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_SVTOOL=y
-CONFIG_IWLWIFI_LEGACY=m
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-CONFIG_HERMES_PRISM=y
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-CONFIG_P54_SPI_DEFAULT_EEPROM=y
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
-CONFIG_WL12XX=m
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# CONFIG_WAN is not set
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-# CONFIG_GIGASET_I4L is not set
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_WM831X=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_PCAP=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AB8500_PONKEY=m
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_NOZOMI=m
-# CONFIG_ISI is not set
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX3107=m
-CONFIG_SERIAL_MFD_HSU=m
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_XILINX_PS_UART=m
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_RAMOOPS=m
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_INTEL_MID=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-CONFIG_I2C_EG20T=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-# CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_XILINX=m
-# CONFIG_SPI_DESIGNWARE is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-CONFIG_PPS_CLIENT_KTIMER=m
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers:
-#
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=m
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_VX855=m
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_TPS65912=m
-CONFIG_GPIO_WM831X=m
-CONFIG_GPIO_ADP5588=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_LANGWELL=y
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_TIMBERDALE=y
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_BQ20Z75=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_BQ27X00_I2C=y
-CONFIG_BATTERY_BQ27X00_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_GPIO=m
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM831X=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_MC13783_ADC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM831X_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_XEN_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65912=y
-CONFIG_MFD_TPS65912_SPI=y
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM831X=y
-CONFIG_MFD_WM831X_SPI=y
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_ABX500_CORE=y
-CONFIG_EZX_PCAP=y
-CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_AB8500_GPADC=y
-CONFIG_MFD_CS5535=m
-CONFIG_MFD_TIMBERDALE=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_JANZ_CMODIO=m
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_BQ24022=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_WM831X=m
-CONFIG_REGULATOR_WM8400=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_AB8500=y
-CONFIG_REGULATOR_TPS6524X=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_RC_CORE=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_VIDEO_S5K6AA=m
-
-#
-# Flash devices
-#
-CONFIG_VIDEO_ADP1653=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported Mantis Adapters
-#
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-
-#
-# Supported nGene Adapters
-#
-CONFIG_DVB_NGENE=m
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-CONFIG_DVB_DDBRIDGE=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_IT913X_FE=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_STUB_POULSBO=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_VIA is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_SMSCUFX is not set
-CONFIG_FB_UDL=m
-CONFIG_FB_VIRTUAL=m
-CONFIG_XEN_FBDEV_FRONTEND=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_WM831X=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_LOGO is not set
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=1
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CA0132=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_FIREWIRE_SPEAKERS=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_QUANTA=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_RENESAS_USBHS_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-CONFIG_USB_RENESAS_USBHS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-CONFIG_USB_SERIAL_ZIO=m
-CONFIG_USB_SERIAL_SSU100=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_R8A66597=m
-CONFIG_USB_GADGET_DWC3=m
-CONFIG_USB_M66592=m
-CONFIG_USB_AMD5536UDC=m
-CONFIG_USB_CI13XXX_PCI=m
-CONFIG_USB_NET2272=m
-CONFIG_USB_NET2272_DMA=y
-CONFIG_USB_NET2280=m
-CONFIG_USB_GOKU=m
-CONFIG_USB_EG20T=m
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_GADGET_SUPERSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FUNCTIONFS=m
-CONFIG_USB_FUNCTIONFS_ETH=y
-CONFIG_USB_FUNCTIONFS_RNDIS=y
-CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_NOKIA is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-CONFIG_USB_G_HID=m
-CONFIG_USB_G_DBGP=m
-# CONFIG_USB_G_DBGP_PRINTK is not set
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SPI=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_NET5501=m
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_PCA9532_GPIO=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MCE_INJ=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_EDAC_SBRIDGE=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM831X=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_PCAP is not set
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_MID_DMAC=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_TIMB_DMA=m
-CONFIG_PCH_DMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MMIO=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_SELFBALLOONING is not set
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=m
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_STAGING=y
-CONFIG_ET131X=m
-CONFIG_SLICOSS=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
-CONFIG_COMEDI_KCOMEDILIB=m
-CONFIG_COMEDI_BOND=m
-CONFIG_COMEDI_TEST=m
-CONFIG_COMEDI_PARPORT=m
-CONFIG_COMEDI_SERIAL2002=m
-CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_ADDI_APCI_035=m
-CONFIG_COMEDI_ADDI_APCI_1032=m
-CONFIG_COMEDI_ADDI_APCI_1500=m
-CONFIG_COMEDI_ADDI_APCI_1516=m
-CONFIG_COMEDI_ADDI_APCI_1564=m
-CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
-CONFIG_COMEDI_ADDI_APCI_2032=m
-CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
-CONFIG_COMEDI_ADDI_APCI_3120=m
-CONFIG_COMEDI_ADDI_APCI_3501=m
-CONFIG_COMEDI_ADDI_APCI_3XXX=m
-CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
-CONFIG_COMEDI_ADL_PCI8164=m
-CONFIG_COMEDI_ADL_PCI9111=m
-CONFIG_COMEDI_ADL_PCI9118=m
-CONFIG_COMEDI_ADV_PCI1710=m
-CONFIG_COMEDI_ADV_PCI1723=m
-CONFIG_COMEDI_ADV_PCI_DIO=m
-CONFIG_COMEDI_AMPLC_DIO200=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
-CONFIG_COMEDI_AMPLC_PCI224=m
-CONFIG_COMEDI_AMPLC_PCI230=m
-CONFIG_COMEDI_CONTEC_PCI_DIO=m
-CONFIG_COMEDI_DT3000=m
-CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
-CONFIG_COMEDI_GSC_HPDI=m
-CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
-CONFIG_COMEDI_DAQBOARD2000=m
-CONFIG_COMEDI_JR3_PCI=m
-CONFIG_COMEDI_KE_COUNTER=m
-CONFIG_COMEDI_CB_PCIDAS64=m
-CONFIG_COMEDI_CB_PCIDAS=m
-CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
-CONFIG_COMEDI_CB_PCIMDAS=m
-CONFIG_COMEDI_CB_PCIMDDA=m
-CONFIG_COMEDI_ME4000=m
-CONFIG_COMEDI_ME_DAQ=m
-CONFIG_COMEDI_NI_6527=m
-CONFIG_COMEDI_NI_65XX=m
-CONFIG_COMEDI_NI_660X=m
-CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_PCIDIO=m
-CONFIG_COMEDI_NI_PCIMIO=m
-CONFIG_COMEDI_RTD520=m
-CONFIG_COMEDI_S526=m
-CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_DT9812=m
-CONFIG_COMEDI_USBDUX=m
-CONFIG_COMEDI_USBDUXFAST=m
-CONFIG_COMEDI_USBDUXSIGMA=m
-CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
-CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=m
-CONFIG_COMEDI_FC=m
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_IDE_PHISON=m
-CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
-# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
-CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_XVMALLOC=y
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
-CONFIG_FB_SM7XX=m
-CONFIG_CRYSTALHD=m
-CONFIG_FB_XGI=m
-CONFIG_ACPI_QUICKSTART=m
-CONFIG_USB_ENESTORAGE=m
-CONFIG_BCM_WIMAX=m
-CONFIG_FT1000=m
-CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
-CONFIG_DRM_PSB_MRST=y
-CONFIG_DRM_PSB_MFLD=y
-CONFIG_DRM_PSB_CDV=y
-CONFIG_INTEL_MEI=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_DVB_AS102=m
-CONFIG_DVB_CXD2099=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
-CONFIG_DT3155_STREAMING=y
-CONFIG_EASYCAP=m
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
-CONFIG_SOLO6X10=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_TTUSBIR=m
-CONFIG_LIRC_ZILOG=m
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_XO15_EBOOK=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-CONFIG_VIRT_DRIVERS=y
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-# CONFIG_PM_DEVFREQ is not set
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT_FIND is not set
-CONFIG_SIGMA=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_NFS_USE_NEW_IDMAPPER is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_CEPH_FS=m
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_CPU_STALL_VERBOSE is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_PREEMPT_TRACER is not set
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_TEST_KSTRTOX=m
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
-CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
-# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_IMA is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
-CONFIG_CORDIC=m
diff --git a/libre/linux-libre-aufs_friendly/dib0700-fix.patch b/libre/linux-libre-aufs_friendly/dib0700-fix.patch
deleted file mode 100644
index 48f07e6fd..000000000
--- a/libre/linux-libre-aufs_friendly/dib0700-fix.patch
+++ /dev/null
@@ -1,1487 +0,0 @@
-commit 198c545cd7306dc90aaae1d61e64175e70a70dc8
-Author: Patrick Boettcher <Patrick.Boettcher@dibcom.fr>
-Date:   Wed Aug 3 17:08:21 2011 +0200
-
-    [media] DiBcom: protect the I2C bufer access
-    
-    This patch protect the I2C buffer access in order to manage concurrent
-    access. This protection is done using mutex.
-    Furthermore, for the dib9000, if a pid filtering command is
-    received during the tuning, this pid filtering command is delayed to
-    avoid any concurrent access issue.
-    
-    Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
-    Cc: Florian Mickler <florian@mickler.org>
-    Cc: stable@kernel.org
-    
-    Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr>
-    Signed-off-by: Patrick Boettcher <Patrick.Boettcher@dibcom.fr>
-
-diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c
-index 1d47d4d..dc1cb17 100644
---- a/drivers/media/dvb/frontends/dib0070.c
-+++ b/drivers/media/dvb/frontends/dib0070.c
-@@ -27,6 +27,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_frontend.h"
- 
-@@ -78,10 +79,18 @@ struct dib0070_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[3];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
--static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
-+static u16 dib0070_read_reg(struct dib0070_state *state, u8 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg;
- 
- 	memset(state->msg, 0, 2 * sizeof(struct i2c_msg));
-@@ -96,13 +105,23 @@ static uint16_t dib0070_read_reg(struct dib0070_state *state, u8 reg)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 2) != 2) {
- 		printk(KERN_WARNING "DiB0070 I2C read failed\n");
--		return 0;
--	}
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+		ret = 0;
-+	} else
-+		ret = (state->i2c_read_buffer[0] << 8)
-+			| state->i2c_read_buffer[1];
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
- 	state->i2c_write_buffer[0] = reg;
- 	state->i2c_write_buffer[1] = val >> 8;
- 	state->i2c_write_buffer[2] = val & 0xff;
-@@ -115,9 +134,12 @@ static int dib0070_write_reg(struct dib0070_state *state, u8 reg, u16 val)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0070 I2C write failed\n");
--		return -EREMOTEIO;
--	}
--	return 0;
-+		ret = -EREMOTEIO;
-+	} else
-+		ret = 0;
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- #define HARD_RESET(state) do { \
-@@ -734,6 +756,7 @@ struct dvb_frontend *dib0070_attach(struct dvb_frontend *fe, struct i2c_adapter
- 	state->cfg = cfg;
- 	state->i2c = i2c;
- 	state->fe  = fe;
-+	mutex_init(&state->i2c_buffer_lock);
- 	fe->tuner_priv = state;
- 
- 	if (dib0070_reset(fe) != 0)
-diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c
-index c9c935a..b174d1c 100644
---- a/drivers/media/dvb/frontends/dib0090.c
-+++ b/drivers/media/dvb/frontends/dib0090.c
-@@ -27,6 +27,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_frontend.h"
- 
-@@ -196,6 +197,7 @@ struct dib0090_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[3];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- struct dib0090_fw_state {
-@@ -208,10 +210,18 @@ struct dib0090_fw_state {
- 	struct i2c_msg msg;
- 	u8 i2c_write_buffer[2];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg;
- 
- 	memset(state->msg, 0, 2 * sizeof(struct i2c_msg));
-@@ -226,14 +236,24 @@ static u16 dib0090_read_reg(struct dib0090_state *state, u8 reg)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 2) != 2) {
- 		printk(KERN_WARNING "DiB0090 I2C read failed\n");
--		return 0;
--	}
-+		ret = 0;
-+	} else
-+		ret = (state->i2c_read_buffer[0] << 8)
-+			| state->i2c_read_buffer[1];
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg & 0xff;
- 	state->i2c_write_buffer[1] = val >> 8;
- 	state->i2c_write_buffer[2] = val & 0xff;
-@@ -246,13 +266,23 @@ static int dib0090_write_reg(struct dib0090_state *state, u32 reg, u16 val)
- 
- 	if (i2c_transfer(state->i2c, state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0090 I2C write failed\n");
--		return -EREMOTEIO;
--	}
--	return 0;
-+		ret = -EREMOTEIO;
-+	} else
-+		ret = 0;
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg;
- 
- 	memset(&state->msg, 0, sizeof(struct i2c_msg));
-@@ -262,13 +292,24 @@ static u16 dib0090_fw_read_reg(struct dib0090_fw_state *state, u8 reg)
- 	state->msg.len = 2;
- 	if (i2c_transfer(state->i2c, &state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0090 I2C read failed\n");
--		return 0;
--	}
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+		ret = 0;
-+	} else
-+		ret = (state->i2c_read_buffer[0] << 8)
-+			| state->i2c_read_buffer[1];
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = val >> 8;
- 	state->i2c_write_buffer[1] = val & 0xff;
- 
-@@ -279,9 +320,12 @@ static int dib0090_fw_write_reg(struct dib0090_fw_state *state, u8 reg, u16 val)
- 	state->msg.len = 2;
- 	if (i2c_transfer(state->i2c, &state->msg, 1) != 1) {
- 		printk(KERN_WARNING "DiB0090 I2C write failed\n");
--		return -EREMOTEIO;
--	}
--	return 0;
-+		ret = -EREMOTEIO;
-+	} else
-+		ret = 0;
-+
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- #define HARD_RESET(state) do {  if (cfg->reset) {  if (cfg->sleep) cfg->sleep(fe, 0); msleep(10);  cfg->reset(fe, 1); msleep(10);  cfg->reset(fe, 0); msleep(10);  }  } while (0)
-@@ -2440,6 +2484,7 @@ struct dvb_frontend *dib0090_register(struct dvb_frontend *fe, struct i2c_adapte
- 	st->config = config;
- 	st->i2c = i2c;
- 	st->fe = fe;
-+	mutex_init(&st->i2c_buffer_lock);
- 	fe->tuner_priv = st;
- 
- 	if (config->wbd == NULL)
-@@ -2471,6 +2516,7 @@ struct dvb_frontend *dib0090_fw_register(struct dvb_frontend *fe, struct i2c_ada
- 	st->config = config;
- 	st->i2c = i2c;
- 	st->fe = fe;
-+	mutex_init(&st->i2c_buffer_lock);
- 	fe->tuner_priv = st;
- 
- 	if (dib0090_fw_reset_digital(fe, st->config) != 0)
-diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c
-index 79cb1c2..dbb76d7 100644
---- a/drivers/media/dvb/frontends/dib7000m.c
-+++ b/drivers/media/dvb/frontends/dib7000m.c
-@@ -11,6 +11,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_frontend.h"
- 
-@@ -55,6 +56,7 @@ struct dib7000m_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[4];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- enum dib7000m_power_mode {
-@@ -69,6 +71,13 @@ enum dib7000m_power_mode {
- 
- static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) | 0x80;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -85,11 +94,21 @@ static u16 dib7000m_read_word(struct dib7000m_state *state, u16 reg)
- 	if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2)
- 		dprintk("i2c read error on %d",reg);
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 	state->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -101,7 +120,10 @@ static int dib7000m_write_word(struct dib7000m_state *state, u16 reg, u16 val)
- 	state->msg[0].buf = state->i2c_write_buffer;
- 	state->msg[0].len = 4;
- 
--	return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ?
-+			-EREMOTEIO : 0);
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- static void dib7000m_write_tab(struct dib7000m_state *state, u16 *buf)
- {
-@@ -1385,6 +1407,7 @@ struct dvb_frontend * dib7000m_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
- 	demod                   = &st->demod;
- 	demod->demodulator_priv = st;
- 	memcpy(&st->demod.ops, &dib7000m_ops, sizeof(struct dvb_frontend_ops));
-+	mutex_init(&st->i2c_buffer_lock);
- 
- 	st->timf_default = cfg->bw->timf;
- 
-diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
-index 0c9f40c..292bc19 100644
---- a/drivers/media/dvb/frontends/dib7000p.c
-+++ b/drivers/media/dvb/frontends/dib7000p.c
-@@ -10,6 +10,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dvb_math.h"
- #include "dvb_frontend.h"
-@@ -68,6 +69,7 @@ struct dib7000p_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[4];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- enum dib7000p_power_mode {
-@@ -81,6 +83,13 @@ static int dib7090_set_diversity_in(struct dvb_frontend *fe, int onoff);
- 
- static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg >> 8;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -97,11 +106,20 @@ static u16 dib7000p_read_word(struct dib7000p_state *state, u16 reg)
- 	if (i2c_transfer(state->i2c_adap, state->msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 	state->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -113,7 +131,10 @@ static int dib7000p_write_word(struct dib7000p_state *state, u16 reg, u16 val)
- 	state->msg[0].buf = state->i2c_write_buffer;
- 	state->msg[0].len = 4;
- 
--	return i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = (i2c_transfer(state->i2c_adap, state->msg, 1) != 1 ?
-+			-EREMOTEIO : 0);
-+	mutex_unlock(&state->i2c_buffer_lock);
-+	return ret;
- }
- 
- static void dib7000p_write_tab(struct dib7000p_state *state, u16 * buf)
-@@ -1646,6 +1667,7 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau
- 		return -ENOMEM;
- 
- 	dpst->i2c_adap = i2c;
-+	mutex_init(&dpst->i2c_buffer_lock);
- 
- 	for (k = no_of_demods - 1; k >= 0; k--) {
- 		dpst->cfg = cfg[k];
-@@ -2324,6 +2346,7 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
- 	demod = &st->demod;
- 	demod->demodulator_priv = st;
- 	memcpy(&st->demod.ops, &dib7000p_ops, sizeof(struct dvb_frontend_ops));
-+	mutex_init(&st->i2c_buffer_lock);
- 
- 	dib7000p_write_word(st, 1287, 0x0003);	/* sram lead in, rdy */
- 
-@@ -2333,8 +2356,9 @@ struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr,
- 	st->version = dib7000p_read_word(st, 897);
- 
- 	/* FIXME: make sure the dev.parent field is initialized, or else
--		request_firmware() will hit an OOPS (this should be moved somewhere
--		more common) */
-+	   request_firmware() will hit an OOPS (this should be moved somewhere
-+	   more common) */
-+	st->i2c_master.gated_tuner_i2c_adap.dev.parent = i2c_adap->dev.parent;
- 
- 	dibx000_init_i2c_master(&st->i2c_master, DIB7000P, st->i2c_adap, st->i2c_addr);
- 
-diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c
-index 7d2ea11..fe284d5 100644
---- a/drivers/media/dvb/frontends/dib8000.c
-+++ b/drivers/media/dvb/frontends/dib8000.c
-@@ -10,6 +10,8 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
-+
- #include "dvb_math.h"
- 
- #include "dvb_frontend.h"
-@@ -37,6 +39,7 @@ struct i2c_device {
- 	u8 addr;
- 	u8 *i2c_write_buffer;
- 	u8 *i2c_read_buffer;
-+	struct mutex *i2c_buffer_lock;
- };
- 
- struct dib8000_state {
-@@ -77,6 +80,7 @@ struct dib8000_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[4];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- enum dib8000_power_mode {
-@@ -86,24 +90,39 @@ enum dib8000_power_mode {
- 
- static u16 dib8000_i2c_read16(struct i2c_device *i2c, u16 reg)
- {
-+	u16 ret;
- 	struct i2c_msg msg[2] = {
--		{.addr = i2c->addr >> 1, .flags = 0,
--			.buf = i2c->i2c_write_buffer, .len = 2},
--		{.addr = i2c->addr >> 1, .flags = I2C_M_RD,
--			.buf = i2c->i2c_read_buffer, .len = 2},
-+		{.addr = i2c->addr >> 1, .flags = 0, .len = 2},
-+		{.addr = i2c->addr >> 1, .flags = I2C_M_RD, .len = 2},
- 	};
- 
-+	if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
-+	msg[0].buf    = i2c->i2c_write_buffer;
- 	msg[0].buf[0] = reg >> 8;
- 	msg[0].buf[1] = reg & 0xff;
-+	msg[1].buf    = i2c->i2c_read_buffer;
- 
- 	if (i2c_transfer(i2c->adap, msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (msg[1].buf[0] << 8) | msg[1].buf[1];
-+	ret = (msg[1].buf[0] << 8) | msg[1].buf[1];
-+	mutex_unlock(i2c->i2c_buffer_lock);
-+	return ret;
- }
- 
- static u16 dib8000_read_word(struct dib8000_state *state, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	state->i2c_write_buffer[0] = reg >> 8;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -120,7 +139,10 @@ static u16 dib8000_read_word(struct dib8000_state *state, u16 reg)
- 	if (i2c_transfer(state->i2c.adap, state->msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	ret = (state->i2c_read_buffer[0] << 8) | state->i2c_read_buffer[1];
-+	mutex_unlock(&state->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static u32 dib8000_read32(struct dib8000_state *state, u16 reg)
-@@ -135,22 +157,35 @@ static u32 dib8000_read32(struct dib8000_state *state, u16 reg)
- 
- static int dib8000_i2c_write16(struct i2c_device *i2c, u16 reg, u16 val)
- {
--	struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0,
--		.buf = i2c->i2c_write_buffer, .len = 4};
-+	struct i2c_msg msg = {.addr = i2c->addr >> 1, .flags = 0, .len = 4};
- 	int ret = 0;
- 
-+	if (mutex_lock_interruptible(i2c->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
-+	msg.buf    = i2c->i2c_write_buffer;
- 	msg.buf[0] = (reg >> 8) & 0xff;
- 	msg.buf[1] = reg & 0xff;
- 	msg.buf[2] = (val >> 8) & 0xff;
- 	msg.buf[3] = val & 0xff;
- 
- 	ret = i2c_transfer(i2c->adap, &msg, 1) != 1 ? -EREMOTEIO : 0;
-+	mutex_unlock(i2c->i2c_buffer_lock);
- 
- 	return ret;
- }
- 
- static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&state->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	state->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	state->i2c_write_buffer[1] = reg & 0xff;
- 	state->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -162,7 +197,11 @@ static int dib8000_write_word(struct dib8000_state *state, u16 reg, u16 val)
- 	state->msg[0].buf = state->i2c_write_buffer;
- 	state->msg[0].len = 4;
- 
--	return i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = (i2c_transfer(state->i2c.adap, state->msg, 1) != 1 ?
-+			-EREMOTEIO : 0);
-+	mutex_unlock(&state->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static const s16 coeff_2k_sb_1seg_dqpsk[8] = {
-@@ -2434,8 +2473,15 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau
- 	if (!client.i2c_read_buffer) {
- 		dprintk("%s: not enough memory", __func__);
- 		ret = -ENOMEM;
--		goto error_memory;
-+		goto error_memory_read;
-+	}
-+	client.i2c_buffer_lock = kzalloc(sizeof(struct mutex), GFP_KERNEL);
-+	if (!client.i2c_buffer_lock) {
-+		dprintk("%s: not enough memory", __func__);
-+		ret = -ENOMEM;
-+		goto error_memory_lock;
- 	}
-+	mutex_init(client.i2c_buffer_lock);
- 
- 	for (k = no_of_demods - 1; k >= 0; k--) {
- 		/* designated i2c address */
-@@ -2476,8 +2522,10 @@ int dib8000_i2c_enumeration(struct i2c_adapter *host, int no_of_demods, u8 defau
- 	}
- 
- error:
-+	kfree(client.i2c_buffer_lock);
-+error_memory_lock:
- 	kfree(client.i2c_read_buffer);
--error_memory:
-+error_memory_read:
- 	kfree(client.i2c_write_buffer);
- 
- 	return ret;
-@@ -2581,6 +2629,8 @@ struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, s
- 	state->i2c.addr = i2c_addr;
- 	state->i2c.i2c_write_buffer = state->i2c_write_buffer;
- 	state->i2c.i2c_read_buffer = state->i2c_read_buffer;
-+	mutex_init(&state->i2c_buffer_lock);
-+	state->i2c.i2c_buffer_lock = &state->i2c_buffer_lock;
- 	state->gpio_val = cfg->gpio_val;
- 	state->gpio_dir = cfg->gpio_dir;
- 
-diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c
-index a085588..b931074 100644
---- a/drivers/media/dvb/frontends/dib9000.c
-+++ b/drivers/media/dvb/frontends/dib9000.c
-@@ -38,6 +38,15 @@ struct i2c_device {
- #define DibInitLock(lock) mutex_init(lock)
- #define DibFreeLock(lock)
- 
-+struct dib9000_pid_ctrl {
-+#define DIB9000_PID_FILTER_CTRL 0
-+#define DIB9000_PID_FILTER      1
-+	u8 cmd;
-+	u8 id;
-+	u16 pid;
-+	u8 onoff;
-+};
-+
- struct dib9000_state {
- 	struct i2c_device i2c;
- 
-@@ -99,6 +108,10 @@ struct dib9000_state {
- 	struct i2c_msg msg[2];
- 	u8 i2c_write_buffer[255];
- 	u8 i2c_read_buffer[255];
-+	DIB_LOCK demod_lock;
-+	u8 get_frontend_internal;
-+	struct dib9000_pid_ctrl pid_ctrl[10];
-+	s8 pid_ctrl_index; /* -1: empty list; -2: do not use the list */
- };
- 
- static const u32 fe_info[44] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-@@ -1743,19 +1756,56 @@ EXPORT_SYMBOL(dib9000_set_gpio);
- int dib9000_fw_pid_filter_ctrl(struct dvb_frontend *fe, u8 onoff)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
--	u16 val = dib9000_read_word(state, 294 + 1) & 0xffef;
-+	u16 val;
-+	int ret;
-+
-+	if ((state->pid_ctrl_index != -2) && (state->pid_ctrl_index < 9)) {
-+		/* postpone the pid filtering cmd */
-+		dprintk("pid filter cmd postpone");
-+		state->pid_ctrl_index++;
-+		state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER_CTRL;
-+		state->pid_ctrl[state->pid_ctrl_index].onoff = onoff;
-+		return 0;
-+	}
-+
-+	DibAcquireLock(&state->demod_lock);
-+
-+	val = dib9000_read_word(state, 294 + 1) & 0xffef;
- 	val |= (onoff & 0x1) << 4;
- 
- 	dprintk("PID filter enabled %d", onoff);
--	return dib9000_write_word(state, 294 + 1, val);
-+	ret = dib9000_write_word(state, 294 + 1, val);
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
-+
- }
- EXPORT_SYMBOL(dib9000_fw_pid_filter_ctrl);
- 
- int dib9000_fw_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
-+	int ret;
-+
-+	if (state->pid_ctrl_index != -2) {
-+		/* postpone the pid filtering cmd */
-+		dprintk("pid filter postpone");
-+		if (state->pid_ctrl_index < 9) {
-+			state->pid_ctrl_index++;
-+			state->pid_ctrl[state->pid_ctrl_index].cmd = DIB9000_PID_FILTER;
-+			state->pid_ctrl[state->pid_ctrl_index].id = id;
-+			state->pid_ctrl[state->pid_ctrl_index].pid = pid;
-+			state->pid_ctrl[state->pid_ctrl_index].onoff = onoff;
-+		} else
-+			dprintk("can not add any more pid ctrl cmd");
-+		return 0;
-+	}
-+
-+	DibAcquireLock(&state->demod_lock);
- 	dprintk("Index %x, PID %d, OnOff %d", id, pid, onoff);
--	return dib9000_write_word(state, 300 + 1 + id, onoff ? (1 << 13) | pid : 0);
-+	ret = dib9000_write_word(state, 300 + 1 + id,
-+			onoff ? (1 << 13) | pid : 0);
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- EXPORT_SYMBOL(dib9000_fw_pid_filter);
- 
-@@ -1778,6 +1828,7 @@ static void dib9000_release(struct dvb_frontend *demod)
- 	DibFreeLock(&state->platform.risc.mbx_lock);
- 	DibFreeLock(&state->platform.risc.mem_lock);
- 	DibFreeLock(&state->platform.risc.mem_mbx_lock);
-+	DibFreeLock(&state->demod_lock);
- 	dibx000_exit_i2c_master(&st->i2c_master);
- 
- 	i2c_del_adapter(&st->tuner_adap);
-@@ -1795,14 +1846,19 @@ static int dib9000_sleep(struct dvb_frontend *fe)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u8 index_frontend;
--	int ret;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
- 		ret = state->fe[index_frontend]->ops.sleep(state->fe[index_frontend]);
- 		if (ret < 0)
--			return ret;
-+			goto error;
- 	}
--	return dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0);
-+	ret = dib9000_mbx_send(state, OUT_MSG_FE_SLEEP, NULL, 0);
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune)
-@@ -1816,7 +1872,10 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u8 index_frontend, sub_index_frontend;
- 	fe_status_t stat;
--	int ret;
-+	int ret = 0;
-+
-+	if (state->get_frontend_internal == 0)
-+		DibAcquireLock(&state->demod_lock);
- 
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
- 		state->fe[index_frontend]->ops.read_status(state->fe[index_frontend], &stat);
-@@ -1846,14 +1905,15 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 					    state->fe[index_frontend]->dtv_property_cache.rolloff;
- 				}
- 			}
--			return 0;
-+			ret = 0;
-+			goto return_value;
- 		}
- 	}
- 
- 	/* get the channel from master chip */
- 	ret = dib9000_fw_get_channel(fe, fep);
- 	if (ret != 0)
--		return ret;
-+		goto return_value;
- 
- 	/* synchronize the cache with the other frontends */
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
-@@ -1866,8 +1926,12 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 		state->fe[index_frontend]->dtv_property_cache.code_rate_LP = fe->dtv_property_cache.code_rate_LP;
- 		state->fe[index_frontend]->dtv_property_cache.rolloff = fe->dtv_property_cache.rolloff;
- 	}
-+	ret = 0;
- 
--	return 0;
-+return_value:
-+	if (state->get_frontend_internal == 0)
-+		DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static int dib9000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tune_state)
-@@ -1912,6 +1976,10 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 		dprintk("dib9000: must specify bandwidth ");
- 		return 0;
- 	}
-+
-+	state->pid_ctrl_index = -1; /* postpone the pid filtering cmd */
-+	DibAcquireLock(&state->demod_lock);
-+
- 	fe->dtv_property_cache.delivery_system = SYS_DVBT;
- 
- 	/* set the master status */
-@@ -1974,13 +2042,18 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 	/* check the tune result */
- 	if (exit_condition == 1) {	/* tune failed */
- 		dprintk("tune failed");
-+		DibReleaseLock(&state->demod_lock);
-+		/* tune failed; put all the pid filtering cmd to junk */
-+		state->pid_ctrl_index = -1;
- 		return 0;
- 	}
- 
- 	dprintk("tune success on frontend%i", index_frontend_success);
- 
- 	/* synchronize all the channel cache */
-+	state->get_frontend_internal = 1;
- 	dib9000_get_frontend(state->fe[0], fep);
-+	state->get_frontend_internal = 0;
- 
- 	/* retune the other frontends with the found channel */
- 	channel_status.status = CHANNEL_STATUS_PARAMETERS_SET;
-@@ -2025,6 +2098,28 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
- 	/* turn off the diversity for the last frontend */
- 	dib9000_fw_set_diversity_in(state->fe[index_frontend - 1], 0);
- 
-+	DibReleaseLock(&state->demod_lock);
-+	if (state->pid_ctrl_index >= 0) {
-+		u8 index_pid_filter_cmd;
-+		u8 pid_ctrl_index = state->pid_ctrl_index;
-+
-+		state->pid_ctrl_index = -2;
-+		for (index_pid_filter_cmd = 0;
-+				index_pid_filter_cmd <= pid_ctrl_index;
-+				index_pid_filter_cmd++) {
-+			if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER_CTRL)
-+				dib9000_fw_pid_filter_ctrl(state->fe[0],
-+						state->pid_ctrl[index_pid_filter_cmd].onoff);
-+			else if (state->pid_ctrl[index_pid_filter_cmd].cmd == DIB9000_PID_FILTER)
-+				dib9000_fw_pid_filter(state->fe[0],
-+						state->pid_ctrl[index_pid_filter_cmd].id,
-+						state->pid_ctrl[index_pid_filter_cmd].pid,
-+						state->pid_ctrl[index_pid_filter_cmd].onoff);
-+		}
-+	}
-+	/* do not postpone any more the pid filtering */
-+	state->pid_ctrl_index = -2;
-+
- 	return 0;
- }
- 
-@@ -2041,6 +2136,7 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
- 	u8 index_frontend;
- 	u16 lock = 0, lock_slave = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++)
- 		lock_slave |= dib9000_read_lock(state->fe[index_frontend]);
- 
-@@ -2059,6 +2155,8 @@ static int dib9000_read_status(struct dvb_frontend *fe, fe_status_t * stat)
- 	if ((lock & 0x0008) || (lock_slave & 0x0008))
- 		*stat |= FE_HAS_LOCK;
- 
-+	DibReleaseLock(&state->demod_lock);
-+
- 	return 0;
- }
- 
-@@ -2066,10 +2164,14 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u16 *c;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	DibAcquireLock(&state->platform.risc.mem_mbx_lock);
--	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0)
--		return -EIO;
-+	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-+		ret = -EIO;
-+		goto error;
-+	}
- 	dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR,
- 			state->i2c_read_buffer, 16 * 2);
- 	DibReleaseLock(&state->platform.risc.mem_mbx_lock);
-@@ -2077,7 +2179,10 @@ static int dib9000_read_ber(struct dvb_frontend *fe, u32 * ber)
- 	c = (u16 *)state->i2c_read_buffer;
- 
- 	*ber = c[10] << 16 | c[11];
--	return 0;
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
-@@ -2086,7 +2191,9 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
- 	u8 index_frontend;
- 	u16 *c = (u16 *)state->i2c_read_buffer;
- 	u16 val;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	*strength = 0;
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
- 		state->fe[index_frontend]->ops.read_signal_strength(state->fe[index_frontend], &val);
-@@ -2097,8 +2204,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
- 	}
- 
- 	DibAcquireLock(&state->platform.risc.mem_mbx_lock);
--	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0)
--		return -EIO;
-+	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-+		ret = -EIO;
-+		goto error;
-+	}
- 	dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);
- 	DibReleaseLock(&state->platform.risc.mem_mbx_lock);
- 
-@@ -2107,7 +2216,10 @@ static int dib9000_read_signal_strength(struct dvb_frontend *fe, u16 * strength)
- 		*strength = 65535;
- 	else
- 		*strength += val;
--	return 0;
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- static u32 dib9000_get_snr(struct dvb_frontend *fe)
-@@ -2151,6 +2263,7 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr)
- 	u8 index_frontend;
- 	u32 snr_master;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	snr_master = dib9000_get_snr(fe);
- 	for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++)
- 		snr_master += dib9000_get_snr(state->fe[index_frontend]);
-@@ -2161,6 +2274,8 @@ static int dib9000_read_snr(struct dvb_frontend *fe, u16 * snr)
- 	} else
- 		*snr = 0;
- 
-+	DibReleaseLock(&state->demod_lock);
-+
- 	return 0;
- }
- 
-@@ -2168,15 +2283,22 @@ static int dib9000_read_unc_blocks(struct dvb_frontend *fe, u32 * unc)
- {
- 	struct dib9000_state *state = fe->demodulator_priv;
- 	u16 *c = (u16 *)state->i2c_read_buffer;
-+	int ret = 0;
- 
-+	DibAcquireLock(&state->demod_lock);
- 	DibAcquireLock(&state->platform.risc.mem_mbx_lock);
--	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0)
--		return -EIO;
-+	if (dib9000_fw_memmbx_sync(state, FE_SYNC_CHANNEL) < 0) {
-+		ret = -EIO;
-+		goto error;
-+	}
- 	dib9000_risc_mem_read(state, FE_MM_R_FE_MONITOR, (u8 *) c, 16 * 2);
- 	DibReleaseLock(&state->platform.risc.mem_mbx_lock);
- 
- 	*unc = c[12];
--	return 0;
-+
-+error:
-+	DibReleaseLock(&state->demod_lock);
-+	return ret;
- }
- 
- int dib9000_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, u8 first_addr)
-@@ -2322,6 +2444,10 @@ struct dvb_frontend *dib9000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, c
- 	DibInitLock(&st->platform.risc.mbx_lock);
- 	DibInitLock(&st->platform.risc.mem_lock);
- 	DibInitLock(&st->platform.risc.mem_mbx_lock);
-+	DibInitLock(&st->demod_lock);
-+	st->get_frontend_internal = 0;
-+
-+	st->pid_ctrl_index = -2;
- 
- 	st->fe[0] = fe;
- 	fe->demodulator_priv = st;
-diff --git a/drivers/media/dvb/frontends/dibx000_common.c b/drivers/media/dvb/frontends/dibx000_common.c
-index dc5d17a..774d507 100644
---- a/drivers/media/dvb/frontends/dibx000_common.c
-+++ b/drivers/media/dvb/frontends/dibx000_common.c
-@@ -1,4 +1,5 @@
- #include <linux/i2c.h>
-+#include <linux/mutex.h>
- 
- #include "dibx000_common.h"
- 
-@@ -10,6 +11,13 @@ MODULE_PARM_DESC(debug, "turn on debugging (default: 0)");
- 
- static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val)
- {
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
- 	mst->i2c_write_buffer[0] = (reg >> 8) & 0xff;
- 	mst->i2c_write_buffer[1] = reg & 0xff;
- 	mst->i2c_write_buffer[2] = (val >> 8) & 0xff;
-@@ -21,11 +29,21 @@ static int dibx000_write_word(struct dibx000_i2c_master *mst, u16 reg, u16 val)
- 	mst->msg[0].buf = mst->i2c_write_buffer;
- 	mst->msg[0].len = 4;
- 
--	return i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	ret = i2c_transfer(mst->i2c_adap, mst->msg, 1) != 1 ? -EREMOTEIO : 0;
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg)
- {
-+	u16 ret;
-+
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	mst->i2c_write_buffer[0] = reg >> 8;
- 	mst->i2c_write_buffer[1] = reg & 0xff;
- 
-@@ -42,7 +60,10 @@ static u16 dibx000_read_word(struct dibx000_i2c_master *mst, u16 reg)
- 	if (i2c_transfer(mst->i2c_adap, mst->msg, 2) != 2)
- 		dprintk("i2c read error on %d", reg);
- 
--	return (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1];
-+	ret = (mst->i2c_read_buffer[0] << 8) | mst->i2c_read_buffer[1];
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+
-+	return ret;
- }
- 
- static int dibx000_is_i2c_done(struct dibx000_i2c_master *mst)
-@@ -257,6 +278,7 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap,
- 					struct i2c_msg msg[], int num)
- {
- 	struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap);
-+	int ret;
- 
- 	if (num > 32) {
- 		dprintk("%s: too much I2C message to be transmitted (%i).\
-@@ -264,10 +286,15 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap,
- 		return -ENOMEM;
- 	}
- 
--	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
--
- 	dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_GPIO_6_7);
- 
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+
-+	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
-+
- 	/* open the gate */
- 	dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1);
- 	mst->msg[0].addr = mst->i2c_addr;
-@@ -282,7 +309,11 @@ static int dibx000_i2c_gated_gpio67_xfer(struct i2c_adapter *i2c_adap,
- 	mst->msg[num + 1].buf = &mst->i2c_write_buffer[4];
- 	mst->msg[num + 1].len = 4;
- 
--	return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO;
-+	ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ?
-+			num : -EIO);
-+
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+	return ret;
- }
- 
- static struct i2c_algorithm dibx000_i2c_gated_gpio67_algo = {
-@@ -294,6 +325,7 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
- 					struct i2c_msg msg[], int num)
- {
- 	struct dibx000_i2c_master *mst = i2c_get_adapdata(i2c_adap);
-+	int ret;
- 
- 	if (num > 32) {
- 		dprintk("%s: too much I2C message to be transmitted (%i).\
-@@ -301,10 +333,14 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
- 		return -ENOMEM;
- 	}
- 
--	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
--
- 	dibx000_i2c_select_interface(mst, DIBX000_I2C_INTERFACE_TUNER);
- 
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+	memset(mst->msg, 0, sizeof(struct i2c_msg) * (2 + num));
-+
- 	/* open the gate */
- 	dibx000_i2c_gate_ctrl(mst, &mst->i2c_write_buffer[0], msg[0].addr, 1);
- 	mst->msg[0].addr = mst->i2c_addr;
-@@ -319,7 +355,10 @@ static int dibx000_i2c_gated_tuner_xfer(struct i2c_adapter *i2c_adap,
- 	mst->msg[num + 1].buf = &mst->i2c_write_buffer[4];
- 	mst->msg[num + 1].len = 4;
- 
--	return i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ? num : -EIO;
-+	ret = (i2c_transfer(mst->i2c_adap, mst->msg, 2 + num) == 2 + num ?
-+			num : -EIO);
-+	mutex_unlock(&mst->i2c_buffer_lock);
-+	return ret;
- }
- 
- static struct i2c_algorithm dibx000_i2c_gated_tuner_algo = {
-@@ -390,8 +429,18 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap,
- int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev,
- 				struct i2c_adapter *i2c_adap, u8 i2c_addr)
- {
--	u8 tx[4];
--	struct i2c_msg m = {.addr = i2c_addr >> 1,.buf = tx,.len = 4 };
-+	int ret;
-+
-+	mutex_init(&mst->i2c_buffer_lock);
-+	if (mutex_lock_interruptible(&mst->i2c_buffer_lock) < 0) {
-+		dprintk("could not acquire lock");
-+		return -EINVAL;
-+	}
-+	memset(mst->msg, 0, sizeof(struct i2c_msg));
-+	mst->msg[0].addr = i2c_addr >> 1;
-+	mst->msg[0].flags = 0;
-+	mst->msg[0].buf = mst->i2c_write_buffer;
-+	mst->msg[0].len = 4;
- 
- 	mst->device_rev = device_rev;
- 	mst->i2c_adap = i2c_adap;
-@@ -431,9 +480,12 @@ int dibx000_init_i2c_master(struct dibx000_i2c_master *mst, u16 device_rev,
- 				"DiBX000: could not initialize the master i2c_adapter\n");
- 
- 	/* initialize the i2c-master by closing the gate */
--	dibx000_i2c_gate_ctrl(mst, tx, 0, 0);
-+	dibx000_i2c_gate_ctrl(mst, mst->i2c_write_buffer, 0, 0);
-+
-+	ret = (i2c_transfer(i2c_adap, mst->msg, 1) == 1);
-+	mutex_unlock(&mst->i2c_buffer_lock);
- 
--	return i2c_transfer(i2c_adap, &m, 1) == 1;
-+	return ret;
- }
- 
- EXPORT_SYMBOL(dibx000_init_i2c_master);
-diff --git a/drivers/media/dvb/frontends/dibx000_common.h b/drivers/media/dvb/frontends/dibx000_common.h
-index f031165..5e01147 100644
---- a/drivers/media/dvb/frontends/dibx000_common.h
-+++ b/drivers/media/dvb/frontends/dibx000_common.h
-@@ -33,6 +33,7 @@ struct dibx000_i2c_master {
- 	struct i2c_msg msg[34];
- 	u8 i2c_write_buffer[8];
- 	u8 i2c_read_buffer[2];
-+	struct mutex i2c_buffer_lock;
- };
- 
- extern int dibx000_init_i2c_master(struct dibx000_i2c_master *mst,
-commit 45cbff13693d645fa5dcbba964e802e1746b2e57
-Author: Olivier Grenie <olivier.grenie@dibcom.fr>
-Date:   Mon Aug 1 17:45:58 2011 +0200
-
-    [media] dib0700: protect the dib0700 buffer access
-    
-    This patch protects the common buffer access inside the dib0700 in order
-    to manage concurrent access. This protection is done using mutex.
-    
-    Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
-    Cc: Florian Mickler <florian@mickler.org>
-    Cc: stable@kernel.org
-    
-    Signed-off-by: Javier Marcet <javier@marcet.info>
-    Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr>
-    Signed-off-by: Patrick Boettcher <patrick.boettcher@dibcom.fr>
-
-diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
-index 5eb91b4..291b645 100644
---- a/drivers/media/dvb/dvb-usb/dib0700_core.c
-+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
-@@ -30,6 +30,11 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
- 	struct dib0700_state *st = d->priv;
- 	int ret;
- 
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),
- 				  REQUEST_GET_VERSION,
- 				  USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
-@@ -46,6 +51,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
- 	if (fwtype != NULL)
- 		*fwtype     = (st->buf[12] << 24) | (st->buf[13] << 16) |
- 			(st->buf[14] << 8) | st->buf[15];
-+	mutex_unlock(&d->usb_mutex);
- 	return ret;
- }
- 
-@@ -108,7 +114,12 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen
- int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val)
- {
- 	struct dib0700_state *st = d->priv;
--	s16 ret;
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
- 
- 	st->buf[0] = REQUEST_SET_GPIO;
- 	st->buf[1] = gpio;
-@@ -116,6 +127,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_
- 
- 	ret = dib0700_ctrl_wr(d, st->buf, 3);
- 
-+	mutex_unlock(&d->usb_mutex);
- 	return ret;
- }
- 
-@@ -125,6 +137,11 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
- 	int ret;
- 
- 	if (st->fw_version >= 0x10201) {
-+		if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+			dprintk("could not acquire lock");
-+			return 0;
-+		}
-+
- 		st->buf[0] = REQUEST_SET_USB_XFER_LEN;
- 		st->buf[1] = (nb_ts_packets >> 8) & 0xff;
- 		st->buf[2] = nb_ts_packets & 0xff;
-@@ -132,6 +149,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
- 		deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets);
- 
- 		ret = dib0700_ctrl_wr(d, st->buf, 3);
-+		mutex_unlock(&d->usb_mutex);
- 	} else {
- 		deb_info("this firmware does not allow to change the USB xfer len\n");
- 		ret = -EIO;
-@@ -208,6 +226,10 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
- 
- 		} else {
- 			/* Write request */
-+			if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+				dprintk("could not acquire lock");
-+				return 0;
-+			}
- 			st->buf[0] = REQUEST_NEW_I2C_WRITE;
- 			st->buf[1] = msg[i].addr << 1;
- 			st->buf[2] = (en_start << 7) | (en_stop << 6) |
-@@ -227,6 +249,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
- 						 USB_TYPE_VENDOR | USB_DIR_OUT,
- 						 0, 0, st->buf, msg[i].len + 4,
- 						 USB_CTRL_GET_TIMEOUT);
-+			mutex_unlock(&d->usb_mutex);
- 			if (result < 0) {
- 				deb_info("i2c write error (status = %d)\n", result);
- 				break;
-@@ -249,6 +272,10 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
- 
- 	if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
- 		return -EAGAIN;
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
- 
- 	for (i = 0; i < num; i++) {
- 		/* fill in the address */
-@@ -279,6 +306,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
- 				break;
- 		}
- 	}
-+	mutex_unlock(&d->usb_mutex);
- 	mutex_unlock(&d->i2c_mutex);
- 
- 	return i;
-@@ -337,7 +365,12 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll,
- 	u16 pll_loopdiv, u16 free_div, u16 dsuScaler)
- {
- 	struct dib0700_state *st = d->priv;
--	s16 ret;
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
- 
- 	st->buf[0] = REQUEST_SET_CLOCK;
- 	st->buf[1] = (en_pll << 7) | (pll_src << 6) |
-@@ -352,6 +385,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll,
- 	st->buf[9] =  dsuScaler         & 0xff; /* LSB */
- 
- 	ret = dib0700_ctrl_wr(d, st->buf, 10);
-+	mutex_unlock(&d->usb_mutex);
- 
- 	return ret;
- }
-@@ -360,10 +394,16 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz)
- {
- 	struct dib0700_state *st = d->priv;
- 	u16 divider;
-+	int ret;
- 
- 	if (scl_kHz == 0)
- 		return -EINVAL;
- 
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	st->buf[0] = REQUEST_SET_I2C_PARAM;
- 	divider = (u16) (30000 / scl_kHz);
- 	st->buf[1] = 0;
-@@ -379,7 +419,11 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz)
- 	deb_info("setting I2C speed: %04x %04x %04x (%d kHz).",
- 		(st->buf[2] << 8) | (st->buf[3]), (st->buf[4] << 8) |
- 		st->buf[5], (st->buf[6] << 8) | st->buf[7], scl_kHz);
--	return dib0700_ctrl_wr(d, st->buf, 8);
-+
-+	ret = dib0700_ctrl_wr(d, st->buf, 8);
-+	mutex_unlock(&d->usb_mutex);
-+
-+	return ret;
- }
- 
- 
-@@ -515,6 +559,11 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
- 		}
- 	}
- 
-+	if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	st->buf[0] = REQUEST_ENABLE_VIDEO;
- 	/* this bit gives a kind of command,
- 	 * rather than enabling something or not */
-@@ -548,7 +597,10 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
- 
- 	deb_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]);
- 
--	return dib0700_ctrl_wr(adap->dev, st->buf, 4);
-+	ret = dib0700_ctrl_wr(adap->dev, st->buf, 4);
-+	mutex_unlock(&adap->dev->usb_mutex);
-+
-+	return ret;
- }
- 
- int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
-@@ -557,6 +609,11 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
- 	struct dib0700_state *st = d->priv;
- 	int new_proto, ret;
- 
-+	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
-+		dprintk("could not acquire lock");
-+		return 0;
-+	}
-+
- 	st->buf[0] = REQUEST_SET_RC;
- 	st->buf[1] = 0;
- 	st->buf[2] = 0;
-@@ -567,23 +624,29 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
- 	else if (rc_type == RC_TYPE_NEC)
- 		new_proto = 0;
- 	else if (rc_type == RC_TYPE_RC6) {
--		if (st->fw_version < 0x10200)
--			return -EINVAL;
-+		if (st->fw_version < 0x10200) {
-+			ret = -EINVAL;
-+			goto out;
-+		}
- 
- 		new_proto = 2;
--	} else
--		return -EINVAL;
-+	} else {
-+		ret = -EINVAL;
-+		goto out;
-+	}
- 
- 	st->buf[1] = new_proto;
- 
- 	ret = dib0700_ctrl_wr(d, st->buf, 3);
- 	if (ret < 0) {
- 		err("ir protocol setup failed");
--		return ret;
-+		goto out;
- 	}
- 
- 	d->props.rc.core.protocol = rc_type;
- 
-+out:
-+	mutex_unlock(&d->usb_mutex);
- 	return ret;
- }
- 
-commit aeb2d456b746164a4bd19e53de0a6678ca63fcad
-Author: Olivier Grenie <olivier.grenie@dibcom.fr>
-Date:   Thu Aug 4 18:10:03 2011 +0200
-
-    [media] dib0700: correct error message
-    
-    The goal of this patch is to correct a previous patch. In case of error,
-    the err() function should be used instead of dprintk() function.
-    
-    Signed-off-by: Olivier Grenie <olivier.grenie@dibcom.fr>
-
-diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
-index 291b645..b693ed1 100644
---- a/drivers/media/dvb/dvb-usb/dib0700_core.c
-+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
-@@ -31,7 +31,7 @@ int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,
- 	int ret;
- 
- 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--		dprintk("could not acquire lock");
-+		err("could not acquire lock");
- 		return 0;
- 	}
- 
-@@ -117,7 +117,7 @@ int dib0700_set_gpio(struct dvb_usb_device *d, enum dib07x0_gpios gpio, u8 gpio_
- 	int ret;
- 
- 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--		dprintk("could not acquire lock");
-+		err("could not acquire lock");
- 		return 0;
- 	}
- 
-@@ -138,7 +138,7 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets)
- 
- 	if (st->fw_version >= 0x10201) {
- 		if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--			dprintk("could not acquire lock");
-+			err("could not acquire lock");
- 			return 0;
- 		}
- 
-@@ -227,7 +227,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
- 		} else {
- 			/* Write request */
- 			if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--				dprintk("could not acquire lock");
-+				err("could not acquire lock");
- 				return 0;
- 			}
- 			st->buf[0] = REQUEST_NEW_I2C_WRITE;
-@@ -273,7 +273,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
- 	if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
- 		return -EAGAIN;
- 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--		dprintk("could not acquire lock");
-+		err("could not acquire lock");
- 		return 0;
- 	}
- 
-@@ -368,7 +368,7 @@ static int dib0700_set_clock(struct dvb_usb_device *d, u8 en_pll,
- 	int ret;
- 
- 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--		dprintk("could not acquire lock");
-+		err("could not acquire lock");
- 		return 0;
- 	}
- 
-@@ -400,7 +400,7 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz)
- 		return -EINVAL;
- 
- 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--		dprintk("could not acquire lock");
-+		err("could not acquire lock");
- 		return 0;
- 	}
- 
-@@ -560,7 +560,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
- 	}
- 
- 	if (mutex_lock_interruptible(&adap->dev->usb_mutex) < 0) {
--		dprintk("could not acquire lock");
-+		err("could not acquire lock");
- 		return 0;
- 	}
- 
-@@ -610,7 +610,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 rc_type)
- 	int new_proto, ret;
- 
- 	if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
--		dprintk("could not acquire lock");
-+		err("could not acquire lock");
- 		return 0;
- 	}
- 
diff --git a/libre/linux-libre-aufs_friendly/ext4-options.patch b/libre/linux-libre-aufs_friendly/ext4-options.patch
deleted file mode 100644
index ef1b2417d..000000000
--- a/libre/linux-libre-aufs_friendly/ext4-options.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Report: https://bbs.archlinux.org/profile.php?id=33804
-Signed-off-by: Tom Gundersen <teg@jklm.no>
-Cc: Thomas Baechler <thomas@archlinux.org>
-Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
-Cc: Dave Reisner <d@falconindy.com>
----
- fs/ext4/super.c |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 502c61f..30de9cd 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1333,6 +1333,7 @@ enum {
- 	Opt_inode_readahead_blks, Opt_journal_ioprio,
- 	Opt_dioread_nolock, Opt_dioread_lock,
- 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
-+	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
- };
- 
- static const match_table_t tokens = {
-@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
- 	{Opt_init_itable, "init_itable=%u"},
- 	{Opt_init_itable, "init_itable"},
- 	{Opt_noinit_itable, "noinit_itable"},
-+	{Opt_nocheck, "nocheck"},
-+	{Opt_reservation, "reservation"},
-+	{Opt_noreservation, "noreservation"},
-+	{Opt_journal_inum, "journal=%u"},
- 	{Opt_err, NULL},
- };
- 
-@@ -1904,6 +1909,16 @@ set_qf_format:
- 		case Opt_noinit_itable:
- 			clear_opt(sb, INIT_INODE_TABLE);
- 			break;
-+#ifdef CONFIG_EXT4_USE_FOR_EXT23
-+		case Opt_nocheck:
-+		case Opt_reservation:
-+		case Opt_noreservation:
-+		case Opt_journal_inum:
-+			ext4_msg(sb, KERN_WARNING,
-+			       "ext3 mount option \"%s\" ignored "
-+			       "by ext4 module", p);
-+			break;
-+#endif
- 		default:
- 			ext4_msg(sb, KERN_ERR,
- 			       "Unrecognized mount option \"%s\" "
diff --git a/libre/linux-libre-aufs_friendly/fix-i915.patch b/libre/linux-libre-aufs_friendly/fix-i915.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/libre/linux-libre-aufs_friendly/fix-i915.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
- drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1267,6 +1267,15 @@
- 		   DAC_B_0_7_V |
- 		   DAC_C_0_7_V);
- 
-+	/*
-+	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+	 * the TV is misdetected. This is hardware requirement.
-+	 */
-+	if (IS_GM45(dev))
-+		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-+	
- 	I915_WRITE(TV_CTL, tv_ctl);
- 	I915_WRITE(TV_DAC, tv_dac);
- 	POSTING_READ(TV_DAC);
diff --git a/libre/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch b/libre/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/libre/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
- drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1267,6 +1267,15 @@
- 		   DAC_B_0_7_V |
- 		   DAC_C_0_7_V);
- 
-+	/*
-+	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+	 * the TV is misdetected. This is hardware requirement.
-+	 */
-+	if (IS_GM45(dev))
-+		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-+	
- 	I915_WRITE(TV_CTL, tv_ctl);
- 	I915_WRITE(TV_DAC, tv_dac);
- 	POSTING_READ(TV_DAC);
diff --git a/libre/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch b/libre/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch
deleted file mode 100644
index e1addbb05..000000000
--- a/libre/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 6c76e0b94e484ffbdf38d2fe2769b6ca9aa99de4
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Mon Oct 31 19:16:18 2011 +0100
-
-    Change accidental error message to debug message.
-    
-    According to https://lkml.org/lkml/2011/9/19/80, this is not supposed
-    to be an error message, but a debug message. This worries users.
-
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 04411ad..02d5794 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -5172,7 +5172,7 @@ static void ironlake_update_pch_refclk(struct drm_device *dev)
- 		} else {
- 			/* Enable SSC on PCH eDP if needed */
- 			if (intel_panel_use_ssc(dev_priv)) {
--				DRM_ERROR("enabling SSC on PCH\n");
-+				DRM_DEBUG("enabling SSC on PCH\n");
- 				temp |= DREF_SUPERSPREAD_SOURCE_ENABLE;
- 			}
- 		}
diff --git a/libre/linux-libre-aufs_friendly/i915-gpu-finish.patch b/libre/linux-libre-aufs_friendly/i915-gpu-finish.patch
deleted file mode 100644
index 5840c9181..000000000
--- a/libre/linux-libre-aufs_friendly/i915-gpu-finish.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-commit 389a55581e30607af0fcde6cdb4e54f189cf46cf
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Tue Nov 29 15:12:16 2011 +0000
-
-    drm/i915: Only clear the GPU domains upon a successful finish
-    
-    By clearing the GPU read domains before waiting upon the buffer, we run
-    the risk of the wait being interrupted and the domains prematurely
-    cleared. The next time we attempt to wait upon the buffer (after
-    userspace handles the signal), we believe that the buffer is idle and so
-    skip the wait.
-    
-    There are a number of bugs across all generations which show signs of an
-    overly haste reuse of active buffers.
-    
-    Such as:
-    
-      https://bugs.freedesktop.org/show_bug.cgi?id=29046
-      https://bugs.freedesktop.org/show_bug.cgi?id=35863
-      https://bugs.freedesktop.org/show_bug.cgi?id=38952
-      https://bugs.freedesktop.org/show_bug.cgi?id=40282
-      https://bugs.freedesktop.org/show_bug.cgi?id=41098
-      https://bugs.freedesktop.org/show_bug.cgi?id=41102
-      https://bugs.freedesktop.org/show_bug.cgi?id=41284
-      https://bugs.freedesktop.org/show_bug.cgi?id=42141
-    
-    A couple of those pre-date i915_gem_object_finish_gpu(), so may be
-    unrelated (such as a wild write from a userspace command buffer), but
-    this does look like a convincing cause for most of those bugs.
-    
-    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-    Cc: stable@kernel.org
-    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-    Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
-
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index d560175..036bc58 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3087,10 +3087,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj)
- 			return ret;
- 	}
- 
-+	ret = i915_gem_object_wait_rendering(obj);
-+	if (ret)
-+		return ret;
-+
- 	/* Ensure that we invalidate the GPU's caches and TLBs. */
- 	obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
--
--	return i915_gem_object_wait_rendering(obj);
-+	return 0;
- }
- 
- /**
diff --git a/libre/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch b/libre/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch
deleted file mode 100644
index a53a3a425..000000000
--- a/libre/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This fix regression introduced by commit:
-
-commit 15b3f3b006b42a678523cad989bfd60b76bf4403
-Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-Date:   Fri Jun 3 07:54:13 2011 -0700
-
-    iwlagn: set smps mode after assoc for 1000 device
-
-Also remove unneeded brackets on the way.
-
-Address:
-https://bugzilla.redhat.com/show_bug.cgi?id=744155
-
-If fix will not get 3.1 release, it should be applied in 3.1 stable.
-
-Cc: stable@kernel.org # 3.1+
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
----
- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
-index ca632f9..5004342 100644
---- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
-@@ -296,8 +296,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
- 		return ret;
- 	}
- 
--	if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) &&
--	    priv->cfg->ht_params->smps_mode)
-+	if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
-+	    priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
- 		ieee80211_request_smps(ctx->vif,
- 				       priv->cfg->ht_params->smps_mode);
- 
--- 
-1.7.1
diff --git a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
deleted file mode 100644
index eb2293d00..000000000
--- a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install
+++ /dev/null
@@ -1,65 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-KERNEL_NAME=-aufs_friendly
-KERNEL_VERSION=3.2.9-1-LIBRE-AUFS_FRIENDLY
-
-post_install () {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
-}
-
-post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub2 &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
-  if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
-    echo "WARNING: /boot appears to be a separate partition but is not mounted."
-  fi
-
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
-}
-
-post_remove() {
-  # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
-}
diff --git a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset b/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset
deleted file mode 100644
index c802eda83..000000000
--- a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre-aufs_friendly' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre-aufs_friendly"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre-aufs_friendly.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-aufs_friendly-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/libre/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch b/libre/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch
deleted file mode 100644
index 880849db5..000000000
--- a/libre/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7fcc7c8acf0fba44d19a713207af7e58267c1179 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Mon, 31 Oct 2011 12:59:44 +1100
-Subject: md/raid10:  Fix bug when activating a hot-spare.
-
-From: NeilBrown <neilb@suse.de>
-
-commit 7fcc7c8acf0fba44d19a713207af7e58267c1179 upstream.
-
-This is a fairly serious bug in RAID10.
-
-When a RAID10 array is degraded and a hot-spare is activated, the
-spare does not take up the empty slot, but rather replaces the first
-working device.
-This is likely to make the array non-functional.   It would normally
-be possible to recover the data, but that would need care and is not
-guaranteed.
-
-This bug was introduced in commit
-   2bb77736ae5dca0a189829fbb7379d43364a9dac
-which first appeared in 3.1.
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/md/raid10.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/md/raid10.c
-+++ b/drivers/md/raid10.c
-@@ -1337,7 +1337,7 @@ static int raid10_add_disk(mddev_t *mdde
- 		mirror_info_t *p = &conf->mirrors[mirror];
- 		if (p->recovery_disabled == mddev->recovery_disabled)
- 			continue;
--		if (!p->rdev)
-+		if (p->rdev)
- 			continue;
- 
- 		disk_stack_limits(mddev->gendisk, rdev->bdev,
diff --git a/libre/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch b/libre/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch
deleted file mode 100644
index 9e570dd3f..000000000
--- a/libre/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-commit 2394d67e446bf616a0885167d5f0d397bdacfdfc
-Author: Oliver Neukum <oneukum@suse.de>
-Date:   Tue Sep 13 08:42:21 2011 +0200
-
-    USB: add RESET_RESUME for webcams shown to be quirky
-    
-    The new runtime PM code has shown that many webcams suffer
-    from a race condition that may crash them upon resume.
-    Runtime PM is especially prone to show the problem because
-    it retains power to the cameras at all times. However
-    system suspension may also crash the devices and retain
-    power to the devices.
-    The only way to solve this problem without races is in
-    usbcore with the RESET_RESUME quirk.
-    
-    Signed-off-by: Oliver Neukum <oneukum@suse.de>
-    Signed-off-by: stable <stable@kernel.org>
-    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 81ce6a8..38f0510 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Creative SB Audigy 2 NX */
- 	{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C200 */
-+	{ USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C250 */
-+	{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam B/C500 */
-+	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam Pro 9000 */
-+	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C310 */
-+	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C270 */
-+	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Harmony 700-series */
- 	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
- 
-@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
- 			USB_QUIRK_CONFIG_INTF_STRINGS },
- 
-+	/* Guillemot Webcam Hercules Dualpix Exchange*/
-+	{ USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* M-Systems Flash Disk Pioneers */
- 	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc
-Author: Jon Levell <linuxusb@coralbark.net>
-Date:   Thu Sep 29 20:42:52 2011 +0100
-
-    USB: add quirk for Logitech C300 web cam
-    
-    My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound.
-    The following trivial patch fixes it.
-    
-    Signed-off-by: Jon Levell <linuxusb@coralbark.net>
-    Cc: stable <stable@kernel.org>
-    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 38f0510..d6a8d82 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Logitech Webcam C250 */
- 	{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C300 */
-+	{ USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam B/C500 */
- 	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index d6a8d82..caa1991 100644
---- a/drivers/usb/core/quirks.c
-+++ b/drivers/usb/core/quirks.c
-@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
- 	/* Logitech Webcam B/C500 */
- 	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C600 */
-+	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Webcam Pro 9000 */
- 	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
- 
diff --git a/libre/pacman-mirrorlist-libre/mirrorlist b/libre/pacman-mirrorlist-libre/mirrorlist
deleted file mode 100644
index f353d0bd0..000000000
--- a/libre/pacman-mirrorlist-libre/mirrorlist
+++ /dev/null
@@ -1,4 +0,0 @@
-# Parabola GNU/Linux
-Server = http://repo.parabolagnulinux.org/$repo/os/$arch
-Server = ftp://ftp.inf.utfsm.cl/pub/parabola/$repo/os/$arch
-
diff --git a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
deleted file mode 100644
index a14e1de69..000000000
--- a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Tue, 28 Jun 2011 22:47:35 +1000
-Subject: [PATCH] makepkg: fix removing symbolic link
-
-The path was not being stripped from $file before prefixing with
-$srcdir resulting in the attempted removal of a very weird
-filename.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
-(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)
----
- scripts/makepkg.sh.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 3ace945..b0b0882 100644
---- a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -509,7 +509,7 @@ download_sources() {
- 		local file=$(get_filepath "$netfile" || true)
- 		if [[ -n "$file" ]]; then
- 			msg2 "$(gettext "Found %s")" "${file##*/}"
--			rm -f "$srcdir/$file"
-+			rm -f "$srcdir/${file##*/}"
- 			ln -s "$file" "$srcdir/"
- 			continue
- 		fi
--- 
-1.7.6
-
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
deleted file mode 100644
index 3967b90ab..000000000
--- a/libre/pacman/rePKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-CARCH=x86_64
-unset build package md5sums source
-_repo=core
-source=(PKGBUILD
-	ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
-	# files for pkg modifications
-  pacman.conf
-  pacman.conf.x86_64
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  cd ${srcdir}
-  cp -a ./* ${pkgdir}
-
-  rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
-
-# No need to repackage for mips64el
-  case "$CARCH" in
-    i686)
-      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-      ;;
-    x86_64)
-      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-      ;;
-  esac
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/sdl-libre/sdl-1.2.14-fix-disappearing-cursor.patch b/libre/sdl-libre/sdl-1.2.14-fix-disappearing-cursor.patch
deleted file mode 100644
index fcd3c314d..000000000
--- a/libre/sdl-libre/sdl-1.2.14-fix-disappearing-cursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
-===================================================================
---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-30 09:16:35.000000000 -0400
-@@ -444,8 +444,10 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( xevent.xcrossing.detail != NotifyInferior ) {
--			if ( this->input_grab == SDL_GRAB_OFF ) {
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) &&
-+		     (xevent.xcrossing.detail != NotifyInferior) ) {
-+               		if ( this->input_grab == SDL_GRAB_OFF ) {
- 				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
- 			} else {
- 				posted = SDL_PrivateMouseMotion(0, 0,
diff --git a/libre/sdl-libre/sdl-1.2.14-joystick-crash.diff b/libre/sdl-libre/sdl-1.2.14-joystick-crash.diff
deleted file mode 100644
index 949e18b96..000000000
--- a/libre/sdl-libre/sdl-1.2.14-joystick-crash.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix crash with joystick detection.
-Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c
-===================================================================
---- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:37:36.000000000 -0500
-+++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c	2010-01-12 12:38:27.000000000 -0500
-@@ -700,7 +700,7 @@
- 				continue;
- 			}
- 			if ( test_bit(i, absbit) ) {
--				int values[5];
-+				int values[6];
- 
- 				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
- 					continue;
diff --git a/mozilla-testing/icecat-i18n/Makefile b/mozilla-testing/icecat-i18n/Makefile
deleted file mode 100644
index 237edb616..000000000
--- a/mozilla-testing/icecat-i18n/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - grep
-#  - pacman
-#  - sed
-#  - wget
-
-# Variables:
-_pkgver=9.0
-pkgver=9.0.1
-pkgrel=2
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY PKGBUILD
-
-index.html: Makefile
-	rm -f $@
-	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
-langpacks.txt: index.html Makefile
-	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@_PKGVER@/$(_pkgver)/' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f index.html langpacks.txt *.xpi
-
-.PHONY: PHONY FORCE
diff --git a/mozilla-testing/icecat-i18n/PKGBUILD b/mozilla-testing/icecat-i18n/PKGBUILD
deleted file mode 100644
index d5b95e811..000000000
--- a/mozilla-testing/icecat-i18n/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Based on firefox-i18n package
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
-
-pkgbase='icecat-i18n'
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo icecat-i18n-$lang | tr A-Z a-z
-        done))
-_pkgver=9.0
-pkgver=9.0.1
-pkgrel=2
-pkgdesc="Language packs for GNUzilla IceCat."
-arch=('any')
-license=('MPL')
-url="http://www.gnu.org/software/gnuzilla/"
-depends=("icecat=${pkgver}")
-source=($(for lang in ${_langpacks[@]}
-        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
-        done))
-noextract=($(for lang in ${_langpacks[@]}
-        do echo $lang.xpi
-        done))
-
-build() {
-  cd "${srcdir}"
-}
-
-_path="/usr/lib/icecat-$_pkgver/extensions/"
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
-}
-"
-done
-
-md5sums=('20e67c29a5e666c102b04a1e60b7f5a6'
-         'f2bb72158cd9a9e26d682dcdff297e86'
-         '31daa3abbe40461f5292b6521ba45179'
-         '38ed2043b03f27bf9c6c30956c90f0af'
-         'c263a1d5a3560c9a4538561ebe1bd332'
-         '9e19e7a56922d3df37844067d6c59a23'
-         '665ae571412f563f562c556cb6790bca'
-         '598725cd42bad8beec856525cd9d85c0'
-         '3e45f1097a1453ef6f3615d5826ff508'
-         '8388434818c995ae50b977d2e7f36996'
-         'fa0afac9df234a977fd8da2905c0eda2'
-         '258d9b993065f3860c2f8d79ed86aa20'
-         'dadeb5e0e03ac6c4a58104ae60c4214a'
-         '17edd78ea185761e3ac1ab69947aa483'
-         '6544c77cb37f97e1eb5c9180902f9767'
-         '579a5a4f3a98f47cba481242faece354'
-         '7a47d59e8a90b852a852d3d8182636e3'
-         '5e5f806e1f6f386dddd32136a9ea0c44'
-         '5985bb817858d6fffad0158df60b926b'
-         '9a9048af47cf7e1eff4a901287321cbf'
-         'ecf628acf988b4efee254f5dd43ed839'
-         '0879552d267febf40ab51a25fd56e126'
-         'd0054611a7cb17f265bbbb2145fa24fd'
-         '86dc6ac2c9fa2d891449dc0fee74925d'
-         '672433eda992ca42468ce736fb679233'
-         '7c1722a1a7b36259b170c601122a025b'
-         'd315044c39fa8e3e404355a12a065cf2'
-         '2e498d9076b814887f0da334fda1e289'
-         'b4c42b439c3db8e77e53f2c0e03197cb'
-         '1c356d82117d92d19474ab0a6c804c6b'
-         'bb2a2bc43106be951ef51b62719f1213'
-         'eda3b14c45b3dd6cc95f93b5fa0fd6cf'
-         '5521ad4ab8cdf1f8863fc0f454c02ee2'
-         '38f8d1533f7d1a6123eb80555e719f6f'
-         '14bb8cf18b6d24f103da376c5d8580b5'
-         '1d0ea799b72c59b9a6922d66c84e63d2'
-         '57a457aaa98d7d93667cfce913632976'
-         '90d589d5cd4d199f579e882c1b1e9287'
-         'a0d354fb2b69828777642ef5abd0e963'
-         'cce959f03a6357ee7a1d2efc6c6af309'
-         '4c9b695d540fb5289600a089e2972aca'
-         'f4e3330139f500b0e37207bd00ad7e81'
-         'e41ca6ea7716bec98956a4138bb091ce'
-         'd59931f40b6e62dc2899eff46da2ac1e'
-         'b21a2c345c8c74d8c4da80273aecd083'
-         '147357710c4712439c646f18b27bf4d0'
-         'f90e382593e105ff697145338162c64e'
-         'c6517c6002fe56527b7a773b8060f553'
-         '52bd84145281204c23b3c608a597f9e8'
-         'e79089b54a3c8401afc7fbd48565d373'
-         'ce49b2490566964e786e2f8c03560bb8'
-         'ec943a3e4e531f8295f03131f2056053'
-         '99ea4eaae77a8c680949e673ef5ff1b7'
-         '74f4139ea78aee64c054468d5cf5528b'
-         'efbd2c801479fbfd82d3da168e582a67'
-         '490f7390148623d6e6805aa04c8dc6f3'
-         '5b51ca012f369e61d505d4f05342b1a7'
-         '90a9774bfe34428b915bda7f5701e8d9'
-         '784924bb0615debf3eba37ea9edced69'
-         'b2be9f59bdf8c2d0e35a4ab2e944f73e'
-         '5607205459f9db6d229235070e45e866'
-         '396231537b4e51b15fa8c781deb27988'
-         '96274f3f8a2bb807f79e896e28132f58'
-         'a31bc07e9bd969665dcf6fe99ac89415'
-         '29bb94f65797299ca5355f0cb64142aa'
-         '9f0d68e0fa81beb81a3f905118f02c55'
-         'af200de2fc6126e10e73d81dd05047ea'
-         '60b7717d3306e2fb18b22804719d0fd2'
-         '15c789baa59d27786d6d1d4c4a7a24ee'
-         '48841ff67fee9f3e1f1ee8ff485a1bbc'
-         '77af86e85548ec10486d23c6e2436d46'
-         '3e6bee3482370be47fd3128f468b806f'
-         '36d41a4885ebf5d04548a9c38e2d2e9c'
-         'fea6e7c1c9f743e348ee5409e0182693'
-         'ddea2e6de27762f1ad505e6c43a87349'
-         '759c0a37cc97aac128b52ec14bc86bb6'
-         'bc2e3922c92c3b4fe49fae5ef46a7f7b'
-         '0a6e0092e9c052b8571ba09bd40b6d4a'
-         'db1c3a4581fc893deba60322350593fb'
-         'b79bdfa5ef8c65de1787fe1be6c48afa'
-         'e4878942c64c3b6da87a84bd87918511'
-         '77e7b5d62449d5be99865c8ba43183b8'
-         '878ab3f21c1ae1fef8eb1198ee3e9af6')
diff --git a/mozilla-testing/icecat-i18n/PKGBUILD.in b/mozilla-testing/icecat-i18n/PKGBUILD.in
deleted file mode 100644
index 90c901e31..000000000
--- a/mozilla-testing/icecat-i18n/PKGBUILD.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Based on firefox-i18n package
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_langpacks=@LANGPACKS@
-
-pkgbase='icecat-i18n'
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo icecat-i18n-$lang | tr A-Z a-z
-        done))
-_pkgver=@_PKGVER@
-pkgver=@PKGVER@
-pkgrel=@PKGREL@
-pkgdesc="Language packs for GNUzilla IceCat."
-arch=('any')
-license=('MPL')
-url="http://www.gnu.org/software/gnuzilla/"
-depends=("icecat=${pkgver}")
-source=($(for lang in ${_langpacks[@]}
-        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
-        done))
-noextract=($(for lang in ${_langpacks[@]}
-        do echo $lang.xpi
-        done))
-
-build() {
-  cd "${srcdir}"
-}
-
-_path="/usr/lib/icecat-$_pkgver/extensions/"
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
-}
-"
-done
-
diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD
deleted file mode 100644
index 5946af42f..000000000
--- a/mozilla-testing/icecat/PKGBUILD
+++ /dev/null
@@ -1,149 +0,0 @@
-# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-# If you are updating this package, don't forget to update the version number in
-# the value for 'browser.dictionaries.download.url' in 'libre.patch'
-
-_pgo=false
-
-_pkgname=icecat
-pkgver=10.0
-pkgrel=1
-
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
-  pkgname+='-pgo'
-fi
-
-pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=(
-  'alsa-lib'
-  'dbus-glib'
-  'desktop-file-utils'
-  'gtk2'
-  'hicolor-icon-theme'
-  'hunspell'
-  'libevent'
-  'libnotify'
-  'libvpx'
-  'libxt'
-  'mime-types'
-  'mozilla-common'
-  'mozilla-searchplugins'
-  'nss>=3.13.1'
-  'sqlite3'
-  'startup-notification'
-)
-makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'libidl2'
-  'mesa'
-  'pkg-config'
-  'python2'
-  'unzip'
-  'wireless_tools'
-  'yasm'
-  'zip'
-)
-if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options=(!ccache)
-fi
-
-url="http://www.gnu.org/software/gnuzilla/"
-install=icecat.install
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
-        mozconfig
-        mozconfig.pgo
-        icecat.desktop
-        icecat-safe.desktop
-        libre.patch
-        firefox-install-dir.patch
-        vendor.js
-        libvpx.patch)
-
-if [ "$_pkgname" != "$pkgname" ]; then
-  provides+=("$_pkgname")
-  conflicts+=("$_pkgname")
-fi
-
-build() {
-  mv "$_pkgname-$pkgver" "$srcdir/mozilla-build"
-  cd "$srcdir/mozilla-build"
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
-  patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
-  patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch
-
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-
-  if $_pgo; then
-    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-    kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  fi
-}
-
-package() {
-  cd "$srcdir/mozilla-build"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
-
-  brandingdir="browser/branding/unofficial"
-  icondir="$pkgdir/usr/share/icons/hicolor"
-  for i in 16x16 32x32 48x48; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
-  done
-
-  install -d                                  "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/icecat.desktop"      "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications"
-
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
-  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
-
-  # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
-
-  # Fix a bug with https-everywhere (duplicate rules)
-  rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD"
-
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
-}
-
-md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7'
-         '6f3a8fd65c416216a1b56b0c2d2d81aa'
-         'ac29b01c189f20abae2f3eef1618ffc0'
-         'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         'd93fe402b87cd000a869e1fd6badc6c9'
-         '145f453ef82f643711c10d97ec57a805'
-         '1e4bcac59e93d21fffa6a1d1ad235247'
-         'c382e35315047e4ca368d09383b39b8d'
-         '5d418ecdbdb9f40597df6b978b0b5ee5')
diff --git a/mozilla-testing/icecat/firefox-install-dir.patch b/mozilla-testing/icecat/firefox-install-dir.patch
deleted file mode 100644
index b6f9700b3..000000000
--- a/mozilla-testing/icecat/firefox-install-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
-+++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
-@@ -68,8 +68,8 @@
- mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
-
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir		= @datadir@
- mandir		= @mandir@
-
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
-
- TOP_DIST	= @TOP_DIST@
- ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/mozilla-testing/icecat/icecat-safe.desktop b/mozilla-testing/icecat/icecat-safe.desktop
deleted file mode 100644
index 87acc970c..000000000
--- a/mozilla-testing/icecat/icecat-safe.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/icecat -safe-mode %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat - Safe Mode
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/mozilla-testing/icecat/icecat.desktop b/mozilla-testing/icecat/icecat.desktop
deleted file mode 100644
index 8a7cad93d..000000000
--- a/mozilla-testing/icecat/icecat.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/icecat %u
-Icon=icecat
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=GNU IceCat
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=false
-Categories=Application;Network;
diff --git a/mozilla-testing/icecat/icecat.install b/mozilla-testing/icecat/icecat.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/mozilla-testing/icecat/icecat.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() {
-  post_install $1
-}
-
diff --git a/mozilla-testing/icecat/libre.patch b/mozilla-testing/icecat/libre.patch
deleted file mode 100644
index 3dca93ee7..000000000
--- a/mozilla-testing/icecat/libre.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- icecat-9.0.1.orig/browser/app/profile/firefox.js	2011-12-26 23:11:39.000000000 -0500
-+++ icecat-9.0.1/browser/app/profile/firefox.js	2011-12-26 23:12:15.000000000 -0500
-@@ -74,7 +76,7 @@
- pref("extensions.update.autoUpdateDefault", true);
- 
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/");
- 
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -876,7 +878,7 @@
- pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
- 
- // base url for the wifi geolocation network provider
--pref("geo.wifi.uri", "https://www.google.com/loc/json");
-+pref("geo.wifi.uri", "http://geomena.org");
- pref("geo.wifi.protocol", 0);
- 
- // Whether to use a panel that looks like an OS X sheet for customization
---- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-26 07:34:23.000000000 -0500
-+++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-26 19:59:04.000000000 -0500
-@@ -1,27 +1,19 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (SSL)
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
-+browser.search.order.1=Duck Duck Go (SSL)
-+browser.search.order.2=Duck Duck Go (Lite)
- 
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Bloglines
--browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
--browser.contentHandlers.types.1.title=My Yahoo
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--browser.contentHandlers.types.2.title=Google
--browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
- 
- # Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/?q=
- 
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
- 
- # increment this number when anything gets changed in the list below.  This will
- # cause Firefox to re-read these prefs and inject any new handlers into the 
---- icecat-9.0.1.orig/browser/app/Makefile.in	2011-12-27 00:22:26.000000000 -0500
-+++ icecat-9.0.1/browser/app/Makefile.in	2011-12-27 00:23:10.000000000 -0500
-@@ -269,7 +269,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/mozilla-testing/icecat/libvpx.patch b/mozilla-testing/icecat/libvpx.patch
deleted file mode 100644
index f883b8e08..000000000
--- a/mozilla-testing/icecat/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/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig
deleted file mode 100644
index b769079d8..000000000
--- a/mozilla-testing/icecat/mozconfig
+++ /dev/null
@@ -1,54 +0,0 @@
-. $topsrcdir/browser/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-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
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# IceCat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-
-# Build-generated
diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default
deleted file mode 100644
index 01e047fc3..000000000
--- a/mozilla-testing/icecat/mozconfig.default
+++ /dev/null
@@ -1,63 +0,0 @@
-# This is a better commented version of the default .mozconfig from 9.0.1
-ac_add_options --enable-application=browser
-
-ac_add_options --prefix=/usr/local
-#ac_add_options --with-default-mozilla-five-home=/usr/local/lib
-
-# System libraries
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-#ac_add_options --with-system-png
-ac_add_options --disable-system-cairo 
-#ac_add_options --with-pthreads
-
-ac_add_options --disable-toolkit-qt
-ac_add_options --enable-toolkit-cairo-gtk2
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-svg-renderer=cairo
-
-# Features
-ac_add_options --enable-extensions="default spellcheck"
-ac_add_options --enable-freetype2
-ac_add_options --enable-pango
-ac_add_options --enable-crypto
-#ac_add_options --enable-postscript
-ac_add_options --enable-svg
-ac_add_options --enable-xft
-
-ac_add_options --disable-chatzilla
-ac_add_options --disable-accessibility
-ac_add_options --disable-calendar
-ac_add_options --disable-composer
-
-#ac_add_options --disable-jsd
-#ac_add_options --disable-libxul
-ac_add_options --disable-ipc
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --disable-negotiateauth
-ac_add_options --disable-profilesharing
-ac_add_options --disable-xinerama
-ac_add_options --disable-xprint
-
-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
-
-ac_add_options --disable-debug
-
-# Optimization
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --enable-optimize="-pipe -O3"
-ac_add_options --enable-strip
-
-# IceCat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
diff --git a/mozilla-testing/icecat/mozconfig.firefox b/mozilla-testing/icecat/mozconfig.firefox
deleted file mode 100644
index 428503642..000000000
--- a/mozilla-testing/icecat/mozconfig.firefox
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is the .mozconfig used by Arch for Firefox
-. $topsrcdir/browser/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-official-branding
-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
-
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/mozilla-testing/icecat/mozconfig.old b/mozilla-testing/icecat/mozconfig.old
deleted file mode 100644
index a790aee48..000000000
--- a/mozilla-testing/icecat/mozconfig.old
+++ /dev/null
@@ -1,78 +0,0 @@
-# This is a better commented version of the .mozconfig used by the Parabola
-# package < v9
-. $topsrcdir/browser/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-cairo
-ac_add_options --with-pthreads
-
-ac_add_options --enable-default-toolkit=cairo-gtk2
-
-# Features
-ac_add_options --enable-extensions=default
-
-ac_add_options --enable-url-classifier
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --enable-canvas
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-smil
-ac_add_options --enable-svg
-
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-libnotify
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-ac_add_options --enable-xterm-updates
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-update
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-ac_add_options --disable-debug
-
-# Optimization
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# IceCat
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
diff --git a/mozilla-testing/icecat/mozconfig.pgo b/mozilla-testing/icecat/mozconfig.pgo
deleted file mode 100644
index b0c249ebf..000000000
--- a/mozilla-testing/icecat/mozconfig.pgo
+++ /dev/null
@@ -1,4 +0,0 @@
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/mozilla-testing/icecat/vendor.js b/mozilla-testing/icecat/vendor.js
deleted file mode 100644
index 808d1b118..000000000
--- a/mozilla-testing/icecat/vendor.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
diff --git a/mozilla-testing/iceweasel-i18n/Makefile b/mozilla-testing/iceweasel-i18n/Makefile
deleted file mode 100644
index d596111f3..000000000
--- a/mozilla-testing/iceweasel-i18n/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the PKGBUILD's list of langpacks.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-
-# Variables:
-# This is to get it from Debian Sid
-debname=iceweasel-l10n
-debver=9.0+debian
-debrel=1
-debrepo=http://ftp.debian.org/debian/pool/main/
-
-pkgver=9.0
-pkgrel=2.1
-
-# Guts: ##############################################################
-
-default: PHONY all
-all: PHONY
-	$(MAKE) clean
-	$(MAKE) PKGBUILD
-.PRECIOUS: PKGBUILD
-
-PKGBUILD.list: Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(phony)/" \
-	  -e '/CUT HERE/,$$d' \
-	  PKGBUILD.in > $@
-	echo 'package() { exit 0; }' >> $@
-	makepkg -gp $@ >> $@
-langpacks.txt: PKGBUILD.list Makefile
-	makepkg -dp $<
-	ls src/*/upstream | sed 's/\.xpi//' > $@
-PKGBUILD: PKGBUILD.in langpacks.txt Makefile
-	sed \
-	  -e 's/@DEBNAME@/$(debname)/' \
-	  -e 's/@DEBVER@/$(debver)/' \
-	  -e 's/@DEBREL@/$(debrel)/' \
-	  -e 's%@DEBREPO@%$(debrepo)%' \
-	  -e 's/@PKGVER@/$(pkgver)/' \
-	  -e 's/@PKGREL@/$(pkgrel)/' \
-	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
-	  -e '/CUT HERE/d' \
-	  -e '/md5sums/,$$d' \
-	  PKGBUILD.in > $@
-	makepkg -dg >> $@
-
-clean: PHONY
-	rm -f PKGBUILD.list langpacks.txt
-
-.PHONY: PHONY FORCE
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD
deleted file mode 100644
index 0743504ee..000000000
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD
+++ /dev/null
@@ -1,142 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=iceweasel
-_debver=11.0
-_debrel=2
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca csb cs cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
-
-pkgbase=iceweasel-i18n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-_pkgver=10.0
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-pkgdesc="Language packs for Debian Iceweasel."
-arch=('any')
-url="http://www.geticeweasel.org/"
-license=('MPL')
-depends=("iceweasel-libre>=$_pkgver")
-source=()
-for lang in ${_langpacks[@]}
-do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
-done
-
-build() {
-  cd "${srcdir}"
-  for f in *.deb
-  do
-      bsdtar xf $f
-      bsdtar xf data.tar.gz
-  done
-}
-
-_path="/usr/lib/iceweasel/extensions"
-
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
-  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
-}
-"
-done
-
-md5sums=('c11d65787c3f2848e0b582115e50c3ca'
-         'f579bb571a43c33d6a13fd71f7853331'
-         '5ec94ba1055f11e8a33674a3ea623fca'
-         '7598e4409463c98c6f358a49c0e0e864'
-         'f3a7156974b43a7829e68e82e6dd749a'
-         '2cd6d08c82a59cee5454d3da763d9808'
-         '3b5529e7d1a6c87e9a99b251bb008b9f'
-         'f1eb67cbc423a49dd4b4f85e1f50034c'
-         '76c39cc1134b4074283fe080a1d0b29e'
-         '1b282bba90202701fa63fc21b44e78d5'
-         '77f818359b98fdd2a23b40989f9f56c6'
-         'cbd8fb3d20a5269ac728c717ebd1d98c'
-         '83e2314c8b80d0fd551fa083d89cef70'
-         'e68bed0670b4a82dbd66512e8ca130c7'
-         '48ea629311ec141de087474ad95fa122'
-         '9c1849045f0004e49c240061358b244f'
-         '72bce5d1aa3e6b21f6b7e7b6f2c8d4f2'
-         '224a5bb2ee4fdde8cc20e79a70e30eab'
-         'e856bf522ad406c3b17e605a922a149f'
-         'e522dd90baf0fdc61fbd45a496993fed'
-         'adc195bb74d8d84f768ab0077c6c80b2'
-         'a8012c48c890655c1ef1826f900f7cd3'
-         'fad33e552bd6fb805a5c92325c649eff'
-         'cad39ebafc45aad5d32f115fa1839ac0'
-         '238fa3a6a33cd30ad2712510cc578baa'
-         '5dadee4c8eca35353e811b93a6602860'
-         '67c7d7ab47d8cd636d6849f9fda68fe7'
-         'b7cf88fe4b118aea853978c7ff43eb57'
-         'c0aa19616cf37148a7f33789c9e88deb'
-         '806a1b78d92c1e6504051f2c6bf2cdcf'
-         '92ee27275709f2c81f229f40d032da23'
-         '6f7369cff0c0680f52394d9caee7b136'
-         '2adba18d2bd10051950f1b37325ddbce'
-         'a2e1834d4b28fa8dea5b8d01adcedb7e'
-         '929bfa11831b267b419a1b09b4d614d4'
-         'fe5ea0a2cc3ee9b45618517a2a6cd162'
-         '45cd4f3e44046bfdc78848d12a0983f9'
-         '7f7681277e566052e6831377b1bcd479'
-         'f136cefdb1b7a8b9fc18cba540414fcc'
-         'e714caf6fc74f9978ca5911310f33f10'
-         '7a745b384d1ee293decce327189d49e8'
-         '5b22c59215b6ce6d3fd588305a6429f6'
-         'b6f1f722168a7e2dc70b02c199e96198'
-         'e490e5a65c40cd60ba64e4511f1dcef1'
-         '640c52cb0b2e4f8ae0d7206fb3db3b33'
-         'a42b31f567dcc8032360caa684df1c08'
-         'd8da0314598179ac5c3479dd397d7827'
-         '7e065b66f0673c3801ee7f37ff33344d'
-         'c8c5d1646483013fa249b3a839523e53'
-         'abf1db7ea2e8014e135f324cf3efc141'
-         '8a352420c9580fe3c930a4b3c4d3530e'
-         '465ca43f628d0567b3de36626b54bf40'
-         '6cc860dae180ed5f80916759da290a9d'
-         'b0d97a60501760c78f520ba4151427a7'
-         '829311af6d4d0d78378fdcfd2cfccc68'
-         'b54daae60d32b270a44b891fdb61e3b5'
-         '39246a00ea31552326d0ea52f8eb1f05'
-         'e49074be0a43ebc9810d89c24de75268'
-         '281f20486ae5b6caadfc5504e7f036ac'
-         '740c3a38b45788378c6c5db795d31ee1'
-         '296df42d755d93032b9a3dc619bc502d'
-         '74b59fa4676d2779f8e1081ac253b122'
-         'a92960238a2c942c4b49b0f4187d0a71'
-         '230fbd4b3e6a65545b4a37ec1549d0e6'
-         'e606f5a9db88334a6cb33086340f4ff7'
-         '0b52b803abe1acb1e137a57fe0497746'
-         '00ddf2c8c6adfcd51230dd469d01ec75'
-         '254303860ecc7c25157f08a4d55a4f68'
-         '70d037f9c5c8f25e2b335c7016f17b58'
-         'b3da484dade70c544d4f0e6a829ef806'
-         '05347b208889b3e4aa86d9a6dccda71d'
-         'a2212a06adac1aa6b74bc2f7e9de2af2'
-         '371d5e9b0a10feec5e05d3fdfd949bc6'
-         '63611b468b7d41a0470385e19a849a8d'
-         'dc691a55cc7f95018e4178e6e794a1a4'
-         '90723a80c36b85006fa7514641cd2f2a'
-         '918683079f1d037d05a9a38b05d4ca51'
-         '77dda2b5fd59bcdb66918b4d13b486ae'
-         '33c2d8bff6cdf141614457c71fcf5d36'
-         '08990457e150c081e0f505515c15df09'
-         '379c5ede369994f016745e7dd83dfe54'
-         '15062007856eb66b04c26694a7f35727'
-         '569b1a54a9ca0b8149f151eb4cf57957'
-         '970928f01c78b094a2c054e58cd85bff')
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD.in b/mozilla-testing/iceweasel-i18n/PKGBUILD.in
deleted file mode 100644
index 05477caef..000000000
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-# Contributor: Figue <ffigue@gmail.com>
-# Based on icecat-i18n package, which is in turn based on firefox-i18n
-
-# When updating to a newer upstream release:
-# - Edit variables in in Makefile.
-# - (optionally) edit PKGBUILD.in
-# - Run 'make'. It will take care of everything else for you.
-
-_debname=@DEBNAME@
-_debver=@DEBVER@
-_debrel=@DEBREL@
-_debrepo=@DEBREPO@
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_langpacks=@LANGPACKS@
-
-pkgbase=iceweasel-i18n
-pkgname=($(for lang in ${_langpacks[@]}
-        do echo $pkgbase-$lang | tr A-Z a-z
-        done))
-_pkgver=@PKGVER@
-pkgver=${_debver}.${_debrel}
-pkgrel=@PKGREL@
-
-pkgdesc="Language packs for Debian Iceweasel."
-arch=('any')
-url="http://www.geticeweasel.org/"
-license=('MPL')
-depends=("iceweasel=$_pkgver")
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
-noextract=($(for lang in ${_langpacks[@]}
-        do echo $lang.xpi
-        done))
-
-dpkg-source() {
-  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-  cd "${_debname}-${_debver}"
-  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
-  cd ..
-}
-
-build() {
-  cd "${srcdir}"
-  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-}
-
-_path="/usr/lib/iceweasel-${_pkgver}/extensions"
-
-# CUT HERE <-- Separates package_*() functions from everything else.
-
-for lang in ${_langpacks[@]}
-do
-    eval "
-package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
-}
-"
-done
-
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
deleted file mode 100644
index 3ef4da470..000000000
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ /dev/null
@@ -1,156 +0,0 @@
-# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-_pgo=false
-
-# We're getting this from Debian Sid
-_debname=iceweasel
-_debver=11.0
-_debrel=2
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=iceweasel
-pkgname=iceweasel-libre
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
-  pkgname+='-pgo'
-fi
-
-pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification')
-makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'yasm' 'zip')
-if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options=(!ccache)
-fi
-
-url="http://www.geticeweasel.org/"
-install=iceweasel.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
-        mozconfig
-        mozconfig.pgo
-        xulrunner-copy-stub.patch
-        libre.patch
-        iceweasel-install-dir.patch
-        region.properties
-        vendor.js)
-md5sums=('01d9d18909ca9fff2483d8fd779a0f89'
-         '59349da94b095fe0623d09ce75696766'
-         'f407208a750cdc9bea3a6a3a3e42dd89'
-         'eab149c1994ab14392e55af3abb08e80'
-         'ac29b01c189f20abae2f3eef1618ffc0'
-         'a485a2b5dc544a8a2bd40c985d2e5813'
-         'addd3a3420cebeda152b447705b086e9'
-         'e529742c0a425648087bc3ce537fe4c5'
-         'f1c76e7e244257856a386ca2de69bdf0'
-         '0d053487907de4376d67d8f499c5502b')
-
-if [ "$_pkgname" != "$pkgname" ]; then
-  provides+=("$_pkgname=$pkgver")
-  conflicts+=("$_pkgname")
-fi
-
-dpkg-source() {
-  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-  mv mozilla-release "${_debname}-${_debver}"
-  mv debian "${_debname}-${_debver}"
-  cd "${_debname}-${_debver}"
-
-# Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
-  quilt push -a
-  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
-  cd ..
-}
-
-build() {
-# Don't run this if we're using -e
-if [ $NOEXTRACT -eq 0 ]; then
-  msg2 "Applying Debian patches..."
-  cd "${srcdir}"
-  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-
-  msg2 "Starting normal build..."
-  mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
-  cd "$srcdir/mozilla-build"
-
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
-  patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
-  patch -Np1 -i "$srcdir/libre.patch"
-fi
-
-  cd "$srcdir/mozilla-build"
-  cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
-
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-
-  if $_pgo; then
-    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
-    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-    kill $! || true
-  else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  fi
-}
-
-package() {
-  cd "$srcdir/mozilla-build"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
-
-  # I don't even know why we're hitting the objdir, and ConnOS didn't.
-  _brandingdir=debian/branding
-  brandingdir=moz-objdir/$_brandingdir
-  icondir="$pkgdir/usr/share/icons/hicolor"
-  for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
-  done
-  install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
-
-  install -d                                  "$pkgdir/usr/share/applications"
-  install -m644 debian/iceweasel.desktop      "$pkgdir/usr/share/applications"
-  #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications"
-
-  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
-  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
-
-  # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
-
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
-}
diff --git a/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch b/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
deleted file mode 100644
index f80a3eca9..000000000
--- a/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/config/autoconf.mk.in	2011-12-31 17:07:52.000000000 -0500
-+++ iceweasel-9.0.1/config/autoconf.mk.in	2011-12-31 17:11:18.000000000 -0500
-@@ -68,8 +68,8 @@
- mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in	2011-12-20 18:28:21.000000000 -0500
-+++ iceweasel-9.0.1/js/src/config/autoconf.mk.in	2011-12-31 17:11:43.000000000 -0500
-@@ -60,8 +60,8 @@
- datadir		= @datadir@
- mandir		= @mandir@
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
- 
- TOP_DIST	= @TOP_DIST@
- ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/mozilla-testing/iceweasel-libre/iceweasel.install b/mozilla-testing/iceweasel-libre/iceweasel.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/mozilla-testing/iceweasel-libre/iceweasel.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() {
-  post_install $1
-}
-
diff --git a/mozilla-testing/iceweasel-libre/libre.patch b/mozilla-testing/iceweasel-libre/libre.patch
deleted file mode 100644
index c1bb0a8c7..000000000
--- a/mozilla-testing/iceweasel-libre/libre.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
---- mozilla-build/browser/app/profile/firefox.js.orig	2012-03-20 01:04:55.890545738 -0300
-+++ mozilla-build/browser/app/profile/firefox.js	2012-03-20 01:05:03.330545430 -0300
-@@ -64,11 +64,11 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-++pref("extensions.getAddons.get.url", "");
-++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
- 
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
- 
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "");
- 
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
-                                             // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
- pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
-                                                 // restart.
-@@ -234,7 +234,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page",                1);
--pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage",            "about:home");
- 
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -324,7 +324,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
- 
- // search engines URL
--pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL",      "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // pointer to the default engine name
- pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-@@ -563,7 +563,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
- 
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js
---- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js	2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0.1/browser/base/content/syncSetup.js	2011-12-21 10:05:15.888062669 +0000
-@@ -59,7 +59,7 @@
- // Broader than we'd like, but after this changed from api-secure.recaptcha.net
- // we had no choice. At least we only do this for the duration of setup.
- // See discussion in Bugs 508112 and 653307.
--const RECAPTCHA_DOMAIN = "https://www.google.com";
-+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com";
- 
- Cu.import("resource://services-sync/main.js");
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-21 09:55:31.032062468 +0000
-@@ -1,8 +1,8 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
- 
-@@ -17,7 +17,7 @@
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms}
- 
- # increment this number when anything gets changed in the list below.  This will
- # cause Firefox to re-read these prefs and inject any new handlers into the 
-diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html
---- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/build/pgo/blueprint/elements.html	2011-12-21 10:04:42.988062659 +0000
-@@ -143,7 +143,7 @@
-       </p>
-       <p>
-         <a>&lt;a&gt; anchor</a><br>
--        <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+        <a href="http://www.duckduckgo.com">&lt;a&gt; a + href</a>
-       </p>
-       <p>
-         <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
---- iceweasel-9.0.1.orig/dom/ipc/test.xul	2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0.1/dom/ipc/test.xul	2011-12-21 10:03:33.224062635 +0000
-@@ -301,6 +301,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/>
-   <label id="messageLog" value="" crop="center"/>
- </window>
-diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul	2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul	2011-12-21 10:03:06.408062626 +0000
-@@ -69,6 +69,6 @@
-        label="setViewportScale"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content"
-            remote="true"/>
- </window>
-diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/xul/app/mobile.js
---- mozilla-build/mobile/xul/app/mobile.js.orig	2012-03-20 01:02:30.300551777 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js	2012-03-20 01:02:40.820551342 -0300
-@@ -218,13 +218,12 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
- 
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-@@ -239,7 +240,7 @@
- pref("privacy.popups.showBrowserMessage", true);
- 
- pref("keyword.enabled", true);
--pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- 
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties	2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties	2011-12-21 09:54:17.560062443 +0000
-@@ -1,8 +1,8 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
- 
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
-@@ -12,7 +12,7 @@
- browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
- 
- # Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=http://duckduckgo.com/?q=
- 
- # increment this number when anything gets changed in the list below.  This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js
---- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0.1/modules/libpref/src/init/all.js	2011-12-21 10:09:17.136062754 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
- //  The first character after a period must be alphabetic.
- 
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-21 12:51:31.188066096 +0000
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
- 
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=gnuzilla.gnu.org
-+more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html
-+pluginupdates_label=gnuzilla.gnu.org
-+pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html
-+plugindoc_label=gnuzilla.gnu.org
-+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
- 
---- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in	2012-02-07 15:40:34.279657460 -0300
-+++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in	2012-02-07 15:40:19.226324812 -0300
-@@ -11,13 +11,13 @@
-     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
- <DD>@bookmarks_toolbarfolder_description@
-     <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-+        <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</A>
-+        <DT><A HREF="https://parabolagnulinux.org/">Parabola</A>
-     </DL><p>
-     <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
-     <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+        <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
-+        <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A>
-     </DL><p>
- </DL><p>
diff --git a/mozilla-testing/iceweasel-libre/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig
deleted file mode 100644
index e79896323..000000000
--- a/mozilla-testing/iceweasel-libre/mozconfig
+++ /dev/null
@@ -1,55 +0,0 @@
-. $topsrcdir/browser/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-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
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# ConnochaetOS
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
-
-# Parabola
-ac_add_options --disable-safe-browsing
-export BUILD_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-
-# Build-generated
diff --git a/mozilla-testing/iceweasel-libre/mozconfig.pgo b/mozilla-testing/iceweasel-libre/mozconfig.pgo
deleted file mode 100644
index b0c249ebf..000000000
--- a/mozilla-testing/iceweasel-libre/mozconfig.pgo
+++ /dev/null
@@ -1,4 +0,0 @@
-# PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/mozilla-testing/iceweasel-libre/region.properties b/mozilla-testing/iceweasel-libre/region.properties
deleted file mode 100644
index 2e980987e..000000000
--- a/mozilla-testing/iceweasel-libre/region.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default search engine
-browser.search.defaultenginename=Duck Duck Go (SSL)
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Duck Duck Go (SSL)
-browser.search.order.2=Duck Duck Go (Lite)
-
-
-# Keyword URL (for location bar searches)
-keyword.URL=https://duckduckgo.com/?q=
-
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
-
-# increment this number when anything gets changed in the list below.  This will
-# cause Firefox to re-read these prefs and inject any new handlers into the 
-# profile database.  Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so 
-# don't make any spelling errors here.
-#gecko.handlerService.defaultHandlersVersion=3
diff --git a/mozilla-testing/iceweasel-libre/vendor.js b/mozilla-testing/iceweasel-libre/vendor.js
deleted file mode 100644
index d8d606bc1..000000000
--- a/mozilla-testing/iceweasel-libre/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch b/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch
deleted file mode 100644
index e3b8e9376..000000000
--- a/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceweasel-9.0.1/browser/app/Makefile.in~	2011-12-25 16:19:29.000000000 -0500
-+++ iceweasel-9.0.1/browser/app/Makefile.in	2011-12-25 16:19:55.000000000 -0500
-@@ -257,7 +257,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/mozilla-testing/mozilla-searchplugins/PKGBUILD b/mozilla-testing/mozilla-searchplugins/PKGBUILD
deleted file mode 100644
index c86c9514a..000000000
--- a/mozilla-testing/mozilla-searchplugins/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
-# Contributor: Figue <ffigue at gmail>
-# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
-
-pkgname=mozilla-searchplugins
-pkgver=1.0
-pkgrel=1
-pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
-arch=('any')
-license=('MPL' 'GPL' 'LGPL')
-url="https://parabolagnulinux.org/"
-source=(
-  duck-duck-go-lite.xml
-  duck-duck-go-ssl.xml
-  internet-archive.xml
-  jamendo-en.xml
-  logless-search.xml
-  scroogle-ssl-english.xml
-  wikipedia.xml
-  yacy.xml
-)
-
-package() {
-  install -m755 -d                "${pkgdir}/usr/lib/mozilla/searchplugins"
-  install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
-}
-
-md5sums=('e1bda0854de7d764f7401c81bb82b5ef'
-         'c5f00b6b24222aacd5a749d1f59c4d24'
-         '462c68585461f8cdc23c93c46f6ee4cf'
-         '2d492295c4308f9bba9ece28d8b3af2d'
-         '937ac0e5392b060d93bd33e761fbfa51'
-         'cf97082e77e3ef5f1bd74b1db9329965'
-         'c35f4971feff8387e0570d7a165eb6fa'
-         '24528ca3f7f1e1a0ba735231aa3ac1de')
diff --git a/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml b/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml
deleted file mode 100644
index 3142d3410..000000000
--- a/mozilla-testing/mozilla-searchplugins/duck-duck-go-lite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Duck Duck Go (Lite)</os:ShortName>
-<os:Description>Search Duck Duck Go (Lite)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml b/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml
deleted file mode 100644
index 4fb1391ab..000000000
--- a/mozilla-testing/mozilla-searchplugins/duck-duck-go-ssl.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Duck Duck Go (SSL)</os:ShortName>
-<os:Description>Search Duck Duck Go (SSL)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/mozilla-testing/mozilla-searchplugins/internet-archive.xml b/mozilla-testing/mozilla-searchplugins/internet-archive.xml
deleted file mode 100644
index 1556a2d8c..000000000
--- a/mozilla-testing/mozilla-searchplugins/internet-archive.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Internet Archive</os:ShortName>
-<os:Description>Search www.archive.org</os:Description>
-<os:InputEncoding>ISO-8859-1</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.src</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.gif</IconUpdateUrl>
-<SearchForm>http://www.archive.org/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.archive.org/search.php?sourceid=Mozilla-search&amp;query={searchTerms}&amp;sort=-%2Fadditional%2Fitem%2Fdownloads">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/mozilla-testing/mozilla-searchplugins/jamendo-en.xml b/mozilla-testing/mozilla-searchplugins/jamendo-en.xml
deleted file mode 100644
index 91d6df6e4..000000000
--- a/mozilla-testing/mozilla-searchplugins/jamendo-en.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Jamendo (en)</os:ShortName>
-<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg==</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico</IconUpdateUrl>
-<SearchForm>http://www.jamendo.com/en</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search/all/{searchTerms}">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/mozilla-testing/mozilla-searchplugins/logless-search.xml b/mozilla-testing/mozilla-searchplugins/logless-search.xml
deleted file mode 100644
index 1538d1ef0..000000000
--- a/mozilla-testing/mozilla-searchplugins/logless-search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Logless Search</os:ShortName>
-<os:Description>Use logless.com to search the Internet in privacy, with no search logs.</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</os:Image>
-<os:Url type="text/html" method="GET" template="http://www.logless.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml b/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml
deleted file mode 100644
index f817dce40..000000000
--- a/mozilla-testing/mozilla-searchplugins/scroogle-ssl-english.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Scroogle SSL English</os:ShortName>
-<os:Description>Scroogle SSL English</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico</IconUpdateUrl>
-<SearchForm>https://ssl.scroogle.org/scrapen8.html</SearchForm>
-<os:Url type="text/html" method="GET" template="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi">
-  <os:Param name="Gw" value="{searchTerms}"/>
-  <os:Param name="l" value="en"/>
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/mozilla-testing/mozilla-searchplugins/wikipedia.xml b/mozilla-testing/mozilla-searchplugins/wikipedia.xml
deleted file mode 100644
index 36b8ed494..000000000
--- a/mozilla-testing/mozilla-searchplugins/wikipedia.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Wikipedia (en)</ShortName>
-<Description>Wikipedia, the free encyclopedia</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
-<Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php">
-  <Param name="action" value="opensearch"/>
-  <Param name="search" value="{searchTerms}"/>
-</Url>
-<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search">
-  <Param name="search" value="{searchTerms}"/>
-  <Param name="sourceid" value="Mozilla-search"/>
-</Url>
-<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm>
-</SearchPlugin>
diff --git a/mozilla-testing/mozilla-searchplugins/yacy.xml b/mozilla-testing/mozilla-searchplugins/yacy.xml
deleted file mode 100644
index 61201ad20..000000000
--- a/mozilla-testing/mozilla-searchplugins/yacy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>YaCy</os:ShortName>
-<os:Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer 'kupferhammer-keller'.</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00</os:Image>
-<os:Url type="text/html" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.html?query={searchTerms}">
-</os:Url><os:Url type="application/rss+xml" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.rss?query={searchTerms}&amp;maximumRecords=10&amp;verify=false">
-</os:Url>
-</SearchPlugin>
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-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/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD
deleted file mode 100644
index 703f55e9f..000000000
--- a/multilib-testing/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 68056 2012-03-17 15:05:46Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.32
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services (32-bit)"
-arch=(x86_64)
-license=('custom')
-depends=('lib32-libpciaccess' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
-        no-pthread-stubs.patch)
-#	git_fixes.diff)
-sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
-          '1a9000f4c94d5bd13555e13e6e51716bf92a0eb8')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  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 --libdir=/usr/lib32 \
-      --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-vmwgfx-experimental-api \
-      --enable-nouveau-experimental-api
-  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-libdrm/git_fixes.diff b/multilib-testing/lib32-libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/multilib-testing/lib32-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/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 721626c0a..000000000
--- a/multilib-testing/lib32-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)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
-	@PCIACCESS_LIBS@ \
-	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/multilib-testing/lib32-libpciaccess/PKGBUILD b/multilib-testing/lib32-libpciaccess/PKGBUILD
deleted file mode 100644
index a807c9343..000000000
--- a/multilib-testing/lib32-libpciaccess/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 67124 2012-03-04 21:51:32Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-_pkgbasename=libpciaccess
-pkgname=lib32-${_pkgbasename}
-pkgver=0.13
-pkgrel=1
-pkgdesc="X11 PCI access library (32-bit"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' ${_pkgbasename})
-makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
-sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/include
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libx11/PKGBUILD b/multilib-testing/lib32-libx11/PKGBUILD
deleted file mode 100644
index e51b57017..000000000
--- a/multilib-testing/lib32-libx11/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 64508 2012-02-15 10:29:36Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libx11
-pkgname=lib32-$_pkgbasename
-pkgver=1.4.99.1
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxcb' 'xproto' 'kbproto' $_pkgbasename)
-makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib')
-options=('!libtool')
-license=('custom:XFREE86')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d')
-
-build() {
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libX11-${pkgver}"
-  ./configure --prefix=/usr --disable-static --disable-xf86bigfont \
-      --libdir=/usr/lib32 --disable-specs
-  make
-  make check
-}
-
-package() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD
deleted file mode 100644
index b51422646..000000000
--- a/multilib-testing/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 64491 2012-02-14 11:43:17Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.8
-pkgrel=2
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'lib32-libxdmcp' 'lib32-libxau'
-         $_pkgbasename)
-makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib'
-             'autoconf')
-options=('!libtool')
-license=('custom')
-source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('18b76759d5bbb863777f37bf3aec23ebaa31d5be'
-          '3455e84642283bc91c8313af319002a20bbcbdf4')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" 
-}
diff --git a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index f17de1b1d..000000000
--- a/multilib-testing/lib32-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/multilib-testing/lib32-libxi/PKGBUILD b/multilib-testing/lib32-libxi/PKGBUILD
deleted file mode 100644
index f56b7c900..000000000
--- a/multilib-testing/lib32-libxi/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 64512 2012-02-15 11:13:00Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxi
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.99.3
-pkgrel=1
-pkgdesc="X11 Input extension library (32-bit)"
-arch=('x86_64')
-url="http://xorg.freedesktop.org"
-depends=('lib32-libxext' 'inputproto' $_pkgbasename)
-makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib)
-options=(!libtool)
-license=('custom')
-source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha1sums=('55de70d18b20341f307b80da035400ed0467c920')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/libXi-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/libXi-${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-llvm/PKGBUILD b/multilib-testing/lib32-llvm/PKGBUILD
deleted file mode 100644
index d2ba4e1a6..000000000
--- a/multilib-testing/lib32-llvm/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 64517 2012-02-15 17:57:32Z lcarlier $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('lib32-llvm')
-pkgver=3.0
-pkgrel=2
-arch=('x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('lib32-libffi' 'python2' 'gcc-multilib')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz)
-sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477')
-
-build() {
-  cd "$srcdir/llvm-$pkgver.src"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  # Fix installation directories, ./configure doesn't seem to set them right
-  sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
-         -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \
-         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
-    Makefile.config.in
-
-  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32/llvm \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-libffi \
-    --enable-targets=all \
-    --disable-expensive-checks \
-    --disable-debug-runtime \
-    --disable-assertions \
-    --with-binutils-include=/usr/include \
-    --with-cxx-include-arch=$CHOST \
-    --$_optimized_switch-optimized
-
-  make REQUIRES_RTTI=1
-}
-
-package() {
-  pkgdesc="Low Level Virtual Machine (32 bits version)"
-  depends=('perl' 'lib32-libffi' 'llvm')
-
-  cd "$srcdir/llvm-$pkgver.src"
-
-  # We move the clang directory out of the tree so it won't get installed and
-  # then we bring it back in for the clang package
-  # mv tools/clang "$srcdir"
-  # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib32/llvm/*.a
-
-  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
-  sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config"
-  mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config"
-
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.*
-
-  # Symlink the gold plugin where clang expects it
-  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so"
-
-  # Add ld.so.conf.d entry
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}}
-  mkdir "$pkgdir"/usr/bin
-  mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32"
-}
diff --git a/multilib-testing/lib32-llvm/cindexer-clang-path.patch b/multilib-testing/lib32-llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/multilib-testing/lib32-llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-   
-   // We now have the CIndex directory, locate clang relative to it.
-   LibClangPath.eraseComponent();
-+  LibClangPath.eraseComponent();
- #endif
-   
-   LibClangPath.appendComponent("clang");
diff --git a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- 	global: main;
- 		__progname;
- 		environ;
-+		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
- 
- 	local: *;
- };
diff --git a/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch
deleted file mode 100644
index 9bbbfaa8b..000000000
--- a/multilib-testing/lib32-llvm/clang-pure64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::ppc64)
-       CmdArgs.push_back("/lib64/ld64.so.1");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");
diff --git a/multilib-testing/lib32-llvm/enable-lto.patch b/multilib-testing/lib32-llvm/enable-lto.patch
deleted file mode 100644
index 3c8691b17..000000000
--- a/multilib-testing/lib32-llvm/enable-lto.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1398,7 +1398,7 @@
-   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
-                          GCCInstallation.getTriple() + "/bin").str());
- 
--  Linker = GetProgramPath("ld");
-+  Linker = GetProgramPath("ld.gold");
- 
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
- 
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3412,11 +3412,11 @@
-     }
-   }
- 
--  if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
-     CmdArgs.push_back("-plugin");
--    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-+    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
-     CmdArgs.push_back(Args.MakeArgString(Plugin));
--  }
-+  // }
- 
-   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch b/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch
deleted file mode 100644
index 84d166471..000000000
--- a/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile
---- llvm-3.0.src.orig/tools/gold/Makefile	2011-05-31 23:00:45.000000000 +0300
-+++ llvm-3.0.src/tools/gold/Makefile	2011-12-04 22:06:59.000000000 +0200
-@@ -26,6 +26,6 @@ LINK_COMPONENTS := support
- # Because off_t is used in the public API, the largefile parts are required for
- # ABI compatibility.
- CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT)
-+CXXFLAGS+=-L $(SharedLibDir) -lLTO
- 
- include $(LEVEL)/Makefile.common
diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD
deleted file mode 100644
index 930f61f9a..000000000
--- a/multilib-testing/lib32-mesa/PKGBUILD
+++ /dev/null
@@ -1,200 +0,0 @@
-# $Id: PKGBUILD 64673 2012-02-17 17:53:28Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    #pkgver=7.10.99.git20110709
-    pkgver=7.11
-  else
-    pkgver=8.0.1
-fi
-
-pkgrel=1
-arch=('x86_64')
-makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1'
-  'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-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=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
-  source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
-  md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd')
-else
-  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-  #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2")
-  md5sums=('24eeebf66971809d8f40775a379b36c9')
-fi
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  # for our llvm-config for 32 bit
-  export LLVM_CONFIG=/usr/bin/llvm-config32
-
-  cd ${srcdir}/?esa-*
-
-  autoreconf -vfi
-
-  if [ "${_git}" = "true" ]; then
-     ./autogen.sh --prefix=/usr \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
-    --enable-gallium-llvm \
-    --disable-gallium-egl --enable-shared-glapi \
-    --enable-shared-glapi \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-egl \
-    --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-32-bit \
-    --libdir=/usr/lib32
-    #  --enable-gallium-svga \
-  else
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
-    --enable-gallium-llvm \
-    --disable-gallium-egl --enable-shared-glapi \
-    --enable-glx-tls \
-    --with-driver=dri \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-egl \
-    --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-32-bit \
-    --libdir=/usr/lib32
-  fi
-
-  make
-}
-
-package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-  replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri')
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
-
-  bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
-}
-
-package_lib32-libglapi() {
-  depends=('lib32-glibc' 'libglapi')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
-
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib32"
-  bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
-}
-
-package_lib32-libgles() {
-  depends=('lib32-libglapi' 'libgles')
-  pkgdesc="Mesa GLES libraries (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-#package_lib32-libegl() {
-#  depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
-#  pkgdesc="Mesa libEGL libraries (32-bit)"
-#
-#  cd ${srcdir}/?esa-*
-#  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-#
-#  install -m755 -d "${pkgdir}/usr/lib32"
-#  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-#  install -m755 -d "${pkgdir}/usr/lib32/egl"
-#  bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
-#  bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
-#  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
-#
-#  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-#  ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
-#}
-
-package_lib32-mesa() {
-  depends=('lib32-libgl' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
-  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/lib32/libGL.so"*
-  rm -f "${pkgdir}/usr/lib32/libglapi.so"*
-  rm -f "${pkgdir}/usr/lib32/libGLESv"*
-  rm -f "${pkgdir}/usr/lib32/libEGL"*
-  rm -rf "${pkgdir}/usr/lib32/egl"
-  rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
-  rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
-}
-
-package_lib32-ati-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  cd ${srcdir}/?esa-*/src/mesa/drivers/dri
-  # classic mesa drivers for radeon,r200
-  make -C radeon DESTDIR="${pkgdir}" install
-  make -C r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
-  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_lib32-intel-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel (32-bit)"
-
-  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_lib32-nouveau-dri() {
-  depends=("lib32-libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
-
diff --git a/multilib-testing/lib32-mesa/fix-build-with-llvm-3.0.patch b/multilib-testing/lib32-mesa/fix-build-with-llvm-3.0.patch
deleted file mode 100644
index ceb5aa129..000000000
--- a/multilib-testing/lib32-mesa/fix-build-with-llvm-3.0.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
-index 56c26f5..d477c40 100644
---- a/src/gallium/auxiliary/draw/draw_llvm.c
-+++ b/src/gallium/auxiliary/draw/draw_llvm.c
-@@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *var);
-  * Create LLVM type for struct draw_jit_texture
-  */
- static LLVMTypeRef
--create_jit_texture_type(struct gallivm_state *gallivm)
-+create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name)
- {
-    LLVMTargetDataRef target = gallivm->target;
-    LLVMTypeRef texture_type;
-@@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_state *gallivm)
-    elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] = 
-       LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
- 
-+#if HAVE_LLVM >= 0x0300
-+   texture_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(texture_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    texture_type = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                           Elements(elem_types), 0);
- 
-+   LLVMAddTypeName(gallivm->module, struct_name, texture_type);
-+
-    /* Make sure the target's struct layout cache doesn't return
-     * stale/invalid data.
-     */
-    LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
- 
-    LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width,
-                           target, texture_type,
-@@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_state *gallivm)
-  */
- static LLVMTypeRef
- create_jit_context_type(struct gallivm_state *gallivm,
--                        LLVMTypeRef texture_type)
-+                        LLVMTypeRef texture_type, const char *struct_name)
- {
-    LLVMTargetDataRef target = gallivm->target;
-    LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context);
-@@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_state *gallivm,
-    elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */
-    elem_types[4] = LLVMArrayType(texture_type,
-                                  PIPE_MAX_VERTEX_SAMPLERS); /* textures */
--
-+#if HAVE_LLVM >= 0x0300
-+   context_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(context_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    context_type = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                           Elements(elem_types), 0);
-+   LLVMAddTypeName(gallivm->module, struct_name, context_type);
- 
-    LLVMInvalidateStructLayout(gallivm->target, context_type);
-+#endif
- 
-    LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants,
-                           target, context_type, 0);
-@@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_state *gallivm,
-  * Create LLVM type for struct pipe_vertex_buffer
-  */
- static LLVMTypeRef
--create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
-+create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name)
- {
-    LLVMTargetDataRef target = gallivm->target;
-    LLVMTypeRef elem_types[3];
-@@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
-    elem_types[1] = LLVMInt32TypeInContext(gallivm->context);
-    elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */
- 
-+#if HAVE_LLVM >= 0x0300
-+   vb_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(vb_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    vb_type = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                      Elements(elem_types), 0);
-+   LLVMAddTypeName(gallivm->module, struct_name, vb_type);
- 
-    LLVMInvalidateStructLayout(gallivm->target, vb_type);
-+#endif
- 
-    LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride,
-                           target, vb_type, 0);
-@@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
-    elem_types[1]  = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
-    elem_types[2]  = LLVMArrayType(elem_types[1], data_elems);
- 
-+#if HAVE_LLVM >= 0x0300
-+   vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name);
-+   LLVMStructSetBody(vertex_header, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-    vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types,
-                                            Elements(elem_types), 0);
-+   LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
- 
-    LLVMInvalidateStructLayout(gallivm->target, vertex_header);
-+#endif
- 
-    /* these are bit-fields and we can't take address of them
-       LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask,
-@@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
-                           target, vertex_header,
-                           DRAW_JIT_VERTEX_DATA);
- 
--   LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
--
-    return vertex_header;
- }
- 
-@@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm)
-    struct gallivm_state *gallivm = llvm->gallivm;
-    LLVMTypeRef texture_type, context_type, buffer_type, vb_type;
- 
--   texture_type = create_jit_texture_type(gallivm);
--   LLVMAddTypeName(gallivm->module, "texture", texture_type);
-+   texture_type = create_jit_texture_type(gallivm, "texture");
- 
--   context_type = create_jit_context_type(gallivm, texture_type);
--   LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type);
-+   context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context");
-    llvm->context_ptr_type = LLVMPointerType(context_type, 0);
- 
-    buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0);
--   LLVMAddTypeName(gallivm->module, "buffer", buffer_type);
-    llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0);
- 
--   vb_type = create_jit_vertex_buffer_type(gallivm);
--   LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type);
-+   vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer");
-    llvm->vb_ptr_type = LLVMPointerType(vb_type, 0);
- }
- 
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index 8636cd6..f44749d 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -27,17 +27,23 @@
- 
- #include <llvm-c/Core.h>
- #include <llvm/Target/TargetMachine.h>
--#include <llvm/Target/TargetRegistry.h>
--#include <llvm/Target/TargetSelect.h>
- #include <llvm/Target/TargetInstrInfo.h>
- #include <llvm/Support/raw_ostream.h>
- #include <llvm/Support/MemoryObject.h>
- 
-+#if HAVE_LLVM >= 0x0300
-+#include <llvm/Support/TargetRegistry.h>
-+#include <llvm/Support/TargetSelect.h>
-+#else /* HAVE_LLVM < 0x0300 */
-+#include <llvm/Target/TargetRegistry.h>
-+#include <llvm/Target/TargetSelect.h>
-+#endif /* HAVE_LLVM < 0x0300 */
-+
- #if HAVE_LLVM >= 0x0209
- #include <llvm/Support/Host.h>
--#else
-+#else /* HAVE_LLVM < 0x0209 */
- #include <llvm/System/Host.h>
--#endif
-+#endif /* HAVE_LLVM < 0x0209 */
- 
- #if HAVE_LLVM >= 0x0207
- #include <llvm/MC/MCDisassembler.h>
-@@ -193,14 +199,23 @@ lp_disassemble(const void* func)
- 
-    InitializeAllDisassemblers();
- 
-+#if HAVE_LLVM >= 0x0300
-+   OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
-+#else
-    OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));
-+#endif
- 
-    if (!AsmInfo) {
-       debug_printf("error: no assembly info for target %s\n", Triple.c_str());
-       return;
-    }
- 
-+#if HAVE_LLVM >= 0x0300
-+   const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), "");
-+   OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI));
-+#else 
-    OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler());
-+#endif 
-    if (!DisAsm) {
-       debug_printf("error: no disassembler for target %s\n", Triple.c_str());
-       return;
-@@ -213,7 +228,11 @@ lp_disassemble(const void* func)
- #else
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
--#if HAVE_LLVM >= 0x0208
-+
-+#if HAVE_LLVM >= 0x0300
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
-+#elif HAVE_LLVM >= 0x0208
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo));
- #else
-@@ -253,7 +272,11 @@ lp_disassemble(const void* func)
- 
-       if (!DisAsm->getInstruction(Inst, Size, memoryObject,
-                                  pc,
--                                 nulls())) {
-+#if HAVE_LLVM >= 0x0300
-+				  nulls(), nulls())) {
-+#else
-+				  nulls())) {
-+#endif
-          debug_printf("invalid\n");
-          pc += 1;
-       }
-@@ -276,7 +299,9 @@ lp_disassemble(const void* func)
-        * Print the instruction.
-        */
- 
--#if HAVE_LLVM >= 0x208
-+#if HAVE_LLVM >= 0x0300
-+      Printer->printInst(&Inst, Out, "");
-+#elif HAVE_LLVM >= 0x208
-       Printer->printInst(&Inst, Out);
- #else
-       Printer->printInst(&Inst);
-@@ -289,7 +314,11 @@ lp_disassemble(const void* func)
- 
-       pc += Size;
- 
-+#if HAVE_LLVM >= 0x0300
-+      const MCInstrDesc &TID = TII->get(Inst.getOpcode());
-+#else
-       const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
-+#endif
- 
-       /*
-        * Keep track of forward jumps to a nearby address.
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.c b/src/gallium/auxiliary/gallivm/lp_bld_type.c
-index c5cf6d4..efd159f 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_type.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c
-@@ -325,16 +325,18 @@ lp_typekind_name(LLVMTypeKind t)
-       return "LLVMArrayTypeKind";
-    case LLVMPointerTypeKind:
-       return "LLVMPointerTypeKind";
-+#if HAVE_LLVM < 0x0300
-    case LLVMOpaqueTypeKind:
-       return "LLVMOpaqueTypeKind";
-+#endif
-    case LLVMVectorTypeKind:
-       return "LLVMVectorTypeKind";
-    case LLVMMetadataTypeKind:
-       return "LLVMMetadataTypeKind";
--   /* Only in LLVM 2.7 and later???
-+#if HAVE_LLVM == 0x0207
-    case LLVMUnionTypeKind:
-       return "LLVMUnionTypeKind";
--   */
-+#endif
-    default:
-       return "unknown LLVMTypeKind";
-    }
-diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c
-index 268f0fa..ce92a80 100644
---- a/src/gallium/drivers/llvmpipe/lp_jit.c
-+++ b/src/gallium/drivers/llvmpipe/lp_jit.c
-@@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-       elem_types[LP_JIT_TEXTURE_BORDER_COLOR] = 
-          LLVMArrayType(LLVMFloatTypeInContext(lc), 4);
- 
-+#if HAVE_LLVM >= 0x0300
-+   texture_type = LLVMStructCreateNamed(gallivm->context, "texture");
-+   LLVMStructSetBody(texture_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-       texture_type = LLVMStructTypeInContext(lc, elem_types,
-                                              Elements(elem_types), 0);
-+      LLVMAddTypeName(gallivm->module, "texture", texture_type);
- 
-       LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
- 
-       LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width,
-                              gallivm->target, texture_type,
-@@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- 
-       LP_CHECK_STRUCT_SIZE(struct lp_jit_texture,
-                            gallivm->target, texture_type);
--
--      LLVMAddTypeName(gallivm->module, "texture", texture_type);
-    }
- 
-    /* struct lp_jit_context */
-@@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-       elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type,
-                                                       PIPE_MAX_SAMPLERS);
- 
-+#if HAVE_LLVM >= 0x0300
-+   context_type = LLVMStructCreateNamed(gallivm->context, "context");
-+   LLVMStructSetBody(context_type, elem_types,
-+                     Elements(elem_types), 0);
-+#else
-       context_type = LLVMStructTypeInContext(lc, elem_types,
-                                              Elements(elem_types), 0);
- 
-       LLVMInvalidateStructLayout(gallivm->target, context_type);
- 
-+      LLVMAddTypeName(gallivm->module, "context", context_type);
-+#endif
-+
-       LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants,
-                              gallivm->target, context_type,
-                              LP_JIT_CTX_CONSTANTS);
-@@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-       LP_CHECK_STRUCT_SIZE(struct lp_jit_context,
-                            gallivm->target, context_type);
- 
--      LLVMAddTypeName(gallivm->module, "context", context_type);
--
-       lp->jit_context_ptr_type = LLVMPointerType(context_type, 0);
-    }
- 
diff --git a/multilib-testing/lib32-util-linux/PKGBUILD b/multilib-testing/lib32-util-linux/PKGBUILD
deleted file mode 100644
index aeb1cbc80..000000000
--- a/multilib-testing/lib32-util-linux/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 66417 2012-02-24 16:16:14Z dreisner $
-# Maintainer: judd <jvinet@zeroflux.org>
-
-_pkgbasename=util-linux
-pkgname=lib32-$_pkgbasename
-pkgver=2.21
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
-url='http://www.kernel.org/pub/linux/utils/util-linux/'
-arch=('x86_64')
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-provides=('lib32-util-linux-ng')
-conflicts=('lib32-util-linux-ng')
-replaces=('lib32-util-linux-ng')
-license=('GPL2')
-options=('!libtool' '!emptydirs')
-source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-$pkgver.tar.xz")
-md5sums=('208aa058f4117759d2939d1be7d662fc')
-
-shopt -s extglob
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./autogen.sh
-  ./configure --without-ncurses --libdir=/usr/lib32
-
-  for lib in lib{mount,blkid,uuid}; do
-    make -C "$lib"
-  done
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # remove everything but libs
-  rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32)
-}
diff --git a/multilib/lib32-glibc/glibc-2.10-bz4781.patch b/multilib/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/multilib/lib32-gnutls/buildfix.diff b/multilib/lib32-gnutls/buildfix.diff
deleted file mode 100644
index 23c749e9d..000000000
--- a/multilib/lib32-gnutls/buildfix.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-index 17f6d3f..cc01dcd 100644 (file)
-
-
---- a/tests/mini-loss-time.c
-+++ b/tests/mini-loss-time.c
-@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
-     {
-       /* parent */
-       server (fd[0], server_packet);
-+      kill(child, SIGTERM);
-     }
-   else 
-     {
---- a/src/libopts/m4/libopts.m4
-+++ b/src/libopts/m4/libopts.m4
-@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
-     fi])
- 
-   AC_ARG_ENABLE([libopts-install],
--    AC_HELP_STRING([--disable-libopts-install],
--       [Do not install libopts with client installation]))
--  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
-+    AC_HELP_STRING([--enable-libopts-install],
-+       [Install libopts with client installation]))
-+  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
- 
-   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
-      AC_MSG_CHECKING([whether autoopts-config can be found])
diff --git a/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch b/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch
deleted file mode 100644
index f1ffdd4d1..000000000
--- a/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
-index f46cad3..102fbaa 100644
---- a/src/kdc/Makefile.in
-+++ b/src/kdc/Makefile.in
-@@ -67,6 +67,7 @@ check-unix:: rtest
-
- check-pytests::
-	$(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
-+	$(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
-
- install::
-	$(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index c169c54..840a2ef 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -243,7 +243,8 @@ tgt_again:
-                     if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
-                         errcode = find_alternate_tgs(request, &server);
-                         firstpass = 0;
--                        goto tgt_again;
-+                        if (errcode == 0)
-+                            goto tgt_again;
-                     }
-                 }
-                 status = "UNKNOWN_SERVER";
-diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py
-new file mode 100644
-index 0000000..1760bcd
---- /dev/null
-+++ b/src/kdc/t_emptytgt.py
-@@ -0,0 +1,8 @@
-+#!/usr/bin/python
-+from k5test import *
-+
-+realm = K5Realm(start_kadmind=False, create_host=False)
-+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
-+if 'not found in Kerberos database' not in output:
-+    fail('TGT lookup for empty realm failed in unexpected way')
-+success('Empty tgt lookup.')
diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD
deleted file mode 100644
index 3cb3e08fc..000000000
--- a/staging/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151576 2012-02-27 18:21:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.7.0
-pkgrel=2
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('804309dca70ede35b4a654ab764e9079')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/alex/PKGBUILD b/staging/alex/PKGBUILD
deleted file mode 100644
index cc609e757..000000000
--- a/staging/alex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151489 2012-02-26 17:23:04Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Philip Nilsson <pnilsson@nullref.se>
-
-pkgname=alex
-pkgver=3.0.1
-pkgrel=1
-pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/alex/'
-license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('5dec239c89165d159faa2154bc0724cd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
-  runghc Setup.lhs build
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs copy --destdir=$pkgdir
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
-
-  # doc/ contains only license which already installed into proper place
-  rm -rf $pkgdir/usr/share/doc
-}
diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD
deleted file mode 100644
index b7a8d537e..000000000
--- a/staging/avogadro/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 151591 2012-02-27 18:55:34Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.0.3
-pkgrel=5
-pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
-url="http://avogadro.openmolecules.net/wiki/Main_Page"
-license=('GPL2')
-depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost')
-install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch'
-        'fix-opengl-headers.patch')
-md5sums=('92c2702c1980f70fb6d87a1a58147911'
-         'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec'
-         'f420bfd22e3d5d8fcddc625cf5e711f6')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
-  patch -p1 -i "${srcdir}"/fix-boost.patch
-  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/avogadro/avogadro.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch
deleted file mode 100644
index 8fb53ef12..000000000
--- a/staging/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
-+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
-@@ -149,7 +149,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
-+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
-@@ -11,7 +11,7 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
---- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
-+++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
-@@ -18,7 +18,7 @@
-   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
-   # We should probably scan the header to verify the Q_OBJECT macro is used
-   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
--  qt4_wrap_cpp(moc_files ${hdr_list})
-+  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-   # Now sort out the ui and qrc files, process them as appropriate
-   set(ui_plugin_files)
-   set(qrc_plugin_files)
diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/staging/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
-+++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
-@@ -25,6 +25,8 @@
- #include "camera.h"
- #include "glwidget.h"
- #include <avogadro/molecule.h>
-+#include <Eigen/LU>
-+#include <GL/glu.h>
- 
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
-+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
-@@ -42,6 +42,7 @@
- #include <QColor>
- #include <QVarLengthArray>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
-+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
-@@ -70,6 +70,8 @@
- 
- #include <openbabel/mol.h>
- 
-+#include <GL/glu.h>
-+
- using namespace OpenBabel;
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
-+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
-@@ -36,6 +36,7 @@
- #include <QFile>
- #include <QDebug>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
-+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
-@@ -44,6 +44,8 @@
- #include <QComboBox>
- #include <QDebug>
- 
-+#include <GL/glu.h>
-+
- using namespace std;
- using namespace OpenBabel;
- using namespace Eigen;
diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
deleted file mode 100644
index 11f58a505..000000000
--- a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
-@@ -75,6 +75,42 @@
-   zmatrix.h
- )
- 
-+SET(libavogadro_MOC_HDRS
-+  animation.h
-+  atom.h
-+  bond.h
-+  color.h
-+  colorbutton.h
-+  colors/elementcolor.h
-+  cube.h
-+  elementdetail_p.h
-+  elementtranslator.h
-+  engine.h
-+  engines/bsdyengine.h
-+  extension.h
-+  fragment.h
-+  glwidget.h
-+  mesh.h
-+  molecule.h
-+  moleculefile.h
-+  moleculefile_p.h
-+  periodictablescene_p.h
-+  periodictableview.h
-+  plotwidget.h
-+  plugin.h
-+  pluginmanager.h
-+  primitive.h
-+  protein.h
-+  pythonengine_p.h
-+  pythonerror.h
-+  pythonextension_p.h
-+  pythontool_p.h
-+  residue.h
-+  tool.h
-+  toolgroup.h
-+  zmatrix.h
-+)
-+
- set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
- # Also add in the qtiocompressor class
- #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
-@@ -113,7 +148,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--qt4_automoc(${libavogadro_SRCS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
-@@ -149,7 +184,7 @@
-     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
- endforeach(headerFile ${libavogadro_HDRS})
- 
--add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
-+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
- target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
---- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
-@@ -224,5 +224,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "animation.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
---- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
-@@ -293,5 +293,3 @@
-    }
- 
-  } // End namespace Avogadro
--
--#include "atom.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
---- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
-@@ -166,5 +166,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "bond.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
---- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
-@@ -152,5 +152,3 @@
-     return "Generic Color";
-   }
- }
--
--#include "color.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
-@@ -94,5 +94,3 @@
-   }
- 
- } // end namespace
--
--#include "colorbutton.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
-@@ -63,7 +63,5 @@
- 
- }
- 
--#include "elementcolor.moc"
- //this is a static color plugin...
- //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
---- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
-@@ -322,5 +322,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "cube.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
-@@ -132,5 +132,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementdetail_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
-@@ -401,5 +401,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementtranslator.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
---- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
-@@ -377,5 +377,3 @@
-       return m_molecule->bonds();
-   }
- }
--
--#include "engine.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
-@@ -442,7 +442,5 @@
-   }
- 
- }
--
--#include "bsdyengine.moc"
- // This is a static engine...
- // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
---- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
-@@ -80,5 +80,3 @@
-   }
- 
- }
--
--#include "extension.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
---- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
-@@ -82,5 +82,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "fragment.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
-@@ -1966,5 +1966,3 @@
-     d->updateCache = true;
-   }
- }
--
--#include "glwidget.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
---- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
-@@ -231,5 +231,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "mesh.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
---- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
-@@ -1575,5 +1575,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "molecule.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
-@@ -22,23 +22,14 @@
-   02110-1301, USA.
-  **********************************************************************/
- 
--#include "moleculefile.h"
-+#include "moleculefile_p.h"
- 
- #include <avogadro/molecule.h>
- 
--#include <QFile>
- #include <QFileInfo>
--#include <QStringList>
--#include <QThread>
- #include <QDebug>
- #include <QPointer>
- 
--#include <openbabel/mol.h>
--#include <openbabel/obconversion.h>
--
--// Included in obconversion.h
--//#include <iostream>
--
- namespace Avogadro {
- 
-   using OpenBabel::OBConversion;
-@@ -578,164 +569,6 @@
-     return false;
-   }
- 
--  class ReadFileThread : public QThread
--  {
--    //    Q_OBJECT 
--
--    public:
--      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
--      {
--      }
--      
--      void addConformer(const OpenBabel::OBMol &conformer)
--      {
--        unsigned int numAtoms = conformer.NumAtoms();
--        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
--        for (unsigned int i = 0; i < numAtoms; ++i)
--          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
--        m_moleculeFile->m_conformers.push_back(coords);
--      }
--
--      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
--      {
--        if (!c) {
--          // this is the first molecule read
--          m_moleculeFile->setConformerFile(true);
--          addConformer(current);
--          return;
--        }
--
--        if (!m_moleculeFile->isConformerFile())
--          return;
--
--        // as long as we are not sure if this really is a 
--        // conformer/trajectory file, add the conformers
--        addConformer(current);
--
--        // performance: check only certain molecule 1-10,20,50
--        switch (c) {
--          case 1:
--          case 2:
--          case 3:
--          case 4:
--          case 5:
--          case 6:
--          case 7:
--          case 8:
--          case 9:
--          case 10:
--          case 20:
--          case 50:
--            break;
--          default:
--            return;
--        }
--
--        if (first.NumAtoms() != current.NumAtoms()) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--          return;
--        }
--
--        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
--          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
--          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
--          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
--            m_moleculeFile->setConformerFile(false);
--            m_moleculeFile->m_conformers.clear();
--            return;
--          }    
--        }
--      }
--
--      void run()
--      {
--        // Check that the file can be read from disk
--        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
--          // Cannot read the file
--          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
--                                         .arg(m_moleculeFile->m_fileName));
--          return;
--        }
-- 
--        // Construct the OpenBabel objects, set the file type
--        OpenBabel::OBConversion conv;
--        OpenBabel::OBFormat *inFormat;
--        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
--          // Input format not supported
--          m_moleculeFile->m_error.append(
--              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
--          return;
--        } else {
--          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
--          if (!inFormat || !conv.SetInFormat(inFormat)) {
--            // Input format not supported
--            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
--                                           .arg(m_moleculeFile->m_fileName));
--            return;
--          }
--        }
--
--        // set any options
--        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
--          foreach(const QString &option,
--              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
--            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
--          }
--        }
--
--        // Now attempt to read the molecule in
--        ifstream ifs;
--        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
--        if (!ifs) // Should not happen, already checked file could be opened
--          return;
--      
--        // read all molecules
--        OpenBabel::OBMol firstOBMol, currentOBMol;
--        unsigned int c = 0;
--        conv.SetInStream(&ifs);
--        m_moleculeFile->streamposRef().push_back(ifs.tellg());
--        while (ifs.good() && conv.Read(&currentOBMol)) {
--          if (!c)
--            firstOBMol = currentOBMol;
--
--          if (c > 20 && !m_moleculeFile->isConformerFile())
--            m_moleculeFile->setFirstReady(true);
--
--          // detect conformer/trajectory files
--          detectConformers(c, firstOBMol, currentOBMol);
--          // store information about molecule
--          m_moleculeFile->streamposRef().push_back(ifs.tellg());
--          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
--          // increment count
--          ++c;
--        }
--        m_moleculeFile->streamposRef().pop_back();
--
--        // signle molecule files are not conformer files
--        if (c == 1) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--        }
--
--        // check for empty titles
--        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
--          if (!m_moleculeFile->titlesRef()[i].isEmpty())
--            continue;
--
--          QString title;
--          if (m_moleculeFile->isConformerFile())
--            title = tr("Conformer %1").arg(i+1);
--          else
--            title = tr("Molecule %1").arg(i+1);
--        
--          m_moleculeFile->titlesRef()[i] = title;
--        }
--      }
--
--      MoleculeFile *m_moleculeFile;
--  }; // end ReadFileThread class
--
-   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
-       const QString &fileType, const QString &fileOptions, bool wait)
-   {
-@@ -794,6 +627,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "moleculefile.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
-@@ -0,0 +1,202 @@
-+/**********************************************************************
-+  MoleculeFile - Class representing molecule file.
-+
-+  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
-+
-+  This file is part of the Avogadro molecular editor project.
-+  For more information, see <http://avogadro.openmolecules.net/>
-+
-+  Avogadro is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 2 of the License, or
-+  (at your option) any later version.
-+
-+  Avogadro is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+  02110-1301, USA.
-+ **********************************************************************/
-+
-+#ifndef MOLECULEFILE_P_H
-+#define MOLECULEFILE_P_H
-+
-+#include "moleculefile.h"
-+
-+#include <openbabel/mol.h>
-+#include <openbabel/obconversion.h>
-+
-+#include <QFile>
-+#include <QStringList>
-+#include <QThread>
-+
-+namespace Avogadro {
-+
-+  using OpenBabel::OBConversion;
-+  using std::ifstream;
-+
-+class ReadFileThread : public QThread
-+{
-+      Q_OBJECT
-+
-+  public:
-+    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
-+    {
-+    }
-+
-+    void addConformer(const OpenBabel::OBMol &conformer)
-+    {
-+      unsigned int numAtoms = conformer.NumAtoms();
-+      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
-+      for (unsigned int i = 0; i < numAtoms; ++i)
-+        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
-+      m_moleculeFile->m_conformers.push_back(coords);
-+    }
-+
-+    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
-+    {
-+      if (!c) {
-+        // this is the first molecule read
-+        m_moleculeFile->setConformerFile(true);
-+        addConformer(current);
-+        return;
-+      }
-+
-+      if (!m_moleculeFile->isConformerFile())
-+        return;
-+
-+      // as long as we are not sure if this really is a
-+      // conformer/trajectory file, add the conformers
-+      addConformer(current);
-+
-+      // performance: check only certain molecule 1-10,20,50
-+      switch (c) {
-+        case 1:
-+        case 2:
-+        case 3:
-+        case 4:
-+        case 5:
-+        case 6:
-+        case 7:
-+        case 8:
-+        case 9:
-+        case 10:
-+        case 20:
-+        case 50:
-+          break;
-+        default:
-+          return;
-+      }
-+
-+      if (first.NumAtoms() != current.NumAtoms()) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+        return;
-+      }
-+
-+      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
-+        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
-+        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
-+        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
-+          m_moleculeFile->setConformerFile(false);
-+          m_moleculeFile->m_conformers.clear();
-+          return;
-+        }
-+      }
-+    }
-+
-+    void run()
-+    {
-+      // Check that the file can be read from disk
-+      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
-+        // Cannot read the file
-+        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
-+                                       .arg(m_moleculeFile->m_fileName));
-+        return;
-+      }
-+
-+      // Construct the OpenBabel objects, set the file type
-+      OpenBabel::OBConversion conv;
-+      OpenBabel::OBFormat *inFormat;
-+      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
-+        // Input format not supported
-+        m_moleculeFile->m_error.append(
-+            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
-+        return;
-+      } else {
-+        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
-+        if (!inFormat || !conv.SetInFormat(inFormat)) {
-+          // Input format not supported
-+          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
-+                                         .arg(m_moleculeFile->m_fileName));
-+          return;
-+        }
-+      }
-+
-+      // set any options
-+      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
-+        foreach(const QString &option,
-+            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
-+          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
-+        }
-+      }
-+
-+      // Now attempt to read the molecule in
-+      ifstream ifs;
-+      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
-+      if (!ifs) // Should not happen, already checked file could be opened
-+        return;
-+
-+      // read all molecules
-+      OpenBabel::OBMol firstOBMol, currentOBMol;
-+      unsigned int c = 0;
-+      conv.SetInStream(&ifs);
-+      m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+      while (ifs.good() && conv.Read(&currentOBMol)) {
-+        if (!c)
-+          firstOBMol = currentOBMol;
-+
-+        if (c > 20 && !m_moleculeFile->isConformerFile())
-+          m_moleculeFile->setFirstReady(true);
-+
-+        // detect conformer/trajectory files
-+        detectConformers(c, firstOBMol, currentOBMol);
-+        // store information about molecule
-+        m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
-+        // increment count
-+        ++c;
-+      }
-+      m_moleculeFile->streamposRef().pop_back();
-+
-+      // signle molecule files are not conformer files
-+      if (c == 1) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+      }
-+
-+      // check for empty titles
-+      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
-+        if (!m_moleculeFile->titlesRef()[i].isEmpty())
-+          continue;
-+
-+        QString title;
-+        if (m_moleculeFile->isConformerFile())
-+          title = tr("Conformer %1").arg(i+1);
-+        else
-+          title = tr("Molecule %1").arg(i+1);
-+
-+        m_moleculeFile->titlesRef()[i] = title;
-+      }
-+    }
-+
-+    MoleculeFile *m_moleculeFile;
-+};
-+
-+} // end namespace Avogadro
-+
-+#endif // MOLECULEFILE_P_H
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "periodictablescene_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -69,4 +69,3 @@
- 
- } // End namespace Avogadro
- 
--#include "periodictableview.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
-@@ -27,7 +27,6 @@
-  **********************************************************************/
- 
- #include "plotwidget.h"
--#include "plotwidget.moc"
- 
- #include <math.h>
- #include <QDebug>
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
---- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
-@@ -65,5 +65,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "plugin.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
-@@ -784,5 +784,3 @@
-   }
- 
- }
--
--#include "pluginmanager.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
---- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
-@@ -77,5 +77,3 @@
-   }
- 
- }
--
--#include "primitive.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
---- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
-@@ -978,5 +978,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "protein.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
-@@ -11,9 +11,9 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--qt4_automoc(moleculelist.cpp)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
- 
--ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
-+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
- SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
- if (WIN32)
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
-@@ -70,4 +70,3 @@
- 
- }
- 
--#include "moleculelist.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
-@@ -289,5 +289,3 @@
- 
- 
- }
--
--#include "pythonengine_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
-@@ -112,4 +112,3 @@
- 
- } // namespace
- 
--#include "pythonerror.moc"
-
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
-@@ -340,5 +340,3 @@
-   }
- 
- }
--
--#include "pythonextension_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
-@@ -344,5 +344,3 @@
-   }
- 
- }
--
--#include "pythontool_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
---- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
-@@ -160,6 +160,3 @@
-   }
- 
- } // End namespace Avogadro
--
-- #include "residue.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
---- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
-@@ -117,5 +117,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "tool.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
-@@ -206,5 +206,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "toolgroup.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
-@@ -149,5 +149,3 @@
- 
- 
- } // End namespace Avogadro
--
--#include "zmatrix.moc"
diff --git a/staging/bluez/PKGBUILD b/staging/bluez/PKGBUILD
deleted file mode 100644
index 277b5413d..000000000
--- a/staging/bluez/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 154962 2012-03-31 22:36:54Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgname=bluez
-pkgver=4.99
-pkgrel=2
-pkgdesc="Libraries and tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('dbus-core' 'python2' 'udev')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
-optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
-            "alsa-lib: Audio bluetooth devices support"
-            "dbus-python: to run bluez-simple-agent"
-            "pygobject: to run bluez-simple-agent"
-            "libusb-compat: USB adapters support"
-            "cups: CUPS backend")
-conflicts=('bluez-libs' 'bluez-utils')
-provides=('bluez-libs' 'bluez-utils')
-replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool')
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
-        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d'
-	'rc.bluetooth')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/lib \
-    --enable-gstreamer \
-    --enable-alsa \
-    --enable-usb \
-    --enable-tools \
-    --enable-bccmd \
-    --enable-dfutool \
-    --enable-hid2hci \
-    --enable-hidd \
-    --enable-pand \
-    --enable-dund \
-    --enable-cups \
-    --enable-wiimote \
-    --disable-test
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
-  
-  install -d ${pkgdir}/etc/bluetooth
-  install -m644 network/network.conf \
-                input/input.conf \
-                audio/audio.conf \
-                serial/serial.conf \
-    ${pkgdir}/etc/bluetooth/
-  
-  install -Dm644 ${srcdir}/bluetooth.conf.d \
-    ${pkgdir}/etc/conf.d/bluetooth
-
-  # FS#27630
-  install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
-  install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
-  install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
-  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
-    "${pkgdir}"/usr/bin/bluez-simple-agent \
-    "${pkgdir}"/usr/bin/bluez-test-device \
-    "${pkgdir}"/usr/bin/bluez-test-input
-
-  # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
-  rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules
-}
-md5sums=('2387053eb5a7b02f37df4871df022a02'
-         '7412982b440f29fa7f76a41a87fef985'
-         '8f9498707f809506928b2e480d3b6789')
diff --git a/staging/bluez/bluetooth.conf.d b/staging/bluez/bluetooth.conf.d
deleted file mode 100644
index 1c1e02589..000000000
--- a/staging/bluez/bluetooth.conf.d
+++ /dev/null
@@ -1,30 +0,0 @@
-# Bluetooth configuraton file
-
-# Bluetooth services (allowed values are "true" and "false")
-
-# Run the bluetoothd daemon (default: true)
-#DAEMON_ENABLE="false"
-
-# Run the sdp daemon (default: false)
-# If this is disabled, hcid's internal sdp daemon will be used
-#SDPD_ENABLE="true"
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-#PAND_ENABLE="true"
-
-# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
-#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Options for hidd, dund and pand (default: none)
-HIDD_OPTIONS="--server"
-#DUND_OPTIONS=""
-#PAND_OPTIONS=""
diff --git a/staging/bluez/rc.bluetooth b/staging/bluez/rc.bluetooth
deleted file mode 100644
index a46ee2abb..000000000
--- a/staging/bluez/rc.bluetooth
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="bluetoothd"
-HIDD_NAME="hidd"
-RFCOMM_NAME="rfcomm"
-PAND_NAME="pand"
-DUND_NAME="dund"
-
-DAEMON_EXEC="/usr/sbin/bluetoothd"
-HIDD_EXEC="/usr/bin/hidd"
-RFCOMM_EXEC="/usr/bin/rfcomm"
-PAND_EXEC="/usr/bin/pand"
-DUND_EXEC="/usr/bin/dund"
-
-DAEMON_ENABLE="true"
-HIDD_ENABLE="false"
-RFCOMM_ENABLE="false"
-DUND_ENABLE="false"
-PAND_ENABLE="false"
-
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-HIDD_OPTIONS=""
-DUND_OPTIONS=""
-PAND_OPTIONS=""
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-case "$1" in
-  start)
-    stat_busy "Starting bluetooth subsystem:"
-    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
-      stat_append " $DAEMON_NAME"
-      $DAEMON_EXEC
-      sleep 1
-    fi
-    if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then
-      stat_append " $SDPD_NAME"
-      $SDPD_EXEC
-    fi
-    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
-      stat_append " $HIDD_NAME"
-      $HIDD_EXEC $HIDD_OPTIONS
-    fi
-    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
-    fi
-    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
-      stat_append " $DUND_NAME"
-      $DUND_EXEC $DUND_OPTIONS
-    fi
-    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
-      stat_append " $PAND_NAME"
-      $PAND_EXEC $PAND_OPTIONS
-    fi
-    add_daemon bluetooth
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping bluetooth subsystem:"
-
-    stat_append " $PAND_NAME"
-    killall $PAND_NAME >/dev/null 2>&1
-
-    stat_append " $DUND_NAME"
-    killall $DUND_NAME >/dev/null 2>&1
-
-    if [ -x "$RFCOMM_EXEC" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC release all >/dev/null 2>&1
-    fi
-
-    stat_append " $HIDD_NAME"
-    killall $HIDD_NAME >/dev/null 2>&1
-
-    stat_append " $SDPD_NAME"
-    killall $SDPD_NAME >/dev/null 2>&1
-
-    stat_append " $DAEMON_NAME"
-    killall $DAEMON_NAME >/dev/null 2>&1
-
-    rm_daemon bluetooth
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD
deleted file mode 100644
index 1faaf1fda..000000000
--- a/staging/ekiga/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 151595 2012-02-27 19:12:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.3.2
-pkgrel=3
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install
deleted file mode 100644
index b1d76a4a3..000000000
--- a/staging/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/ghc/PKGBUILD b/staging/ghc/PKGBUILD
deleted file mode 100644
index 3e46660ea..000000000
--- a/staging/ghc/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 151083 2012-02-24 18:59:29Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Special note for devs looking to upgrade this package:
-#   ghc places a unique hash for each library when it is built.
-#   Libraries depend on versions specified by those hashes.
-#   This implies that all libraries need to be rebuilt when ghc is rebuilt.
-#   Also, due to dependency loop problems, haskell-ghc-paths and haddock
-#   do not carry version dependencies. You will have to remember to build them too.
-
-pkgname=ghc
-pkgver=7.4.1
-pkgrel=2
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-depends=('perl' 'gmp>=5.0' 'gcc' 'libffi')
-makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
-checkdepends=('python2')
-install='ghc.install'
-groups=('haskell')
-provides=('haskell-array=0.4.0.0'
-          'haskell-base=4.5.0.0'
-          'haskell-binary=0.5.1.0'
-          'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.9.2.1'
-          'haskell-containers=0.4.2.1'
-          'haskell-deepseq=1.3.0.0'
-          'haskell-directory=1.1.0.2'
-          'haskell-extensible-exceptions=0.1.1.4'
-          'haskell-filepath=1.3.0.0'
-          'haskell-ghc-prim=0.2.0.0'
-          'haskell-haskell2010=1.1.0.1'
-          'haskell-haskell98=2.0.0.1'
-          'haskell-hoopl=3.8.7.3'
-          'haskell-hpc=0.5.1.1'
-          'haskell-integer-gmp=0.4.0.0'
-          'haskell-old-locale=1.0.0.4'
-          'haskell-old-time=1.1.0.0'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.1'
-          'haskell-template-haskell=2.7.0.0'
-          'haskell-time=1.4'
-          'haskell-unix=2.5.1.0'
-          'haskell-cabal=1.14.0'
-         )
-replaces=('haskell-array<0.4.0.0'
-          'haskell-base<4.5.0.0'
-          'haskell-binary<0.5.1.0'
-          'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.9.2.1'
-          'haskell-containers<0.4.2.1'
-          'haskell-deepseq<1.3.0.0'
-          'haskell-directory<1.1.0.2'
-          'haskell-extensible-exceptions<0.1.1.4'
-          'haskell-filepath<1.3.0.0'
-          'haskell-ghc-prim<0.2.0.0'
-          'haskell-haskell2010<1.1.0.1'
-          'haskell-haskell98<2.0.0.1'
-          'haskell-hoopl<3.8.7.3'
-          'haskell-hpc<0.5.1.1'
-          'haskell-integer-gmp<0.4.0.0'
-          'haskell-old-locale<1.0.0.4'
-          'haskell-old-time<1.1.0.0'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.1'
-          'haskell-template-haskell<2.7.0.0'
-          'haskell-time<1.4'
-          'haskell-unix<2.5.1.0'
-          'haskell-cabal<1.14.0'
-         )
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('5d86c420978b49cc60edea9bd4c36703'
-         '54bc9405c14c3226b6e3de3cd61e2777'
-         '82b67cdd24a2e434a4399f30f14b21a3')
-
-build() {
-  cd ghc-${pkgver}
-
-  cp ${srcdir}/build.mk mk/build.mk
-
-  ./configure \
-    --prefix=/usr
-
-  make -j4 -l8
-}
-
-check() {
-  cd ghc-${pkgver}
-
-  # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
-  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
-
-  # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
-  make THREADS=9 test
-  # might be some failures
-  #make fulltest
-}
-
-package() {
-  cd ghc-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/ghc
-  install -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/ghc
-}
diff --git a/staging/ghc/build.mk b/staging/ghc/build.mk
deleted file mode 100644
index bc26a21fe..000000000
--- a/staging/ghc/build.mk
+++ /dev/null
@@ -1,175 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# overall build type, and then tweak the options in the relevant section
-# below.
-
-# Uncomment one of these to select a build profile below:
-
-# Full build with max optimisation and everything enabled (very slow build)
-BuildFlavour = perf
-
-# Fast build with optimised libraries, no profiling (RECOMMENDED):
-#BuildFlavour = quick
-
-# Even faster build.  NOT RECOMMENDED: the libraries will be
-# completely unoptimised, so any code built with this compiler
-# (including stage2) will run very slowly:
-#BuildFlavour = quickest
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-# An unregisterised, optimised build of ghc, for porting:
-#BuildFlavour = unreg
-
-GhcLibWays = v
-
-# -------- 1. A Performance/Distribution build--------------------------------
-
-ifeq "$(BuildFlavour)" "perf"
-
-# perf matches the default settings, repeated here for comparison:
-
-SRC_HC_OPTS     = -O -H64m
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O2 -fasm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# -------- A Fast build ------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O0 -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- A Fast build with optimised libs ----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- Profile the stage2 compiler ---------------------------------------
-
-ifeq "$(BuildFlavour)" "prof"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O -fasm
-GhcLibHcOpts       = -O -fasm
-
-GhcLibWays         += p
-GhcProfiled        = YES
-
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-
-# -------- A Development build (stage 1) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts    = -Rghc-timing -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
-
-endif
-
-# -------- A Development build (stage 2) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O -fasm
-GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
-
-# After stage 1 and the libraries have been built, you can uncomment this line:
-
-# stage=2
-
-# Then stage 1 will not be touched by the build system, until
-# you comment the line again.  This is a useful trick for when you're
-# working on stage 2 and want to freeze stage 1 and the libraries for
-# a while.
-
-endif
-
-# -------- A Unregisterised build) -------------------------------------------
-
-ifeq "$(BuildFlavour)" "unreg"
-
-GhcUnregisterised    = YES
-GhcWithNativeCodeGen = NO
-
-SRC_HC_OPTS          = -O -H64m
-GhcStage1HcOpts      = -O
-GhcStage2HcOpts      = -O2
-GhcHcOpts            = -Rghc-timing
-GhcLibHcOpts         = -O2
-SplitObjs            = NO
-HADDOCK_DOCS         = NO
-BUILD_DOCBOOK_HTML   = NO
-BUILD_DOCBOOK_PS     = NO
-BUILD_DOCBOOK_PDF    = NO
-
-endif
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# NoFib settings
-NoFibWays =
-STRIP_CMD = :
diff --git a/staging/ghc/ghc.install b/staging/ghc/ghc.install
deleted file mode 100644
index c0200e4a6..000000000
--- a/staging/ghc/ghc.install
+++ /dev/null
@@ -1,10 +0,0 @@
-pre_upgrade() {
-  echo '==> Unregistering cabalized packages...'
-  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
-  echo '==> Done.'
-}
-
-post_upgrade() {
-  echo '==> All cabalized packages need to be reinstalled now.'
-  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
-}
diff --git a/staging/ghc/print-provides-replaces.sh b/staging/ghc/print-provides-replaces.sh
deleted file mode 100755
index 33d1da051..000000000
--- a/staging/ghc/print-provides-replaces.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. PKGBUILD
-
-if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
-  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
-  exit 1
-fi
-
-declare -A exclude
-# no Win32 cause we're not building on windows
-exclude['Win32']=1
-# no integer-simple because we use integer-gmp
-exclude['integer-simple']=1
-# extract excluded libraries from ghc.mk
-for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
-  exclude[${exclude_pkg}]=1
-done
-
-cd src/ghc-${pkgver}/libraries
-
-# $1 is the name of the variable
-# $2 is the string for the test, either '=' or '<'
-print_var() {
-  printf "$1=("
-  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
-    [[ ${exclude[${pkg}]} ]] && continue
-    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
-  done
-  # also add cabal
-  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
-  echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces' '<'
diff --git a/staging/gpsd/PKGBUILD b/staging/gpsd/PKGBUILD
deleted file mode 100644
index 99b468286..000000000
--- a/staging/gpsd/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 154959 2012-03-31 22:33:52Z tomegun $
-# 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=2
-pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
-url="http://catb.org/gpsd/"
-license=('BSD')
-depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
-optdepends=('php: generate a PHP status page for your GPS'
-            'php-gd: image support for the PHP status page'
-            'pygtk: GUI frontends')
-makedepends=('scons' 'docbook-xsl' 'chrpath')
-backup=('etc/conf.d/gpsd')
-options=('!libtool')
-install="${pkgname}.install"
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd' 'gpsd.conf.d')
-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}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
-
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
-  install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
-
-  # GPSD needs RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
-
-  install -D -m644 packaging/X11/xgps.desktop \
-    "${pkgdir}/usr/share/applications/xgps.desktop"
-  install -D -m644 packaging/X11/xgpsspeed.desktop \
-    "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
-  install -D -m644 packaging/X11/gpsd-logo.png \
-    "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
-
-  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/gpsd/gpsd b/staging/gpsd/gpsd
deleted file mode 100755
index b510a7542..000000000
--- a/staging/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/staging/gpsd/gpsd.conf.d b/staging/gpsd/gpsd.conf.d
deleted file mode 100644
index 9fef72cb9..000000000
--- a/staging/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/staging/gpsd/gpsd.install b/staging/gpsd/gpsd.install
deleted file mode 100644
index ee661fcb1..000000000
--- a/staging/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/staging/gstreamer0.10-ugly/PKGBUILD b/staging/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index 4d4b718e1..000000000
--- a/staging/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 150671 2012-02-20 00:31:40Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.18
-pkgrel=6
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('04a7009a4efea2844075949c111f5e4d')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gvfs/PKGBUILD b/staging/gvfs/PKGBUILD
deleted file mode 100644
index 9abf4e950..000000000
--- a/staging/gvfs/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 150673 2012-02-20 00:41:16Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.10.1
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/etc/bash_completion.d
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf')
-  optdepends=('gvfs-afc: AFC (mobile devices) support'
-              'gvfs-smb: SMB/CIFS (Windows client) support'
-              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support'
-              'gvfs-afp: Apple Filing Protocol (AFP) support')
-  install=gvfs.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^am__append_3/#am__append_3/' \
-      -e 's/^am__append_4/#am__append_4/' \
-      -i monitor/Makefile
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
-  install=gvfs-smb.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=${pkgver}")
-  install=gvfs-module.install
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
-}
diff --git a/staging/gvfs/gvfs-module.install b/staging/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/staging/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/staging/gvfs/gvfs-smb.install b/staging/gvfs/gvfs-smb.install
deleted file mode 100644
index 0b8783c7b..000000000
--- a/staging/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/staging/gvfs/gvfs.install b/staging/gvfs/gvfs.install
deleted file mode 100644
index 9458b1513..000000000
--- a/staging/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/staging/happy/PKGBUILD b/staging/happy/PKGBUILD
deleted file mode 100644
index c84247e5a..000000000
--- a/staging/happy/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 151112 2012-02-24 23:20:45Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
- 
-pkgname=happy
-pkgver=1.18.9
-pkgrel=4
-pkgdesc="The Parser Generator for Haskell"
-url="http://www.haskell.org/happy/"
-arch=('i686' 'x86_64')
-license=("custom:BSD3")
-depends=('gmp')
-makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('aeb565fe572f979f15a24db0df2de37d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  runhaskell Setup.lhs configure -O --prefix=/usr
-  runhaskell Setup.lhs build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  runhaskell Setup.lhs copy --destdir="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/haskell-html/PKGBUILD b/staging/haskell-html/PKGBUILD
deleted file mode 100644
index 44a3ea50b..000000000
--- a/staging/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=10
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-html/haskell-html.install b/staging/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/staging/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-http/PKGBUILD b/staging/haskell-http/PKGBUILD
deleted file mode 100644
index 79de205cc..000000000
--- a/staging/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.2
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('b61ff88ef8d699f73a6ed27c6abf6600')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-http/haskell-http.install b/staging/haskell-http/haskell-http.install
deleted file mode 100644
index fdebb1cb8..000000000
--- a/staging/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-http
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-mtl/PKGBUILD b/staging/haskell-mtl/PKGBUILD
deleted file mode 100644
index 315d81a73..000000000
--- a/staging/haskell-mtl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=mtl
-pkgname=haskell-mtl
-pkgver=2.0.1.0
-pkgrel=4
-pkgdesc="Monad transformer library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('934fa813625ef7e88a6a96a09815ff95')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-mtl/haskell-mtl.install b/staging/haskell-mtl/haskell-mtl.install
deleted file mode 100644
index 9325811e8..000000000
--- a/staging/haskell-mtl/haskell-mtl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mtl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-network/PKGBUILD b/staging/haskell-network/PKGBUILD
deleted file mode 100644
index 59dc9334b..000000000
--- a/staging/haskell-network/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=network
-pkgname=haskell-network
-pkgver=2.3.0.11
-pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('cfe4922ac85685be9f86d4d34654f481')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-network/haskell-network.install b/staging/haskell-network/haskell-network.install
deleted file mode 100644
index a56c31d0a..000000000
--- a/staging/haskell-network/haskell-network.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-parsec/PKGBUILD b/staging/haskell-parsec/PKGBUILD
deleted file mode 100644
index e4f7da1e6..000000000
--- a/staging/haskell-parsec/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-
-_hkgname=parsec
-pkgname=haskell-parsec
-pkgver=3.1.2
-pkgrel=1
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('c2a75dfd247ae4839e2602b62dc87487')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-parsec/haskell-parsec.install b/staging/haskell-parsec/haskell-parsec.install
deleted file mode 100644
index dfa0701b9..000000000
--- a/staging/haskell-parsec/haskell-parsec.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-quickcheck/PKGBUILD b/staging/haskell-quickcheck/PKGBUILD
deleted file mode 100644
index 7b27cfb0c..000000000
--- a/staging/haskell-quickcheck/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=QuickCheck
-pkgname=haskell-quickcheck
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Automatic testing of Haskell programs"
-url="http://hackage.haskell.org/package/QuickCheck"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-quickcheck/haskell-quickcheck.install b/staging/haskell-quickcheck/haskell-quickcheck.install
deleted file mode 100644
index c9e12fadc..000000000
--- a/staging/haskell-quickcheck/haskell-quickcheck.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-quickcheck
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-random/PKGBUILD b/staging/haskell-random/PKGBUILD
deleted file mode 100644
index 3b929c3d6..000000000
--- a/staging/haskell-random/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=random
-pkgname=haskell-random
-pkgver=1.0.1.1
-pkgrel=1
-pkgdesc="A basic random number generation library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/staging/haskell-random/haskell-random.install b/staging/haskell-random/haskell-random.install
deleted file mode 100644
index b6d807e1a..000000000
--- a/staging/haskell-random/haskell-random.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-regex-base/PKGBUILD b/staging/haskell-regex-base/PKGBUILD
deleted file mode 100644
index 3b8ecb4bb..000000000
--- a/staging/haskell-regex-base/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-base
-pkgname=haskell-regex-base
-pkgver=0.93.2
-pkgrel=5
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-regex-base/haskell-regex-base.install b/staging/haskell-regex-base/haskell-regex-base.install
deleted file mode 100644
index 3ad2fea28..000000000
--- a/staging/haskell-regex-base/haskell-regex-base.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-base
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-regex-compat/PKGBUILD b/staging/haskell-regex-compat/PKGBUILD
deleted file mode 100644
index c880ff4f2..000000000
--- a/staging/haskell-regex-compat/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-compat
-pkgname=haskell-regex-compat
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d0573ab4e2f3de5faa61380b67333320')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-regex-compat/haskell-regex-compat.install b/staging/haskell-regex-compat/haskell-regex-compat.install
deleted file mode 100644
index 898c0bba1..000000000
--- a/staging/haskell-regex-compat/haskell-regex-compat.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-regex-posix/PKGBUILD b/staging/haskell-regex-posix/PKGBUILD
deleted file mode 100644
index 1bed15490..000000000
--- a/staging/haskell-regex-posix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-posix
-pkgname=haskell-regex-posix
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="The posix regex backend for regex-base"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-regex-posix/haskell-regex-posix.install b/staging/haskell-regex-posix/haskell-regex-posix.install
deleted file mode 100644
index 2b89fae7b..000000000
--- a/staging/haskell-regex-posix/haskell-regex-posix.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-posix
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-text/PKGBUILD b/staging/haskell-text/PKGBUILD
deleted file mode 100644
index c4c9664f7..000000000
--- a/staging/haskell-text/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=text
-pkgname=haskell-text
-pkgver=0.11.1.13
-pkgrel=1
-pkgdesc="An efficient packed Unicode text type."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/staging/haskell-text/haskell-text.install b/staging/haskell-text/haskell-text.install
deleted file mode 100644
index 620db3921..000000000
--- a/staging/haskell-text/haskell-text.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-text
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-transformers/PKGBUILD b/staging/haskell-transformers/PKGBUILD
deleted file mode 100644
index 8d4df2800..000000000
--- a/staging/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 151092 2012-02-24 20:41:57Z tdziedzic $
-
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Rémy Oudompheng <remy@archlinux.org>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.2.2.0
-pkgrel=4
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=${pkgname}.install
-md5sums=('3470ac66116900cd1ba84d3744474e49')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-transformers/haskell-transformers.install b/staging/haskell-transformers/haskell-transformers.install
deleted file mode 100644
index eec2af6e1..000000000
--- a/staging/haskell-transformers/haskell-transformers.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-xhtml/PKGBUILD b/staging/haskell-xhtml/PKGBUILD
deleted file mode 100644
index 4ec98da52..000000000
--- a/staging/haskell-xhtml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=xhtml
-pkgname=haskell-xhtml
-pkgver=3000.2.0.5
-pkgrel=1
-pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
-url="http://hackage.haskell.org/package/xhtml"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('d51e20de416b825aba6b874a221acfc4')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-xhtml/haskell-xhtml.install b/staging/haskell-xhtml/haskell-xhtml.install
deleted file mode 100644
index d03b8a053..000000000
--- a/staging/haskell-xhtml/haskell-xhtml.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-xhtml
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-zlib/PKGBUILD b/staging/haskell-zlib/PKGBUILD
deleted file mode 100644
index d47562b9d..000000000
--- a/staging/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=3
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'zlib' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-zlib/haskell-zlib.install b/staging/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index d387b7b65..000000000
--- a/staging/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD
deleted file mode 100644
index dd0ed5d08..000000000
--- a/staging/hugin/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 151705 2012-03-01 06:42:10Z pierre $
-# 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=2
-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/staging/hugin/hugin.install b/staging/hugin/hugin.install
deleted file mode 100644
index 362749233..000000000
--- a/staging/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/staging/kdeutils-printer-applet/PKGBUILD b/staging/kdeutils-printer-applet/PKGBUILD
deleted file mode 100644
index 45cf9cbcc..000000000
--- a/staging/kdeutils-printer-applet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 152113 2012-03-04 15:07:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-printer-applet
-pkgver=4.8.1
-pkgrel=1
-pkgdesc='System tray icon for managing print jobs'
-url='http://kde.org/applications/system/printerapplet/'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/printer-applet-${pkgver}.tar.xz")
-sha1sums=('c3002fea0382386256c3acaebd907a41db0ccc4e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../printer-applet-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-}
diff --git a/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
deleted file mode 100644
index bf2c3501f..000000000
--- a/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sat, 3 Mar 2012 12:37:06 +0100
-Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d}
-
-This allows rootprefix to be set to /usr, even if not all other packages
-have been fixed to read from this dir.
----
- libkmod/libkmod.c   |    5 +++--
- tools/kmod-depmod.c |    1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 36ca629..12c1112 100644
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -62,6 +62,7 @@ static const char *default_config_paths[] = {
- 	SYSCONFDIR "/modprobe.d",
- 	"/run/modprobe.d",
- 	ROOTPREFIX "/lib/modprobe.d",
-+	"/lib/modprobe.d",
- 	NULL
- };
- 
-@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname)
-  * @config_paths: ordered array of paths (directories or files) where
-  *                to load from user-defined configuration parameters such as
-  *                alias, blacklists, commands (install, remove). If
-- *                NULL defaults to /run/modprobe.d, /etc/modprobe.d and
-- *                $rootprefix/lib/modprobe.d. Give an empty vector if
-+ *                NULL defaults to /run/modprobe.d, /etc/modprobe.d,
-+ *                $rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an empty vector if
-  *                configuration should not be read. This array must be null
-  *                terminated.
-  *
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 1871e18..7bb1c5d 100644
---- a/tools/kmod-depmod.c
-+++ b/tools/kmod-depmod.c
-@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = {
- 	"/run/depmod.d",
- 	SYSCONFDIR "/depmod.d",
- 	ROOTPREFIX "/lib/depmod.d",
-+	"/lib/depmod.d",
- 	NULL
- };
- 
--- 
-1.7.9.5
-
diff --git a/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
deleted file mode 100644
index f39f36ace..000000000
--- a/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sat, 31 Mar 2012 12:17:39 +0200
-Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules
-
-This means that we can move the configuration paths from /lib
-to /usr/lib without having to touch the kernel and related
-packages.
-
-That can be dealt with separately at a later location, in which case
-all we have to do is revert this patch.
-
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- libkmod/libkmod.c     |    2 +-
- tools/kmod-depmod.c   |    2 +-
- tools/kmod-modinfo.c  |    4 ++--
- tools/kmod-modprobe.c |    4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 12c1112..11edfa0 100644
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -196,7 +196,7 @@ static int log_priority(const char *priority)
- 	return 0;
- }
- 
--static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules";
-+static const char *dirname_default_prefix = "/lib/modules";
- 
- static char *get_kernel_release(const char *dirname)
- {
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 7bb1c5d..454d538 100644
---- a/tools/kmod-depmod.c
-+++ b/tools/kmod-depmod.c
-@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[])
- 	}
- 
- 	cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
--				  "%s" ROOTPREFIX "/lib/modules/%s",
-+				  "%s/lib/modules/%s",
- 				  root == NULL ? "" : root, cfg.kversion);
- 
- 	if (optind == argc)
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index aa5223f..b13cd4b 100644
---- a/tools/kmod-modinfo.c
-+++ b/tools/kmod-modinfo.c
-@@ -339,7 +339,7 @@ static void help(const char *progname)
- 		"\t-0, --null                  Use \\0 instead of \\n\n"
- 		"\t-F, --field=FIELD           Print only provided FIELD\n"
- 		"\t-k, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
--		"\t-b, --basedir=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+		"\t-b, --basedir=DIR           Use DIR as filesystem root for /lib/modules\n"
- 		"\t-V, --version               Show version\n"
- 		"\t-h, --help                  Show this help\n",
- 		progname);
-@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[])
- 			}
- 			kversion = u.release;
- 		}
--		snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s",
-+		snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s",
- 			 root, kversion);
- 		dirname = dirname_buf;
- 	}
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 4760682..ccb41d8 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -128,7 +128,7 @@ static void help(const char *progname)
- 		"\t-n, --show                  Same as --dry-run\n"
- 
- 		"\t-C, --config=FILE           Use FILE instead of default search paths\n"
--		"\t-d, --dirname=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+		"\t-d, --dirname=DIR           Use DIR as filesystem root for /lib/modules\n"
- 		"\t-S, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
- 
- 		"\t-s, --syslog                print to syslog, not stderr\n"
-@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv)
- 			kversion = u.release;
- 		}
- 		snprintf(dirname_buf, sizeof(dirname_buf),
--				"%s" ROOTPREFIX "/lib/modules/%s", root,
-+				"%s/lib/modules/%s", root,
- 				kversion);
- 		dirname = dirname_buf;
- 	}
--- 
-1.7.9.5
-
diff --git a/staging/kmod/PKGBUILD b/staging/kmod/PKGBUILD
deleted file mode 100644
index d06c84008..000000000
--- a/staging/kmod/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 154955 2012-03-31 21:06:52Z tomegun $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=7
-pkgrel=2
-pkgdesc="Linux kernel module handling"
-arch=('i686' 'x86_64')
-url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
-license=('GPL2')
-depends=('glibc' 'zlib')
-options=('!libtool')
-provides=('module-init-tools=3.16')
-conflicts=('module-init-tools')
-replaces=('module-init-tools')
-source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
-        "depmod-search.conf"
-        "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
-        "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
-md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb'
-         'dd62cbf62bd8f212f51ef8c43bec9a77'
-         'ba73b9e98db1abbf41274f922fcfbd55'
-         'c9af56636c5667cf4ce3a31ea56e03d9')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch
-  patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
-
-  ./configure \
-    --sysconfdir=/etc \
-    --with-zlib \
-    --with-rootprefix=/usr
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  # extra directories
-  install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin"
-
-  # add symlinks to kmod
-  ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
-  ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
-
-  for tool in {ins,ls,rm}mod modinfo; do
-    ln -s kmod "$pkgdir/usr/bin/$tool"
-  done
-
-  # install depmod.d file for search/ dir
-  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/staging/kmod/depmod-search.conf b/staging/kmod/depmod-search.conf
deleted file mode 100644
index 36f2cf7db..000000000
--- a/staging/kmod/depmod-search.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /usr/lib/depmod.d/search.conf
-#
-
-search updates extramodules built-in
diff --git a/staging/libcdio/PKGBUILD b/staging/libcdio/PKGBUILD
deleted file mode 100644
index 350deb487..000000000
--- a/staging/libcdio/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 150473 2012-02-18 01:35:00Z allan $
-# Maintainer:
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=libcdio
-pkgver=0.83
-pkgrel=1
-pkgdesc="GNU Compact Disc Input and Control Library"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/libcdio/"
-depends=('libcddb' 'ncurses')
-options=('!libtool')
-install=libcdio.install
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
-        libcdio-0.83-linking.patch)
-md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb'
-         'a7864a4b572a1e2a28cc0a05aa4a67d3'
-         '5a7f50209c03d5919d5b932f07871af7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
-  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  
-  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
-    $pkgdir/usr/include/cdio/cdio_config.h
-}
diff --git a/staging/libcdio/libcdio-0.83-linking.patch b/staging/libcdio/libcdio-0.83-linking.patch
deleted file mode 100644
index 84a0746b5..000000000
--- a/staging/libcdio/libcdio-0.83-linking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
---- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
-+++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
-@@ -315,15 +315,15 @@
- 
- isofile2_SOURCES = isofile2.cpp
- isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- isolist_SOURCES = isolist.cpp
- isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- iso4_SOURCES = iso4.cpp
- iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- mmc1_SOURCES = mmc1.cpp
- mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)
diff --git a/staging/libcdio/libcdio.install b/staging/libcdio/libcdio.install
deleted file mode 100644
index 33a4e1ace..000000000
--- a/staging/libcdio/libcdio.install
+++ /dev/null
@@ -1,13 +0,0 @@
-info_dir=/usr/share/info
-
-post_install() {
-  install-info ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
-}
diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD
deleted file mode 100644
index fbd367677..000000000
--- a/staging/libgpod/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154964 2012-03-31 22:50:08Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.2
-pkgrel=4
-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 --with-udev-dir=/usr/lib/udev \
-      --enable-udev --with-python=/usr/bin/python2
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-
diff --git a/staging/libmtp/PKGBUILD b/staging/libmtp/PKGBUILD
deleted file mode 100644
index 3e394fd79..000000000
--- a/staging/libmtp/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 154966 2012-03-31 23:02:48Z tomegun $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-
-pkgname=libmtp
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="Library implementation of the Media Transfer Protocol"
-arch=("i686" "x86_64")
-url="http://libmtp.sourceforge.net"
-license=('LGPL')
-depends=('libusb')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6dc708757e3fd3ccce7445b4f2171263')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-udev=/usr/lib/udev
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/liborigin2/PKGBUILD b/staging/liborigin2/PKGBUILD
deleted file mode 100644
index 9340c9e2e..000000000
--- a/staging/liborigin2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 151659 2012-02-29 20:41:17Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgbase=liborigin2
-pkgname=('liborigin2' 'liborigin2-docs')
-pkgver=20110829
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://soft.proindependent.com/liborigin2/"
-license=('GPL3')
-makedepends=('doxygen' 'qt' 'boost')
-replaces=('liborigin')
-provides=('liborigin')
-source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip
-	liborigin.pro.archlinux
-	http://tree.phi-sci.com/tree.hh)
-sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
-          '9bb73eccc031b3a9e7c061b8cdbaf3e20aa2669d'
-          '2fd9ff17ff6b6f34b20fc473c82bf17ac1922e86')
-
-build() {
-	cd "${srcdir}/${pkgbase}"
-
-	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
-        install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
-	qmake liborigin2.pro QMAKESPEC=linux-g++
-  	make QTDIR=/usr/ QMAKESPEC=linux-g++
-
-	 # create documentation
-        cd doc
-        doxygen
-}
-
-package_liborigin2() {
-        pkgdesc="A library for reading OriginLab OPJ project files"
-        depends=('boost-libs')
-
-        cd "${srcdir}/${pkgbase}"
-
-  	INSTALL_ROOT="${pkgdir}" make install
-
-        # install missing includes
-        install -Dm644 tree.hh "${pkgdir}/usr/include/liborigin2/tree.hh"
-        for i in *.h; do
-          install -Dm644 ${i} "${pkgdir}/usr/include/liborigin2/${i}"
-        done
-}
-package_liborigin2-docs() {
-        pkgdesc="Documentation for liborigin2: a library for reading OriginLab OPJ project files"
-
-        cd "${srcdir}/${pkgbase}/doc"
-	install -d "${pkgdir}/usr/share/doc/${pkgbase}"
-	cp -rf html/* "${pkgdir}/usr/share/doc/${pkgbase}"
-	chmod 755 "${pkgdir}/usr/share/doc/liborigin2/images"
-	chmod 644 "${pkgdir}/usr/share/doc/liborigin2/images/origin_import.png"
-}
diff --git a/staging/liborigin2/liborigin.pro.archlinux b/staging/liborigin2/liborigin.pro.archlinux
deleted file mode 100644
index f0eef7293..000000000
--- a/staging/liborigin2/liborigin.pro.archlinux
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET           = origin2

-TEMPLATE     = lib

-CONFIG      += warn_on release thread

-#CONFIG      += staticlib

-MOC_DIR      = ./tmp

-OBJECTS_DIR  = ./tmp

-

-DESTDIR      = ./

-

-#INCLUDEPATH += boost_1_33_0

-LIBS        += -lboost_date_time

-LIBS        += -lboost_thread

-

-headers.files = \$\$HEADERS

-headers.path = /usr/include/liborigin2

-target.path = /usr/lib

-INSTALLS = target headers

-

-include(liborigin2.pri)

-

diff --git a/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD
deleted file mode 100644
index c97bd201d..000000000
--- a/staging/libpst/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 151590 2012-02-27 18:55:08Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libpst
-pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.five-ten-sg.com/libpst/"
-license=('GPL')
-makedepends=('python2' 'boost')
-source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-      --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
-  make
-}
-
-package_libpst() {
-  pkgdesc="Outlook .pst file converter"
-  depends=('gcc-libs')
-  optdepends=('boost-libs: for libpst python interface')
-  options=('!libtool' '!docs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libpst-docs() {
-  pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-htmlDATA
-  cd "${srcdir}/${pkgbase}-${pkgver}/html"
-  make DESTDIR="${pkgdir}" install-htmldevelDATA
-}
diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index f94ccd70c..000000000
--- a/staging/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151583 2012-02-27 18:40:10Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.15.10
-pkgrel=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export CFLAGS+=" -fvisibility=hidden"
-  export CXXFLAGS+=" -fvisibility=hidden"
-  ./configure --prefix=/usr \
-      --enable-python-binding \
-      --with-libgeoip=system
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/licq/PKGBUILD b/staging/licq/PKGBUILD
deleted file mode 100644
index f7ebed9dc..000000000
--- a/staging/licq/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 151709 2012-03-01 09:29:43Z giovanni $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=licq
-pkgver=1.6.0
-pkgrel=2
-pkgdesc="Advanced graphical ICQ clone and more for Unix" 
-arch=('i686' 'x86_64')
-url="http://www.licq.org"
-license=('GPL')
-depends=('libxss' 'qt' 'openssl')
-makedepends=('cmake' 'boost')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('383153697e281a0b1b4ff008936731b8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # licq
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
-  make
-
-  # qt4-gui
-  cd ../plugins/qt4-gui
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd ../plugins/qt4-gui/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/lyx/PKGBUILD b/staging/lyx/PKGBUILD
deleted file mode 100644
index a76ad43cb..000000000
--- a/staging/lyx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 151661 2012-02-29 21:11:11Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=lyx
-pkgver=2.0.3
-pkgrel=2
-pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
-arch=('i686' 'x86_64')
-url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
-makedepends=('boost')
-optdepends=('rcs: built-in version control system'
-            'texlive-latexextra: float wrap support')
-license=('GPL')
-source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
-        lyx.desktop lyxrc.dist)
-backup=('etc/lyx/lyxrc.dist')
-install=lyx.install
-options=('emptydirs')
-sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
-          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
-  sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  ./configure --prefix=/usr \
-    --with-frontend=qt4 --without-included-boost \
-    --without-included-mythes
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  # install desktop entry
-  install -Dm644 "${srcdir}/lyx.desktop" \
-    "${pkgdir}/usr/share/applications/lyx.desktop"
-  install -Dm644 "lib/images/lyx.png" \
-    "${pkgdir}/usr/share/pixmaps/lyx.png"
-
-  # install default config file
-  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
-  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
-}
diff --git a/staging/lyx/lyx.desktop b/staging/lyx/lyx.desktop
deleted file mode 100644
index 649b30c98..000000000
--- a/staging/lyx/lyx.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;
diff --git a/staging/lyx/lyx.install b/staging/lyx/lyx.install
deleted file mode 100644
index c15c17b3a..000000000
--- a/staging/lyx/lyx.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
-
-
diff --git a/staging/lyx/lyxrc.dist b/staging/lyx/lyxrc.dist
deleted file mode 100644
index dd18694f9..000000000
--- a/staging/lyx/lyxrc.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-### This file is part of
-### ========================================================
-###          LyX, The Document Processor
-###
-###          Copyright 1995 Matthias Ettrich
-###          Copyright 1995-2011 The LyX Team.
-###
-### ========================================================
-
-# The file lyxrc.dist gives initial global options for all LyX users.
-# Almost all settings here can be overridden through the preferences in LyX.
-
-\thesaurusdir_path "/usr/share/mythes"
-\hunspelldir_path "/usr/share/myspell"
diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD
deleted file mode 100644
index cd450a1e4..000000000
--- a/staging/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 151597 2012-02-27 20:17:39Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: xduugu <xduugu@gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.3.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
-             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('2cd84ff24e1d9217dd3caf170f34e758')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Disable automagic curl dep used for online update checking
-  sed -i -e '/curl/d' configure.in
-  export CURL_CFLAGS="" CURL_LIBS=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
-  rake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-package_mkvtoolnix-cli() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkvinfo
-  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
-  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}
diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 74d9eb2ef..000000000
--- a/staging/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}
diff --git a/staging/oxine/PKGBUILD b/staging/oxine/PKGBUILD
deleted file mode 100644
index 6a686bfee..000000000
--- a/staging/oxine/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150677 2012-02-20 01:49:45Z allan $
-# Maintainer:
-# Contributor: Rouslan Solomakhin <rouslan@localnet.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=oxine
-pkgver=0.7.1
-pkgrel=6
-pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems"
-arch=('i686' 'x86_64')
-url="http://oxine.sourceforge.net/"
-license=('GPL')
-depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst')
-source=(http://downloads.sourceforge.net/sourceforge/oxine/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2a2d05ee21892624e35cf539e532c0dd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#include <curl/types.h>||' configure src/download.c
-  ./configure --prefix=/usr --disable-hal --without-jsw --disable-extractor \
-    --without-imagemagick --disable-gdkpixbuf --disable-weather
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/pcmciautils/PKGBUILD b/staging/pcmciautils/PKGBUILD
deleted file mode 100644
index e76e08b34..000000000
--- a/staging/pcmciautils/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 154968 2012-03-31 23:04:36Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pcmciautils
-pkgver=018
-pkgrel=3
-pkgdesc="Utilities for inserting and removing PCMCIA cards"
-arch=(i686 x86_64)
-url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
-license=('GPL')
-groups=('base')
-# sysfsutils will not be required in the next release
-depends=('udev' 'sysfsutils')
-conflicts=('pcmcia-cs')
-# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-options=(!makeflags)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's,/usr/bin/install,install,g;
-             s,/lib/udev,/usr/lib/udev,g' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('964c802994677a71b38ec56554aa229f')
diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD
deleted file mode 100644
index 39d08ac9c..000000000
--- a/staging/source-highlight/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151593 2012-02-27 19:04:37Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.6
-pkgrel=2
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('gcc-libs' 'bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('44856c15a5dc8694e30d92f640ed348f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-	      --with-bash-completion=${pkgdir}/etc/bash_completion.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install
deleted file mode 100644
index 4fd1b3005..000000000
--- a/staging/source-highlight/source-highlight.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=usr/share/info
-info_files=(source-highlight.info source-highlight-lib.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/staging/system-config-printer/PKGBUILD b/staging/system-config-printer/PKGBUILD
deleted file mode 100644
index 3875bb476..000000000
--- a/staging/system-config-printer/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 154970 2012-03-31 23:15:18Z tomegun $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=system-config-printer
-pkgname=('system-config-printer-common'
-         'system-config-printer-gnome')
-pkgver=1.3.9
-pkgrel=2
-pkgdesc="A CUPS printer configuration tool and status applet"
-url="http://cyberelk.net/tim/software/system-config-printer/"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
-source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
-md5sums=('df424f127eede63965608e5ec5e27519'
-         'd105b7f7725c1ec538b6e6adb10667f3')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer 
-
-  ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --with-udev-rules
-
-  make
-}
-
-package_system-config-printer-common() {
-  pkgdesc='Pygtk CUPS Configuration'
-  depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat')
-  optdepends=('system-config-printer-gnome: for the GTK frontend'
-	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
-  replaces=('system-config-printer')
-  provides=("system-config-printer=${pkgver}")
-  conflicts=('system-config-printer')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  install -d "${pkgdir}"/usr/share/${pkgbase}
-  install -m644 config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -m755 pysmb.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -d "${pkgdir}"/etc/dbus-1/system.d/
-  install -m644 dbus/com.redhat.NewPrinterNotification.conf \
-    dbus/com.redhat.PrinterDriversInstaller.conf \
-    "${pkgdir}"/etc/dbus-1/system.d/
-  install -d "${pkgdir}"/etc/cupshelpers/
-  install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
-
-  install -d "${pkgdir}"/usr/lib/udev/rules.d
-  install -m755 udev/{udev-add-printer,udev-configure-printer} \
-    "${pkgdir}"/usr/lib/udev/
-  install -m644 udev/70-printers.rules \
-    "${pkgdir}"/usr/lib/udev/rules.d
-
-  for file in build/lib/cupshelpers/*.py; do
-    install -Dm644 $file \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
-  done
-}
-
-package_system-config-printer-gnome() {
-  pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend'
-  depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify')
-  optdependence=('gnome-keyring: password management')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # files provided by system-config-printer-common
-  cd "${pkgdir}"/usr/share/${pkgbase}
-  rm config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    pysmb.py
-  rm -r "${pkgdir}"/etc/dbus-1/
-  rm -r "${pkgdir}"/etc/cupshelpers/
-  rm -r "${pkgdir}"/etc/udev/
-  rm -r "${pkgdir}"/usr/lib/
-}
diff --git a/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
deleted file mode 100644
index 7ac9251b3..000000000
--- a/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt@redhat.com>
-Date: Fri, 2 Mar 2012 10:39:10 +0100
-Subject: [PATCH] util: never follow symlinks in rm_rf_children()
-
-The function checks if the entry is a directory before recursing, but
-there is a window between the check and the open, during which the
-directory could be replaced with a symlink.
-
-CVE-2012-1174
-https://bugzilla.redhat.com/show_bug.cgi?id=803358
----
- src/util.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util.c b/src/util.c
-index 20cbc2b..dfc1dc6 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
-                 if (is_dir) {
-                         int subdir_fd;
- 
--                        if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
-+                        subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
-+                        if (subdir_fd < 0) {
-                                 if (ret == 0 && errno != ENOENT)
-                                         ret = -errno;
-                                 continue;
--- 
-1.7.9.4
-
diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD
deleted file mode 100644
index 38df148a2..000000000
--- a/staging/systemd/PKGBUILD
+++ /dev/null
@@ -1,108 +0,0 @@
-# $Id: PKGBUILD 154953 2012-03-31 21:05:37Z tomegun $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=44
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
-             'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release"
-        0001-util-never-follow-symlinks-in-rm_rf_children.patch)
-md5sums=('11f44ff74c87850064e4351518bcff17'
-         '752636def0db3c03f121f8b4f44a63cd'
-         'b5863d6d4b47e2b5bda8eb57bde0d327')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # https://bugzilla.redhat.com/show_bug.cgi?id=803358
-  patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
-
-  ./configure --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --with-pamlibdir=/lib/security \
-              --localstatedir=/var \
-              --with-distro=arch \
-              --enable-split-usr
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
-  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'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  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"
-
-  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"
-  chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # symlink to /bin/systemd for compat and sanity
-  mkdir -p "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-  mkdir -p "$pkgdir/lib/systemd"
-  ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
-
-  # use python2 for systemd-analyze
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # didn't build this...
-  rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
-
-  # fix .so links in manpage stubs
-  find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
-      -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
-
-  # rename man pages to avoid conflicts with sysvinit and initscripts
-  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-            man5/{hostname,{vconsole,locale}.conf}.5)
-  cd "$pkgdir/usr/share/man"
-  for manpage in "${manpages[@]}"; do
-    IFS='/' read section page <<< "$manpage"
-    mv "$manpage" "$section/systemd.$page"
-  done
-
-  ### split off libsystemd (libs, includes, pkgconfig, man3)
-  install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
-
-  cd "$srcdir"/libsystemd
-  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
-  mv "$pkgdir/usr/include/systemd" usr/include
-  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-}
-
-package_libsystemd() {
-  pkgdesc="systemd client libraries"
-  depends=('libcap' 'xz')
-
-  mv "$srcdir/libsystemd"/* "$pkgdir"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/staging/systemd/cpp-compat.patch b/staging/systemd/cpp-compat.patch
deleted file mode 100644
index 346c353bc..000000000
--- a/staging/systemd/cpp-compat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
-Author: Lennart Poettering <lennart@poettering.net>
-Date:   2012-03-05 15:16:10 +0100
-
-    sd-login: c++ compatibility
-
-diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
-index 2f3c90c..6e99cfc 100644
---- a/src/systemd/sd-login.h
-+++ b/src/systemd/sd-login.h
-@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service);
- int sd_session_get_type(const char *session, char **type);
- 
- /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
--int sd_session_get_class(const char *session, char **class);
-+int sd_session_get_class(const char *session, char **clazz);
- 
- /* Determine the X11 display of this session. */
- int sd_session_get_display(const char *session, char **display);
diff --git a/staging/systemd/os-release b/staging/systemd/os-release
deleted file mode 100644
index 5e24a6031..000000000
--- a/staging/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/staging/systemd/systemd.install b/staging/systemd/systemd.install
deleted file mode 100644
index 11004222a..000000000
--- a/staging/systemd/systemd.install
+++ /dev/null
@@ -1,54 +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
-    systemctl daemon-reload >/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/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
deleted file mode 100644
index d4d162167..000000000
--- a/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From f2bdace5bb68d4f3162f886b27210762d8b115b8 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sat, 3 Mar 2012 12:28:15 +0100
-Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev
-
-This means we don't need a flagday in order to move udev to use
-/usr/lib/udev/rules.d
----
- src/libudev.c |   25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/src/libudev.c b/src/libudev.c
-index be24329..754d713 100644
---- a/src/libudev.c
-+++ b/src/libudev.c
-@@ -43,8 +43,8 @@ struct udev {
-         void *userdata;
-         char *sys_path;
-         char *dev_path;
--        char *rules_path[4];
--        unsigned long long rules_path_ts[4];
-+        char *rules_path[5];
-+        unsigned long long rules_path_ts[5];
-         int rules_path_count;
-         char *run_path;
-         struct udev_list properties_list;
-@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void)
-                         goto err;
- 
-         if (udev->rules_path[0] == NULL) {
--                /* /usr/lib/udev -- system rules */
--                udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d");
-+                /* /lib/udev -- compat for system rules */
-+                udev->rules_path[0] = strdup("/lib/udev/rules.d");
-                 if (!udev->rules_path[0])
-+                       goto err;
-+
-+                /* /usr/lib/udev -- system rules */
-+                udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d");
-+                if (!udev->rules_path[1])
-                         goto err;
- 
-                 /* /etc/udev -- local administration rules */
--                udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d");
--                if (!udev->rules_path[1])
-+                udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d");
-+                if (!udev->rules_path[2])
-                         goto err;
- 
-                 /* /run/udev -- runtime rules */
--                if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0)
-+                if (asprintf(&udev->rules_path[3], "%s/rules.d", udev->run_path) < 0)
-                         goto err;
- 
--                udev->rules_path_count = 3;
-+                udev->rules_path_count = 4;
-         }
- 
-         dbg(udev, "context %p created\n", udev);
-@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void)
-         dbg(udev, "dev_path='%s'\n", udev->dev_path);
-         dbg(udev, "sys_path='%s'\n", udev->sys_path);
-         dbg(udev, "run_path='%s'\n", udev->run_path);
--        dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]);
-+        dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1],
-+              udev->rules_path[2], udev->rules_path[3]);
-         free(config_file);
-         return udev;
- err:
-@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev)
-         free(udev->rules_path[0]);
-         free(udev->rules_path[1]);
-         free(udev->rules_path[2]);
-+        free(udev->rules_path[3]);
-         free(udev->run_path);
-         dbg(udev, "context %p released\n", udev);
-         free(udev);
--- 
-1.7.9.5
-
diff --git a/staging/udev/0002-reinstate-TIMEOUT-handling.patch b/staging/udev/0002-reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 9d1d36fb6..000000000
--- a/staging/udev/0002-reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Thu, 15 Mar 2012 02:12:43 +0100
-Subject: [PATCH 2/2] reinstate TIMEOUT= handling
-
-Without treating events with timeouts specially some drivers would cause a
-30 seconds stall on boot: .
-
-I also received reports of some drivers not working at all, even after the
-timeout.
-
-We will remove this patch when more drivers have been fixed in the kernel (3.4?).
-
-This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
-57c6f8ae5f52a6e8ffc66a54966346f733dded39.
----
- TODO                  |    2 ++
- src/libudev-device.c  |   19 +++++++++++++++++++
- src/libudev-private.h |    1 +
- src/udevd.c           |   13 ++++++++++---
- 4 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/TODO b/TODO
-index 36e8440..c2e59b6 100644
---- a/TODO
-+++ b/TODO
-@@ -1,6 +1,8 @@
-  - find a way to tell udev to not cancel firmware
-    requests in initramfs
- 
-+ - remove TIMEOUT= handling
-+
-  - move /lib/udev/devices/ to tmpfiles
- 
-  - trigger --subsystem-match=usb/usb_device
-diff --git a/src/libudev-device.c b/src/libudev-device.c
-index 10f28b8..639c367 100644
---- a/src/libudev-device.c
-+++ b/src/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
-         struct udev_list tags_list;
-         unsigned long long int seqnum;
-         unsigned long long int usec_initialized;
-+        int timeout;
-         int devlink_priority;
-         int refcount;
-         dev_t devnum;
-@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
-         return 0;
- }
- 
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+        return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+        char num[32];
-+
-+        udev_device->timeout = timeout;
-+        snprintf(num, sizeof(num), "%u", timeout);
-+        udev_device_add_property(udev_device, "TIMEOUT", num);
-+        return 0;
-+}
-+
- const char *udev_device_get_devpath_old(struct udev_device *udev_device)
- {
-         return udev_device->devpath_old;
-@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
-                 udev_device_set_devpath_old(udev_device, &property[12]);
-         } else if (strncmp(property, "SEQNUM=", 7) == 0) {
-                 udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
-+        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (strncmp(property, "IFINDEX=", 8) == 0) {
-                 udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (strncmp(property, "DEVMODE=", 8) == 0) {
-@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev)
-         udev_list_init(udev, &udev_device->sysattr_value_list, true);
-         udev_list_init(udev, &udev_device->sysattr_list, false);
-         udev_list_init(udev, &udev_device->tags_list, true);
-+        udev_device->timeout = -1;
-         udev_device->watch_handle = -1;
-         /* copy global properties */
-         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev-private.h b/src/libudev-private.h
-index 5f5c64a..ec63b67 100644
---- a/src/libudev-private.h
-+++ b/src/libudev-private.h
-@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udevd.c b/src/udevd.c
-index 1702217..88e9272 100644
---- a/src/udevd.c
-+++ b/src/udevd.c
-@@ -401,7 +401,7 @@ out:
-         }
- }
- 
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
-         struct udev_list_node *loop;
- 
-@@ -427,7 +427,7 @@ static void event_run(struct event *event)
-                 return;
-         }
- 
--        if (children >= children_max) {
-+        if (!force && children >= children_max) {
-                 if (children_max > 1)
-                         info(event->udev, "maximum number (%i) of children reached\n", children);
-                 return;
-@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev)
- 
-         event->state = EVENT_QUEUED;
-         udev_list_node_append(&event->node, &event_list);
-+
-+        /* run all events with a timeout set immediately */
-+        if (udev_device_get_timeout(dev) > 0) {
-+                event_run(event, true);
-+                return 0;
-+        }
-+
-         return 0;
- }
- 
-@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev)
-                         continue;
-                 }
- 
--                event_run(event);
-+                event_run(event, false);
-         }
- }
- 
--- 
-1.7.9.5
-
diff --git a/staging/udev/PKGBUILD b/staging/udev/PKGBUILD
deleted file mode 100644
index 5b2ad49ce..000000000
--- a/staging/udev/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 154974 2012-03-31 23:23:46Z 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=7
-pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
-install=udev.install
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('gobject-introspection' 'gperf' 'libxslt')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
-	0001-split-usr-always-read-config-files-from-lib-udev.patch
-	0002-reinstate-TIMEOUT-handling.patch
-	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
-
-  patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch
-  patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --libexecdir=/usr/lib \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system \
-              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
-              --enable-udev_acl
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
- 
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # install the mkinitpcio hook
-  install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev
-  install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev
-
-  # udevd moved, symlink to make life easy for restarting udevd manually
-  ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd
-
-  # the path to udevadm is hardcoded in some places
-  install -d ${pkgdir}/sbin
-  ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  for i in $pkgdir/usr/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'
-         '02a0dbbdcba6c1eae3ef65b6b06bde1f'
-         'a9fae85491a08d7759388c605389a8c5'
-         'a4dd853050bf2e0ae6b2e3d2c75499c2'
-         'ee0bfe91a20fff12cc25ab1d1e024853')
diff --git a/staging/udev/initcpio-hooks-udev b/staging/udev/initcpio-hooks-udev
deleted file mode 100644
index 87aa7960f..000000000
--- a/staging/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/staging/udev/initcpio-install-udev b/staging/udev/initcpio-install-udev
deleted file mode 100644
index e7e2c0f60..000000000
--- a/staging/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/staging/udev/udev.install b/staging/udev/udev.install
deleted file mode 100644
index 557efe9e1..000000000
--- a/staging/udev/udev.install
+++ /dev/null
@@ -1,59 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
-    echo "udev changes:"
-    if [ "$(vercmp $2 168)" -lt 0 ]; then
-      echo " * Kernel 2.6.32 or newer is now required."
-      echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed."
-      echo " * Arch specific cd symlinks are now no longer created."
-      echo " * cd and net persistent rules will no longer be autogenerated,"
-      echo "   see <https://wiki.archlinux.org/index.php/Udev> for details."
-      echo " * Errors are now logged (possibly to the console) by default."
-    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 " * 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."
-    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 " * kbd and rtc devices are no longer world readable."
-      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."
-    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 " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-      echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
-      echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-      echo "   this functionality back."
-      echo " * We no longer create the static nodes on install needed for an initrd-less"
-      echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
-      echo "   installs."
-    fi
-    if [ "$(vercmp $2 175)" -lt 0 ]; then
-      echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
-      echo "   kernels have this enabled."
-    fi
-    if [ "$(vercmp $2 181)" -lt 0 ]; then
-      echo " * udev-compat has been removed, and should be uninstalled."
-      echo " * Framebuffers are no longer blacklisted by default."
-      echo " * binaries moved from /sbin to /usr/bin"
-    fi
-    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
-    echo "   load the 'loop' module before using losetup"
-  fi
-}
diff --git a/staging/udisks/PKGBUILD b/staging/udisks/PKGBUILD
deleted file mode 100644
index fcded4b5c..000000000
--- a/staging/udisks/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 154972 2012-03-31 23:19:08Z tomegun $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=udisks
-pkgver=1.0.4
-pkgrel=3
-pkgdesc="Disk Management Service"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
-makedepends=('intltool' 'docbook-xsl')
-options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/udisks --disable-static
-  #fix location for bash_completion helper
-  sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # move udev helpers and rules to /usr/lib
-  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
-  rm -r "${pkgdir}"/lib
-}
diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD
deleted file mode 100644
index 5eaa218e0..000000000
--- a/staging/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 150675 2012-02-20 01:13:48Z allan $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.1
-pkgrel=2
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
-             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau')
-optdepends=('imagemagick: for using the imagemagick plugin' \
-            'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'mesa: for using the opengl plugin' \
-            'wavpack: for using the wavpack plugin' \
-            'faad2: for using the faad plugin' \
-            'libmng: for using the mng plugin' \
-            'aalib: for using the aalib plugin' \
-            'libmodplug: for using the modplug plugin' \
-            'libdca: for using the dca plugin' \
-            'a52dec: for using the a52 plugin' \
-            'libmad: for using the mp3 plugin' \
-            'libmpcdec: for using the musepack plugin' \
-            'libcaca: for using the caca plugin' \
-            'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin' \
-            'libvdpau: for using the VDPAU plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('ebb2648456504ff4ce08c34de258d3125832bb94')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/akonadi/PKGBUILD b/testing/akonadi/PKGBUILD
deleted file mode 100644
index d96040ac1..000000000
--- a/testing/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151916 2012-03-04 09:59:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('54e0556d73c22c7b3393069071e0b717')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/akonadi/akonadi.install b/testing/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/testing/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD
deleted file mode 100644
index 337139b90..000000000
--- a/testing/alex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151663 2012-02-29 21:12:35Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Philip Nilsson <pnilsson@nullref.se>
-
-pkgname=alex
-pkgver=3.0.1
-pkgrel=1
-pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/alex/'
-license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('5dec239c89165d159faa2154bc0724cd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
-  runghc Setup.lhs build
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs copy --destdir=$pkgdir
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
-
-  # doc/ contains only license which already installed into proper place
-  rm -rf $pkgdir/usr/share/doc
-}
diff --git a/testing/avogadro/PKGBUILD b/testing/avogadro/PKGBUILD
deleted file mode 100644
index 396c17171..000000000
--- a/testing/avogadro/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 151803 2012-03-03 08:08:41Z ibiru $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.0.3
-pkgrel=5
-pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
-url="http://avogadro.openmolecules.net/wiki/Main_Page"
-license=('GPL2')
-depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost')
-install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch'
-        'fix-opengl-headers.patch')
-md5sums=('92c2702c1980f70fb6d87a1a58147911'
-         'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec'
-         'f420bfd22e3d5d8fcddc625cf5e711f6')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
-  patch -p1 -i "${srcdir}"/fix-boost.patch
-  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/avogadro/avogadro.install b/testing/avogadro/avogadro.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/testing/avogadro/avogadro.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/avogadro/fix-boost.patch b/testing/avogadro/fix-boost.patch
deleted file mode 100644
index 8fb53ef12..000000000
--- a/testing/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
-+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
-@@ -149,7 +149,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
-+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
-@@ -11,7 +11,7 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
---- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
-+++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
-@@ -18,7 +18,7 @@
-   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
-   # We should probably scan the header to verify the Q_OBJECT macro is used
-   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
--  qt4_wrap_cpp(moc_files ${hdr_list})
-+  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-   # Now sort out the ui and qrc files, process them as appropriate
-   set(ui_plugin_files)
-   set(qrc_plugin_files)
diff --git a/testing/avogadro/fix-opengl-headers.patch b/testing/avogadro/fix-opengl-headers.patch
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/testing/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
-+++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
-@@ -25,6 +25,8 @@
- #include "camera.h"
- #include "glwidget.h"
- #include <avogadro/molecule.h>
-+#include <Eigen/LU>
-+#include <GL/glu.h>
- 
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
-+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
-@@ -42,6 +42,7 @@
- #include <QColor>
- #include <QVarLengthArray>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
-+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
-@@ -70,6 +70,8 @@
- 
- #include <openbabel/mol.h>
- 
-+#include <GL/glu.h>
-+
- using namespace OpenBabel;
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
-+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
-@@ -36,6 +36,7 @@
- #include <QFile>
- #include <QDebug>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
-+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
-@@ -44,6 +44,8 @@
- #include <QComboBox>
- #include <QDebug>
- 
-+#include <GL/glu.h>
-+
- using namespace std;
- using namespace OpenBabel;
- using namespace Eigen;
diff --git a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
deleted file mode 100644
index 11f58a505..000000000
--- a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
-@@ -75,6 +75,42 @@
-   zmatrix.h
- )
- 
-+SET(libavogadro_MOC_HDRS
-+  animation.h
-+  atom.h
-+  bond.h
-+  color.h
-+  colorbutton.h
-+  colors/elementcolor.h
-+  cube.h
-+  elementdetail_p.h
-+  elementtranslator.h
-+  engine.h
-+  engines/bsdyengine.h
-+  extension.h
-+  fragment.h
-+  glwidget.h
-+  mesh.h
-+  molecule.h
-+  moleculefile.h
-+  moleculefile_p.h
-+  periodictablescene_p.h
-+  periodictableview.h
-+  plotwidget.h
-+  plugin.h
-+  pluginmanager.h
-+  primitive.h
-+  protein.h
-+  pythonengine_p.h
-+  pythonerror.h
-+  pythonextension_p.h
-+  pythontool_p.h
-+  residue.h
-+  tool.h
-+  toolgroup.h
-+  zmatrix.h
-+)
-+
- set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
- # Also add in the qtiocompressor class
- #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
-@@ -113,7 +148,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--qt4_automoc(${libavogadro_SRCS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
-@@ -149,7 +184,7 @@
-     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
- endforeach(headerFile ${libavogadro_HDRS})
- 
--add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
-+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
- target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
---- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
-@@ -224,5 +224,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "animation.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
---- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
-@@ -293,5 +293,3 @@
-    }
- 
-  } // End namespace Avogadro
--
--#include "atom.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
---- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
-@@ -166,5 +166,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "bond.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
---- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
-@@ -152,5 +152,3 @@
-     return "Generic Color";
-   }
- }
--
--#include "color.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
-@@ -94,5 +94,3 @@
-   }
- 
- } // end namespace
--
--#include "colorbutton.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
-@@ -63,7 +63,5 @@
- 
- }
- 
--#include "elementcolor.moc"
- //this is a static color plugin...
- //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
---- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
-@@ -322,5 +322,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "cube.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
-@@ -132,5 +132,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementdetail_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
-@@ -401,5 +401,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementtranslator.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
---- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
-@@ -377,5 +377,3 @@
-       return m_molecule->bonds();
-   }
- }
--
--#include "engine.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
-@@ -442,7 +442,5 @@
-   }
- 
- }
--
--#include "bsdyengine.moc"
- // This is a static engine...
- // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
---- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
-@@ -80,5 +80,3 @@
-   }
- 
- }
--
--#include "extension.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
---- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
-@@ -82,5 +82,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "fragment.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
-@@ -1966,5 +1966,3 @@
-     d->updateCache = true;
-   }
- }
--
--#include "glwidget.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
---- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
-@@ -231,5 +231,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "mesh.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
---- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
-@@ -1575,5 +1575,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "molecule.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
-@@ -22,23 +22,14 @@
-   02110-1301, USA.
-  **********************************************************************/
- 
--#include "moleculefile.h"
-+#include "moleculefile_p.h"
- 
- #include <avogadro/molecule.h>
- 
--#include <QFile>
- #include <QFileInfo>
--#include <QStringList>
--#include <QThread>
- #include <QDebug>
- #include <QPointer>
- 
--#include <openbabel/mol.h>
--#include <openbabel/obconversion.h>
--
--// Included in obconversion.h
--//#include <iostream>
--
- namespace Avogadro {
- 
-   using OpenBabel::OBConversion;
-@@ -578,164 +569,6 @@
-     return false;
-   }
- 
--  class ReadFileThread : public QThread
--  {
--    //    Q_OBJECT 
--
--    public:
--      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
--      {
--      }
--      
--      void addConformer(const OpenBabel::OBMol &conformer)
--      {
--        unsigned int numAtoms = conformer.NumAtoms();
--        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
--        for (unsigned int i = 0; i < numAtoms; ++i)
--          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
--        m_moleculeFile->m_conformers.push_back(coords);
--      }
--
--      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
--      {
--        if (!c) {
--          // this is the first molecule read
--          m_moleculeFile->setConformerFile(true);
--          addConformer(current);
--          return;
--        }
--
--        if (!m_moleculeFile->isConformerFile())
--          return;
--
--        // as long as we are not sure if this really is a 
--        // conformer/trajectory file, add the conformers
--        addConformer(current);
--
--        // performance: check only certain molecule 1-10,20,50
--        switch (c) {
--          case 1:
--          case 2:
--          case 3:
--          case 4:
--          case 5:
--          case 6:
--          case 7:
--          case 8:
--          case 9:
--          case 10:
--          case 20:
--          case 50:
--            break;
--          default:
--            return;
--        }
--
--        if (first.NumAtoms() != current.NumAtoms()) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--          return;
--        }
--
--        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
--          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
--          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
--          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
--            m_moleculeFile->setConformerFile(false);
--            m_moleculeFile->m_conformers.clear();
--            return;
--          }    
--        }
--      }
--
--      void run()
--      {
--        // Check that the file can be read from disk
--        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
--          // Cannot read the file
--          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
--                                         .arg(m_moleculeFile->m_fileName));
--          return;
--        }
-- 
--        // Construct the OpenBabel objects, set the file type
--        OpenBabel::OBConversion conv;
--        OpenBabel::OBFormat *inFormat;
--        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
--          // Input format not supported
--          m_moleculeFile->m_error.append(
--              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
--          return;
--        } else {
--          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
--          if (!inFormat || !conv.SetInFormat(inFormat)) {
--            // Input format not supported
--            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
--                                           .arg(m_moleculeFile->m_fileName));
--            return;
--          }
--        }
--
--        // set any options
--        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
--          foreach(const QString &option,
--              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
--            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
--          }
--        }
--
--        // Now attempt to read the molecule in
--        ifstream ifs;
--        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
--        if (!ifs) // Should not happen, already checked file could be opened
--          return;
--      
--        // read all molecules
--        OpenBabel::OBMol firstOBMol, currentOBMol;
--        unsigned int c = 0;
--        conv.SetInStream(&ifs);
--        m_moleculeFile->streamposRef().push_back(ifs.tellg());
--        while (ifs.good() && conv.Read(&currentOBMol)) {
--          if (!c)
--            firstOBMol = currentOBMol;
--
--          if (c > 20 && !m_moleculeFile->isConformerFile())
--            m_moleculeFile->setFirstReady(true);
--
--          // detect conformer/trajectory files
--          detectConformers(c, firstOBMol, currentOBMol);
--          // store information about molecule
--          m_moleculeFile->streamposRef().push_back(ifs.tellg());
--          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
--          // increment count
--          ++c;
--        }
--        m_moleculeFile->streamposRef().pop_back();
--
--        // signle molecule files are not conformer files
--        if (c == 1) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--        }
--
--        // check for empty titles
--        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
--          if (!m_moleculeFile->titlesRef()[i].isEmpty())
--            continue;
--
--          QString title;
--          if (m_moleculeFile->isConformerFile())
--            title = tr("Conformer %1").arg(i+1);
--          else
--            title = tr("Molecule %1").arg(i+1);
--        
--          m_moleculeFile->titlesRef()[i] = title;
--        }
--      }
--
--      MoleculeFile *m_moleculeFile;
--  }; // end ReadFileThread class
--
-   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
-       const QString &fileType, const QString &fileOptions, bool wait)
-   {
-@@ -794,6 +627,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "moleculefile.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
-@@ -0,0 +1,202 @@
-+/**********************************************************************
-+  MoleculeFile - Class representing molecule file.
-+
-+  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
-+
-+  This file is part of the Avogadro molecular editor project.
-+  For more information, see <http://avogadro.openmolecules.net/>
-+
-+  Avogadro is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 2 of the License, or
-+  (at your option) any later version.
-+
-+  Avogadro is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+  02110-1301, USA.
-+ **********************************************************************/
-+
-+#ifndef MOLECULEFILE_P_H
-+#define MOLECULEFILE_P_H
-+
-+#include "moleculefile.h"
-+
-+#include <openbabel/mol.h>
-+#include <openbabel/obconversion.h>
-+
-+#include <QFile>
-+#include <QStringList>
-+#include <QThread>
-+
-+namespace Avogadro {
-+
-+  using OpenBabel::OBConversion;
-+  using std::ifstream;
-+
-+class ReadFileThread : public QThread
-+{
-+      Q_OBJECT
-+
-+  public:
-+    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
-+    {
-+    }
-+
-+    void addConformer(const OpenBabel::OBMol &conformer)
-+    {
-+      unsigned int numAtoms = conformer.NumAtoms();
-+      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
-+      for (unsigned int i = 0; i < numAtoms; ++i)
-+        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
-+      m_moleculeFile->m_conformers.push_back(coords);
-+    }
-+
-+    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
-+    {
-+      if (!c) {
-+        // this is the first molecule read
-+        m_moleculeFile->setConformerFile(true);
-+        addConformer(current);
-+        return;
-+      }
-+
-+      if (!m_moleculeFile->isConformerFile())
-+        return;
-+
-+      // as long as we are not sure if this really is a
-+      // conformer/trajectory file, add the conformers
-+      addConformer(current);
-+
-+      // performance: check only certain molecule 1-10,20,50
-+      switch (c) {
-+        case 1:
-+        case 2:
-+        case 3:
-+        case 4:
-+        case 5:
-+        case 6:
-+        case 7:
-+        case 8:
-+        case 9:
-+        case 10:
-+        case 20:
-+        case 50:
-+          break;
-+        default:
-+          return;
-+      }
-+
-+      if (first.NumAtoms() != current.NumAtoms()) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+        return;
-+      }
-+
-+      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
-+        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
-+        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
-+        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
-+          m_moleculeFile->setConformerFile(false);
-+          m_moleculeFile->m_conformers.clear();
-+          return;
-+        }
-+      }
-+    }
-+
-+    void run()
-+    {
-+      // Check that the file can be read from disk
-+      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
-+        // Cannot read the file
-+        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
-+                                       .arg(m_moleculeFile->m_fileName));
-+        return;
-+      }
-+
-+      // Construct the OpenBabel objects, set the file type
-+      OpenBabel::OBConversion conv;
-+      OpenBabel::OBFormat *inFormat;
-+      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
-+        // Input format not supported
-+        m_moleculeFile->m_error.append(
-+            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
-+        return;
-+      } else {
-+        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
-+        if (!inFormat || !conv.SetInFormat(inFormat)) {
-+          // Input format not supported
-+          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
-+                                         .arg(m_moleculeFile->m_fileName));
-+          return;
-+        }
-+      }
-+
-+      // set any options
-+      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
-+        foreach(const QString &option,
-+            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
-+          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
-+        }
-+      }
-+
-+      // Now attempt to read the molecule in
-+      ifstream ifs;
-+      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
-+      if (!ifs) // Should not happen, already checked file could be opened
-+        return;
-+
-+      // read all molecules
-+      OpenBabel::OBMol firstOBMol, currentOBMol;
-+      unsigned int c = 0;
-+      conv.SetInStream(&ifs);
-+      m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+      while (ifs.good() && conv.Read(&currentOBMol)) {
-+        if (!c)
-+          firstOBMol = currentOBMol;
-+
-+        if (c > 20 && !m_moleculeFile->isConformerFile())
-+          m_moleculeFile->setFirstReady(true);
-+
-+        // detect conformer/trajectory files
-+        detectConformers(c, firstOBMol, currentOBMol);
-+        // store information about molecule
-+        m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
-+        // increment count
-+        ++c;
-+      }
-+      m_moleculeFile->streamposRef().pop_back();
-+
-+      // signle molecule files are not conformer files
-+      if (c == 1) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+      }
-+
-+      // check for empty titles
-+      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
-+        if (!m_moleculeFile->titlesRef()[i].isEmpty())
-+          continue;
-+
-+        QString title;
-+        if (m_moleculeFile->isConformerFile())
-+          title = tr("Conformer %1").arg(i+1);
-+        else
-+          title = tr("Molecule %1").arg(i+1);
-+
-+        m_moleculeFile->titlesRef()[i] = title;
-+      }
-+    }
-+
-+    MoleculeFile *m_moleculeFile;
-+};
-+
-+} // end namespace Avogadro
-+
-+#endif // MOLECULEFILE_P_H
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "periodictablescene_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -69,4 +69,3 @@
- 
- } // End namespace Avogadro
- 
--#include "periodictableview.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
-@@ -27,7 +27,6 @@
-  **********************************************************************/
- 
- #include "plotwidget.h"
--#include "plotwidget.moc"
- 
- #include <math.h>
- #include <QDebug>
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
---- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
-@@ -65,5 +65,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "plugin.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
-@@ -784,5 +784,3 @@
-   }
- 
- }
--
--#include "pluginmanager.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
---- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
-@@ -77,5 +77,3 @@
-   }
- 
- }
--
--#include "primitive.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
---- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
-@@ -978,5 +978,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "protein.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
-@@ -11,9 +11,9 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--qt4_automoc(moleculelist.cpp)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
- 
--ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
-+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
- SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
- if (WIN32)
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
-@@ -70,4 +70,3 @@
- 
- }
- 
--#include "moleculelist.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
-@@ -289,5 +289,3 @@
- 
- 
- }
--
--#include "pythonengine_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
-@@ -112,4 +112,3 @@
- 
- } // namespace
- 
--#include "pythonerror.moc"
-
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
-@@ -340,5 +340,3 @@
-   }
- 
- }
--
--#include "pythonextension_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
-@@ -344,5 +344,3 @@
-   }
- 
- }
--
--#include "pythontool_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
---- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
-@@ -160,6 +160,3 @@
-   }
- 
- } // End namespace Avogadro
--
-- #include "residue.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
---- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
-@@ -117,5 +117,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "tool.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
-@@ -206,5 +206,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "toolgroup.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
-@@ -149,5 +149,3 @@
- 
- 
- } // End namespace Avogadro
--
--#include "zmatrix.moc"
diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD
deleted file mode 100644
index 6a0ae5ae2..000000000
--- a/testing/bash/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 153697 2012-03-18 06:05:58Z eric $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=bash
-_basever=4.2
-_patchlevel=024 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=2
-pkgdesc="The GNU Bourne Again shell"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnu.org/software/bash/bash.html"
-groups=('base')
-backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
-depends=('readline>=6.1' 'glibc')
-provides=('sh')
-install=bash.install
-source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
-        dot.bashrc
-        dot.bash_profile
-        dot.bash_logout
-        system.bashrc
-        system.bash_logout)
-if [ $_patchlevel -gt 000 ]; then
-    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
-    done
-fi
-
-build() {
-  cd "${srcdir}"/${pkgname}-$_basever
-  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-    msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
-    patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
-  done
-
-  _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\'
-               -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\'
-               -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\'
-               -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\')
-  export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
-
-  ./configure --prefix=/usr --with-curses --enable-readline \
-    --without-bash-malloc --with-installed-readline \
-    --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-$_basever
-  make check
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-$_basever
-  make DESTDIR="${pkgdir}" install
-
-  # for now, bash is our default /bin/sh
-  cd "${pkgdir}"/bin
-  ln -s bash sh
-
-  install -dm755 "${pkgdir}"/etc/skel/
-  
-  # system-wide configuration files
-  install -m644 "${srcdir}"/system.bashrc "${pkgdir}"/etc/bash.bashrc
-  install -m644 "${srcdir}"/system.bash_logout "${pkgdir}"/etc/bash.bash_logout
-  
-  # user configuration file skeletons
-  install -m644 "${srcdir}"/dot.bashrc "${pkgdir}"/etc/skel/.bashrc
-  install -m644 "${srcdir}"/dot.bash_profile "${pkgdir}"/etc/skel/.bash_profile
-  install -m644 "${srcdir}"/dot.bash_logout "${pkgdir}"/etc/skel/.bash_logout
-}
-
-md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
-         '8d37a3f97a48c1e56e1a4ded877ed944'
-         '027d6bd8f5f6a06b75bb7698cb478089'
-         '2902e0fee7a9168f3a4fd2ccd60ff047'
-         '42f4400ed2314bd7519c020d0187edc5'
-         '3546099a1b2f667adc9794f52e78e35b'
-         '472f536d7c9e8250dc4568ec4cfaf294'
-         '1100bc1dda2cdc06ac44d7e5d17864a3'
-         'a7184b76eb4a079f10174a0a8f574819'
-         '30e7948079921d3261efcc6a40722135'
-         'c4d45307f7e69fe508ce347c4cec1955'
-         '9ea06decec43a198f3d7cf29acc602f8'
-         '74bddae6eeb9227a04a467d42597a34d'
-         'fb48f6134d7b013135929476aa0c250c'
-         '3e6a18226b16c773229246abd07a1f5e'
-         'e70e45de33426b38153b390be0dbbcd4'
-         'e667dc9348ebc3e0e14bfdd87f4b6ff2'
-         'ce4e5c484993705b27daa151eca242c2'
-         '41cbd8e57589bc081a546a014ddb12f8'
-         '88d1f96db29461767602e2546803bda7'
-         'b8b781520f4c7493a2a1ac3010a44a44'
-         '24c574bf6d6a581e300823d9c1276af6'
-         '354a0899a7c4b446454c52546562b55b'
-         '4c5835f2fbab36c4292bb334977e5b6d'
-         'ff4547ca7b508d52101729d61f5b77b6'
-         '0a51602b535ef661ee707be6c8bdb373'
-         'cec7c92a4d8052ea4b29216365d16566'
-         '58deacf3d57cbd75575444ff6a3b0806'
-         '9ed2a08e549c3c17745f19e8413cfb31'
-         '72d5059820015231483bb7415d09e9db'
-         '45b04b41a4230f469d3e47ab9952c2df'
-         '608336ebe215984ef126e3c29d2d3409'
-         '623f63025d155a84977b62531e260ee2'
-         'ed19da878e3f630834c62b9d9dcc6fce'
-         'eef2dd4a0e4505dc8f8e664b40c6cd66'
-         '2d07daba0b8ca8f876d2aa052ff594b4'
-         '0cb823a44e6dc1cde7ac97ae5c8163c9'
-         '53d246537e1fffd1aaa02ba5c056211c'
-         '60f983a1dded5f0b28040ff4b3f1e9b5'
-         '304fd129a58fee2d8a34f8b4704db0aa'
-         '9df4bf4f46aaadc436f430187741f815'
-         '6921a0b4228fe89b6537a5c29f027c89'
-         '4ef0e2a2cbfbdd53346f927000b7e112'
-         '1195d85447f3d048d2c9bcd075fa765c'
-         'b0f3a651ce29a1feee687d93177870f1'
-         'b09000bba08da6ac753124593850cdf7'
-         '204bb5054d1f8bafe2b446d4e5d0d99a'
-         '09d3f96a16b881334cfaee0cf320b47e'
-         'aab415350bcc2bb0c29943b413499d96'
-         '597bf71a2aac6feb510b7505cdd3d4f7'
-         'b0db384bdedecafbdd70c8d22c56af5f'
-         '3fab459b4e09daea529cacad025b13b3'
-         'bab99835ad6198cb1109fac89a085262'
-         '4ad8d11e72afc6090e701073ff034cf4'
-         '5658ef10c9d0d804126ec1ce700e4e2c')
diff --git a/testing/bash/bash.install b/testing/bash/bash.install
deleted file mode 100644
index bc75e9b6a..000000000
--- a/testing/bash/bash.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(bash.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout
deleted file mode 100644
index 0e4e4f184..000000000
--- a/testing/bash/dot.bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# ~/.bash_logout
-#
diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile
deleted file mode 100644
index 5545f007e..000000000
--- a/testing/bash/dot.bash_profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# ~/.bash_profile
-#
-
-[[ -f ~/.bashrc ]] && . ~/.bashrc
diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc
deleted file mode 100644
index a355b0cd3..000000000
--- a/testing/bash/dot.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# ~/.bashrc
-#
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-alias ls='ls --color=auto'
-PS1='[\u@\h \W]\$ '
diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout
deleted file mode 100644
index a76e48e4a..000000000
--- a/testing/bash/system.bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/bash.bash_logout
-#
diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc
deleted file mode 100644
index a2231e861..000000000
--- a/testing/bash/system.bashrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# /etc/bash.bashrc
-#
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-PS1='[\u@\h \W]\$ '
-PS2='> '
-PS3='> '
-PS4='+ '
-
-case ${TERM} in
-  xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-                                                        
-    ;;
-  screen)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-    ;;
-esac
-
-[ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
diff --git a/testing/bluez/fix-a2dp.patch b/testing/bluez/fix-a2dp.patch
deleted file mode 100644
index e4bb1372a..000000000
--- a/testing/bluez/fix-a2dp.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Thu, 26 Jan 2012 23:39:02 +0200
-Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket
- is disabled
-
-Local endpoints can only be used when UNIX socket API is available.
----
- audio/a2dp.c |   15 +++++++--------
- 1 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/audio/a2dp.c b/audio/a2dp.c
-index 5ca105c..bbb91ce 100644
---- a/audio/a2dp.c
-+++ b/audio/a2dp.c
-@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
- 
- int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- {
--	int sbc_srcs = 1, sbc_sinks = 1;
-+	int sbc_srcs = 0, sbc_sinks = 0;
- 	int mpeg12_srcs = 0, mpeg12_sinks = 0;
--	gboolean source = TRUE, sink = FALSE, socket = TRUE;
-+	gboolean source = TRUE, sink = FALSE, socket = FALSE;
- 	gboolean delay_reporting = FALSE;
- 	char *str;
- 	GError *err = NULL;
-@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 			source = TRUE;
- 		if (strstr(str, "Source"))
- 			sink = TRUE;
-+		if (strstr(str, "Socket"))
-+			socket = TRUE;
- 		g_free(str);
- 	}
- 
-@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	}
- 
- 	/* Don't register any local sep if Socket is disabled */
--	if (socket == FALSE) {
--		sbc_srcs = 0;
--		sbc_sinks = 0;
--		mpeg12_srcs = 0;
--		mpeg12_sinks = 0;
-+	if (socket == FALSE)
- 		goto proceed;
--	}
- 
- 	str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_srcs = 1;
- 	} else {
- 		sbc_srcs = atoi(str);
- 		g_free(str);
-@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_sinks = 1;
- 	} else {
- 		sbc_sinks = atoi(str);
- 		g_free(str);
--- 
-1.7.6.5
-
diff --git a/testing/boost/PKGBUILD b/testing/boost/PKGBUILD
deleted file mode 100644
index f771f698b..000000000
--- a/testing/boost/PKGBUILD
+++ /dev/null
@@ -1,118 +0,0 @@
-# $Id: PKGBUILD 151805 2012-03-03 08:08:44Z ibiru $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.49.0
-_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        exceptions.patch)
-license=('custom')
-md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca'
-         '9b44c28b36303152050c8c82469569c5')
-
-_stagedir="${srcdir}/stagedir"
-
-build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-  # https://svn.boost.org/trac/boost/ticket/5731
-  patch -p0 -i "${srcdir}/exceptions.patch"
-
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
-      toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
-      --layout=system \
-      ${MAKEFLAGS} \
-      install
-}
-
-package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
-
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
-}
-
-package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
-
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
-}
diff --git a/testing/boost/exceptions.patch b/testing/boost/exceptions.patch
deleted file mode 100644
index 9faa71526..000000000
--- a/testing/boost/exceptions.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
---- boost/numeric/conversion/converter_policies.hpp~	2008-10-13 11:00:03.000000000 +0200
-+++ boost/numeric/conversion/converter_policies.hpp	2011-07-22 11:46:40.961876274 +0200
-@@ -20,6 +20,7 @@
- 
- #include "boost/mpl/if.hpp"
- #include "boost/mpl/integral_c.hpp"
-+#include "boost/throw_exception.hpp"
- 
- namespace boost { namespace numeric
- {
-@@ -159,9 +160,9 @@ struct def_overflow_handler
-   void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
-   {
-     if ( r == cNegOverflow )
--      throw negative_overflow() ;
-+      boost::throw_exception( negative_overflow() ) ;
-     else if ( r == cPosOverflow )
--           throw positive_overflow() ;
-+      boost::throw_exception( positive_overflow() ) ;
-   }
- } ;
- 
-
-Diff finished.  Fri Jul 22 11:46:49 2011
diff --git a/testing/bootchart/PKGBUILD b/testing/bootchart/PKGBUILD
deleted file mode 100644
index d8f606056..000000000
--- a/testing/bootchart/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 153849 2012-03-19 21:13:34Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-pkgname="bootchart"
-pkgver=1.15
-pkgrel=1
-pkgdesc="a 'startup' graphing tool"
-url="https://meego.gitorious.org/meego-developer-tools/bootchart"
-license=('GPL2')
-arch=(i686 x86_64)
-depends=('glibc')
-source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	'build.patch')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i ../build.patch
-
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('e24cad9db140521fca5193a88589e669'
-         '5546709bc77b775290cb54a29affa6ec')
diff --git a/testing/bootchart/build.patch b/testing/bootchart/build.patch
deleted file mode 100644
index 82c6e1bfd..000000000
--- a/testing/bootchart/build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4fe62e6b4c072676d246be02ba92a1df3a9d0feb Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 16 Mar 2012 01:34:10 +0100
-Subject: [PATCH] Makefile: move binary and avoid empty dirs
-
-Install to /usr/bin by default, and don't install an empty /etc.
----
- Makefile |   10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 566a848..c017509 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,12 +6,10 @@ CC := gcc
- all: bootchartd
- 
- install: bootchartd
--	mkdir -p $(DESTDIR)/sbin
--	mkdir -p $(DESTDIR)/etc
--	mkdir -p $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0755 bootchartd $(DESTDIR)/sbin/
--	install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/
-+	install -d $(DESTDIR)/usr/bin
-+	install -d $(DESTDIR)/usr/share/doc/bootchart
-+	install -m0755 bootchartd $(DESTDIR)/usr/bin/
-+	install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
- 
- OBJS := log.o svg.o bootchart.o
- 
--- 
-1.7.9.4
-
diff --git a/testing/capi4hylafax/PKGBUILD b/testing/capi4hylafax/PKGBUILD
deleted file mode 100644
index ff9680255..000000000
--- a/testing/capi4hylafax/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 153867 2012-03-20 08:29:04Z tpowa $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=capi4hylafax
-pkgver=010300
-pkgrel=6
-pkgdesc="capi plugin for hylafax to enable isdn faxing"
-arch=(i686 x86_64)
-url="ftp://ftp.avm.de/tools"
-license=('GPL')
-depends=('glibc' 'isdn4k-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/clamav/PKGBUILD b/testing/clamav/PKGBUILD
deleted file mode 100644
index 4646e77a4..000000000
--- a/testing/clamav/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 154473 2012-03-28 23:18:37Z bisson $
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=clamav
-pkgver=0.97.4
-pkgrel=2
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'conf.d'
-        'logrotate'
-        'tmpfiles.d'
-        'config.patch')
-sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d'
-          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
-          'cb116cdab49a810381a515cbcfb6a6c148547f07'
-          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
-          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../config.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav \
-		--disable-clamav \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# Make sure conf files get installed, because make install
-	# doesn't do that if clamav is already installed upon building.
-	install -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf"
-	install -D -m644 etc/freshclam.conf "${pkgdir}/etc/clamav/freshclam.conf"
-
-	install -D -m644 ../tmpfiles.d "${pkgdir}/usr/lib/tmpfiles.d/clamav.conf"
-	install -D -m644 ../logrotate "${pkgdir}/etc/logrotate.d/clamav"
-	install -D -m644 ../conf.d "${pkgdir}/etc/conf.d/clamav"
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/clamav"
-
-	# Un-distribute databases to require freshclam.
-	rm "${pkgdir}"/var/lib/clamav/*.cvd
-}
diff --git a/testing/clamav/conf.d b/testing/clamav/conf.d
deleted file mode 100644
index 9cd44d9f8..000000000
--- a/testing/clamav/conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# clamav startup script config options
-
-# change these to "yes" to start 
-START_FRESHCLAM="no"
-START_CLAMD="no"
-
-# Options to pass to freshclam (man freshclam for more info).
-FRESHCLAM_OPTS="-c 12"
diff --git a/testing/clamav/config.patch b/testing/clamav/config.patch
deleted file mode 100644
index 0640df2c3..000000000
--- a/testing/clamav/config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
---- old/etc/clamd.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf	2010-12-02 19:31:45.873357389 +0100
-@@ -14 +14 @@
--#LogFile /tmp/clamd.log
-+LogFile /var/log/clamav/clamd.log
-@@ -34 +34 @@
--#LogTime yes
-+LogTime yes
-@@ -61 +61 @@
--#PidFile /var/run/clamd.pid
-+PidFile /run/clamav/clamd.pid
-@@ -65 +65 @@
--#TemporaryDirectory /var/tmp
-+TemporaryDirectory /tmp
-@@ -80 +80 @@
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /var/lib/clamav/clamd.sock
-@@ -190 +190 @@
--#User clamav
-+User clamav
-diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf
---- old/etc/freshclam.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf	2010-12-02 19:31:51.190024057 +0100
-@@ -17 +17 @@
--#UpdateLogFile /var/log/freshclam.log
-+UpdateLogFile /var/log/clamav/freshclam.log
-@@ -121 +121 @@
--#NotifyClamd /path/to/clamd.conf
-+NotifyClamd /etc/clamav/clamd.conf
diff --git a/testing/clamav/install b/testing/clamav/install
deleted file mode 100644
index a2092e815..000000000
--- a/testing/clamav/install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-	getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
-	getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
-
-	chown -R clamav:clamav /var/lib/clamav
-	install -o clamav -g clamav -d /run/clamav
-	install -o clamav -g clamav -d /var/log/clamav
-}
-
-post_remove() {
-	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
-	getent group clamav &>/dev/null && groupdel clamav >/dev/null
-	return 0
-}
diff --git a/testing/clamav/logrotate b/testing/clamav/logrotate
deleted file mode 100644
index 6a9051bed..000000000
--- a/testing/clamav/logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
-    create 644 clamav clamav
-    sharedscripts
-    postrotate
-            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
-            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/testing/clamav/rc.d b/testing/clamav/rc.d
deleted file mode 100644
index 127c86c0f..000000000
--- a/testing/clamav/rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
-
-PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
-PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
-
-case "$1" in
-	start)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Starting ClamD"
-			[[ -z $PID_CD ]] && /usr/sbin/clamd
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-		sleep 1
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Starting FreshClam"
-			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	stop)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Stopping ClamD"
-			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
-				if [[ $? -gt 0 ]]; then
-					stat_fail
-				else
-					rm_daemon clamav
-					stat_done
-				fi
-		fi
-
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Stopping FreshClam"
-			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					rm_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"	
-esac
-exit 0
diff --git a/testing/clamav/tmpfiles.d b/testing/clamav/tmpfiles.d
deleted file mode 100644
index 22d29941e..000000000
--- a/testing/clamav/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav
diff --git a/testing/crda/PKGBUILD b/testing/crda/PKGBUILD
deleted file mode 100644
index b60c4dacc..000000000
--- a/testing/crda/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 150306 2012-02-16 20:41:31Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=crda
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="Central Regulatory Domain Agent for wireless networks"
-arch=(i686 x86_64)
-url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
-license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw')
-makedepends=('python-m2crypto')
-install=crda.install
-source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
-        crda.rc libnl32.patch)
-md5sums=('5226f65aebacf94baaf820f8b4e06df4'
-         '014eef3f8655e9a130064ec6891317fc'
-         'c1f7aff29f15a0364ae6f7905a1d4ae6')
-                  
-build() {
-  msg "Compiling crda ..."
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -Np1 -i "$srcdir/libnl32.patch"
-  sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
-  make crda regdbdump
-}
-
-package() {
-  # Install crda, regdbdump and udev rules
-  msg "Installing crda ..."
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules
-
-  msg "Installing license ..."
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
-  
-  msg "Installing boot script ..."
-  install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom
-}
diff --git a/testing/crda/crda.install b/testing/crda/crda.install
deleted file mode 100644
index c18e15f71..000000000
--- a/testing/crda/crda.install
+++ /dev/null
@@ -1,18 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom."
-  echo "It will automatically be set when necessary."
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package
-  # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one
-  # from wireless-regdb by the user-defined one
-  if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then
-    if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then
-      mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom
-    fi
-  fi
-}
diff --git a/testing/crda/crda.rc b/testing/crda/crda.rc
deleted file mode 100755
index 13dbd870e..000000000
--- a/testing/crda/crda.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/wireless-regdom
-
-case "$1" in
-  start)
-    if [ -n "${WIRELESS_REGDOM}" ]; then
-        stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}"
-        if iw reg set ${WIRELESS_REGDOM}; then
-            stat_done
-        else
-            stat_fail
-        fi
-    fi
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start"  
-esac
-exit 0
diff --git a/testing/crda/libnl32.patch b/testing/crda/libnl32.patch
deleted file mode 100644
index 682b6c5de..000000000
--- a/testing/crda/libnl32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile
---- crda-1.1.2/Makefile	2011-08-10 01:36:19.000000000 +0200
-+++ crda-1.1.2-libnl32/Makefile	2012-02-09 18:53:33.376430180 +0100
-@@ -51,7 +51,7 @@
- 
- ifeq ($(NL3FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
--NLLIBS += -lnl-genl
-+NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
- NLLIBNAME = libnl-3.0
- else
- 	ifeq ($(NL2FOUND),Y)
diff --git a/testing/cups-filters/PKGBUILD b/testing/cups-filters/PKGBUILD
deleted file mode 100644
index 4822f84e0..000000000
--- a/testing/cups-filters/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 150443 2012-02-17 21:33:59Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="OpenPrinting CUPS Filters"
-arch=('i686' 'x86_64')
-url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
-license=('GPL')
-groups=()
-depends=('ghostscript' 'lcms2' 'poppler')
-makedepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-#options=(!makeflags)
-install=
-source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz)
-md5sums=('0f158e42798da7da030721f7ec139ece')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check
-#}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  #make DESTDIR="$pkgdir/" install
-  make install BUILDROOT="$pkgdir/"
-  # drop static lib
-  rm -f ${pkgdir}/usr/lib/*.a
-}
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index 985c4694d..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 154088 2012-03-22 23:51:37Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=curl
-pkgver=7.25.0
-pkgrel=1
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        curlbuild.h)
-md5sums=('a56cbe2778b09769f8a5ba17d8f4d92a'
-         '0e0fd2da19bde6f7be687667e2fac02f'
-         '751bd433ede935c8fae727377625a8ae')
-
-ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
-case $ptrsize in
-  8) _curlbuild=curlbuild-64.h ;;
-  4) _curlbuild=curlbuild-32.h ;;
-  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
-    exit 1
-    ;;
-esac
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-      --prefix=/usr \
-      --mandir=/usr/share/man \
-      --disable-dependency-tracking \
-      --disable-ldap \
-      --disable-ldaps \
-      --enable-ipv6 \
-      --enable-manual \
-      --enable-versioned-symbols \
-      --enable-threaded-resolver \
-      --without-libidn \
-      --with-random=/dev/urandom \
-      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # devel
-  install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
-  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
-  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/testing/curl/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/testing/dialog/PKGBUILD b/testing/dialog/PKGBUILD
deleted file mode 100644
index 0bcad68b9..000000000
--- a/testing/dialog/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 151732 2012-03-01 19:24:39Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=dialog
-pkgver=1.1_20120215
-pkgrel=1
-pkgdesc="A tool to display dialog boxes from shell scripts"
-arch=('i686' 'x86_64')
-url="http://invisible-island.net/dialog/"
-license=('LGPL2.1')
-depends=('ncurses')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-sha1sums=('0d8a07e064c6d4f9cc7d9cb21c4609dc4a19537e')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --with-ncursesw --enable-nls
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
deleted file mode 100644
index 0dc6893fa..000000000
--- a/testing/dnsutils/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 151909 2012-03-03 22:30:05Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: mario <mario_vazq@hotmail.com>
-
-pkgname=dnsutils
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.0
-_pkgver=9.9.0
-pkgrel=1
-
-pkgdesc='DNS utilities: dig host nslookup'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
-options=('!makeflags')
-depends=('openssl' 'krb5' 'idnkit')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch'
-        'trusted-key.key')
-sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
-          'b465ef6160b004838f04de9978fe1be8422af777'
-          'ca93da30c89de4365b846325d6ec4674a3e4fc02')
-
-replaces=('bind-tools' 'host')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-bind.patch
-	export STD_CDEFINES='-DDIG_SIGCHASE'
-
-	# hack to remove unused bloat from the binaries
-	CFLAGS+=' -fdata-sections -ffunction-sections'
-	LDFLAGS+=' -Wl,--gc-sections'
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-idn \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-	install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	cd bin; make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch
deleted file mode 100644
index 19d650964..000000000
--- a/testing/dnsutils/remove-bind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
-@@ -19,8 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PKCS11_TOOLS@
-+SUBDIRS =	dig
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -aur old/lib/Makefile.in new/lib/Makefile.in
---- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
-+++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
-@@ -23,7 +23,7 @@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =	isc dns isccfg bind9 lwres
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/testing/dnsutils/trusted-key.key b/testing/dnsutils/trusted-key.key
deleted file mode 100644
index 866cadda2..000000000
--- a/testing/dnsutils/trusted-key.key
+++ /dev/null
@@ -1,2 +0,0 @@
-.			172800	IN	DNSKEY	256 3 8 AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF
-.			172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0=
diff --git a/testing/dovecot/PKGBUILD b/testing/dovecot/PKGBUILD
deleted file mode 100644
index 894d24e3b..000000000
--- a/testing/dovecot/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 150923 2012-02-23 17:51:46Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Paul Mattal <paul@mattal.com>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
-
-pkgname=dovecot
-pkgver=2.1.1
-pkgrel=2
-pkgdesc="An IMAP and POP3 server written with security primarily in mind"
-arch=('i686' 'x86_64')
-url="http://dovecot.org/"
-license=("LGPL")
-depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10'
-        'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
-makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
-optdepends=('libldap: ldap plugin'
-           'clucene: alternative FTS indexer')
-provides=('imap-server' 'pop3-server')
-options=('!libtool')
-backup=(etc/dovecot/dovecot.conf
-	etc/dovecot/conf.d/{10-auth,10-director,10-logging,10-mail,10-master,10-ssl}.conf
-	etc/dovecot/conf.d/{15-lda,20-imap,20-lmtp,20-pop3}.conf
-	etc/dovecot/conf.d/{90-acl,90-plugin,90-quota}.conf
-	etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext
-	etc/ssl/dovecot-openssl.cnf)
-install=$pkgname.install
-source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
-md5sums=('db41a4de848d2bc834c30af0eb5575fd'
-         'e3bf2c4989ccb8a30a5d80ae89b06f76'
-         '587159e84e2da6f83d70b3c706ba87cc')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  	--libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
-	--disable-static \
-	--with-nss \
-	--with-pam \
-	--with-mysql \
-	--with-pgsql \
-	--with-sqlite \
-	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
-	--with-gssapi \
-	--with-ldap=plugin \
-	--with-zlib --with-bzlib \
-	--with-libcap \
-	--with-solr \
-	--with-lucene \
-	--with-docs
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # install the launch script
-  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
-
-  # install example conf files and ssl.conf
-  install -d -m755 ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf.ext ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/
-  install -d -m755 ${pkgdir}/etc/ssl
-  install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/
-
-  rm ${pkgdir}/etc/dovecot/README
-}
diff --git a/testing/dovecot/dovecot.install b/testing/dovecot/dovecot.install
deleted file mode 100644
index 873b82e2f..000000000
--- a/testing/dovecot/dovecot.install
+++ /dev/null
@@ -1,58 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-
-  # Make sure the group and user "dovecot"+"dovenull exists on this system and have the correct values
-
-  # dovecot
-  if grep -q "^dovecot:" /etc/group &> /dev/null ; then
-    groupmod -g 76 -n dovecot dovecot &> /dev/null
-  else
-    groupadd -g 76 dovecot &> /dev/null
-  fi
-
-  if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null
-  fi 
-
-  # dovenull
-  if grep -q "^dovenull:" /etc/group &> /dev/null ; then
-    groupmod -g 74 -n dovenull dovenull &> /dev/null
-  else
-    groupadd -g 74 dovenull &> /dev/null
-  fi
-
-  if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null
-  fi 
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-      if [ "`vercmp $2 2.0.0`" -lt 0 ]; then
-        # important upgrade notice
-        echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE"
-        echo "> ------------------------------------"
-        echo "> see http://wiki2.dovecot.org/Upgrading/2.0"
-	echo "> make sure, you convert the dovecot.conf file"
-      fi
-      if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then
-        # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later
-        userdel dovecot &> /dev/null
-        userdel dovenull &> /dev/null
-      fi
-    post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-    userdel dovecot &> /dev/null
-    userdel dovenull &> /dev/null
-    groupdel dovecot &> /dev/null || /bin/true
-    groupdel dovenull &> /dev/null || /bin/true
-    rm -rf /var/run/dovecot/ &> /dev/null || /bin/true
-}
diff --git a/testing/dovecot/dovecot.sh b/testing/dovecot/dovecot.sh
deleted file mode 100755
index e8966bd55..000000000
--- a/testing/dovecot/dovecot.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-daemon_name=dovecot
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-        start)
-                stat_busy "Starting $daemon_name daemon"
-
-                PID=$(get_pid)
-                if [[ -z $PID ]]; then
-                        [[ -f /var/run/$daemon_name.pid ]] &&
-                                rm -f /var/run/$daemon_name.pid
-                # RUN
-                $daemon_name
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        echo $(get_pid) > /var/run/$daemon_name.pid
-                        add_daemon $daemon_name
-                        stat_done
-                fi
-                else
-                        stat_fail
-                        exit 1
-                fi
-                ;;
-
-        stop)
-                stat_busy "Stopping $daemon_name daemon"
-                PID=$(get_pid)
-                # KILL
-                [[ -n $PID ]] && kill $PID &> /dev/null
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        rm -f /var/run/$daemon_name.pid &> /dev/null
-                        rm_daemon $daemon_name
-                        stat_done
-                fi
-                ;;
-
-        restart)
-                $0 stop
-                sleep 3
-                $0 start
-                ;;
-
-        status)
-                stat_busy "Checking $daemon_name status";
-                ck_status $daemon_name
-                ;;
-
-        *)
-                echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD
deleted file mode 100644
index 062c0b673..000000000
--- a/testing/ekiga/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 151807 2012-03-03 08:08:47Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.3.2
-pkgrel=3
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install
deleted file mode 100644
index b1d76a4a3..000000000
--- a/testing/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD
deleted file mode 100644
index eee03d3bb..000000000
--- a/testing/file/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 150825 2012-02-23 08:25:19Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=file
-pkgver=5.11
-pkgrel=1
-pkgdesc="File type identification utility"
-arch=('i686' 'x86_64')
-license=('custom')
-groups=('base')
-url="http://www.darwinsys.com/file/"
-depends=('glibc' 'zlib')
-options=('!libtool')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('16a407bd66d6c7a832f3a5c0d609c27b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
-  
-  ./configure --prefix=/usr --datadir=/usr/share/file
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR=${pkgdir} install
-  install -dm755 ${pkgdir}/usr/share/misc
-  ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc
-  
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/testing/freetype2/PKGBUILD b/testing/freetype2/PKGBUILD
deleted file mode 100644
index 7b63249ca..000000000
--- a/testing/freetype2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 152722 2012-03-09 11:24:37Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=freetype2
-pkgver=2.4.9
-pkgrel=1
-pkgdesc="TrueType font rendering library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://freetype.sourceforge.net"
-depends=('zlib' 'bzip2' 'sh')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
-        freetype-2.3.0-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch)
-md5sums=('77a893dae81fd5b896632715ca041179'
-         '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680')
-
-build() {
-  cd "${srcdir}/freetype-${pkgver}"
-  patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
-  patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
-
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/freetype-${pkgver}"
-  make -k check
-}
-
-package() {
-  cd "${srcdir}/freetype-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/freetype2/freetype-2.2.1-enable-valid.patch b/testing/freetype2/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f..000000000
--- a/testing/freetype2/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
- 
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
- 
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
- 
- # OpenType table validation.  Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/testing/freetype2/freetype-2.3.0-enable-spr.patch b/testing/freetype2/freetype-2.3.0-enable-spr.patch
deleted file mode 100644
index 8432e28a4..000000000
--- a/testing/freetype2/freetype-2.3.0-enable-spr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
-+++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
-   /* This is done to allow FreeType clients to run unmodified, forcing     */
-   /* them to display normal gray-level anti-aliased glyphs.                */
-   /*                                                                       */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
- 
- 
-   /*************************************************************************/
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-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/ghc/PKGBUILD b/testing/ghc/PKGBUILD
deleted file mode 100644
index 43b5a69a0..000000000
--- a/testing/ghc/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 151665 2012-02-29 21:12:37Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Special note for devs looking to upgrade this package:
-#   ghc places a unique hash for each library when it is built.
-#   Libraries depend on versions specified by those hashes.
-#   This implies that all libraries need to be rebuilt when ghc is rebuilt.
-#   Also, due to dependency loop problems, haskell-ghc-paths and haddock
-#   do not carry version dependencies. You will have to remember to build them too.
-
-pkgname=ghc
-pkgver=7.4.1
-pkgrel=2
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-depends=('perl' 'gmp>=5.0' 'gcc' 'libffi')
-makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
-checkdepends=('python2')
-install='ghc.install'
-groups=('haskell')
-provides=('haskell-array=0.4.0.0'
-          'haskell-base=4.5.0.0'
-          'haskell-binary=0.5.1.0'
-          'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.9.2.1'
-          'haskell-containers=0.4.2.1'
-          'haskell-deepseq=1.3.0.0'
-          'haskell-directory=1.1.0.2'
-          'haskell-extensible-exceptions=0.1.1.4'
-          'haskell-filepath=1.3.0.0'
-          'haskell-ghc-prim=0.2.0.0'
-          'haskell-haskell2010=1.1.0.1'
-          'haskell-haskell98=2.0.0.1'
-          'haskell-hoopl=3.8.7.3'
-          'haskell-hpc=0.5.1.1'
-          'haskell-integer-gmp=0.4.0.0'
-          'haskell-old-locale=1.0.0.4'
-          'haskell-old-time=1.1.0.0'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.1'
-          'haskell-template-haskell=2.7.0.0'
-          'haskell-time=1.4'
-          'haskell-unix=2.5.1.0'
-          'haskell-cabal=1.14.0'
-         )
-replaces=('haskell-array<0.4.0.0'
-          'haskell-base<4.5.0.0'
-          'haskell-binary<0.5.1.0'
-          'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.9.2.1'
-          'haskell-containers<0.4.2.1'
-          'haskell-deepseq<1.3.0.0'
-          'haskell-directory<1.1.0.2'
-          'haskell-extensible-exceptions<0.1.1.4'
-          'haskell-filepath<1.3.0.0'
-          'haskell-ghc-prim<0.2.0.0'
-          'haskell-haskell2010<1.1.0.1'
-          'haskell-haskell98<2.0.0.1'
-          'haskell-hoopl<3.8.7.3'
-          'haskell-hpc<0.5.1.1'
-          'haskell-integer-gmp<0.4.0.0'
-          'haskell-old-locale<1.0.0.4'
-          'haskell-old-time<1.1.0.0'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.1'
-          'haskell-template-haskell<2.7.0.0'
-          'haskell-time<1.4'
-          'haskell-unix<2.5.1.0'
-          'haskell-cabal<1.14.0'
-         )
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('5d86c420978b49cc60edea9bd4c36703'
-         '54bc9405c14c3226b6e3de3cd61e2777'
-         '82b67cdd24a2e434a4399f30f14b21a3')
-
-build() {
-  cd ghc-${pkgver}
-
-  cp ${srcdir}/build.mk mk/build.mk
-
-  ./configure \
-    --prefix=/usr
-
-  make -j4 -l8
-}
-
-check() {
-  cd ghc-${pkgver}
-
-  # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
-  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
-
-  # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
-  make THREADS=9 test
-  # might be some failures
-  #make fulltest
-}
-
-package() {
-  cd ghc-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/ghc
-  install -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/ghc
-}
diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk
deleted file mode 100644
index bc26a21fe..000000000
--- a/testing/ghc/build.mk
+++ /dev/null
@@ -1,175 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# overall build type, and then tweak the options in the relevant section
-# below.
-
-# Uncomment one of these to select a build profile below:
-
-# Full build with max optimisation and everything enabled (very slow build)
-BuildFlavour = perf
-
-# Fast build with optimised libraries, no profiling (RECOMMENDED):
-#BuildFlavour = quick
-
-# Even faster build.  NOT RECOMMENDED: the libraries will be
-# completely unoptimised, so any code built with this compiler
-# (including stage2) will run very slowly:
-#BuildFlavour = quickest
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-# An unregisterised, optimised build of ghc, for porting:
-#BuildFlavour = unreg
-
-GhcLibWays = v
-
-# -------- 1. A Performance/Distribution build--------------------------------
-
-ifeq "$(BuildFlavour)" "perf"
-
-# perf matches the default settings, repeated here for comparison:
-
-SRC_HC_OPTS     = -O -H64m
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O2 -fasm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# -------- A Fast build ------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O0 -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- A Fast build with optimised libs ----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- Profile the stage2 compiler ---------------------------------------
-
-ifeq "$(BuildFlavour)" "prof"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O -fasm
-GhcLibHcOpts       = -O -fasm
-
-GhcLibWays         += p
-GhcProfiled        = YES
-
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-
-# -------- A Development build (stage 1) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts    = -Rghc-timing -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
-
-endif
-
-# -------- A Development build (stage 2) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O -fasm
-GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
-
-# After stage 1 and the libraries have been built, you can uncomment this line:
-
-# stage=2
-
-# Then stage 1 will not be touched by the build system, until
-# you comment the line again.  This is a useful trick for when you're
-# working on stage 2 and want to freeze stage 1 and the libraries for
-# a while.
-
-endif
-
-# -------- A Unregisterised build) -------------------------------------------
-
-ifeq "$(BuildFlavour)" "unreg"
-
-GhcUnregisterised    = YES
-GhcWithNativeCodeGen = NO
-
-SRC_HC_OPTS          = -O -H64m
-GhcStage1HcOpts      = -O
-GhcStage2HcOpts      = -O2
-GhcHcOpts            = -Rghc-timing
-GhcLibHcOpts         = -O2
-SplitObjs            = NO
-HADDOCK_DOCS         = NO
-BUILD_DOCBOOK_HTML   = NO
-BUILD_DOCBOOK_PS     = NO
-BUILD_DOCBOOK_PDF    = NO
-
-endif
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# NoFib settings
-NoFibWays =
-STRIP_CMD = :
diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install
deleted file mode 100644
index c0200e4a6..000000000
--- a/testing/ghc/ghc.install
+++ /dev/null
@@ -1,10 +0,0 @@
-pre_upgrade() {
-  echo '==> Unregistering cabalized packages...'
-  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
-  echo '==> Done.'
-}
-
-post_upgrade() {
-  echo '==> All cabalized packages need to be reinstalled now.'
-  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
-}
diff --git a/testing/ghc/print-provides-replaces.sh b/testing/ghc/print-provides-replaces.sh
deleted file mode 100755
index 33d1da051..000000000
--- a/testing/ghc/print-provides-replaces.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. PKGBUILD
-
-if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
-  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
-  exit 1
-fi
-
-declare -A exclude
-# no Win32 cause we're not building on windows
-exclude['Win32']=1
-# no integer-simple because we use integer-gmp
-exclude['integer-simple']=1
-# extract excluded libraries from ghc.mk
-for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
-  exclude[${exclude_pkg}]=1
-done
-
-cd src/ghc-${pkgver}/libraries
-
-# $1 is the name of the variable
-# $2 is the string for the test, either '=' or '<'
-print_var() {
-  printf "$1=("
-  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
-    [[ ${exclude[${pkg}]} ]] && continue
-    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
-  done
-  # also add cabal
-  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
-  echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces' '<'
diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/testing/glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/testing/glibc/glibc-2.15-confstr-strdup.patch b/testing/glibc/glibc-2.15-confstr-strdup.patch
deleted file mode 100644
index 5ce9cd232..000000000
--- a/testing/glibc/glibc-2.15-confstr-strdup.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/posix/confstr.c b/posix/confstr.c
-index 3c9566d..3ba9e5a 100644
---- a/posix/confstr.c
-+++ b/posix/confstr.c
-@@ -104,7 +104,7 @@ confstr (name, buf, len)
- 	  }
- #endif
- 	restenvs[string_len++] = '\0';
--	string = restenvs;
-+	string = strdup(restenvs);
-       }
-       break;
- 
-@@ -167,7 +167,7 @@ confstr (name, buf, len)
- 	  }
- #endif
- 	restenvs[string_len++] = '\0';
--	string = restenvs;
-+	string = strdup(restenvs);
-       }
-       break;
- 
-@@ -230,7 +230,7 @@ confstr (name, buf, len)
- 	  }
- #endif
- 	restenvs[string_len++] = '\0';
--	string = restenvs;
-+	string = strdup(restenvs);
-       }
-       break;
- 
diff --git a/testing/gnupg/PKGBUILD b/testing/gnupg/PKGBUILD
deleted file mode 100644
index 9aca50271..000000000
--- a/testing/gnupg/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 154401 2012-03-27 20:04:10Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=gnupg
-pkgver=2.0.19
-pkgrel=1
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('curl: gpg2keys_curl'
-            'libldap: gpg2keys_ldap'
-            'libusb-compat: scdaemon'
-            'texinfo: documentation')
-makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
-depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
-source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
-          'f6e6830610a8629b0aad69d789373bf8ca481733')
-
-install=install
-
-conflicts=('gnupg2')
-provides=("gnupg2=${pkgver}")
-replaces=('gnupg2')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
-	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
-}
diff --git a/testing/gnupg/gnupg.install b/testing/gnupg/gnupg.install
deleted file mode 100644
index 0a6f3d518..000000000
--- a/testing/gnupg/gnupg.install
+++ /dev/null
@@ -1,21 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f ${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 ${info_dir}/dir 2> /dev/null
-  done
-}
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnupg/install b/testing/gnupg/install
deleted file mode 100644
index 3a5dc9fd6..000000000
--- a/testing/gnupg/install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f ${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 ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/gpgme/PKGBUILD b/testing/gpgme/PKGBUILD
deleted file mode 100644
index 09182b057..000000000
--- a/testing/gpgme/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154244 2012-03-24 17:10:41Z bisson $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgname=gpgme
-pkgver=1.3.1
-pkgrel=4
-pkgdesc="A C wrapper library for GnuPG"
-arch=('i686' 'x86_64')
-url="http://www.gnupg.org/related_software/gpgme/"
-license=('GPL')
-depends=('libgpg-error' 'pth' 'gnupg>=2')
-install=${pkgname}.install
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('90afa8436ce2b2683c001c824bd22601'
-         'a032ddc27177ef4ee54e25a231e62da5')
-sha1sums=('7d19a95a2239da13764dad7f97541be884ec5a37'
-          '93316a81a8f903c5b604716b6937884ea7b0917a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/gpgme/gpgme.install b/testing/gpgme/gpgme.install
deleted file mode 100644
index b54620d9a..000000000
--- a/testing/gpgme/gpgme.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(gpgme.info gpgme.info-1 gpgme.info-2)
-
-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/testing/grep/PKGBUILD b/testing/grep/PKGBUILD
deleted file mode 100644
index 511e1b119..000000000
--- a/testing/grep/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 153237 2012-03-12 09:51:20Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.11
-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}
-        grep-2.11-exclude-dir-crash.patch)
-md5sums=('ad9c6dbdeab93e50d2bc380f10ed3643'
-         'e4fea5e355973c951f93f48bc86f92fa'
-         'e882644cf8c1a4e37da7ba8c0867e70b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i $srcdir/grep-2.11-exclude-dir-crash.patch
-  ./configure --prefix=/usr --without-included-regex
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  install -dm755 ${pkgdir}/bin
-  ln -s /usr/bin/grep ${pkgdir}/bin/grep
-}
diff --git a/testing/grep/grep-2.11-exclude-dir-crash.patch b/testing/grep/grep-2.11-exclude-dir-crash.patch
deleted file mode 100644
index 6b1731768..000000000
--- a/testing/grep/grep-2.11-exclude-dir-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 12 Mar 2012 09:28:01 +0100
-Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand
-
-* src/main.c (grepdir): Don't invoke excluded_file_name on NULL.
-* NEWS (Bug fixes): Mention it.
----
- NEWS       |    5 +++++
- src/main.c |    2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index d0a63d5..d4d70f5 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,11 @@ GNU grep NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug fixes
-+
-+   grep no longer segfaults with -r --exclude-dir and no file operand.
-+   I.e., ":|grep -r --exclude-dir=D PAT" would segfault.
-+
- 
- * Noteworthy changes in release 2.11 (2012-03-02) [stable]
- 
-diff --git a/src/main.c b/src/main.c
-index 2f6c761..f4f1235 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats)
-   struct stats const *ancestor;
-   char *name_space;
-   int status = 1;
--  if (excluded_directory_patterns
-+  if (dir && excluded_directory_patterns
-       && excluded_file_name (excluded_directory_patterns, dir))
-     return 1;
- 
--- 
-1.7.9.3
-
diff --git a/testing/grep/grep.install b/testing/grep/grep.install
deleted file mode 100644
index 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/happy/PKGBUILD b/testing/happy/PKGBUILD
deleted file mode 100644
index 4c17ba500..000000000
--- a/testing/happy/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 151667 2012-02-29 21:12:39Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
- 
-pkgname=happy
-pkgver=1.18.9
-pkgrel=4
-pkgdesc="The Parser Generator for Haskell"
-url="http://www.haskell.org/happy/"
-arch=('i686' 'x86_64')
-license=("custom:BSD3")
-depends=('gmp')
-makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('aeb565fe572f979f15a24db0df2de37d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  runhaskell Setup.lhs configure -O --prefix=/usr
-  runhaskell Setup.lhs build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  runhaskell Setup.lhs copy --destdir="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/haskell-html/PKGBUILD b/testing/haskell-html/PKGBUILD
deleted file mode 100644
index 44a3ea50b..000000000
--- a/testing/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=10
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-html/haskell-html.install b/testing/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/testing/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD
deleted file mode 100644
index 79de205cc..000000000
--- a/testing/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.2
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('b61ff88ef8d699f73a6ed27c6abf6600')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-http/haskell-http.install b/testing/haskell-http/haskell-http.install
deleted file mode 100644
index fdebb1cb8..000000000
--- a/testing/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-http
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD
deleted file mode 100644
index 315d81a73..000000000
--- a/testing/haskell-mtl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=mtl
-pkgname=haskell-mtl
-pkgver=2.0.1.0
-pkgrel=4
-pkgdesc="Monad transformer library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('934fa813625ef7e88a6a96a09815ff95')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-mtl/haskell-mtl.install b/testing/haskell-mtl/haskell-mtl.install
deleted file mode 100644
index 9325811e8..000000000
--- a/testing/haskell-mtl/haskell-mtl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mtl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD
deleted file mode 100644
index 59dc9334b..000000000
--- a/testing/haskell-network/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=network
-pkgname=haskell-network
-pkgver=2.3.0.11
-pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('cfe4922ac85685be9f86d4d34654f481')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-network/haskell-network.install b/testing/haskell-network/haskell-network.install
deleted file mode 100644
index a56c31d0a..000000000
--- a/testing/haskell-network/haskell-network.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD
deleted file mode 100644
index e4f7da1e6..000000000
--- a/testing/haskell-parsec/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-
-_hkgname=parsec
-pkgname=haskell-parsec
-pkgver=3.1.2
-pkgrel=1
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('c2a75dfd247ae4839e2602b62dc87487')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-parsec/haskell-parsec.install b/testing/haskell-parsec/haskell-parsec.install
deleted file mode 100644
index dfa0701b9..000000000
--- a/testing/haskell-parsec/haskell-parsec.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-quickcheck/PKGBUILD b/testing/haskell-quickcheck/PKGBUILD
deleted file mode 100644
index 7b27cfb0c..000000000
--- a/testing/haskell-quickcheck/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=QuickCheck
-pkgname=haskell-quickcheck
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Automatic testing of Haskell programs"
-url="http://hackage.haskell.org/package/QuickCheck"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-quickcheck/haskell-quickcheck.install b/testing/haskell-quickcheck/haskell-quickcheck.install
deleted file mode 100644
index c9e12fadc..000000000
--- a/testing/haskell-quickcheck/haskell-quickcheck.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-quickcheck
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-random/PKGBUILD b/testing/haskell-random/PKGBUILD
deleted file mode 100644
index 3b929c3d6..000000000
--- a/testing/haskell-random/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=random
-pkgname=haskell-random
-pkgver=1.0.1.1
-pkgrel=1
-pkgdesc="A basic random number generation library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/testing/haskell-random/haskell-random.install b/testing/haskell-random/haskell-random.install
deleted file mode 100644
index b6d807e1a..000000000
--- a/testing/haskell-random/haskell-random.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-regex-base/PKGBUILD b/testing/haskell-regex-base/PKGBUILD
deleted file mode 100644
index 3b8ecb4bb..000000000
--- a/testing/haskell-regex-base/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-base
-pkgname=haskell-regex-base
-pkgver=0.93.2
-pkgrel=5
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-regex-base/haskell-regex-base.install b/testing/haskell-regex-base/haskell-regex-base.install
deleted file mode 100644
index 3ad2fea28..000000000
--- a/testing/haskell-regex-base/haskell-regex-base.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-base
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-regex-compat/PKGBUILD b/testing/haskell-regex-compat/PKGBUILD
deleted file mode 100644
index c880ff4f2..000000000
--- a/testing/haskell-regex-compat/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-compat
-pkgname=haskell-regex-compat
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d0573ab4e2f3de5faa61380b67333320')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-regex-compat/haskell-regex-compat.install b/testing/haskell-regex-compat/haskell-regex-compat.install
deleted file mode 100644
index 898c0bba1..000000000
--- a/testing/haskell-regex-compat/haskell-regex-compat.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-regex-posix/PKGBUILD b/testing/haskell-regex-posix/PKGBUILD
deleted file mode 100644
index 1bed15490..000000000
--- a/testing/haskell-regex-posix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-posix
-pkgname=haskell-regex-posix
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="The posix regex backend for regex-base"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-regex-posix/haskell-regex-posix.install b/testing/haskell-regex-posix/haskell-regex-posix.install
deleted file mode 100644
index 2b89fae7b..000000000
--- a/testing/haskell-regex-posix/haskell-regex-posix.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-posix
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD
deleted file mode 100644
index c4c9664f7..000000000
--- a/testing/haskell-text/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=text
-pkgname=haskell-text
-pkgver=0.11.1.13
-pkgrel=1
-pkgdesc="An efficient packed Unicode text type."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/testing/haskell-text/haskell-text.install b/testing/haskell-text/haskell-text.install
deleted file mode 100644
index 620db3921..000000000
--- a/testing/haskell-text/haskell-text.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-text
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD
deleted file mode 100644
index 078bde867..000000000
--- a/testing/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 151687 2012-02-29 21:13:06Z tdziedzic $
-
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Rémy Oudompheng <remy@archlinux.org>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.2.2.0
-pkgrel=4
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=${pkgname}.install
-md5sums=('3470ac66116900cd1ba84d3744474e49')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-transformers/haskell-transformers.install b/testing/haskell-transformers/haskell-transformers.install
deleted file mode 100644
index eec2af6e1..000000000
--- a/testing/haskell-transformers/haskell-transformers.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD
deleted file mode 100644
index d47562b9d..000000000
--- a/testing/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=3
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'zlib' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-zlib/haskell-zlib.install b/testing/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index d387b7b65..000000000
--- a/testing/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD
deleted file mode 100644
index d5f04fc5c..000000000
--- a/testing/hugin/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 151809 2012-03-03 08:08:49Z 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=2
-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/icedtea-web-java7/PKGBUILD b/testing/icedtea-web-java7/PKGBUILD
deleted file mode 100644
index b12233bbb..000000000
--- a/testing/icedtea-web-java7/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=icedtea-web-java7
-pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit')
-source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d')
-
-_javaver=7
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-build() {
-  cd "${srcdir}"/icedtea-web*
-
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-
-  ./configure --prefix=${_jvmdir} \
-      --datarootdir=/usr/share \
-      --with-jdk-home=${_jvmdir}
-  make
-}
-
-check() {
-  cd "${srcdir}"/icedtea-web*
-  # as more tests have been added some are expectged to fail
-  # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html
-  make -k check || /bin/true
-}
-
-
-package_icedtea-web-java7() {
-
-  pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
-  depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
-  install=${pkgname}.install
-
-  cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
-  # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
-  make DESTDIR="${pkgdir}" install-exec-local install-data-local
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
-  install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
-  # remove splitted doc files
-  rm -rf ${pkgdir}/usr/share/doc
-
-  # link binaries into /usr/bin + jre/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
-  done
-  popd
-
-  # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
-  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
-  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-java7-doc() {
-
-  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
-  cd "${srcdir}"/icedtea-web*
-  make DESTDIR="${pkgdir}" install-data-local
-  # remove javaws about and man page
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/man
-  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
-}
diff --git a/testing/icedtea-web-java7/icedtea-web-java7.install b/testing/icedtea-web-java7/icedtea-web-java7.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/icedtea-web-java7/icedtea-web-java7.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/icedtea-web/PKGBUILD b/testing/icedtea-web/PKGBUILD
deleted file mode 100644
index 55be91977..000000000
--- a/testing/icedtea-web/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 152425 2012-03-06 19:33:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=icedtea-web
-pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit')
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-sha256sums=('3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d')
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
-      --datarootdir=/usr/share
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # as more tests have been added some are expectged to fail
-  # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html
-  make -k check || /bin/true
-}
-
-
-package_icedtea-web() {
-
-  pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
-  depends=('openjdk6' 'gtk2' 'desktop-file-utils')
-  install=$pkgname.install
-
-  cd "$srcdir/$pkgname-$pkgver"
-  # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
-  make DESTDIR="$pkgdir" install-exec-local install-data-local
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
-  install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
-  # remove splitted doc files
-  rm -rf ${pkgdir}/usr/share/doc
-
-  # link binaries into /usr/bin + jre/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
-  done
-  popd
-
-  # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
-  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
-  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-doc() {
-
-  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install-data-local
-  # remove javaws about and man page
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/man
-  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
-}
diff --git a/testing/icedtea-web/icedtea-web.install b/testing/icedtea-web/icedtea-web.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/icedtea-web/icedtea-web.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/iproute2/fix-ip-l.patch b/testing/iproute2/fix-ip-l.patch
deleted file mode 100644
index 7f1749cbb..000000000
--- a/testing/iproute2/fix-ip-l.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <shemminger@vyatta.com>
-Date: Fri, 20 Jan 2012 08:16:02 -0800
-Subject: [PATCH] ip: make 'ip l' be 'ip link'
-
-Restore compatiablity for those lazy typists.
----
- ip/ip.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ip/ip.c b/ip/ip.c
-index 7b4bacb..20dc3b5 100644
---- a/ip/ip.c
-+++ b/ip/ip.c
-@@ -72,8 +72,8 @@ static const struct cmd {
- 	{ "neighbour",	do_ipneigh },
- 	{ "ntable",	do_ipntable },
- 	{ "ntbl",	do_ipntable },
--	{ "l2tp",	do_ipl2tp },
- 	{ "link",	do_iplink },
-+	{ "l2tp",	do_ipl2tp },
- 	{ "tunnel",	do_iptunnel },
- 	{ "tunl",	do_iptunnel },
- 	{ "tuntap",	do_iptuntap },
--- 
-1.7.6.5
-
diff --git a/testing/iproute2/remove-libnl-headers.patch b/testing/iproute2/remove-libnl-headers.patch
deleted file mode 100644
index 921e1fa82..000000000
--- a/testing/iproute2/remove-libnl-headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <shemminger@vyatta.com>
-Date: Tue, 10 Jan 2012 08:50:49 -0800
-Subject: [PATCH] iplt2p: remove unused libnl headers
-
-Leftover from change to original code.
----
- ip/ipl2tp.c |    7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
-index 042ddb4..97f98b6 100644
---- a/ip/ipl2tp.c
-+++ b/ip/ipl2tp.c
-@@ -23,13 +23,6 @@
- #include <linux/if_arp.h>
- #include <linux/ip.h>
- 
--#include <netlink/netlink.h>
--#include <netlink/genl/genl.h>
--#include <netlink/genl/family.h>
--#include <netlink/genl/mngt.h>
--#include <netlink/genl/ctrl.h>
--#include <netlink/utils.h>
--
- #include <linux/genetlink.h>
- #include <linux/l2tp.h>
- 
--- 
-1.7.6.5
-
diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
deleted file mode 100644
index c98a92afc..000000000
--- a/testing/iw/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 150308 2012-02-16 20:41:33Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=iw
-pkgver=3.3
-pkgrel=2
-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/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD
deleted file mode 100644
index fb683380f..000000000
--- a/testing/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 152071 2012-03-04 14:42:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.8.0
-pkgrel=2
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/xz/kig-${pkgver}.tar.xz")
-sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kig-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
-}
diff --git a/testing/kdeedu-kig/kdeedu-kig.install b/testing/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-kig/kdeedu-kig.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kdeedu-rocs/PKGBUILD b/testing/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index b8ac2c3e5..000000000
--- a/testing/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 152080 2012-03-04 14:47:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.8.0
-pkgrel=2
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/xz/rocs-${pkgver}.tar.xz")
-sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969')
-options=('!makeflags')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../rocs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD
deleted file mode 100644
index 2f43c009e..000000000
--- a/testing/kismet/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 150310 2012-02-16 20:41:36Z heftig $
-# 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=4
-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' 'libnl1' '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 3078d0625..000000000
--- a/testing/kismet/kismet.changelog
+++ /dev/null
@@ -1,29 +0,0 @@
-2012-02-10  Eric Bélanger  <eric@archlinux.org>
-	* Change libnl depends to libnl1
-	
-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/libarchive/interpret-non-posix-zips.patch b/testing/libarchive/interpret-non-posix-zips.patch
deleted file mode 100644
index 63bc439d9..000000000
--- a/testing/libarchive/interpret-non-posix-zips.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-Index: libarchive/archive_read_support_format_zip.c
-===================================================================
---- libarchive/archive_read_support_format_zip.c	(revision 4189)
-+++ libarchive/archive_read_support_format_zip.c	(revision 4190)
-@@ -217,14 +217,13 @@
- }
- 
- /*
-- * TODO: This is a performance sink because it forces
-- * the read core to drop buffered data from the start
-- * of file, which will then have to be re-read again
-- * if this bidder loses.
-+ * TODO: This is a performance sink because it forces the read core to
-+ * drop buffered data from the start of file, which will then have to
-+ * be re-read again if this bidder loses.
-  *
-- * Consider passing in the winning bid value to subsequent
-- * bidders so that this bidder in particular can avoid
-- * seeking if it knows it's going to lose anyway.
-+ * We workaround this a little by passing in the best bid so far so
-+ * that later bidders can do nothing if they know they'll never
-+ * outbid.  But we can certainly do better...
-  */
- static int
- archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
-@@ -311,19 +310,29 @@
- 		external_attributes = archive_le32dec(p + 38);
- 		zip_entry->local_header_offset = archive_le32dec(p + 42);
- 
-+		/* If we can't guess the mode, leave it zero here;
-+		   when we read the local file header we might get
-+		   more information. */
-+		zip_entry->mode = 0;
- 		if (zip_entry->system == 3) {
- 			zip_entry->mode = external_attributes >> 16;
--		} else {
--			zip_entry->mode = AE_IFREG | 0777;
- 		}
- 
--		/* Do we need to parse filename here? */
--		/* Or can we wait until we read the local header? */
-+		/* We don't read the filename until we get to the
-+		   local file header.  Reading it here would speed up
-+		   table-of-contents operations (removing the need to
-+		   find and read local file header to get the
-+		   filename) at the cost of requiring a lot of extra
-+		   space. */
-+		/* We don't read the extra block here.  We assume it
-+		   will be duplicated at the local file header. */
- 		__archive_read_consume(a,
- 		    46 + filename_length + extra_length + comment_length);
- 	}
- 
--	/* TODO: Sort zip entries. */
-+	/* TODO: Sort zip entries by file offset so that we
-+	   can optimize get_next_header() to use skip instead of
-+	   seek. */
- 
- 	return ARCHIVE_OK;
- }
-@@ -434,6 +443,11 @@
- 			return (30);
- 	}
- 
-+	/* TODO: It's worth looking ahead a little bit for a valid
-+	 * PK signature.  In particular, that would make it possible
-+	 * to read some UUEncoded SFX files or SFX files coming from
-+	 * a network socket. */
-+
- 	return (0);
- }
- 
-Index: libarchive/test/test_compat_zip_6.zip.uu
-===================================================================
---- libarchive/test/test_compat_zip_6.zip.uu	(revision 0)
-+++ libarchive/test/test_compat_zip_6.zip.uu	(revision 4190)
-@@ -0,0 +1,10 @@
-+begin 755 test_compat_zip_6.zip
-+M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@
-+M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD
-+M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0-
-+M"E!+`0(4"PH``````'@3-T`````````````````6````````````$```````
-+M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+
-+M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E
-+M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B```````
-+`
-+end
-Index: libarchive/test/test_compat_zip.c
-===================================================================
---- libarchive/test/test_compat_zip.c	(revision 4189)
-+++ libarchive/test/test_compat_zip.c	(revision 4190)
-@@ -348,6 +348,53 @@
- 	free(p);
- }
- 
-+/*
-+ * Issue 225: Errors extracting MSDOS Zip archives with directories.
-+ */
-+static void
-+compat_zip_6_verify(struct archive *a)
-+{
-+	struct archive_entry *ae;
-+
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-+	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
-+	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
-+	assertEqualInt(1327314468, archive_entry_mtime(ae));
-+	assertEqualInt(0, archive_entry_size(ae));
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-+	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
-+	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
-+	assertEqualInt(1327314476, archive_entry_mtime(ae));
-+	assertEqualInt(11, archive_entry_size(ae));
-+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
-+}
-+
-+static void
-+test_compat_zip_6(void)
-+{
-+	const char *refname = "test_compat_zip_6.zip";
-+	struct archive *a;
-+	void *p;
-+	size_t s;
-+
-+	extract_reference_file(refname);
-+	p = slurpfile(&s, refname);
-+
-+	assert((a = archive_read_new()) != NULL);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7));
-+	compat_zip_6_verify(a);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
-+
-+	assert((a = archive_read_new()) != NULL);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7));
-+	compat_zip_6_verify(a);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
-+}
-+
- DEFINE_TEST(test_compat_zip)
- {
- 	test_compat_zip_1();
-@@ -355,6 +402,7 @@
- 	test_compat_zip_3();
- 	test_compat_zip_4();
- 	test_compat_zip_5();
-+	test_compat_zip_6();
- }
- 
- 
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 4189)
-+++ Makefile.am	(revision 4190)
-@@ -462,6 +462,7 @@
- 	libarchive/test/test_compat_zip_3.zip.uu			\
- 	libarchive/test/test_compat_zip_4.zip.uu			\
- 	libarchive/test/test_compat_zip_5.zip.uu			\
-+	libarchive/test/test_compat_zip_6.zip.uu			\
- 	libarchive/test/test_fuzz_1.iso.Z.uu				\
- 	libarchive/test/test_fuzz.cab.uu				\
- 	libarchive/test/test_fuzz.lzh.uu				\
diff --git a/testing/libarchive/skip-fiemap-on-unavail.patch b/testing/libarchive/skip-fiemap-on-unavail.patch
deleted file mode 100644
index d054aea4e..000000000
--- a/testing/libarchive/skip-fiemap-on-unavail.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 293687358e2c52213a3f077bb3d8f860ea5bfda9 Mon Sep 17 00:00:00 2001
-From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
-Date: Mon, 6 Feb 2012 04:51:16 +0900
-Subject: [PATCH] Fix issue 238. Skip the setup sparse on linux without a
- check of errno if ioctl(,FS_IOC_FIEMAP,) failed because the
- errno is not fixed , for example, some file system returns
- ENOTTY, another returns EOPNOTSUPP, or EINVAL and so on. We
- cannot decide what errno exactly indicates an unsupported
- error.
-
----
- libarchive/archive_read_disk_entry_from_file.c |   13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
-index eef42ef74..6415008 100644
---- a/libarchive/archive_read_disk_entry_from_file.c
-+++ b/libarchive/archive_read_disk_entry_from_file.c
-@@ -859,16 +859,9 @@ setup_sparse(struct archive_read_disk *a,
- 
- 		r = ioctl(fd, FS_IOC_FIEMAP, fm); 
- 		if (r < 0) {
--			/* When errno is ENOTTY, it is better we should
--			 * return ARCHIVE_OK because an earlier version
--			 *(<2.6.28) cannot perfom FS_IOC_FIEMAP.
--			 * We should also check if errno is EOPNOTSUPP,
--			 * it means "Operation not supported". */
--			if (errno != ENOTTY && errno != EOPNOTSUPP) {
--				archive_set_error(&a->archive, errno,
--				    "FIEMAP failed");
--				exit_sts = ARCHIVE_FAILED;
--			}
-+			/* When something error happens, it is better we
-+			 * should return ARCHIVE_OK because an earlier
-+			 * version(<2.6.28) cannot perfom FS_IOC_FIEMAP. */
- 			goto exit_setup_sparse;
- 		}
- 		if (fm->fm_mapped_extents == 0)
--- 
-1.7.9.2
-
diff --git a/testing/libarchive/test-with-zip-mtime.patch b/testing/libarchive/test-with-zip-mtime.patch
deleted file mode 100644
index 79e2f3c7e..000000000
--- a/testing/libarchive/test-with-zip-mtime.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libarchive/test/test_compat_zip.c
-===================================================================
---- libarchive/test/test_compat_zip.c	(revision 4197)
-+++ libarchive/test/test_compat_zip.c	(revision 4198)
-@@ -359,12 +359,16 @@
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
- 	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
- 	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
--	assertEqualInt(1327314468, archive_entry_mtime(ae));
-+	/* Zip timestamps are local time, so vary by time zone. */
-+	/* TODO: A more complex assert would work here; we could
-+	   verify that it's within +/- 24 hours of a particular value. */
-+	/* assertEqualInt(1327314468, archive_entry_mtime(ae)); */
- 	assertEqualInt(0, archive_entry_size(ae));
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
- 	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
- 	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
--	assertEqualInt(1327314476, archive_entry_mtime(ae));
-+	/* Zip timestamps are local time, so vary by time zone. */
-+	/* assertEqualInt(1327314476, archive_entry_mtime(ae)); */
- 	assertEqualInt(11, archive_entry_size(ae));
- 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
- }
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 bfd29c1ca..000000000
--- a/testing/libdrm/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 153651 2012-03-17 08:41:21Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libdrm
-pkgver=2.4.32
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-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
-)
-sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
-          '825ff5e0c4238b31bdea52f104bfec8949270e25'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-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 5430244f9..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)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD
deleted file mode 100644
index a1de65d9f..000000000
--- a/testing/libedit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 153246 2012-03-12 13:49:58Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Roman Cheplyaka <roma@ro-che.info>
-
-pkgname=libedit
-pkgver=20120311_3.0
-pkgrel=1
-pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
-url='http://www.thrysoee.dk/editline/'
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('ncurses')
-options=('!libtool')
-source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
-sha1sums=('2a4be10c33af5e3b09c1d3c8829b02fe5b41796b')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
-	./configure --prefix=/usr --enable-widec --enable-static=no
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
-	make prefix="${pkgdir}"/usr install
-
-	cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
-}
diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD
deleted file mode 100644
index fd436f152..000000000
--- a/testing/libevent/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 150654 2012-02-19 12:52:52Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=libevent
-pkgver=2.0.17
-pkgrel=1
-pkgdesc="An event notification library"
-arch=('i686' 'x86_64')
-url="http://www.monkey.org/~provos/libevent/"
-license=('GPL2')
-depends=('openssl')
-optdepends=('python2: to use event_rpcgen.py')
-options=('!libtool')
-source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc})
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  sed -i 's#python#python2#' event_rpcgen.py
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('dad64aaaaff16b5fbec25160c06fee9a'
-         'ef4a32a96df3941fed58fbe39b4eab9d')
diff --git a/testing/libgphoto2/PKGBUILD b/testing/libgphoto2/PKGBUILD
deleted file mode 100644
index 323b863db..000000000
--- a/testing/libgphoto2/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 152700 2012-03-08 23:18:37Z tomegun $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=libgphoto2
-pkgver=2.4.13
-pkgrel=1
-pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
-arch=(i686 x86_64)
-url="http://www.gphoto.org"
-license=(LGPL)
-depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb')
-install=libgphoto2.install
-options=('libtool')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure \
-	--prefix=/usr \
-	--disable-rpath
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Remove unused udev helper
-  rm -rf "${pkgdir}/usr/lib/udev"
-
-  install -m755 -d "${pkgdir}/lib/udev/rules.d"
-  LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
-  CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
-      "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \
-      "${pkgdir}/lib/udev/rules.d/40-gphoto.rules"
-
-  # Remove recursive symlink
-  rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"
-}
-md5sums=('7d8a1d3ae02069af381f07a0bb4bfc15')
diff --git a/testing/libgphoto2/libgphoto2.install b/testing/libgphoto2/libgphoto2.install
deleted file mode 100644
index c7944414f..000000000
--- a/testing/libgphoto2/libgphoto2.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_upgrade() {
-if [ "$(vercmp $2 2.14.13)" -lt 0 ]; then
-  groupdel camera &>/dev/null
-  echo "Users no longer need to be in the 'camera' group to use camera devices"
-fi
-}
diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD
deleted file mode 100644
index 3b4249cbe..000000000
--- a/testing/libnl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 150314 2012-02-16 20:41:42Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libnl
-pkgver=3.2.7
-pkgrel=1
-pkgdesc="Library for applications dealing with netlink sockets"
-arch=(i686 x86_64)
-url="http://www.infradead.org/~tgr/libnl/"
-license=(GPL)
-depends=(glibc)
-backup=(etc/libnl/classid etc/libnl/pktloc)
-options=(!libtool)
-source=("$url/files/$pkgname-$pkgver.tar.gz")
-md5sums=('6a233a9dffa0ee3a7f6110c95c5410ab')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libnl1/PKGBUILD b/testing/libnl1/PKGBUILD
deleted file mode 100644
index 2a7fe05fa..000000000
--- a/testing/libnl1/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150312 2012-02-16 20:41:40Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libnl1
-pkgver=1.1
-pkgrel=1
-pkgdesc="Library for applications dealing with netlink sockets (Legacy version)"
-arch=('i686' 'x86_64')
-url="http://www.infradead.org/~tgr/libnl/"
-license=('GPL')
-depends=('glibc')
-source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz"
-        'fix-compilation.patch')
-md5sums=('ae970ccd9144e132b68664f98e7ceeb1'
-         'e1f5e82c8aa1b3ad025c7b588178de1e')
-
-build() {
-  cd ${srcdir}/libnl-${pkgver}
-  patch -Np1 -i ${srcdir}/fix-compilation.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/libnl-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/libnl1/fix-compilation.patch b/testing/libnl1/fix-compilation.patch
deleted file mode 100644
index 891562a39..000000000
--- a/testing/libnl1/fix-compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-local.h	2009-06-26 11:15:33.186011844 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/testing/liborigin2/PKGBUILD b/testing/liborigin2/PKGBUILD
deleted file mode 100644
index 1e4edb312..000000000
--- a/testing/liborigin2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 151815 2012-03-03 08:08:57Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgbase=liborigin2
-pkgname=('liborigin2' 'liborigin2-docs')
-pkgver=20110829
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://soft.proindependent.com/liborigin2/"
-license=('GPL3')
-makedepends=('doxygen' 'qt' 'boost')
-replaces=('liborigin')
-provides=('liborigin')
-source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip
-	liborigin.pro.archlinux
-	http://tree.phi-sci.com/tree.hh)
-sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
-          '9bb73eccc031b3a9e7c061b8cdbaf3e20aa2669d'
-          '2fd9ff17ff6b6f34b20fc473c82bf17ac1922e86')
-
-build() {
-	cd "${srcdir}/${pkgbase}"
-
-	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
-        install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
-	qmake liborigin2.pro QMAKESPEC=linux-g++
-  	make QTDIR=/usr/ QMAKESPEC=linux-g++
-
-	 # create documentation
-        cd doc
-        doxygen
-}
-
-package_liborigin2() {
-        pkgdesc="A library for reading OriginLab OPJ project files"
-        depends=('boost-libs')
-
-        cd "${srcdir}/${pkgbase}"
-
-  	INSTALL_ROOT="${pkgdir}" make install
-
-        # install missing includes
-        install -Dm644 tree.hh "${pkgdir}/usr/include/liborigin2/tree.hh"
-        for i in *.h; do
-          install -Dm644 ${i} "${pkgdir}/usr/include/liborigin2/${i}"
-        done
-}
-package_liborigin2-docs() {
-        pkgdesc="Documentation for liborigin2: a library for reading OriginLab OPJ project files"
-
-        cd "${srcdir}/${pkgbase}/doc"
-	install -d "${pkgdir}/usr/share/doc/${pkgbase}"
-	cp -rf html/* "${pkgdir}/usr/share/doc/${pkgbase}"
-	chmod 755 "${pkgdir}/usr/share/doc/liborigin2/images"
-	chmod 644 "${pkgdir}/usr/share/doc/liborigin2/images/origin_import.png"
-}
diff --git a/testing/liborigin2/liborigin.pro.archlinux b/testing/liborigin2/liborigin.pro.archlinux
deleted file mode 100644
index f0eef7293..000000000
--- a/testing/liborigin2/liborigin.pro.archlinux
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET           = origin2

-TEMPLATE     = lib

-CONFIG      += warn_on release thread

-#CONFIG      += staticlib

-MOC_DIR      = ./tmp

-OBJECTS_DIR  = ./tmp

-

-DESTDIR      = ./

-

-#INCLUDEPATH += boost_1_33_0

-LIBS        += -lboost_date_time

-LIBS        += -lboost_thread

-

-headers.files = \$\$HEADERS

-headers.path = /usr/include/liborigin2

-target.path = /usr/lib

-INSTALLS = target headers

-

-include(liborigin2.pri)

-

diff --git a/testing/libpcap/PKGBUILD b/testing/libpcap/PKGBUILD
deleted file mode 100644
index 9d62dd421..000000000
--- a/testing/libpcap/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 150316 2012-02-16 20:41:44Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=libpcap
-pkgver=1.2.1
-pkgrel=2
-pkgdesc="A system-independent interface for user-level packet capture"
-arch=('i686' 'x86_64')
-url="http://www.tcpdump.org/"
-license=('BSD')
-depends=('glibc' 'libnl' 'sh')
-makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
-        libnl32.patch)
-sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd'
-            'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4'
-            '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/libnl32.patch"
-  autoreconf -f -i
-  ./configure --prefix=/usr --enable-ipv6 --with-libnl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -d -m755 ${pkgdir}/usr/bin
-  make DESTDIR=${pkgdir} install
-  # remove static library
-  rm -rf ${pkgdir}/usr/lib/libpcap.a
-  
-  # backwards compatibility, programs often look for net/bpf.h
-  mkdir -p ${pkgdir}/usr/include/net
-  cd ${pkgdir}/usr/include/net
-  ln -s ../pcap-bpf.h bpf.h
-
-  #install the license
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/testing/libpcap/libnl32.patch b/testing/libpcap/libnl32.patch
deleted file mode 100644
index 633fd003e..000000000
--- a/testing/libpcap/libnl32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in
---- libpcap-1.2.1/configure.in	2012-01-02 01:47:37.000000000 +0100
-+++ libpcap-1.2.1-libnl32/configure.in	2012-02-09 19:29:29.405603749 +0100
-@@ -433,12 +433,13 @@
- 		#
- 		# Try libnl 2.x first.
- 		#
--		AC_CHECK_LIB(nl, nl_socket_alloc,
-+		AC_CHECK_LIB(nl-3, nl_socket_alloc,
- 		[
- 			#
- 			# Yes, we have libnl 2.x.
- 			#
--			LIBS="-lnl-genl -lnl $LIBS"
-+			LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS"
-+			V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)"
- 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
- 		],
diff --git a/testing/libpciaccess/PKGBUILD b/testing/libpciaccess/PKGBUILD
deleted file mode 100644
index 3d396d2bb..000000000
--- a/testing/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.13
-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=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353')
-
-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/testing/libpst/PKGBUILD b/testing/libpst/PKGBUILD
deleted file mode 100644
index df08f1f9c..000000000
--- a/testing/libpst/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 151817 2012-03-03 08:09:00Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libpst
-pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.five-ten-sg.com/libpst/"
-license=('GPL')
-makedepends=('python2' 'boost')
-source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-      --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
-  make
-}
-
-package_libpst() {
-  pkgdesc="Outlook .pst file converter"
-  depends=('gcc-libs')
-  optdepends=('boost-libs: for libpst python interface')
-  options=('!libtool' '!docs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libpst-docs() {
-  pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-htmlDATA
-  cd "${srcdir}/${pkgbase}-${pkgver}/html"
-  make DESTDIR="${pkgdir}" install-htmldevelDATA
-}
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
deleted file mode 100644
index 0ba44063e..000000000
--- a/testing/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,662 +0,0 @@
-# $Id: PKGBUILD 153539 2012-03-15 18:08:35Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder')
-_LOver=3.5.1.2
-pkgver=3.5.1
-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' 'postgresql-libs'
-              #'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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.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
-	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
-	buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a)
-noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	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)
-md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3'
-         '607b544cd7b38f9e6db6fe7da25007a7'
-         'a3fa7818bfab14a6cccec645193e9982'
-         '18f577b374d60b3c760a3a3350407632'
-         'd28864eb2b59bb57b034c0d4662a3cee'
-         '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'
-         '15fe8b5d79fbdc0b6bc2b454086671e7')
-
-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
-	patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.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-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"\
-		--with-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
-
-#		--disable-ext-lightproof \
-
-
-#--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'
-             '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' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # no file-list so far
- install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
- 
-# # create directories from *list.txt file
-# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   install -dm755 ${pkgdir}/${directory/\%dir/}
-# done
-# # install files into the pkg from fakeinstall dir
-# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   dirname=`dirname $file`
-#   # check if directory has been already been created - some are missing like manpages
-#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-#   # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- 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/libreoffice/buildfix_boost.diff b/testing/libreoffice/buildfix_boost.diff
deleted file mode 100644
index d8608d0d4..000000000
--- a/testing/libreoffice/buildfix_boost.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 05 Apr 2011 14:07:02 +0000
-Subject: silence some more of that annoying gcc#47679
-
----
-diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
-index 1c804aa..9b33a5f 100644
---- a/boost/boost.gcc47679.patch
-+++ b/boost/boost.gcc47679.patch
-@@ -36,3 +36,26 @@
-          template <int MaxDigits>
-          inline bool allow_more_digits(std::size_t i)
-          {
-+--- misc/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-++++ misc/build/boost_1_44_0/boost/optional/optional.hpp	2011-04-05 13:19:01.223587256 +0100
-+@@ -31,6 +31,8 @@
-+ 
-+ #include "boost/optional/optional_fwd.hpp"
-+ 
-++#include <string.h>
-++
-+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-+ // VC6.0 has the following bug:
-+ //   When a templated assignment operator exist, an implicit conversion
-+@@ -114,6 +116,11 @@
-+ 
-+   public:
-+ 
-++    aligned_storage()
-++    {
-++      memset(&dummy_, 0, sizeof(dummy_));
-++    }
-++
-+     void const* address() const { return &dummy_.data[0]; }
-+     void      * address()       { return &dummy_.data[0]; }
-+ } ;
---
-cgit v0.8.3-6-g21f6
-
diff --git a/testing/libreoffice/buildfix_ct2n.diff b/testing/libreoffice/buildfix_ct2n.diff
deleted file mode 100644
index 979587f79..000000000
--- a/testing/libreoffice/buildfix_ct2n.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 12 Apr 2011 19:35:51 +0000
-Subject: duplicate NULLs
-
----
-diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
-index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n	ct2n	:	solenv NULL NULL
-+ct2n	ct2n	:	solenv NULL
- ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
- ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/libreoffice/gcc462_buildfix.diff b/testing/libreoffice/gcc462_buildfix.diff
deleted file mode 100644
index c19e520dc..000000000
--- a/testing/libreoffice/gcc462_buildfix.diff
+++ /dev/null
@@ -1,138 +0,0 @@
---- ./framework/source/accelerators/acceleratorcache.cxx.orig	2011-12-15 15:08:41.329168423 -0200
-+++ ./framework/source/accelerators/acceleratorcache.cxx	2011-12-15 15:17:59.473190664 -0200
-@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
- AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
-     : ThreadHelpBase(&Application::GetSolarMutex())
- {
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
- }
- 
-@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac
-     // SAFE -> ----------------------------------
-     WriteGuard aWriteLock(m_aLock);
-     
--    m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+    m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
-     m_lKey2Commands = rCopy.m_lKey2Commands;
-     
-     aWriteLock.unlock();
---- ./framework/source/loadenv/loadenv.cxx.orig	2011-12-15 15:08:15.771487938 -0200
-+++ ./framework/source/loadenv/loadenv.cxx	2011-12-15 15:19:06.038358483 -0200
-@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
-     // take over all new parameters.
-     m_xTargetFrame.clear();
-     m_xBaseFrame                    = xBaseFrame        ;
--    m_lMediaDescriptor              = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+    m_lMediaDescriptor              =  tmp;
-     m_sTarget                       = sTarget           ;
-     m_nSearchFlags                  = nSearchFlags      ;
-     m_eFeature                      = eFeature          ;
---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig	2011-12-15 15:08:49.033072112 -0200
-+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx	2011-12-15 15:11:07.209344668 -0200
-@@ -175,6 +175,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig	2011-12-19 11:10:56.000000000 +0000
-+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx	2011-12-19 11:12:06.000000000 +0000
-@@ -185,6 +185,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+		UIElementType& operator=(const UIElementType& rRight) {
-+			bModified = rRight.bModified;
-+			bLoaded = rRight.bLoaded;
-+			bDefaultLayer = rRight.bDefaultLayer;
-+			nElementType = rRight.nElementType;
-+			aElementsHashMap = rRight.aElementsHashMap;
-+			xStorage = rRight.xStorage;
-+			return *this;
-+		};
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig	2011-12-19 11:14:17.000000000 +0000
-+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx	2011-12-19 11:15:16.000000000 +0000
-@@ -171,6 +171,15 @@ namespace framework
-                 sal_Int16                                                         nElementType;
-                 UIElementDataHashMap                                              aElementsHashMap;
-                 com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+                UIElementType& operator=(const UIElementType& rRight) {
-+                        bModified = rRight.bModified;
-+                        bLoaded = rRight.bLoaded;
-+                        bDefaultLayer = rRight.bDefaultLayer;
-+                        nElementType = rRight.nElementType;
-+                        aElementsHashMap = rRight.aElementsHashMap;
-+                        xStorage = rRight.xStorage;
-+                        return *this;
-+                };
-             };
- 
-             typedef ::std::vector< UIElementType > UIElementTypesVector;
-
---- ./padmin/source/prtsetup.cxx.orig	2011-12-15 15:09:05.133870823 -0200
-+++ ./padmin/source/prtsetup.cxx	2011-12-15 15:13:55.626239170 -0200
-@@ -813,7 +813,7 @@ extern "C" {
- 
-         if( aDialog.Execute() )
-         {
--            rJobData = aDialog.getSetup();
-+            rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
-             nRet = 1;
-         }
- 
---- ./sfx2/source/doc/guisaveas.cxx.orig	2011-12-15 15:08:58.332955848 -0200
-+++ ./sfx2/source/doc/guisaveas.cxx	2011-12-15 15:12:39.953185212 -0200
-@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co
-         if ( aFilterName.getLength() )
-             m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
- 
--        aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
-+        aFiltPropsHM <<  aFilterProps;
-         nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
-     }
- 
---- ./framework/inc/classes/filtercachedata.hxx.orig	2011-12-17 13:14:22.102898902 +0000
-+++ ./framework/inc/classes/filtercachedata.hxx	2011-12-17 13:17:51.524424012 +0000
-@@ -230,7 +230,7 @@
-         {
-             bPreferred			= rCopy.bPreferred		;
-             sName				= rCopy.sName			;
--            lUINames			= rCopy.lUINames		;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sMediaType			= rCopy.sMediaType		;
-             sClipboardFormat	= rCopy.sClipboardFormat;
-             nDocumentIconID		= rCopy.nDocumentIconID	;
-@@ -298,7 +298,7 @@
-             nOrder              = rCopy.nOrder              ;
-             sName				= rCopy.sName				;
-             sType				= rCopy.sType				;
--            lUINames			= rCopy.lUINames			;
-+            lUINames			= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             sDocumentService	= rCopy.sDocumentService	;
-             sFilterService		= rCopy.sFilterService		;
-             sUIComponent        = rCopy.sUIComponent        ;
-@@ -405,7 +405,7 @@
-         inline Loader& impl_copy( const Loader& rCopy )
-         {
-             sName       = rCopy.sName       ;
--            lUINames	= rCopy.lUINames	;
-+            lUINames	= const_cast < framework::BaseHash<rtl::OUString>&  > (rCopy.lUINames);
-             lTypes		= rCopy.lTypes		;
-             return (*this);
-         }
diff --git a/testing/libreoffice/libreoffice.install b/testing/libreoffice/libreoffice.install
deleted file mode 100644
index e66b66f3d..000000000
--- a/testing/libreoffice/libreoffice.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
-         for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-#  post_install $1
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "LibreOffice has been split into several packages:"
-    echo "- libreoffice-common"
-    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
-    echo "Now you need to install at least one libreoffice-langpack!"
-  fi
-}
-
-post_remove() {
-update-desktop-database -q
-xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff b/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff
deleted file mode 100644
index fd61cb4ca..000000000
--- a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- scp2/inc/macros.inc.old	2011-05-18 17:51:47.000000000 +0200
-+++ scp2/inc/macros.inc	2011-07-18 19:58:27.000000000 +0200
-@@ -92,10 +92,10 @@
- #endif
- 
- #define BIN_FILE_BODY \
--        UnixRights   = 555
-+        UnixRights   = 755
- 
- #define TXT_FILE_BODY \
--        UnixRights   = 444
-+        UnixRights   = 644
- 
- #define USER_FILE_BODY \
-         UnixRights   = 644
diff --git a/testing/libreoffice/vbahelper.visibility.patch b/testing/libreoffice/vbahelper.visibility.patch
deleted file mode 100644
index 5739100d0..000000000
--- a/testing/libreoffice/vbahelper.visibility.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
- 
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbaquerytable \
-         sc/source/ui/vba/vbarange \
-         sc/source/ui/vba/vbasheetobject \
--        sc/source/ui/vba/vbasheetobjects \
-         sc/source/ui/vba/vbastyle \
-         sc/source/ui/vba/vbastyles \
-         sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
-         sc/source/ui/vba/vbawsfunction \
- ))
- 
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+        sc/source/ui/vba/vbasheetobjects \
-+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- 	$$(LDFLAGS) \
diff --git a/testing/libtorrent-rasterbar/PKGBUILD b/testing/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index 945acefaa..000000000
--- a/testing/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151819 2012-03-03 08:09:02Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.15.10
-pkgrel=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export CFLAGS+=" -fvisibility=hidden"
-  export CXXFLAGS+=" -fvisibility=hidden"
-  ./configure --prefix=/usr \
-      --enable-python-binding \
-      --with-libgeoip=system
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libx11/PKGBUILD b/testing/libx11/PKGBUILD
deleted file mode 100644
index 3e1d87dc0..000000000
--- a/testing/libx11/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 149995 2012-02-12 09:43:51Z 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/testing/libx11/xorg.csh b/testing/libx11/xorg.csh
deleted file mode 100644
index 26c49a222..000000000
--- a/testing/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/testing/libx11/xorg.sh b/testing/libx11/xorg.sh
deleted file mode 100644
index e1de6866c..000000000
--- a/testing/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/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD
deleted file mode 100644
index 208856a72..000000000
--- a/testing/libxcb/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 152764 2012-03-09 15:54:53Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxcb
-pkgver=1.8.1
-pkgrel=1
-pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python2')
-options=('!libtool')
-license=('custom')
-source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 8e8162f0a..000000000
--- a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/testing/libxi/PKGBUILD b/testing/libxi/PKGBUILD
deleted file mode 100644
index 200a2b96d..000000000
--- a/testing/libxi/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 152807 2012-03-09 17:09:29Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libxi
-pkgver=1.6.0
-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=('b7edf48f93e8abd13ca688fa7f597452c4b74346')
-
-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/testing/licq/PKGBUILD b/testing/licq/PKGBUILD
deleted file mode 100644
index d75786518..000000000
--- a/testing/licq/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 151866 2012-03-03 15:34:37Z giovanni $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=licq
-pkgver=1.6.0
-pkgrel=4
-pkgdesc="Advanced graphical ICQ clone and more for Unix" 
-arch=('i686' 'x86_64')
-url="http://www.licq.org"
-license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt')
-makedepends=('cmake' 'boost')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('383153697e281a0b1b4ff008936731b8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # licq
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
-  make
-
-  # qt4-gui
-  cd ../plugins/qt4-gui
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd ../plugins/qt4-gui/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/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 6f73b9a38..000000000
--- a/testing/lvm2/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 153478 2012-03-14 22:43:14Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.95
-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=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
-          '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
-          '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/lyx/PKGBUILD b/testing/lyx/PKGBUILD
deleted file mode 100644
index 618a89fc7..000000000
--- a/testing/lyx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 151823 2012-03-03 08:09:08Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=lyx
-pkgver=2.0.3
-pkgrel=2
-pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
-arch=('i686' 'x86_64')
-url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
-makedepends=('boost')
-optdepends=('rcs: built-in version control system'
-            'texlive-latexextra: float wrap support')
-license=('GPL')
-source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
-        lyx.desktop lyxrc.dist)
-backup=('etc/lyx/lyxrc.dist')
-install=lyx.install
-options=('emptydirs')
-sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
-          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
-  sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  ./configure --prefix=/usr \
-    --with-frontend=qt4 --without-included-boost \
-    --without-included-mythes
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  # install desktop entry
-  install -Dm644 "${srcdir}/lyx.desktop" \
-    "${pkgdir}/usr/share/applications/lyx.desktop"
-  install -Dm644 "lib/images/lyx.png" \
-    "${pkgdir}/usr/share/pixmaps/lyx.png"
-
-  # install default config file
-  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
-  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
-}
diff --git a/testing/lyx/lyx.desktop b/testing/lyx/lyx.desktop
deleted file mode 100644
index 649b30c98..000000000
--- a/testing/lyx/lyx.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;
diff --git a/testing/lyx/lyx.install b/testing/lyx/lyx.install
deleted file mode 100644
index c15c17b3a..000000000
--- a/testing/lyx/lyx.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
-
-
diff --git a/testing/lyx/lyxrc.dist b/testing/lyx/lyxrc.dist
deleted file mode 100644
index dd18694f9..000000000
--- a/testing/lyx/lyxrc.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-### This file is part of
-### ========================================================
-###          LyX, The Document Processor
-###
-###          Copyright 1995 Matthias Ettrich
-###          Copyright 1995-2011 The LyX Team.
-###
-### ========================================================
-
-# The file lyxrc.dist gives initial global options for all LyX users.
-# Almost all settings here can be overridden through the preferences in LyX.
-
-\thesaurusdir_path "/usr/share/mythes"
-\hunspelldir_path "/usr/share/myspell"
diff --git a/testing/mailman/PKGBUILD b/testing/mailman/PKGBUILD
deleted file mode 100644
index 7acce6dfb..000000000
--- a/testing/mailman/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 150587 2012-02-18 15:53:57Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=mailman
-pkgver=2.1.14
-pkgrel=2
-pkgdesc="Mailing list manager with built in web access"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.list.org/"
-depends=('python2' 'smtp-server')
-# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
-backup=('usr/lib/mailman/Mailman/mm_cfg.py')
-install=$pkgname.install
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
-        'mailman-2.1-build.patch'
-        'rc.mailman')
-md5sums=('9ea163871ceccbd33fee4c9e335fcf7b'
-         'ed04d062379eb21e39ce1e70e6b1ade2'
-         '3d83d06d0ec3319bf3c7d9df5d18e89f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # fix calls to /usr/bin/python
-  find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} +
-  # fix directory permissions to satisfy check_perms
-  patch -Np1 -i ${srcdir}/mailman-2.1-build.patch
-
-  ./configure --without-permcheck \
-              --prefix=/usr/lib/mailman \
-              --with-var-prefix=/var/lib/mailman \
-              --with-mail-gid=80 \
-              --with-username=80 --with-groupname=80 \
-              --with-cgi-gid=http --with-python=/usr/bin/python2
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # let's follow Fedora FHS way; Gentoo does it the other way round
-
-  # Create a link so that the config file mm_cfg.py appears in config
-  # directory /etc/mailman. We don't put mm_cfg.py in the config directory
-  # because its executable code (python file) and the security policy wants
-  # to keep executable code out of /etc and inside of a lib directory instead,
-  # and because traditionally mm_cfg.py was in the Mailman subdirectory and
-  # experienced mailman admins will expect to find it there. But having it
-  # "appear" in the config directory is good practice and heading in the
-  # right direction for FHS compliance.
-  install -d -m755 ${pkgdir}/etc/${pkgname}
-  ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py
-
-  # fix some permissions to satisfy check_perms
-  chown -R 80:80 $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
-  chown http:80 ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2770 ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* 
-  chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman
-
-  # install the launch script
-  install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman
-}
diff --git a/testing/mailman/mailman-2.1-build.patch b/testing/mailman/mailman-2.1-build.patch
deleted file mode 100644
index d00613ad7..000000000
--- a/testing/mailman/mailman-2.1-build.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
---- mailman-2.1.12-a/bin/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/bin/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -56,7 +55,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -72,8 +71,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
---- mailman-2.1.12-a/cron/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/cron/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -68,8 +67,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
---- mailman-2.1.12-a/Mailman/Archiver/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
---- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
---- mailman-2.1.12-a/Mailman/Cgi/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
-         done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
---- mailman-2.1.12-a/Mailman/Commands/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Commands/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
---- mailman-2.1.12-a/Mailman/Gui/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Gui/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
---- mailman-2.1.12-a/Mailman/Handlers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
---- mailman-2.1.12-a/Mailman/Logging/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Logging/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
---- mailman-2.1.12-a/Mailman/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -20,8 +20,6 @@
- 
- # Variables set by configure
- 
--VERSION=	@VERSION@
--
- VPATH=		@srcdir@
- srcdir= 	@srcdir@
- bindir= 	@bindir@
-@@ -30,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -48,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -79,12 +76,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--	@for d in $(SUBDIRS); \
--	do \
--	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
--	done
--
- clean:
- 	for d in $(SUBDIRS); \
- 	do \
-diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
---- mailman-2.1.12-a/Mailman/MTA/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/MTA/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
---- mailman-2.1.12-a/Mailman/Queue/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Queue/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
---- mailman-2.1.12-a/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -61,11 +61,10 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
- LANGPACK = README-I18N.en templates messages
-@@ -85,14 +84,24 @@
- 
- doinstall: $(SUBDIRS)
- 	@echo "Creating architecture independent directories..."
-+	dir=$(DESTDIR)$(prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
-+	dir=$(DESTDIR)$(var_prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
- 	@for d in $(VAR_DIRS); \
- 	do \
- 	    dir=$(DESTDIR)$(var_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -102,9 +111,7 @@
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -114,9 +121,7 @@
- 	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
---- mailman-2.1.12-a/messages/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/messages/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -32,7 +32,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -43,7 +42,6 @@
- CFLAGS=		$(OPT) $(DEFS)
- PACKAGEDIR= 	$(prefix)/messages
- SHELL=		/bin/sh
--DIRSETGID=	chmod g+s
- MSGFMT= 	@PYTHON@ ../build/bin/msgfmt.py
- MSGMERGE=	msgmerge
- 
-@@ -60,7 +58,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -90,9 +88,8 @@
- 	do \
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    echo "Creating language directory $$dir"; \
--	    $(srcdir)/../mkinstalldirs $$dir; \
--	    chmod $(DIRMODE) $$dir; \
--	    $(DIRSETGID) $$dir; \
-+	    $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \
-+	    $(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	done
- 	@for d in $(LANGUAGES); \
- 	do \
-@@ -113,8 +110,6 @@
- 
- mofiles: $(MOFILES)
- 
--finish:
--
- clean:
- 	-rm -f */LC_MESSAGES/mailman.mo
- 
-diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
---- mailman-2.1.12-a/misc/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/misc/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -30,7 +30,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=		@PYTHON@
- 
-@@ -62,7 +61,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- DATAMODE=	664
-@@ -101,8 +100,6 @@
- 	    (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
---- mailman-2.1.12-a/scripts/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/scripts/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -49,7 +48,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -68,8 +67,6 @@
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
---- mailman-2.1.12-a/src/Makefile.in	2009-07-28 12:19:47.000000000 +0200
-+++ mailman-2.1.12-b/src/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=  	@PYTHON@
- 
-@@ -63,10 +62,9 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
--EXEMODE=	755
-+DIRMODE=	2775
-+EXEMODE=	2755
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- # Fixed definitions
- 
-@@ -110,20 +108,10 @@
- 	do \
- 	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
- 	    $(INSTALL_PROGRAM) $$f $$exe; \
--	    $(DIRSETGID) $$exe; \
- 	done
- 	for f in $(MAIL_PROGS); \
- 	do \
- 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \
--	    $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \
--	done
--
--finish:
--	-for f in $(SUID_CGI_PROGS); \
--	do \
--	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
--	    chown $(MAILMAN_USER) $$exe; \
--	    chmod u+s $$exe; \
- 	done
- 
- clean:
-diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
---- mailman-2.1.12-a/templates/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/templates/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- TRUE=		@TRUE@
- 
-@@ -48,7 +47,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,15 +60,13 @@
- install:
- 	for d in $(LANGUAGES); \
- 	do \
--	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
-+	    $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
- 	    do \
- 	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    done; \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
---- mailman-2.1.12-a/tests/bounces/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/bounces/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
---- mailman-2.1.12-a/tests/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
---- mailman-2.1.12-a/tests/msgs/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/msgs/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
diff --git a/testing/mailman/mailman.install b/testing/mailman/mailman.install
deleted file mode 100644
index ec85260a5..000000000
--- a/testing/mailman/mailman.install
+++ /dev/null
@@ -1,31 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  # Make sure the group and user "mailman" exists on this system and has the correct values
-  if grep -q "^mailman:" /etc/group &> /dev/null ; then
-    groupmod -g 80 -n mailman mailman &> /dev/null
-  else
-    groupadd -g 80 mailman &> /dev/null
-  fi
-  
-  if grep -q "^mailman:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman mailman &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman &> /dev/null
-  fi 
-
-  # check file permissions
-#  cd /usr/lib/mailman && bin/check_perms -f  > /dev/null 2>&1     # -f applies fixes we should solve in the PKGBUILD
-  cd /usr/lib/mailman && bin/check_perms > /dev/null
-}
-
-## 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() {
-  userdel mailman &>/dev/null
-  groupdel mailman &>/dev/null || /bin/true
-}
diff --git a/testing/mailman/rc.mailman b/testing/mailman/rc.mailman
deleted file mode 100644
index 07660e530..000000000
--- a/testing/mailman/rc.mailman
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting mailman Daemon"
-      /usr/lib/mailman/bin/mailmanctl start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mailman
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mailman Daemon"
-    /usr/lib/mailman/bin/mailmanctl stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mailman
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/man-db/PKGBUILD b/testing/man-db/PKGBUILD
deleted file mode 100644
index 7d8abc692..000000000
--- a/testing/man-db/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 150437 2012-02-17 18:38:58Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-
-pkgname=man-db
-pkgver=2.6.1
-pkgrel=1
-pkgdesc="A utility for reading man pages"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/man-db/"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
-backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
-conflicts=('man')
-provides=('man')
-replaces=('man')
-install=${pkgname}.install
-source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz
-        convert-mans man-db.cron.daily)
-options=('!libtool')
-md5sums=('79658e8695c7b9b3be1ee340d78a4692'
-         '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
-	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # part of groff pkg
-  rm -f ${pkgdir}/usr/bin/zsoelim
-
-  # script from LFS to convert manpages, see
-  # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
-  install -D -m755 ${srcdir}/convert-mans  ${pkgdir}/usr/bin/convert-mans 
-
-  #install whatis cron script
-  install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db
-}
-
diff --git a/testing/man-db/convert-mans b/testing/man-db/convert-mans
deleted file mode 100644
index 58a0224b0..000000000
--- a/testing/man-db/convert-mans
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-FROM="$1"
-TO="$2"
-shift ; shift
-while [ $# -gt 0 ]
-do
-        FILE="$1"
-        shift
-        iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
-        mv .tmp.iconv "$FILE"
-done
diff --git a/testing/man-db/man-db.cron.daily b/testing/man-db/man-db.cron.daily
deleted file mode 100755
index 53e66e1e9..000000000
--- a/testing/man-db/man-db.cron.daily
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEMANDB="/usr/bin/mandb --quiet"
-
-# Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
-
-# taken from Debian
-# man-db cron daily
-set -e
-
-if ! [ -d /var/cache/man ]; then
-    # Recover from deletion, per FHS.
-    mkdir -p /var/cache/man
-    chmod 755 /var/cache/man
-fi
-
-# regenerate man database
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}"
-fi
-
-${UPDATEMANDB}
-
-exit 0
diff --git a/testing/man-db/man-db.install b/testing/man-db/man-db.install
deleted file mode 100644
index f6f0f27a6..000000000
--- a/testing/man-db/man-db.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo "it's recommended to create an initial"
-  echo "database running as root:"
-  echo "\"/usr/bin/mandb --quiet\""
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then
-     echo "systemuser \"man\" is no more required"
-     echo "run \"userdel man\". please also"
-     echo "chown root:root /var/cache/man"
-  fi
-  # force database rebuild to get rid off badly imported pages
-  if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then
-     echo "(re)building database..."
-     mandb -c --quiet
-  fi
-}
-
-post_remove() {
-  rm -rf /var/cache/man
-}
diff --git a/testing/mesa/LICENSE b/testing/mesa/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/testing/mesa/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
deleted file mode 100644
index e3bd1f687..000000000
--- a/testing/mesa/PKGBUILD
+++ /dev/null
@@ -1,245 +0,0 @@
-# $Id: PKGBUILD 152845 2012-03-09 20:43:02Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=mesa
-pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110709
-    #pkgver=7.11
-  else
-    pkgver=8.0.1
-fi
-pkgrel=2
-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'
-         '24eeebf66971809d8f40775a379b36c9')
-
-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,svga,swrast \
-    --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi\
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --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,svga,swrast \
-    --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi\
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --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 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_osmesa() {
-  depends=('mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library"
-  
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
-}
-
-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/libOSMesa"*
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.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/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 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_svga-dri() {
-  depends=("mesa=${pkgver}")
-  pkgdesc="Gallium3D VMware guest GL driver"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD
deleted file mode 100644
index fe79e7f67..000000000
--- a/testing/mkinitcpio-busybox/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 152129 2012-03-04 23:31:59Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=mkinitcpio-busybox
-pkgver=1.19.4
-pkgrel=2
-pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
-url="http://www.busybox.net/"
-license=('GPL')
-depends=('glibc')
-options=('!buildflags')
-source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
-        'config')
-sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee'
-            '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a')
-
-build() {
-  cd "$srcdir/busybox-$pkgver"
-
-  local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
-
-  sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
-    "$srcdir/config" > .config
-
-  make
-}
-
-package() {
-  install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config
deleted file mode 100644
index 3cd776e03..000000000
--- a/testing/mkinitcpio-busybox/config
+++ /dev/null
@@ -1,1013 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.19.2
-# Sun Oct 16 15:24:19 2011
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-# CONFIG_FEATURE_SYSTEMD is not set
-# CONFIG_FEATURE_RTMINMAX is not set
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=0
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-# CONFIG_FEATURE_HWIB is not set
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_XZ is not set
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-# CONFIG_FEATURE_SEAMLESS_GZ is not set
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-# CONFIG_FEATURE_AR_CREATE is not set
-# CONFIG_BUNZIP2 is not set
-# CONFIG_BZIP2 is not set
-# CONFIG_CPIO is not set
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-# CONFIG_GUNZIP is not set
-# CONFIG_GZIP is not set
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-# CONFIG_TAR is not set
-# CONFIG_FEATURE_TAR_CREATE is not set
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-# CONFIG_UNXZ is not set
-# CONFIG_XZ is not set
-# CONFIG_UNZIP is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_FEATURE_DATE_NANO is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
-# CONFIG_ID is not set
-# CONFIG_GROUPS is not set
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-# CONFIG_BASE64 is not set
-# CONFIG_WHO is not set
-# CONFIG_USERS is not set
-# CONFIG_CAL is not set
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DD=y
-# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-# CONFIG_FSYNC is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LN=y
-# CONFIG_LOGNAME is not set
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-# CONFIG_STTY is not set
-# CONFIG_SUM is not set
-# CONFIG_SYNC is not set
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-# CONFIG_TEE is not set
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TRUE=y
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHOAMI is not set
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_FGCONSOLE is not set
-# CONFIG_CLEAR is not set
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-# CONFIG_RESET is not set
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-CONFIG_SETFONT=y
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-# CONFIG_PATCH is not set
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
-# CONFIG_FEATURE_ALLOW_EXEC is not set
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_MAXDEPTH is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-# CONFIG_FEATURE_FIND_USER is not set
-# CONFIG_FEATURE_FIND_GROUP is not set
-# CONFIG_FEATURE_FIND_NOT is not set
-# CONFIG_FEATURE_FIND_DEPTH is not set
-# CONFIG_FEATURE_FIND_PAREN is not set
-# CONFIG_FEATURE_FIND_SIZE is not set
-# CONFIG_FEATURE_FIND_PRUNE is not set
-# CONFIG_FEATURE_FIND_DELETE is not set
-# CONFIG_FEATURE_FIND_PATH is not set
-# CONFIG_FEATURE_FIND_REGEX is not set
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_CRYPT is not set
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=0
-CONFIG_LAST_SYSTEM_ID=0
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-# CONFIG_DEFAULT_MODULES_DIR is not set
-# CONFIG_DEFAULT_DEPMOD_FILE is not set
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-# CONFIG_MORE is not set
-# CONFIG_MOUNT is not set
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
-# CONFIG_FEATURE_MOUNT_FSTAB is not set
-# CONFIG_PIVOT_ROOT is not set
-# CONFIG_RDATE is not set
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
-# CONFIG_FEATURE_SWAPON_PRI is not set
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-
-#
-# Filesystem/Volume identification
-#
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-# CONFIG_TIME is not set
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_WHOIS is not set
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-# CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_UDHCPC is not set
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-CONFIG_FREE=y
-# CONFIG_FUSER is not set
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_WATCH is not set
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_HISTFILESIZE is not set
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
diff --git a/testing/mkvtoolnix/PKGBUILD b/testing/mkvtoolnix/PKGBUILD
deleted file mode 100644
index 4e0998e89..000000000
--- a/testing/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 151825 2012-03-03 08:09:10Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: xduugu <xduugu@gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.3.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
-             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('2cd84ff24e1d9217dd3caf170f34e758')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Disable automagic curl dep used for online update checking
-  sed -i -e '/curl/d' configure.in
-  export CURL_CFLAGS="" CURL_LIBS=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
-  rake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-package_mkvtoolnix-cli() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkvinfo
-  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
-  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}
diff --git a/testing/mkvtoolnix/mkvtoolnix.install b/testing/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 74d9eb2ef..000000000
--- a/testing/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}
diff --git a/testing/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD
deleted file mode 100644
index ecc508bc3..000000000
--- a/testing/mlocate/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 151799 2012-03-03 05:54:38Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.25
-pkgrel=1
-pkgdesc="Faster merging drop-in for slocate"
-arch=('i686' 'x86_64')
-url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
-license=('GPL')
-conflicts=('slocate')
-provides=('slocate')
-replaces=('slocate')
-depends=('glibc' 'coreutils' 'sh')
-backup=('etc/updatedb.conf'
-        'etc/cron.daily/updatedb')
-install=mlocate.install
-source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz
-	updatedb.conf
-	updatedb.cron.daily)
-md5sums=('c6d043b170613b0e327a815b497f680a'
-         'c374ff223f2e07b5e602ba22359f2335'
-         'cde5da81bebad2de556ef2e43d895e13')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  sed -i '/^groupname /s/mlocate/locate/' Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-  make
-
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  # Set up a default updatedb.conf and a daily cronjob
-  install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf
-  install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
-
-  # Install Mlocate
-  make DESTDIR=$pkgdir install
-
-  ln -sv locate $pkgdir/usr/bin/slocate
-  chgrp -v 21 $pkgdir/usr/bin/locate
-  chmod -v 2755 $pkgdir/usr/bin/locate
-
-  install -dm755 $pkgdir/var/lib
-  install -d -m750 -g21 $pkgdir/var/lib/locate
-}
diff --git a/testing/mlocate/mlocate.install b/testing/mlocate/mlocate.install
deleted file mode 100644
index c7b7f9cf7..000000000
--- a/testing/mlocate/mlocate.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade "$1" "$1"
-  echo "mlocate command is technically locate, but slocate is symlinked and still works."
-  echo "You should run updatedb as root."
-}
-
-post_upgrade() {
-  # This can be removed after {m,x}locate have both been updated
-  getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null
-  getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null
-
-  getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null
-  chown -R root:locate var/lib/mlocate
-}
-
-pre_remove() {
-  getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null
-}
diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf
deleted file mode 100644
index 722b04205..000000000
--- a/testing/mlocate/updatedb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# directories to exclude from the slocate database:
-PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
-
-# filesystems to exclude from the slocate database:
-PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs vboxsf"
diff --git a/testing/mlocate/updatedb.cron.daily b/testing/mlocate/updatedb.cron.daily
deleted file mode 100755
index cac9bb063..000000000
--- a/testing/mlocate/updatedb.cron.daily
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEDB="/usr/bin/updatedb"
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}"
-fi
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
-  if [ -f /etc/updatedb.conf ]; then
-    ${UPDATEDB}
-  else
-    ${UPDATEDB} -f proc
-  fi
-fi
diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD
deleted file mode 100644
index 3452276cc..000000000
--- a/testing/mpd/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 154008 2012-03-21 11:58:11Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.16.7
-pkgrel=2
-pkgdesc='Flexible, powerful, server-side application for playing music'
-url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'rc.d') 
-sha1sums=('878f3ce82d4f00f6cbad63a625b2c0274c4a704a'
-          '3777bdb4fff4b7911be3b1242aabae9d2912ef18')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-lastfm \
-		--enable-jack \
-		--enable-pulse \
-		--enable-documentation \
-		--disable-libwrap \
-		--disable-cue \
-		--disable-sidplay \
-		--with-systemdsystemunitdir=/lib/systemd/system
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i doc/mpdconf.example
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/usr/share/mpd/mpd.conf.example
-
-	cd "${pkgdir}"/usr/share/doc/mpd
-	tar cfJ api.tar.xz --remove-files api
-	rmdir developer protocol user
-}
diff --git a/testing/mpd/install b/testing/mpd/install
deleted file mode 100644
index 655645716..000000000
--- a/testing/mpd/install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null
-	getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/true -G audio mpd >/dev/null
-	echo '==> Now create a /etc/mpd.conf file; see: /usr/share/mpd/mpd.conf.example'
-}
-
-post_remove() {
-	getent passwd mpd &>/dev/null && userdel mpd >/dev/null
-	getent group mpd &>/dev/null && groupdel mpd >/dev/null
-}
diff --git a/testing/mpd/rc.d b/testing/mpd/rc.d
deleted file mode 100755
index 86f77419f..000000000
--- a/testing/mpd/rc.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -d /run/mpd ]] || install -d -g mpd -o mpd /run/mpd
-
-case "$1" in
-	start)
-		stat_busy 'Starting Music Player Daemon'
-		/usr/bin/mpd /etc/mpd.conf &> /dev/null &&
-		{ add_daemon mpd; stat_done; } || stat_fail
-		;;
-	stop)
-		stat_busy 'Stopping Music Player Daemon'
-		/usr/bin/mpd --kill /etc/mpd.conf &> /dev/null &&
-		{ rm_daemon mpd; stat_done; } || stat_fail
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
deleted file mode 100644
index ef8e56403..000000000
--- a/testing/mpfr/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 152748 2012-03-09 13:54:49Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=mpfr
-_pkgver=3.1.0
-_patchlevel=p7
-pkgver=${_pkgver}.${_patchlevel}
-pkgrel=1
-pkgdesc="Multiple-precision floating-point library"
-arch=('i686' 'x86_64')
-url="http://www.mpfr.org/"
-license=('LGPL')
-depends=('gmp>=5.0')
-options=('!libtool')
-install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
-        mpfr-${_pkgver}.${_patchlevel}.patch)
-md5sums=('6e495841bb026481567006cec0f821c3'
-         '293374ee4b01527f8f7889fdfa9016f8'
-         'fb1bf603a2ad5e6ecc1903c3c53f5e13')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
-  ./configure --prefix=/usr --enable-thread-safe --enable-shared
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mpfr/mpfr-3.1.0.p7.patch b/testing/mpfr/mpfr-3.1.0.p7.patch
deleted file mode 100644
index f3de639bc..000000000
--- a/testing/mpfr/mpfr-3.1.0.p7.patch
+++ /dev/null
@@ -1,1236 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
-@@ -0,0 +1 @@
-+lib-search-path
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p1
-+3.1.0-p2
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p1"
-+#define MPFR_VERSION_STRING "3.1.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p1";
-+  return "3.1.0-p2";
- }
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
---- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-@@ -65,8 +65,24 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
---- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-@@ -1124,11 +1124,27 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
- all: all-am
- 
- .SUFFIXES:
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p2
-+3.1.0-p3
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p2"
-+#define MPFR_VERSION_STRING "3.1.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
---- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -1178,7 +1178,7 @@
-   mpfr_exp_t exp;
-   char * str;
-   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
--  const int keep_trailing_zeros = spec_g && spec.alt;
-+  const int keep_trailing_zeros = !spec_g || spec.alt;
- 
-   /* WARNING: an empty precision field is forbidden (it means precision = 6
-      and it should have been changed to 6 before the function call) */
-@@ -1356,7 +1356,7 @@
-   else
-     /* 1 <= |p| */
-     {
--      size_t nsd;  /* Number of significant digits */
-+      size_t str_len;
- 
-       /* Determine the position of the most significant decimal digit. */
-       exp = floor_log10 (p);
-@@ -1365,12 +1365,10 @@
-         /* P is too large to print all its integral part digits */
-         return -1;
- 
--      np->ip_size = exp + 1;
--
--      nsd = spec.prec + np->ip_size;
-       if (dec_info == NULL)
--        {
--          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
-+        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
-+          str =
-+            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
-           register_string (np->sl, str);
-         }
-       else
-@@ -1379,81 +1377,60 @@
-           str = dec_info->str;
-         }
-       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
-+      str_len = strlen (str);
-+
-+      /* integral part */
-+      if (exp > str_len)
-+        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
-+           power of 10 (p integer, so no fractional part) */
-+        {
-+          np->ip_trailing_zeros = exp - str_len;
-+          np->ip_size = str_len;
-+        }
-+      else
-+        np->ip_size = exp;
- 
-       if (spec.group)
-         /* thousands separator in integral part */
-         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
- 
--      if (nsd == 0 || (spec_g && !spec.alt))
--        /* compute how much non-zero digits in integral and fractional
--           parts */
-+      /* fractional part */
-+      str += np->ip_size;
-+      str_len -= np->ip_size;
-+      if (!keep_trailing_zeros)
-+        /* remove trailing zeros, if any */
-         {
--          size_t str_len;
--          str_len = strlen (str); /* note: the sign has been skipped */
--
--          if (exp > str_len)
--            /* mpfr_get_str doesn't give the trailing zeros when p is a
--               multiple of 10 (p integer, so no fractional part) */
--            {
--              np->ip_trailing_zeros = exp - str_len;
--              np->ip_size = str_len;
--              if (spec.alt)
--                np->point = MPFR_DECIMAL_POINT;
--            }
--          else
--            /* str may contain some digits which are in fractional part */
-+          char *ptr = str + str_len - 1; /* pointer to the last digit of
-+                                            str */
-+          while ((*ptr == '0') && (str_len != 0))
-             {
--              char *ptr;
--
--              ptr = str + str_len - 1; /* points to the end of str */
--              str_len -= np->ip_size;  /* number of digits in fractional
--                                          part */
--
--              if (!keep_trailing_zeros)
--                /* remove trailing zeros, if any */
--                {
--                  while ((*ptr == '0') && (str_len != 0))
--                    {
--                      --ptr;
--                      --str_len;
--                    }
--                }
--
--              if (str_len > INT_MAX)
--                /* too many digits in fractional part */
--                return -1;
--
--              if (str_len != 0)
--                /* some digits in fractional part */
--                {
--                  np->point = MPFR_DECIMAL_POINT;
--                  np->fp_ptr = str + np->ip_size;
--                  np->fp_size = str_len;
--                }
-+              --ptr;
-+              --str_len;
-             }
-         }
--      else
--        /* spec.prec digits in fractional part */
-+
-+      if (str_len > 0)
-+        /* some nonzero digits in fractional part */
-         {
--          if (np->ip_size == exp - 1)
--            /* the absolute value of the number has been rounded up to a power
--               of ten.
--               Insert an additional zero in integral part and put the rest of
--               them in fractional part. */
--            np->ip_trailing_zeros = 1;
-+          if (str_len > INT_MAX)
-+            /* too many digits in fractional part */
-+            return -1;
- 
--          if (spec.prec != 0)
--            {
--              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
--              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_ptr = str;
-+          np->fp_size = str_len;
-+        }
- 
--              np->point = MPFR_DECIMAL_POINT;
--              np->fp_ptr = str + np->ip_size;
--              np->fp_size = spec.prec;
--            }
--          else if (spec.alt)
--            np->point = MPFR_DECIMAL_POINT;
-+      if (keep_trailing_zeros && str_len < spec.prec)
-+        /* add missing trailing zeros */
-+        {
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_trailing_zeros = spec.prec - np->fp_size;
-         }
-+
-+      if (spec.alt)
-+        /* add decimal point even if no digits follow it */
-+        np->point = MPFR_DECIMAL_POINT;
-     }
- 
-   return 0;
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p2";
-+  return "3.1.0-p3";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
---- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -475,6 +475,18 @@
-   check_sprintf ("-1.", "%- #0.1RG", x);
- 
-   /* precision zero */
-+  mpfr_set_d (x, 9.5, MPFR_RNDN);
-+  check_sprintf ("9",    "%.0RDf", x);
-+  check_sprintf ("10",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 19.5, MPFR_RNDN);
-+  check_sprintf ("19",    "%.0RDf", x);
-+  check_sprintf ("20",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 99.5, MPFR_RNDN);
-+  check_sprintf ("99",    "%.0RDf", x);
-+  check_sprintf ("100",   "%.0RUf", x);
-+
-   mpfr_set_d (x, -9.5, MPFR_RNDN);
-   check_sprintf ("-10",    "%.0RDf", x);
-   check_sprintf ("-10",    "%.0RYf", x);
-@@ -1078,6 +1090,23 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+bug20111102 (void)
-+{
-+  mpfr_t t;
-+  char s[100];
-+
-+  mpfr_init2 (t, 84);
-+  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
-+  mpfr_sprintf (s, "%.20RNg", t);
-+  if (strcmp (s, "1000") != 0)
-+    {
-+      printf ("Error in bug20111102, expected 1000, got %s\n", s);
-+      exit (1);
-+    }
-+  mpfr_clear (t);
-+}
-+
- /* In particular, the following test makes sure that the rounding
-  * for %Ra and %Rb is not done on the MPFR number itself (as it
-  * would overflow). Note: it has been reported on comp.std.c that
-@@ -1161,6 +1190,7 @@
-   locale = setlocale (LC_ALL, "C");
- #endif
- 
-+  bug20111102 ();
-   native_types ();
-   hexadecimal ();
-   binary ();
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
-@@ -0,0 +1 @@
-+gmp41compat
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p3
-+3.1.0-p4
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
---- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
-@@ -2994,11 +2994,12 @@
- 
-    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
-      behavior no longer depends on the platform (assuming this is also
--     true for GMP's random generator).  As a consequence, the returned
--     values can be different between MPFR 3.1 and previous MPFR
--     versions.  Note: as the reproducibility of these functions was not
--     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
--     as backward incompatible with previous versions.
-+     true for GMP's random generator, which is not the case between GMP
-+     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
-+     the returned values can be different between MPFR 3.1 and previous
-+     MPFR versions.  Note: as the reproducibility of these functions
-+     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
-+     regarded as backward incompatible with previous versions.
- 
- 
- 
-@@ -4239,13 +4240,13 @@
- Node: Type and Macro Changes129308
- Node: Added Functions132029
- Node: Changed Functions134972
--Node: Removed Functions139167
--Node: Other Changes139579
--Node: Contributors141108
--Node: References143574
--Node: GNU Free Documentation License145315
--Node: Concept Index167758
--Node: Function and Type Index173677
-+Node: Removed Functions139253
-+Node: Other Changes139665
-+Node: Contributors141194
-+Node: References143660
-+Node: GNU Free Documentation License145401
-+Node: Concept Index167844
-+Node: Function and Type Index173763
- 
- End Tag Table
- 
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
---- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
-@@ -3466,8 +3466,9 @@
- a lack of specification.
- 
- @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
--Their behavior no longer depends on the platform (assuming this is also
--true for GMP's random generator).  As a consequence, the returned values
-+Their behavior no longer depends on the platform (assuming this is also true
-+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
-+@code{gmp_randinit_default} is used).  As a consequence, the returned values
- can be different between MPFR 3.1 and previous MPFR versions.
- Note: as the reproducibility of these functions was not specified
- before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p3"
-+#define MPFR_VERSION_STRING "3.1.0-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p3";
-+  return "3.1.0-p4";
- }
-diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
---- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -114,21 +114,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.895943"
-+# define C2 "0.848824"
-+#else
-+# define C1 "0.479652"
-+# define C2 "0.648529"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.895943") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.895943, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.848824") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.848824, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
---- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -160,23 +160,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.8488312"
-+# define C2 "0.8156509"
-+#else
-+# define C1 "0.6485367"
-+# define C2 "0.9362717"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandom (x, s, MPFR_RNDN);
--  /* the following values are obtained on a 32-bit computer, we should get
--     the same values on a 64-bit computer */
--  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8488312, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandom (x, s, MPFR_RNDN);
--  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8156509, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
-@@ -0,0 +1 @@
-+logging-freeze
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p4
-+3.1.0-p5
-diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
---- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
---- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
-@@ -29,7 +29,7 @@
-   MPFR_LOG_FUNC
-     (("x[%Pu]=%.*Rg u=%d rnd=%d",
-       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
--     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
-+     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
- 
-   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
-     {
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p4"
-+#define MPFR_VERSION_STRING "3.1.0-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
---- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p4";
-+  return "3.1.0-p5";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
-@@ -0,0 +1 @@
-+logging-varfmt
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p5
-+3.1.0-p6
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-@@ -1592,7 +1592,7 @@
-   do                                                                    \
-     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
-         (mpfr_log_current <= mpfr_log_level))                           \
--      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
-+      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
-                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
-   while (0)
- 
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p5"
-+#define MPFR_VERSION_STRING "3.1.0-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p5";
-+  return "3.1.0-p6";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-08 15:17:03.000000000 +0000
-@@ -0,0 +1 @@
-+large-prec
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-08 15:17:03.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p6
-+3.1.0-p7
-diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c
---- mpfr-3.1.0-a/src/add1.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1.c	2012-03-08 15:17:03.000000000 +0000
-@@ -44,12 +44,12 @@
-   bq = MPFR_PREC(b);
-   cq = MPFR_PREC(c);
- 
--  an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */
-+  an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */
-   aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS;
-   sh = aq2 - aq;                  /* non-significant bits in low limb */
- 
--  bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */
--  cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
- 
-   ap = MPFR_MANT(a);
-   bp = MPFR_MANT(b);
-@@ -124,7 +124,7 @@
-       dif = aq2 - diff_exp;
-       /* dif is the number of bits of c which overlap with a' */
- 
--      difn = (dif-1)/GMP_NUMB_BITS + 1;
-+      difn = MPFR_PREC2LIMBS (dif);
-       /* only the highest difn limbs from c have to be considered */
-       if (MPFR_UNLIKELY(difn > cn))
-         {
-diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c
---- mpfr-3.1.0-a/src/add1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -107,7 +107,7 @@
- 
-   /* Read prec and num of limbs */
-   p = MPFR_PREC(b);
--  n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS;
-+  n = MPFR_PREC2LIMBS (p);
-   MPFR_UNSIGNED_MINUS_MODULO(sh, p);
-   bx = MPFR_GET_EXP(b);
-   d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c));
-diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c
---- mpfr-3.1.0-a/src/agm.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/agm.c	2012-03-08 15:17:03.000000000 +0000
-@@ -91,7 +91,7 @@
-   q = MPFR_PREC(r);
-   p = q + MPFR_INT_CEIL_LOG2(q) + 15;
-   MPFR_ASSERTD (p >= 7); /* see algorithms.tex */
--  s = (p - 1) / GMP_NUMB_BITS + 1;
-+  s = MPFR_PREC2LIMBS (p);
- 
-   /* b (op2) and a (op1) are the 2 operands but we want b >= a */
-   compare = mpfr_cmp (op1, op2);
-@@ -285,7 +285,7 @@
- 
-       /* Next iteration */
-       MPFR_ZIV_NEXT (loop, p);
--      s = (p - 1) / GMP_NUMB_BITS + 1;
-+      s = MPFR_PREC2LIMBS (p);
-     }
-   MPFR_ZIV_FREE (loop);
- 
-diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c
---- mpfr-3.1.0-a/src/eq.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/eq.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,8 +56,8 @@
-   if (uexp != vexp)
-     return 0; /* no bit agree */
- 
--  usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1;
--  vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1;
-+  usize = MPFR_LIMB_SIZE (u);
-+  vsize = MPFR_LIMB_SIZE (v);
- 
-   if (vsize > usize) /* exchange u and v */
-     {
-diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c
---- mpfr-3.1.0-a/src/exp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/exp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -133,7 +133,7 @@
-               mp_size_t yn;
-               int sh;
- 
--              yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+              yn = MPFR_LIMB_SIZE (y);
-               sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y);
-               MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh;
-               inexact = 1;
-diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c
---- mpfr-3.1.0-a/src/get_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_d.c	2012-03-08 15:17:03.000000000 +0000
-@@ -100,7 +100,7 @@
-           nbits += (1021 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE );
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c
---- mpfr-3.1.0-a/src/get_flt.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_flt.c	2012-03-08 15:17:03.000000000 +0000
-@@ -92,7 +92,7 @@
-           nbits += (125 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT);
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c
---- mpfr-3.1.0-a/src/get_str.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_str.c	2012-03-08 15:17:03.000000000 +0000
-@@ -2351,7 +2351,7 @@
- 
-       /* the first digit will contain only r bits */
-       prec = (m - 1) * pow2 + r; /* total number of bits */
--      n = (prec - 1) / GMP_NUMB_BITS + 1;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       MPFR_TMP_MARK (marker);
-       x1 = MPFR_TMP_LIMBS_ALLOC (n + 1);
-@@ -2417,12 +2417,12 @@
-       exact = 1;
- 
-       /* number of limbs */
--      n = 1 + (prec - 1) / GMP_NUMB_BITS;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       /* a will contain the approximation of the mantissa */
-       a = MPFR_TMP_LIMBS_ALLOC (n);
- 
--      nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+      nx = MPFR_LIMB_SIZE (x);
- 
-       if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or
-                                 division to perform */
-diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c
---- mpfr-3.1.0-a/src/init2.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/init2.c	2012-03-08 15:17:03.000000000 +0000
-@@ -51,7 +51,7 @@
-      which both have an odd mantissa */
-   MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
--  xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
-   tmp   = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize));
- 
-   MPFR_PREC(x) = p;                /* Set prec */
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-@@ -67,7 +67,7 @@
- 
-   /* Now, the unit bit is represented. */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of represented fractional bits (including the trailing 0's) */
- 
-   x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS);
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-03-08 15:17:03.000000000 +0000
-@@ -646,10 +646,15 @@
-  **************** mpfr_t properties *******************
-  ******************************************************/
- 
-+/* In the following macro, p is usually a mpfr_prec_t, but this macro
-+   works with other integer types (without integer overflow). */
-+#define MPFR_PREC2LIMBS(p) \
-+  (MPFR_ASSERTD (p >= 1), ((p) - 1) / GMP_NUMB_BITS + 1)
-+
- #define MPFR_PREC(x)      ((x)->_mpfr_prec)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_MANT(x)      ((x)->_mpfr_d)
--#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1)
-+#define MPFR_LIMB_SIZE(x) (MPFR_PREC2LIMBS (MPFR_PREC ((x))))
- 
- 
- /******************************************************
-@@ -1213,8 +1218,8 @@
-     _destp = MPFR_MANT (dest);                                              \
-     if (MPFR_UNLIKELY (_destprec >= _srcprec))                              \
-       {                                                                     \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs;       \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec) - _srcs;                       \
-         MPN_COPY (_destp + _dests, srcp, _srcs);                            \
-         MPN_ZERO (_destp, _dests);                                          \
-         inexact = 0;                                                        \
-@@ -1227,8 +1232,8 @@
-         mp_limb_t _rb, _sb, _ulp;                                           \
-                                                                             \
-         /* Compute Position and shift */                                    \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec);                               \
-         MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec);                        \
-         _sp = (srcp) + _srcs - _dests;                                      \
-                                                                             \
-@@ -1372,7 +1377,7 @@
-       if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src)))            \
-         {                                                               \
-           MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src),                  \
--                    (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \
-+                    MPFR_LIMB_SIZE (src));                              \
-           inexact = 0;                                                  \
-         }                                                               \
-       else                                                              \
-@@ -1682,7 +1687,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE))            \
-    {                                                                    \
-      (g).alloc = (num) * _size * sizeof (mp_limb_t);                    \
-@@ -1733,7 +1738,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  (g).alloc = (num) * _size * sizeof (mp_limb_t);                        \
-  if (MPFR_LIKELY (_oalloc == 0))                                        \
-    (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc);         \
-@@ -1886,7 +1891,7 @@
-        MPFR_NORETURN_ATTR;
- 
- __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t,
--                                                unsigned long));
-+                                                mpfr_prec_t));
- 
- __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*,
-                                                             unsigned long));
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p6"
-+#define MPFR_VERSION_STRING "3.1.0-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c
---- mpfr-3.1.0-a/src/mul.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul.c	2012-03-08 15:17:03.000000000 +0000
-@@ -93,15 +93,15 @@
- 
-   ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c);
- 
--  bq = MPFR_PREC(b);
--  cq = MPFR_PREC(c);
-+  bq = MPFR_PREC (b);
-+  cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   /* <= k, thus no int overflow */
-   MPFR_ASSERTD(tn <= k);
- 
-@@ -292,12 +292,12 @@
-   bq = MPFR_PREC (b);
-   cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
- 
-   /* Check for no size_t overflow*/
-diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c
---- mpfr-3.1.0-a/src/pow.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/pow.c	2012-03-08 15:17:03.000000000 +0000
-@@ -136,7 +136,7 @@
-      (b) all the 'z' bits are zero
-   */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of z+0 bits */
- 
-   yn = prec / GMP_NUMB_BITS;
-diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c
---- mpfr-3.1.0-a/src/print_raw.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/print_raw.c	2012-03-08 15:17:03.000000000 +0000
-@@ -84,7 +84,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   printf("%s ", str);
-   for(n-- ; n>=0 ; n--)
-@@ -109,7 +109,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   for(n-- ; n>=0 ; n--)
-     {
-diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c
---- mpfr-3.1.0-a/src/round_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -55,12 +55,12 @@
- 
-   MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX);
- 
--  nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */
-+  nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */
- 
-   /* check if x has enough allocated space for the significand */
-   /* Get the number of limbs from the precision.
-      (Compatible with all allocation methods) */
--  ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  ow = MPFR_LIMB_SIZE (x);
-   if (nw > ow)
-     {
-       /* FIXME: Variable can't be created using custom allocation,
-diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c
---- mpfr-3.1.0-a/src/round_raw_generic.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_raw_generic.c	2012-03-08 15:17:03.000000000 +0000
-@@ -80,7 +80,7 @@
-       (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg)))
-     return 0;
- 
--  xsize = (xprec-1)/GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (xprec);
-   nw = yprec / GMP_NUMB_BITS;
-   rw = yprec & (GMP_NUMB_BITS - 1);
- 
-diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c
---- mpfr-3.1.0-a/src/set.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set.c	2012-03-08 15:17:03.000000000 +0000
-@@ -48,8 +48,7 @@
-       /* Same precision and b is not singular:
-        * just copy the mantissa, and set the exponent and the sign
-        * The result is exact. */
--      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b),
--                (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS);
-+      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b));
-       MPFR_RET (0);
-     }
-   else
-diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c
---- mpfr-3.1.0-a/src/set_f.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_f.c	2012-03-08 15:17:03.000000000 +0000
-@@ -43,7 +43,7 @@
-   if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0)
-     MPFR_CHANGE_SIGN (y);
- 
--  sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+  sy = MPFR_LIMB_SIZE (y);
-   my = MPFR_MANT(y);
-   mx = PTR(x);
- 
-diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c
---- mpfr-3.1.0-a/src/set_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
-   /* Calculate the new number of limbs */
--  xsize = (p - 1) / GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
- 
-   /* Realloc only if the new size is greater than the old */
-   xoldsize = MPFR_GET_ALLOC_SIZE (x);
-diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c
---- mpfr-3.1.0-a/src/setmax.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/setmax.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   mp_limb_t *xp;
- 
-   MPFR_SET_EXP (x, e);
--  xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+  xn = MPFR_LIMB_SIZE (x);
-   sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x);
-   xp = MPFR_MANT(x);
-   xp[0] = MP_LIMB_T_MAX << sh;
-diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c
---- mpfr-3.1.0-a/src/sqr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sqr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,11 +56,11 @@
-   ax = 2 * MPFR_GET_EXP (b);
-   bq = MPFR_PREC(b);
- 
--  MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX);
- 
--  bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */
--  tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square,
--                                               2*bn or 2*bn-1 */
-+  bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */
-+  tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square,
-+                                    2*bn or 2*bn-1 */
- 
-   if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD))
-     return mpfr_mul (a, b, b, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c
---- mpfr-3.1.0-a/src/stack_interface.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/stack_interface.c	2012-03-08 15:17:03.000000000 +0000
-@@ -26,7 +26,7 @@
- size_t
- mpfr_custom_get_size (mpfr_prec_t prec)
- {
--  return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB;
-+  return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
- }
- 
- #undef mpfr_custom_init
-diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c
---- mpfr-3.1.0-a/src/strtofr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/strtofr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -467,7 +467,7 @@
-       /* Set y to the value of the ~prec most significant bits of pstr->mant
-          (as long as we guarantee correct rounding, we don't need to get
-          exactly prec bits). */
--      ysize = (prec - 1) / GMP_NUMB_BITS + 1;
-+      ysize = MPFR_PREC2LIMBS (prec);
-       /* prec bits corresponds to ysize limbs */
-       ysize_bits = ysize * GMP_NUMB_BITS;
-       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
-diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c
---- mpfr-3.1.0-a/src/sub1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sub1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -155,8 +155,8 @@
-   MPFR_ASSERTD(MPFR_IS_PURE_FP(c));
- 
-   /* Read prec and num of limbs */
--  p = MPFR_PREC(b);
--  n = (p-1)/GMP_NUMB_BITS+1;
-+  p = MPFR_PREC (b);
-+  n = MPFR_PREC2LIMBS (p);
- 
-   /* Fast cmp of |b| and |c|*/
-   bx = MPFR_GET_EXP (b);
-diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c
---- mpfr-3.1.0-a/src/urandomb.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/urandomb.c	2012-03-08 15:17:03.000000000 +0000
-@@ -31,13 +31,20 @@
-    a sufficient number of limbs */
- void
- mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate,
--               unsigned long int nbits)
-+               mpfr_prec_t nbits)
- {
-   mpz_t z;
- 
-+  MPFR_ASSERTN (nbits >= 1);
-   /* To be sure to avoid the potential allocation of mpz_urandomb */
--  ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1;
-+  ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits);
-   PTR(z)   = mp;
-+#if __MPFR_GMP(5,0,0)
-+  /* Check for integer overflow (unless mp_bitcnt_t is signed,
-+     but according to the GMP manual, this shouldn't happen).
-+     Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */
-+  MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1);
-+#endif
-   mpz_urandomb (z, rstate, nbits);
- }
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-08 15:17:03.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p6";
-+  return "3.1.0-p7";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c
---- mpfr-3.1.0-a/tests/tinits.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tinits.c	2012-03-08 15:17:03.000000000 +0000
-@@ -1,4 +1,4 @@
--/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
-+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears.
- 
- Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
- Contributed by the Arenaire and Caramel projects, INRIA.
-@@ -20,18 +20,43 @@
- http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
- 
-+#include <stdlib.h>
-+
- #include "mpfr-test.h"
- 
- int
- main (void)
- {
-   mpfr_t a, b, c;
-+  long large_prec;
- 
-   tests_start_mpfr ();
-+
-   mpfr_inits (a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-   mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-+
-+  /* test for precision 2^31-1, see
-+     https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */
-+  large_prec = 2147483647;
-+  if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
-+    {
-+      /* We assume that the precision won't be increased internally. */
-+      if (large_prec > MPFR_PREC_MAX)
-+        large_prec = MPFR_PREC_MAX;
-+      mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0);
-+      mpfr_set_ui (a, 17, MPFR_RNDN);
-+      mpfr_set (b, a, MPFR_RNDN);
-+      if (mpfr_get_ui (a, MPFR_RNDN) != 17)
-+        {
-+          printf ("Error in mpfr_init2 with precision 2^31-1\n");
-+          exit (1);
-+        }
-+      mpfr_clears (a, b, (mpfr_ptr) 0);
-+    }
-+
-   tests_end_mpfr ();
-+
-   return 0;
- }
diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install
deleted file mode 100644
index d6dd0475b..000000000
--- a/testing/mpfr/mpfr.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(mpfr.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/msmtp/PKGBUILD b/testing/msmtp/PKGBUILD
deleted file mode 100644
index 14ab7906d..000000000
--- a/testing/msmtp/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 153973 2012-03-21 06:27:24Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Ben Mazer <blm@groknil.org>
-
-pkgbase=msmtp
-pkgname=('msmtp' 'msmtp-mta')
-pkgver=1.4.27
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://msmtp.sourceforge.net"
-makedepends=('texlive-core' 'gsasl' 'libgnome-keyring')
-source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('e335745133b4729fe84c49f836b4d2fa9281e040')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
-  make
-  make -C doc html pdf
-}
-
-package_msmtp() {
-  pkgdesc="A mini smtp client"
-  depends=('gsasl' 'libgnome-keyring')
-  install=msmtp.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-  make DESTDIR="${pkgdir}" -C doc install-html install-pdf
-
-# Installing example configs and scripts to /usr/share/doc/msmtp
-# as they are not installed by default (Debian and Gentoo do it this way)
-  install -d "${pkgdir}/usr/share/doc/msmtp"
-  cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/"
-  install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/"
-
-  install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim"
-}
-
-package_msmtp-mta() {
-  pkgdesc="A mini smtp client - the regular MTA"
-  depends=('msmtp')
-  provides=('smtp-forwarder')
-
-  install -d "${pkgdir}/usr/sbin"
-  ln -s /usr/bin/msmtp "${pkgdir}/usr/sbin/sendmail"
-}
diff --git a/testing/msmtp/msmtp.install b/testing/msmtp/msmtp.install
deleted file mode 100644
index c4dd76476..000000000
--- a/testing/msmtp/msmtp.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(msmtp.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/neon/PKGBUILD b/testing/neon/PKGBUILD
deleted file mode 100644
index 7fa3af41d..000000000
--- a/testing/neon/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 153541 2012-03-15 18:19:26Z pierre $
-# Maintainer:
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=neon
-pkgver=0.29.6
-pkgrel=4
-pkgdesc="HTTP and WebDAV client library with a C interface"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('krb5' 'expat' 'ca-certificates')
-url="http://www.webdav.org/neon/"
-source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('591e0c82e6979e7e615211b386b8f6bc')
-options=('libtool') # FS#16067
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --with-expat \
-    --enable-shared \
-    --disable-static \
-    --with-ssl=openssl \
-    --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-  make
-
-  # fix invalid .so links in man pages (FS#24902)
-  sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/*
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD
deleted file mode 100644
index 7d77857bf..000000000
--- a/testing/net-snmp/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 150318 2012-02-16 20:41:47Z heftig $
-# Maintainer: 
-# Contributor: Dale Blount <dale@archlinux.org>
-
-pkgname=net-snmp
-pkgver=5.7.1
-pkgrel=2
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/"
-license=('BSD')
-depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-            'perl-tk: for snmpcheck and tkmib applications'
-            'python2: for the python modules')
-provides=('ucd-snmp')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        snmpd.confd snmpd.rc libnl32.patch)
-sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
-          '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
-          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
-          '74a9848b95f63378eb1753fc309d2b74de5afb0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
-  patch -Np1 -i "$srcdir/libnl32.patch"
-  autoreconf -f -i
-
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --enable-ucd-snmp-compatibility \
-    --enable-ipv6 \
-    --with-python-modules \
-    --with-default-snmp-version="3" \
-    --with-sys-contact="root@localhost" \
-    --with-sys-location="Unknown" \
-    --with-logfile="/var/log/snmpd.log" \
-    --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp" \
-    --disable-static
-  make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/net-snmp/libnl32.patch b/testing/net-snmp/libnl32.patch
deleted file mode 100644
index d93d7ef67..000000000
--- a/testing/net-snmp/libnl32.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c	2012-02-09 20:02:49.136022132 +0100
-@@ -566,8 +566,9 @@
- static int
- tcpTable_load_netlink(void)
- {
-+	int err;
- 	/*  TODO: perhaps use permanent nl handle? */
--	struct nl_handle *nl = nl_handle_alloc();
-+	struct nl_sock *nl = nl_socket_alloc();
- 
- 	if (nl == NULL) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n"));
-@@ -575,10 +576,10 @@
- 		return -1;
- 	}
- 
--	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 
-@@ -590,10 +591,10 @@
- 	struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
- 	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
- 
--	if (nl_send_auto_complete(nl, nm) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_send_auto_complete(nl, nm)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 	nlmsg_free(nm);
-@@ -604,9 +605,9 @@
- 
- 	while (running) {
- 		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
--			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
--			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
--			nl_handle_destroy(nl);
-+			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len)));
-+			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len));
-+			nl_socket_free(nl);
- 			return -1;
- 		}
- 
-@@ -655,7 +656,7 @@
- 		free(buf);
- 	}
- 
--	nl_handle_destroy(nl);
-+	nl_socket_free(nl);
- 
- 	if (tcp_head) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n"));
-diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
---- net-snmp-5.7.1/configure.d/config_os_libs2	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2	2012-02-09 20:10:44.282165275 +0100
-@@ -224,8 +224,9 @@
- if test "x$with_nl" != "xno"; then
-     case $target_os in
-     linux*) # Check for libnl (linux)
-+	CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
- 	NETSNMP_SEARCH_LIBS(
--	    nl_connect, nl,
-+	    nl_connect, nl-3,
- 	    [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
-     ;;
-     esac
diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09bbf..000000000
--- a/testing/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f4f..000000000
--- a/testing/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/snmpd
-
-PID=`pidof -o %PPID /usr/sbin/snmpd`
-case "$1" in
-  start)
-    stat_busy "Starting Net-SNMP"
-    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/snmpd.pid
-      add_daemon snmpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Net-SNMP"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/snmpd.pid
-      rm_daemon snmpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD
deleted file mode 100644
index f00fe4ebe..000000000
--- a/testing/nfs-utils/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 151758 2012-03-02 09:09:32Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
-# Contributor: abelstr <abel@pinklf.eu>
-# Contributor: Marco Lima <cipparello gmail com>
-
-pkgname=nfs-utils
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="Support programs for Network File Systems"
-arch=('i686' 'x86_64')
-url='http://nfs.sourceforge.net'
-license=('GPL')
-backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
-depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	nfs-common
-	nfs-common.conf
-	nfs-server
-	nfs-server.conf
-	exports
-	idmapd.conf
-	start-statd.patch
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch)
-install=nfs-utils.install
-md5sums=('8395ac770720b83c5c469f88306d7765'
-         'dd0d65fc6e8f422fa12520813098264b'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
-         '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
-  #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
-  # arch specific patch
-  patch -Np0 -i $srcdir/start-statd.patch
-
-  ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
-              --without-tcp-wrappers --with-statedir=/var/lib/nfs \
-              --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount
-
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
-
-  # support python2 (FS#25120)
-  sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}
-
-  # NFS & NFSv4 init scripts
-  install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common
-  install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
-  # Configuration
-  install -D -m 644 ../exports "$pkgdir/"etc/exports
-  install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
-  install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
-  install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
-  # directories
-  mkdir "$pkgdir/"etc/exports.d
-  mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
-  mkdir "$pkgdir/"var/lib/nfs/v4recovery
-}
diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports
deleted file mode 100644
index 8f4aac598..000000000
--- a/testing/nfs-utils/exports
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/exports
-#
-# List of directories exported to NFS clients.  See exports(5).
-# Use exportfs -arv to reread.
-#
-# Example for NFSv2 and NFSv3:
-#  /srv/home       hostname1(rw,sync) hostname2(ro,sync)
-#
-# Example for NFSv4:
-#  /srv/nfs4	   hostname1(rw,sync,fsid=0)
-#  /srv/nfs4/home   hostname1(rw,sync,nohide)
-# Using Kerberos and integrity checking:
-#  /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt)
-#  /srv/nfs4/home   gss/krb5i(rw,sync,nohide)
-#
diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf
deleted file mode 100644
index b1b23afe9..000000000
--- a/testing/nfs-utils/idmapd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[General]
-
-Verbosity = 0
-Pipefs-Directory = /var/lib/nfs/rpc_pipefs
-Domain = localdomain
-
-[Mapping]
-
-Nobody-User = nobody
-Nobody-Group = nobody
-
-[Translation]
-
-Method = nsswitch
diff --git a/testing/nfs-utils/kernel-3.0-segfault.patch b/testing/nfs-utils/kernel-3.0-segfault.patch
deleted file mode 100644
index 3dba94a05..000000000
--- a/testing/nfs-utils/kernel-3.0-segfault.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-mount.nfs segfaults if kernel version number does not contain
-at least 3 components delimited with a dot.
-
-Avoid this by matching up to three unsigned integers inialised
-to zero, separated by dots.
-
-A version that does not start with an integer is probably a future
-version where the versioning evolved to another scheme.
-Return UINT_MAX which is guaranteed to be higher than existing
-versions. This would also make it possible to easily identify
-versions that do not start with an integer.
-
-Signed-off-by: Luk Claes <luk@...>
----
- utils/mount/version.h |   16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/utils/mount/version.h b/utils/mount/version.h
-index af61a6f..531cf68 100644
---- a/utils/mount/version.h
-+++ b/utils/mount/version.h
-@@ -23,8 +23,8 @@
- #ifndef _NFS_UTILS_MOUNT_VERSION_H
- #define _NFS_UTILS_MOUNT_VERSION_H
-
--#include <stdlib.h>
--#include <string.h>
-+#include <stdio.h>
-+#include <limits.h>
-
- #include <sys/utsname.h>
-
-@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q,
- static inline unsigned int linux_version_code(void)
- {
- 	struct utsname my_utsname;
--	unsigned int p, q, r;
-+	unsigned int p, q = 0, r = 0;
-
-+	/* UINT_MAX as backward compatibility code should not be run */
- 	if (uname(&my_utsname))
--		return 0;
-+		return UINT_MAX;
-
--	p = (unsigned int)atoi(strtok(my_utsname.release, "."));
--	q = (unsigned int)atoi(strtok(NULL, "."));
--	r = (unsigned int)atoi(strtok(NULL, "."));
-+	/* UINT_MAX as future versions might not start with an integer */
-+	if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1)
-+		return UINT_MAX;
-+	
- 	return MAKE_VERSION(p, q, r);
- }
diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common
deleted file mode 100644
index 7b16b4b3c..000000000
--- a/testing/nfs-utils/nfs-common
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-common
-
-NEED_STATD=
-STATD_OPTS=
-NEED_IDMAPD=
-IDMAPD_OPTS=
-NEED_GSSD=
-GSSD_OPTS=
-PIPEFS_MOUNTPOINT=
-PIPEFS_MOUNTOPTS=
-
-# rpc.statd daemon & binary location
-STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.gssd daemon & binary location
-GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default mountpoint and options for rpc_pipefs filesystem
-[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs"
-[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults"
-
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
-# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) 
-AUTO_NEED_IDMAPD=no
-AUTO_NEED_GSSD=no
-
-if [ -f /etc/fstab ]; then
-  exec 9<&0 </etc/fstab
-  
-  while read DEV MTPT FSTYPE OPTS REST; do
-    if [ "$FSTYPE" = "nfs4" ]; then
-      AUTO_NEED_IDMAPD=yes
-    fi
-    case "$OPTS" in
-      sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
-	AUTO_NEED_GSSD=yes
-      ;;
-    esac
-  done
-
-  exec 0<&9 9<&-
-fi
-
-# We also need idmapd if we run an NFSv4 server. It's fairly difficult
-# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
-# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
-# file. This does not mean that there are NFSv4 or other mounts active (or
-# even that nfs-kernel-server is installed), but it matches what the "start"
-# condition in nfs-kernel-server's init script does, which has a value in
-# itself.
-if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
-  AUTO_NEED_IDMAPD=yes
-fi
-
-case "$NEED_STATD" in
-  yes|no)
-    ;;
-  *)
-    NEED_STATD=yes
-    ;;
-esac
-
-case "$NEED_IDMAPD" in
-  yes|no)	
-    ;;
-  *)
-    NEED_IDMAPD=$AUTO_NEED_IDMAPD
-    ;;
-esac
-
-case "$NEED_GSSD" in
-  yes|no)	
-    ;;
-  *)
-    NEED_GSSD=$AUTO_NEED_GSSD
-    ;;
-esac
-
-do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
-      modprobe -q "$1" || true
-    fi
-}
-
-do_mount() {
-    if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
-      return 1
-    fi
-    
-    if grep -vw "$1" /proc/mounts &> /dev/null ; then
-      if ! mountpoint -q "$2" ; then
-	mount -t "$1" "$1" "$2" -o "$3"
-	return
-      fi
-    fi
-    return 0
-}
-
-do_umount() {
-    if mountpoint -q "$1" ; then
-      umount "$1"
-    fi
-    return 0
-}
-
-get_pid() {
-	pidof -o %PPID "$1"
-}
-
-case "$1" in
-  start)
-    ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; }
-    rc=0
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Starting $STATD_DAEMON_NAME daemon"
-      PID=$(get_pid $STATD)
-      if [ -z "$PID" ]; then
-	[ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid
-	# RUN
-	$STATD $STATD_OPTS
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid
-	  stat_done
-	fi
-      else
-	stat_fail
-	exit 1
-      fi
-      # Run sm-notify
-      /usr/sbin/sm-notify $SMNOTIFY_OPTS
-    fi
-
-    if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-      stat_busy "Mounting pipefs filesystem"
-      do_modprobe sunrpc
-      do_modprobe nfs
-      do_modprobe nfsd
-      do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" 
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-        stat_done
-      fi
-
-      if [ "$NEED_IDMAPD" = yes ]; then
-	stat_busy "Starting $IDMAPD_DAEMON_NAME daemon"
-	PID=$(get_pid $IDMAPD)
-	if [ -z "$PID" ]; then
-	  [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid
-	  # RUN
-	  $IDMAPD $IDMAPD_OPTS
-	  #
-	  rc=$(($rc+$?))
-	  if [ $rc -gt 0 ]; then
-	    stat_fail
-	    exit $rc
-	  else
-	    echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid
-	    stat_done
-	  fi
-	else
-	  stat_fail
-	  exit 1
-        fi
-      fi
-
-      if [ "$NEED_GSSD" = yes ]; then
-	do_modprobe rpcsec_gss_krb5
-	stat_busy "Starting $GSSD_DAEMON_NAME daemon"
-	PID=$(get_pid $GSSD)
-	if [ -z "$PID" ]; then
-	  [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid
-	  # RUN
-	  $GSSD $GSSD_OPTS
-	  #
-	  rc=$(($rc+$?))
-	  if [ $rc -gt 0 ]; then
-	    stat_fail
-	    exit $rc
-	  else
-	    echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid
-	    stat_done
-	  fi
-	else
-	  stat_fail
-	  exit 1
-        fi
-      fi
-    fi
-
-    add_daemon $daemon_name
-    ;;
-
-  stop)
-    rc=0
-    if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-
-      if [ "$NEED_GSSD" = yes ]; then
-	stat_busy "Stopping $GSSD_DAEMON_NAME daemon"
-	PID=$(get_pid $GSSD)
-	# KILL
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null
-	  stat_done
-	fi
-      fi
-
-      if [ "$NEED_IDMAPD" = yes ]; then
-	stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon"
-	PID=$(get_pid $IDMAPD)
-	# KILL
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null
-	  stat_done
-	fi
-      fi
-      do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true
-    fi
-
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Stopping $STATD_DAEMON_NAME daemon"
-      PID=$(get_pid $STATD)
-      # KILL
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null
-	stat_done
-      fi
-    fi
-
-    rm_daemon $daemon_name
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Daemon $STATD_DAEMON_NAME running"
-      PID=$(get_pid $STATD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-
-    if [ "$NEED_GSSD" = yes ]; then
-      stat_busy "Daemon $GSSD_DAEMON_NAME running"
-      PID=$(get_pid $GSSD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-      
-    if [ "$NEED_IDMAPD" = yes ]; then
-      stat_busy "Daemon $IDMAPD_DAEMON_NAME running"
-      PID=$(get_pid $IDMAPD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-    echo
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|status|restart}"  
-esac
-exit 0
-	    
diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf
deleted file mode 100644
index 12466b3e5..000000000
--- a/testing/nfs-utils/nfs-common.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Parameters to be passed to nfs-common (nfs clients & server) init script.
-#
-
-# If you do not set values for the NEED_ options, they will be attempted
-# autodetected; this should be sufficient for most people. Valid alternatives
-# for the NEED_ options are "yes" and "no".
-
-# Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=""
-
-# Options to pass to rpc.statd.
-# See rpc.statd(8) for more details.
-# N.B. statd normally runs on both client and server, and run-time
-# options should be specified accordingly.
-# STATD_OPTS="-p 32765 -o 32766"
-STATD_OPTS=""
-
-# Options to pass to sm-notify
-# e.g. SMNOTIFY_OPTS="-p 32764"
-SMNOTIFY_OPTS=""
-
-# Do you want to start the idmapd daemon? It is only needed for NFSv4.
-NEED_IDMAPD=""
-
-# Options to pass to rpc.idmapd.
-# See rpc.idmapd(8) for more details.
-IDMAPD_OPTS=""
-
-# Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=""
-
-# Options to pass to rpc.gssd.
-# See rpc.gssd(8) for more details.
-GSSD_OPTS=""
-
-# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
-PIPEFS_MOUNTPOINT=""
-
-# Options used to mount rpc_pipefs filesystem; the default is "defaults".
-PIPEFS_MOUNTOPTS=""
diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server
deleted file mode 100644
index 6aa609d8c..000000000
--- a/testing/nfs-utils/nfs-server
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-server
-
-NFSD_COUNT=
-NFSD_OPTS=
-NEED_SVCGSSD=
-SVCGSSD_OPTS=
-MOUNTD_OPTS=
-PROCNFSD_MOUNTPOINT=
-PROCNFSD_MOUNTOPTS=
-
-# rpc.nfsd daemon & binary location
-NFSD_PROCESS_NAME=nfsd
-NFSD_DAEMON_NAME=rpc.nfsd
-NFSD="/usr/sbin/rpc.nfsd"
-
-# rpc.svcgssd daemon & binary location
-SVCGSSD_DAEMON_NAME=rpc.svcgssd
-SVCGSSD="/usr/sbin/rpc.svcgssd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.mountd daemon & binary location
-MOUNTD_DAEMON_NAME=rpc.mountd
-MOUNTD="/usr/sbin/rpc.mountd"
-
-# exortfs binary location
-EXPORTFS="/usr/sbin/exportfs"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default number of nfsd servers
-[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8
-
-# Default mountpoint and options for nfsd filesystem
-[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd"
-[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
-
-case "$NEED_SVCGSSD" in
-  yes|no)
-    ;;
-  *)
-    NEED_SVCGSSD=no
-    ;;
-esac
-
-do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
-      modprobe -q "$1" || true
-    fi
-}
-
-do_mount() {
-    if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
-      return 1
-    fi
-    
-    if grep -vw "$1" /proc/mounts &> /dev/null ; then
-      if ! mountpoint -q "$2" ; then
-	mount -t "$1" "$1" "$2" -o "$3"
-	return
-      fi
-    fi
-    return 0
-}
-
-do_umount() {
-    if mountpoint -q "$1" ; then
-      umount "$1"
-    fi
-    return 0
-}
-
-get_pid() {
-	pidof -o %PPID "$1"
-}
-
-case "$1" in
-  start)
-    ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; }
-    rc=0
-    stat_busy "Mounting nfsd filesystem"
-    do_modprobe nfsd
-    do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    stat_busy "Exporting all directories"
-    $EXPORTFS -r
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    stat_busy "Starting $NFSD_DAEMON_NAME daemon"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid
-      # RUN
-      $NFSD $NFSD_OPTS $NFSD_COUNT
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid
-	stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      do_modprobe rpcsec_gss_krb5
-      stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon"
-      PID=$(get_pid $SVCGSSD)
-      if [ -z "$PID" ]; then
-	[ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid
-	# RUN
-	$SVCGSSD $SVCGSSD_OPTS
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid
-	  stat_done
-	fi
-      else
-	stat_fail
-	exit 1
-      fi
-    fi
-
-    PID=$(get_pid $IDMAPD)
-    [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null
-
-    stat_busy "Starting $MOUNTD_DAEMON_NAME daemon"
-    PID=$(get_pid $MOUNTD)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid
-      # RUN
-      $MOUNTD $MOUNTD_OPTS
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid
-	stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-
-    add_daemon $daemon_name
-    ;;
-
-  stop)
-    rc=0
-    stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon"
-    PID=$(get_pid $MOUNTD)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null
-      stat_done
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon"
-      PID=$(get_pid $SVCGSSD)
-      # KILL
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null
-	stat_done
-      fi
-    fi
-
-    stat_busy "Stopping $NFSD_DAEMON_NAME daemon"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    # KILL (SIGINT)
-    [ ! -z "$PID" ] && kill -2 $PID &> /dev/null
-    #
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      sleep 1
-      PID=$(get_pid $NFSD_PROCESS_NAME)
-      # KILL (KILL) - just to be sure
-      [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
-      #
-      rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null
-      stat_done
-    fi
-
-    stat_busy "Unexporting all directories"
-    $EXPORTFS -au
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    # flush everything out of the kernels export table
-    if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then
-      $EXPORTFS -f
-    fi
-    do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true
-    rm_daemon $daemon_name
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-
-    stat_busy "Daemon $NFSD_DAEMON_NAME running"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    stat_busy "Daemon $MOUNTD_DAEMON_NAME running"
-    PID=$(get_pid $MOUNTD)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      stat_busy "Daemon $SVCGSSD_DAEMON_NAME running"
-      PID=$(get_pid $SVCGSSD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-    echo
-    ;;
-
-  reload)
-    rc=0
-    stat_busy "Re-exporting all directories"
-    $EXPORTFS -r
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|status|reload|restart}"  
-esac
-exit 0
diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf
deleted file mode 100644
index 581e26350..000000000
--- a/testing/nfs-utils/nfs-server.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Parameters to be passed to nfs-server init script.
-#
-
-# Options to pass to rpc.nfsd.
-# See rpc.nfsd(8) for more details.
-NFSD_OPTS=""
-
-# Number of servers to start up; the default is 8 servers.
-NFSD_COUNT=""
-
-# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
-PROCNFSD_MOUNTPOINT=""
-
-# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
-PROCNFSD_MOUNTOPTS=""
-
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# a fixed port here using the --port option.
-# See rpc.mountd(8) for more details.
-MOUNTD_OPTS=""
-
-# Do you want to start the svcgssd daemon? It is only required for Kerberos
-# exports. Valid alternatives are "yes" and "no"; the default is "no".
-NEED_SVCGSSD=""
-
-# Options to pass to rpc.svcgssd.
-# See rpc.svcgssd(8) for more details.
-SVCGSSD_OPTS=""
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
deleted file mode 100644
index c9e60afc7..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- 	return var_mtab_does_not_exist;
- }
- 
--static int
-+int
- mtab_is_a_symlink(void) {
-         get_mtab_info();
-         return var_mtab_is_a_symlink;
---- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
- 
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
---- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
- 	int flags;
- 	mntFILE *mfp;
- 
-+	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+	   that would create a file /proc/mounts in case the proc filesystem
-+	   is not mounted, and the fchmod below would also fail. */
-+	if (mtab_is_a_symlink()) {
-+		return EX_SUCCESS;
-+	}
-+
- 	lock_mtab();
- 
- 	mfp = nfs_setmntent (MOUNTED, "a+");
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
deleted file mode 100644
index ea50a21d8..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.2/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -381,10 +381,6 @@
- 		mount_error(NULL, mount_point, ENOTDIR);
- 		return 1;
- 	}
--	if (access(mount_point, X_OK) < 0) {
--		mount_error(NULL, mount_point, errno);
--		return 1;
--	}
- 
- 	return 0;
- }
diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install
deleted file mode 100644
index 7dcdf9575..000000000
--- a/testing/nfs-utils/nfs-utils.install
+++ /dev/null
@@ -1,32 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-cat << 'EOM'
-  ==> PLEASE NOTE:
-  ==> Extended configuration options for NFS (clients & server) are available in
-  ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf
-  ==>
-  ==> Please refer to http://wiki.archlinux.org/index.php/Nfs
-  ==> for further information on NFS; for NFSv4, refer to
-  ==> http://wiki.archlinux.org/index.php/NFSv4   
-EOM
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
-cat << 'EOM'
-  ==> IMPORTANT NFS UTILS CHANGES:
-  ==> This is a rather important upgrade, you are going to have to change config files.
-  ==> /etc/rc.conf daemons changes:
-  ==> Change portmap to rpcbind
-  ==> Change nfslock to nfs-common
-  ==> Change nfsd to nfs-server
-  ==>
-  ==> Extended configuration options for NFS (clients & server) are available in:
-  ==> /etc/conf.d/nfs-common
-  ==> /etc/conf.d/nfs-server
-  ==> Please change them to your needs.
-EOM
-  fi
-}
diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch
deleted file mode 100644
index 5d73b6e35..000000000
--- a/testing/nfs-utils/start-statd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- utils/statd/start-statd	2007-05-11 04:40:57.000000000 +0100
-+++ utils/statd/start-statd.new	2007-09-21 17:11:34.000000000 +0100
-@@ -1,9 +1,16 @@
--#!/bin/bash -p
-+#!/bin/sh
-+
-+# Original script provided by the NFS project
-+# Modified for Arch Linux by Tom Killian
-+
- # nfsmount calls this script when mounting a filesystem with locking
- # enabled, but when statd does not seem to be running (based on
- # /var/run/rpc.statd.pid).
- # It should run statd with whatever flags are apropriate for this
- # site.
--PATH=/sbin:/usr/sbin
--exec rpc.statd --no-notify
-+
-+# source application-specific settings
-+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf
-+
-+exec /usr/sbin/rpc.statd $STATD_OPTS
- 
diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD
deleted file mode 100644
index 61895f9fa..000000000
--- a/testing/nspr/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 150956 2012-02-24 10:04:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=nspr
-pkgver=4.9
-pkgrel=1
-pkgdesc="Netscape Portable Runtime"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/nspr/"
-license=('MPL' 'GPL')
-depends=('glibc')
-makedepends=('zip')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
-        nspr.pc.in)
-md5sums=('aa0c960b23a9d66a3c30c3e6ba80a99a'
-         'bce1611f3117b53fc904cab549c09967')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  if [ "$CARCH" = "x86_64" ]; then
-    confflags="--enable-64bit"
-  else
-    confflags=""
-  fi
-
-  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-      -i mozilla/nsprpub/config/rules.mk
-
-  ./mozilla/nsprpub/configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --includedir=/usr/include/nspr \
-      --enable-optimize \
-      --disable-debug ${confflags}
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  NSPR_LIBS=`./config/nspr-config --libs`
-  NSPR_CFLAGS=`./config/nspr-config --cflags`
-  NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
-  	-e "s,%prefix%,/usr," \
-	-e "s,%exec_prefix%,/usr/bin," \
-	-e "s,%includedir%,/usr/include/nspr," \
-	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
-	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
-
-  chmod 644 ${pkgdir}/usr/lib/*.a
-
-  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
-	"${pkgdir}/usr/bin/prerr.properties" \
-	"${pkgdir}/usr/share/aclocal/nspr.m4" \
-	"${pkgdir}/usr/include/nspr/md"
-}
diff --git a/testing/nspr/nspr.pc.in b/testing/nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0ca..000000000
--- a/testing/nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD
deleted file mode 100644
index d24c3c91c..000000000
--- a/testing/nss/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 150999 2012-02-24 13:00:04Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nss
-pkgver=3.13.3
-pkgrel=1
-pkgdesc="Mozilla Network Security Services"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.9
-depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}/src/${pkgname}-${pkgver}.tar.gz
-        nss-no-rpath.patch
-        nss.pc.in
-        nss-config.in
-        add_spi+cacert_ca_certs.patch
-        ssl-renegotiate-transitional.patch)
-sha1sums=('6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6'
-          'c8fcdb153af9d39689243119adb475905a657284'
-          'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
-          'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
-          '3d89f29e321d7df7269b7ae6d219654543feaa6a'
-          '8a964a744ba098711b80c0d279a2993524e8eb92')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
-  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
-  patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
-  # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-  # Removes rpath
-  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
-
-  # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-      -i security/coreconf/rules.mk
-
-  # Generate certdata.c from certdata.txt
-  cd security/nss/lib/ckfw/builtins
-  make generate
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export BUILD_OPT=1
-  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-  export NSS_USE_SYSTEM_SQLITE=1
-  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
-  export XCFLAGS="${CFLAGS}"
-
-  [ "$CARCH" = "x86_64" ] && export USE_64=1
-
-  make -j 1 -C mozilla/security/coreconf
-  make -j 1 -C mozilla/security/dbm
-  make -j 1 -C mozilla/security/nss
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/include/nss"
-
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-
-  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
-  				-e "s,%prefix%,/usr,g" \
-				-e "s,%exec_prefix%,/usr/bin,g" \
-				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${pkgver},g" \
-				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
-
-  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
-  				    -e "s,@prefix@,/usr/bin,g" \
-				    -e "s,@exec_prefix@,/usr/bin,g" \
-				    -e "s,@includedir@,/usr/include/nss,g" \
-				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config"
-  chmod 755 "${pkgdir}/usr/bin/nss-config"
-
-  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
-              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
-  do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
-  done
-
-  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
-  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
-
-  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
-  done
-
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
-}
diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch
deleted file mode 100644
index bf7e2ca16..000000000
--- a/testing/nss/add_spi+cacert_ca_certs.patch
+++ /dev/null
@@ -1,568 +0,0 @@
-## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds the SPI Inc. and CAcert.org CA certificates
-
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:32:14.000000000 +0100
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:35:07.577861466 +0100
-@@ -23475,3 +23475,558 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+ 
-+#
-+# Certificate "CAcert.org Class 1 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
-+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
-+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
-+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
-+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
-+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
-+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
-+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
-+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
-+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
-+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
-+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
-+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
-+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
-+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
-+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
-+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
-+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
-+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
-+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
-+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
-+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
-+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
-+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
-+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
-+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
-+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
-+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
-+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
-+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
-+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
-+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
-+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
-+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
-+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
-+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
-+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
-+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
-+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
-+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
-+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
-+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
-+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
-+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
-+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
-+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
-+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
-+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
-+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
-+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
-+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
-+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
-+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
-+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
-+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
-+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
-+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
-+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
-+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
-+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
-+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
-+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
-+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
-+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
-+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
-+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
-+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
-+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
-+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
-+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
-+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
-+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
-+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
-+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
-+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
-+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
-+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
-+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
-+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
-+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
-+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
-+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
-+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
-+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
-+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
-+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
-+\103
-+END
-+
-+# Trust for Certificate "CAcert.org Class 1 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
-+\166\316\217\063
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 3 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
-+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
-+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
-+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
-+\063\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
-+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
-+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
-+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
-+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
-+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
-+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
-+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
-+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
-+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
-+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
-+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
-+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
-+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
-+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
-+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
-+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
-+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
-+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
-+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
-+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
-+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
-+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
-+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
-+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
-+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
-+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
-+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
-+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
-+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
-+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
-+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
-+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
-+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
-+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
-+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
-+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
-+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
-+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
-+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
-+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
-+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
-+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
-+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
-+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
-+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
-+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
-+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
-+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
-+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
-+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
-+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
-+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
-+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
-+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
-+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
-+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
-+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
-+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
-+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
-+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
-+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
-+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
-+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
-+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
-+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
-+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
-+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
-+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
-+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
-+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
-+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
-+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
-+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
-+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
-+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
-+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
-+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
-+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
-+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
-+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
-+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
-+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
-+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
-+\322\156\245\033\231\047\200\347\013\251\250\000
-+END
-+
-+# Trust for Certificate "CAcert.org Class 3 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
-+\030\116\052\055
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
-+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
-+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
-+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
-+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
-+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
-+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
-+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
-+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
-+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
-+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
-+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
-+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
-+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
-+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
-+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
-+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
-+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
-+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
-+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
-+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
-+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
-+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
-+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
-+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
-+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
-+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
-+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
-+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
-+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
-+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
-+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
-+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
-+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
-+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
-+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
-+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
-+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
-+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
-+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
-+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
-+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
-+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
-+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
-+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
-+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
-+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
-+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
-+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
-+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
-+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
-+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
-+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
-+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
-+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
-+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
-+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
-+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
-+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
-+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
-+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
-+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
-+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
-+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
-+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
-+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
-+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
-+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
-+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
-+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
-+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
-+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
-+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
-+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
-+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
-+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
-+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
-+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
-+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
-+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
-+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
-+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
-+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
-+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
-+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
-+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
-+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
-+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
-+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
-+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
-+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
-+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
-+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
-+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
-+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
-+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
-+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
-+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
-+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
-+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
-+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
-+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
-+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
-+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
-+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
-+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
-+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
-+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
-+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
-+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
-+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
-+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
-+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
-+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
-+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
-+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
-+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
-+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
-+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
-+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
-+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
-+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
-+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
-+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
-+\243\140
-+END
-+
-+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
-+\251\220\103\034
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in
deleted file mode 100644
index f8f893e71..000000000
--- a/testing/nss/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	nssutil
-	ssl
-	smime
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
-      fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
-      fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
-      fi
-      echo $libdirs
-fi      
-
diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch
deleted file mode 100644
index 35ea57315..000000000
--- a/testing/nss/nss-no-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
- 
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
- 
diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in
deleted file mode 100644
index d47b9e146..000000000
--- a/testing/nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch
deleted file mode 100644
index f457c5551..000000000
--- a/testing/nss/ssl-renegotiate-transitional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
---- a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
-     PR_FALSE,   /* noLocks            */
-     PR_FALSE,   /* enableSessionTickets */
-     PR_FALSE,   /* enableDeflate      */
--    2,          /* enableRenegotiation (default: requires extension) */
-+    3,          /* enableRenegotiation (default: transitional) */
-     PR_FALSE,   /* requireSafeNegotiation */
- };
- 
diff --git a/testing/ntrack/PKGBUILD b/testing/ntrack/PKGBUILD
deleted file mode 100644
index 858f396f6..000000000
--- a/testing/ntrack/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150322 2012-02-16 20:41:52Z heftig $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=ntrack
-pkgver=16
-pkgrel=2
-epoch=1
-pkgdesc="A network connectivity tracking library"
-arch=('i686' 'x86_64')
-url="http://launchpad.net/ntrack/"
-license=('LGPL')
-depends=('qt' 'libnl')
-makedepends=('python2')
-options=('!libtool' '!emptydirs')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
-        'libnl3.patch')
-md5sums=('21691dac43460a6791cba3decbc68242'
-         '0a1f6b7f9a01c323e81d6da95cad93cd')
-
-build() {
-  cd "${srcdir}/${pkgname}-0${pkgver}"
-  patch -p1 -i "${srcdir}"/libnl3.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-0${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/ntrack/libnl3.patch b/testing/ntrack/libnl3.patch
deleted file mode 100644
index 879b52c8c..000000000
--- a/testing/ntrack/libnl3.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
-Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib.
-
-Index: ntrack/glib/Makefile.am
-===================================================================
---- ntrack.orig/glib/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/Makefile.am	2011-12-22 20:07:10.243344976 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS =
-Index: ntrack/glib/Makefile.in
-===================================================================
---- ntrack.orig/glib/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/Makefile.in	2011-12-22 20:07:14.871344769 -0500
-@@ -325,7 +325,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS = 
-Index: ntrack/glib/test/Makefile.am
-===================================================================
---- ntrack.orig/glib/test/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/test/Makefile.am	2011-12-22 20:07:19.451344565 -0500
-@@ -27,7 +27,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/glib/test/Makefile.in
-===================================================================
---- ntrack.orig/glib/test/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/test/Makefile.in	2011-12-22 20:07:23.903344367 -0500
-@@ -260,7 +260,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/gobject/Makefile.am
-===================================================================
---- ntrack.orig/gobject/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.am	2011-12-22 20:07:27.515344206 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/gobject/Makefile.in
-===================================================================
---- ntrack.orig/gobject/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.in	2011-12-22 20:07:31.519344028 -0500
-@@ -347,7 +347,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/modules/Makefile.am
-===================================================================
---- ntrack.orig/modules/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.am	2011-12-22 20:07:35.519343851 -0500
-@@ -26,7 +26,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS =
-Index: ntrack/modules/Makefile.in
-===================================================================
---- ntrack.orig/modules/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.in	2011-12-22 20:07:39.391343676 -0500
-@@ -352,7 +352,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS = 
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 8de3917c8..000000000
--- a/testing/nx-common/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 153543 2012-03-15 18:23:51Z pierre $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nx-common
-pkgver=3.5.0
-pkgrel=4
-pkgdesc="NoMachine NX common package for client and server"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://nomachine.com/"
-depends=('libjpeg-turbo' 'libpng' 'openssl' '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/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index 4b9f1ca54..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# $Id: PKGBUILD 153670 2012-03-17 18:34:49Z eric $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.30
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default
-        ntlm.patch
-        mutex-end-of-struct-sigsegv.patch)
-sha1sums=('7447e89b9a5199f9bb2231bda42c308a1b6513d9'
-          'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
-          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
-          '694269dad78c7a806649c2d7f57bb7e503df3af1')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i "${srcdir}"/ntlm.patch
-  patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch
-
-  sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
-  sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
-  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
-  sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
-
-  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
-  ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
-    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
-    --enable-ipv6 --enable-syslog --enable-local \
-    --enable-bdb --enable-hdb \
-    --enable-crypt --enable-dynamic \
-    --with-threads --disable-wrappers \
-    --without-fetch \
-    --enable-spasswd --with-cyrus-sasl \
-    --enable-overlays=mod --enable-modules=yes
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make test
-}
-
-package_libldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'e2fsprogs')
-  backup=('etc/openldap/ldap.conf')
-  options=('!libtool')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in include libraries doc/man/man3 ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
-  ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
-  depends=("libldap>=${pkgver}" 'libltdl' 'util-linux')
-  backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
-  options=('!libtool' 'emptydirs')
-  install=openldap.install
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in clients servers doc/man/man{1,5,8} ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  rm -r "${pkgdir}"/run
-
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
-
-  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-
-  install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
-  install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
-  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
-  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openldap/mutex-end-of-struct-sigsegv.patch b/testing/openldap/mutex-end-of-struct-sigsegv.patch
deleted file mode 100644
index e8996386a..000000000
--- a/testing/openldap/mutex-end-of-struct-sigsegv.patch
+++ /dev/null
@@ -1,293 +0,0 @@
- libraries/libldap/init.c     |    8 ++-
- libraries/libldap/ldap-int.h |  198 ++++++++++++++++++++++--------------------
- 2 files changed, 110 insertions(+), 96 deletions(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 39292d2..9d37e64 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -36,7 +36,13 @@
- #include "lutil.h"
- 
- struct ldapoptions ldap_int_global_options =
--	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };  
-+	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
-+		LDAP_LDO_NULLARG
-+		LDAP_LDO_CONNECTIONLESS_NULLARG
-+		LDAP_LDO_TLS_NULLARG
-+		LDAP_LDO_SASL_NULLARG
-+		LDAP_LDO_GSSAPI_NULLARG
-+		LDAP_LDO_MUTEX_NULLARG };
- 
- #define ATTR_NONE	0
- #define ATTR_BOOL	1
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index f8e6126..ac6c9e5 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -185,29 +185,59 @@ struct ldapoptions {
- #define LDAP_TRASHED_SESSION	0xFF
- 	int   ldo_debug;
- 
--#ifdef LDAP_R_COMPILE
--	ldap_pvt_thread_mutex_t	ldo_mutex;
--#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
--#else
--#define LDAP_LDO_MUTEX_NULLARG
--#endif
-+	ber_int_t		ldo_version;
-+	ber_int_t		ldo_deref;
-+	ber_int_t		ldo_timelimit;
-+	ber_int_t		ldo_sizelimit;
-+
-+	/* per API call timeout */
-+	struct timeval		ldo_tm_api;
-+	struct timeval		ldo_tm_net;
-+
-+	LDAPURLDesc *ldo_defludp;
-+	int		ldo_defport;
-+	char*	ldo_defbase;
-+	char*	ldo_defbinddn;	/* bind dn */
-+
-+	/*
-+	 * Per connection tcp-keepalive settings (Linux only,
-+	 * ignored where unsupported)
-+	 */
-+	ber_int_t ldo_keepalive_idle;
-+	ber_int_t ldo_keepalive_probes;
-+	ber_int_t ldo_keepalive_interval;
-+
-+	int		ldo_refhoplimit;	/* limit on referral nesting */
-+
-+	/* LDAPv3 server and client controls */
-+	LDAPControl	**ldo_sctrls;
-+	LDAPControl **ldo_cctrls;
-+
-+	/* LDAP rebind callback function */
-+	LDAP_REBIND_PROC *ldo_rebind_proc;
-+	void *ldo_rebind_params;
-+	LDAP_NEXTREF_PROC *ldo_nextref_proc;
-+	void *ldo_nextref_params;
-+	LDAP_URLLIST_PROC *ldo_urllist_proc;
-+	void *ldo_urllist_params;
-+
-+	/* LDAP connection callback stack */
-+	ldaplist *ldo_conn_cbs;
-+
-+	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
-+
-+#define LDAP_LDO_NULLARG	,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0
- 
- #ifdef LDAP_CONNECTIONLESS
- #define	LDAP_IS_UDP(ld)		((ld)->ld_options.ldo_is_udp)
- 	void*			ldo_peer;	/* struct sockaddr* */
- 	char*			ldo_cldapdn;
- 	int			ldo_is_udp;
-+#define	LDAP_LDO_CONNECTIONLESS_NULLARG	,0,0,0
-+#else
-+#define	LDAP_LDO_CONNECTIONLESS_NULLARG
- #endif
- 
--	/* per API call timeout */
--	struct timeval		ldo_tm_api;
--	struct timeval		ldo_tm_net;
--
--	ber_int_t		ldo_version;
--	ber_int_t		ldo_deref;
--	ber_int_t		ldo_timelimit;
--	ber_int_t		ldo_sizelimit;
--
- #ifdef HAVE_TLS
-    	/* tls context */
-    	void		*ldo_tls_ctx;
-@@ -226,16 +256,12 @@ struct ldapoptions {
-    	int			ldo_tls_mode;
-    	int			ldo_tls_require_cert;
- 	int			ldo_tls_impl;
--#ifdef HAVE_OPENSSL_CRL
-    	int			ldo_tls_crlcheck;
--#endif
-+#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0
-+#else
-+#define LDAP_LDO_TLS_NULLARG
- #endif
- 
--	LDAPURLDesc *ldo_defludp;
--	int		ldo_defport;
--	char*	ldo_defbase;
--	char*	ldo_defbinddn;	/* bind dn */
--
- #ifdef HAVE_CYRUS_SASL
- 	char*	ldo_def_sasl_mech;		/* SASL Mechanism(s) */
- 	char*	ldo_def_sasl_realm;		/* SASL realm */
-@@ -244,6 +270,9 @@ struct ldapoptions {
- 
- 	/* SASL Security Properties */
- 	struct sasl_security_properties	ldo_sasl_secprops;
-+#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0}
-+#else
-+#define LDAP_LDO_SASL_NULLARG
- #endif
- 
- #ifdef HAVE_GSSAPI
-@@ -253,34 +282,17 @@ struct ldapoptions {
- #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT	0x0001
- #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL	0x0002
- 	unsigned ldo_gssapi_options;
-+#define LDAP_LDO_GSSAPI_NULLARG ,0,0
-+#else
-+#define LDAP_LDO_GSSAPI_NULLARG
- #endif
- 
--	/*
--	 * Per connection tcp-keepalive settings (Linux only,
--	 * ignored where unsupported)
--	 */
--	ber_int_t ldo_keepalive_idle;
--	ber_int_t ldo_keepalive_probes;
--	ber_int_t ldo_keepalive_interval;
--
--	int		ldo_refhoplimit;	/* limit on referral nesting */
--
--	/* LDAPv3 server and client controls */
--	LDAPControl	**ldo_sctrls;
--	LDAPControl **ldo_cctrls;
--
--	/* LDAP rebind callback function */
--	LDAP_REBIND_PROC *ldo_rebind_proc;
--	void *ldo_rebind_params;
--	LDAP_NEXTREF_PROC *ldo_nextref_proc;
--	void *ldo_nextref_params;
--	LDAP_URLLIST_PROC *ldo_urllist_proc;
--	void *ldo_urllist_params;
--
--	/* LDAP connection callback stack */
--	ldaplist *ldo_conn_cbs;
--
--	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
-+#ifdef LDAP_R_COMPILE
-+	ldap_pvt_thread_mutex_t	ldo_mutex;
-+#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
-+#else
-+#define LDAP_LDO_MUTEX_NULLARG
-+#endif
- };
- 
- 
-@@ -375,6 +387,46 @@ struct ldap_common {
- 	Sockbuf		*ldc_sb;	/* socket descriptor & buffer */
- #define ld_sb			ldc->ldc_sb
- 
-+	unsigned short	ldc_lberoptions;
-+#define	ld_lberoptions		ldc->ldc_lberoptions
-+
-+	/* protected by msgid_mutex */
-+	ber_len_t		ldc_msgid;
-+#define	ld_msgid		ldc->ldc_msgid
-+
-+	/* do not mess with these */
-+	/* protected by req_mutex */
-+	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
-+	/* protected by res_mutex */
-+	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
-+#define	ld_requests		ldc->ldc_requests
-+#define	ld_responses		ldc->ldc_responses
-+
-+	/* protected by abandon_mutex */
-+	ber_len_t	ldc_nabandoned;
-+	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
-+#define	ld_nabandoned		ldc->ldc_nabandoned
-+#define	ld_abandoned		ldc->ldc_abandoned
-+
-+	/* unused by libldap */
-+	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
-+#define	ld_cache		ldc->ldc_cache
-+
-+	/* do not mess with the rest though */
-+
-+	/* protected by conn_mutex */
-+	LDAPConn	*ldc_defconn;	/* default connection */
-+#define	ld_defconn		ldc->ldc_defconn
-+	LDAPConn	*ldc_conns;	/* list of server connections */
-+#define	ld_conns		ldc->ldc_conns
-+	void		*ldc_selectinfo;/* platform specifics for select */
-+#define	ld_selectinfo		ldc->ldc_selectinfo
-+
-+	/* ldap_common refcnt - free only if 0 */
-+	/* protected by ldc_mutex */
-+	unsigned int		ldc_refcnt;
-+#define	ld_ldcrefcnt		ldc->ldc_refcnt
-+
- 	/* protected by ldo_mutex */
- 	struct ldapoptions ldc_options;
- #define ld_options		ldc->ldc_options
-@@ -403,66 +455,22 @@ struct ldap_common {
- #define ld_urllist_params	ld_options.ldo_urllist_params
- 
- #define ld_version		ld_options.ldo_version
--#ifdef LDAP_R_COMPILE
--#define	ld_ldopts_mutex		ld_options.ldo_mutex
--#endif
--
--	unsigned short	ldc_lberoptions;
--#define	ld_lberoptions		ldc->ldc_lberoptions
--
--	/* protected by msgid_mutex */
--	ber_len_t		ldc_msgid;
--#define	ld_msgid		ldc->ldc_msgid
--
--	/* do not mess with these */
--	/* protected by req_mutex */
--	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
--	/* protected by res_mutex */
--	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
--#define	ld_requests		ldc->ldc_requests
--#define	ld_responses		ldc->ldc_responses
- 
- #ifdef LDAP_R_COMPILE
-+	ldap_pvt_thread_mutex_t	ldc_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_msgid_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_conn_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_req_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_res_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_abandon_mutex;
-+#define	ld_ldopts_mutex		ld_options.ldo_mutex
-+#define	ld_ldcmutex		ldc->ldc_mutex
- #define	ld_msgid_mutex		ldc->ldc_msgid_mutex
- #define	ld_conn_mutex		ldc->ldc_conn_mutex
- #define	ld_req_mutex		ldc->ldc_req_mutex
- #define	ld_res_mutex		ldc->ldc_res_mutex
- #define	ld_abandon_mutex	ldc->ldc_abandon_mutex
- #endif
--
--	/* protected by abandon_mutex */
--	ber_len_t	ldc_nabandoned;
--	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
--#define	ld_nabandoned		ldc->ldc_nabandoned
--#define	ld_abandoned		ldc->ldc_abandoned
--
--	/* unused by libldap */
--	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
--#define	ld_cache		ldc->ldc_cache
--
--	/* do not mess with the rest though */
--
--	/* protected by conn_mutex */
--	LDAPConn	*ldc_defconn;	/* default connection */
--#define	ld_defconn		ldc->ldc_defconn
--	LDAPConn	*ldc_conns;	/* list of server connections */
--#define	ld_conns		ldc->ldc_conns
--	void		*ldc_selectinfo;/* platform specifics for select */
--#define	ld_selectinfo		ldc->ldc_selectinfo
--
--	/* ldap_common refcnt - free only if 0 */
--#ifdef LDAP_R_COMPILE
--	ldap_pvt_thread_mutex_t	ldc_mutex;
--#define	ld_ldcmutex		ldc->ldc_mutex
--#endif
--	/* protected by ldc_mutex */
--	unsigned int		ldc_refcnt;
--#define	ld_ldcrefcnt		ldc->ldc_refcnt
- };
- 
- struct ldap {
diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/testing/openldap/ntlm.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
-actually called by evolution-data-server, checked at version 1.12.2.
-Without this patch, the Exchange addressbook integration uses simple binds
-with cleartext passwords.
-
-Russ checked with openldap-software for upstream's opinion on this patch
-on 2007-12-21.  Upstream had never received it as a patch submission and
-given that it's apparently only for older Exchange servers that can't do
-SASL and DIGEST-MD5, it's not very appealing.
-
-Bug#457374 filed against evolution-data-server asking if this support is
-still required on 2007-12-21.
-
-Index: trunk/include/ldap.h
-===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
- 	LDAPControl	**ctrls,
- 	LDAPDerefRes	**drp ));
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE  ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+      LDAP    *ld,
-+      LDAP_CONST char *dn,
-+      ber_tag_t tag,
-+      struct berval *cred,
-+      LDAPControl **sctrls,
-+      LDAPControl **cctrls,
-+      int   *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+      LDAP    *ld,
-+      LDAPMessage *res,
-+      struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP    *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int   *msgidp )
-+{
-+ BerElement  *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+      id, LDAP_REQ_BIND,
-+      ld->ld_version, dn, tag,
-+      cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+   ld->ld_errno = LDAP_ENCODING_ERROR;
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+   return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP    *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement  *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+   return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+   LDAP_FREE( ld->ld_error );
-+   ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+   LDAP_FREE( ld->ld_matched );
-+   ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+      &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+   ld->ld_errno = LDAP_DECODING_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -27,7 +27,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- 
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -29,7 +29,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
- 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
-@@ -47,7 +47,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install
deleted file mode 100644
index cf3cb9f25..000000000
--- a/testing/openldap/openldap.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install(){
-  groupadd -g 439 ldap &>/dev/null
-  useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_upgrade(){
-  getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
-  getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_remove(){
-  if getent passwd ldap >/dev/null 2>&1; then
-    userdel ldap
-  fi
-  if getent group ldap >/dev/null 2>&1; then
-    groupdel ldap
-  fi
-}
diff --git a/testing/openldap/slapd b/testing/openldap/slapd
deleted file mode 100755
index 4f212da66..000000000
--- a/testing/openldap/slapd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
-
-PID=`pidof -o %PPID /usr/sbin/slapd`
-case "$1" in
-  start)
-    stat_busy "Starting OpenLDAP"
-    [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
-    if [ -z "$PID" ]; then
-      if [ -z "$SLAPD_SERVICES" ]; then
-        /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
-      else
-        /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
-      fi
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      add_daemon slapd
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenLDAP"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/openldap/slapd.pid
-      rm -f /run/openldap/slapd.args
-      rm_daemon slapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default
deleted file mode 100644
index 72ae2a6a7..000000000
--- a/testing/openldap/slapd.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# slapd normally serves ldap only on all TCP-ports 389. slapd can also
-# service requests on TCP-port 636 (ldaps) and requests via unix
-# sockets.
-# Example usage:
-#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_OPTIONS=""
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
deleted file mode 100644
index 6203ac45c..000000000
--- a/testing/openssh/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 153863 2012-03-20 07:01:42Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=5.9p1
-pkgrel=8
-pkgdesc='Free version of the SSH connectivity tools'
-arch=('i686' 'x86_64')
-license=('custom:BSD')
-url='http://www.openssh.org/portable.html'
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-depends=('krb5' 'openssl' 'libedit')
-optdepends=('x11-ssh-askpass: input passphrase in X without a terminal')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56'
-          '954bf1660aa32620c37034320877f4511b767ccb'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
-          '21fa88de6cc1c7912e71655f50896ba17991a1c2')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/ssh \
-		--sysconfdir=/etc/ssh \
-		--with-privsep-user=nobody \
-		--with-md5-passwords \
-		--with-pam \
-		--with-mantype=man \
-		--with-xauth=/usr/bin/xauth \
-		--with-kerberos5=/usr \
-		--with-ssl-engine \
-		--with-libedit=/usr/lib \
-		--disable-strip # stripping is done by makepkg
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
-	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
-	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
-
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
-	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
-	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
-	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
-	sed \
-		-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
-		-e '/^#UsePAM no$/c UsePAM yes' \
-		-i "${pkgdir}"/etc/ssh/sshd_config
-}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
deleted file mode 100755
index 1d68fb877..000000000
--- a/testing/openssh/sshd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/var/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-	PID=
-	rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-	start)
-		stat_busy 'Starting Secure Shell Daemon'
-		/usr/bin/ssh-keygen -A
-		[[ -d /var/empty ]] || mkdir -p /var/empty
-		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			add_daemon sshd
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Secure Shell Daemon'
-		[[ ! -z $PID ]] && kill $PID &> /dev/null
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			rm_daemon sshd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/testing/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/testing/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
deleted file mode 100644
index c7b91cdfb..000000000
--- a/testing/openssh/sshd.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-#auth		required	pam_securetty.so	#Disable remote root
-auth		required	pam_unix.so
-auth		required	pam_env.so
-account		required	pam_nologin.so
-account		required	pam_unix.so
-account		required	pam_time.so
-password	required	pam_unix.so
-session		required	pam_unix_session.so
-session		required	pam_limits.so
--session	optional	pam_ck_connector.so nox11
--session	optional	pam_systemd.so
diff --git a/testing/openssl/PKGBUILD b/testing/openssl/PKGBUILD
deleted file mode 100644
index 4dc7bc248..000000000
--- a/testing/openssl/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 154554 2012-03-30 08:24:50Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=openssl
-_ver=1.0.1
-# use a pacman compatible version scheme
-# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgver=$_ver
-pkgrel=2
-pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
-arch=('i686' 'x86_64')
-url='https://www.openssl.org'
-license=('custom:BSD')
-depends=('perl')
-optdepends=('ca-certificates')
-options=('!makeflags')
-backup=('etc/ssl/openssl.cnf')
-source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
-        "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
-        'fix-manpages.patch'
-        'no-rpath.patch'
-        'ca-dir.patch'
-        'disable-tls12-client.patch')
-md5sums=('134f168bc2a8333f19f81d684841710b'
-         'efbe93c11747fed52e60567819409d8a'
-         '5bbc0655bda2af95bc8eb568963ce8ba'
-         'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90'
-         '26432b9d7af63c63828b6405c9185400')
-
-build() {
-	cd $srcdir/$pkgname-$_ver
-
-	if [ "${CARCH}" == 'x86_64' ]; then
-		openssltarget='linux-x86_64'
-		optflags='enable-ec_nistp_64_gcc_128'
-	elif [ "${CARCH}" == 'i686' ]; then
-		openssltarget='linux-elf'
-		optflags=''
-	fi
-
-	# avoid conflicts with other man pages
-	# see http://www.linuxfromscratch.org/patches/downloads/openssl/
-	patch -p1 -i $srcdir/fix-manpages.patch
-	# remove rpath: http://bugs.archlinux.org/task/14367
-	patch -p0 -i $srcdir/no-rpath.patch
-	# set ca dir to /etc/ssl by default
-	patch -p0 -i $srcdir/ca-dir.patch
-	# workaround for PR#2771
-	patch -p1 -i $srcdir/disable-tls12-client.patch
-	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
-	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-		shared zlib enable-md2 ${optflags} \
-		"${openssltarget}" \
-		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \
-		-DOPENSSL_NO_TLS1_2_CLIENT
-
-	make depend
-	make
-}
-
-check() {
-	cd $srcdir/$pkgname-$_ver
-	# the test fails due to missing write permissions in /etc/ssl
-	# revert this patch for make test
-	patch -p0 -R -i $srcdir/ca-dir.patch
-	make test
-	patch -p0 -i $srcdir/ca-dir.patch
-}
-
-package() {
-	cd $srcdir/$pkgname-$_ver
-	make INSTALL_PREFIX=$pkgdir MANDIR=/usr/share/man install
-	install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/testing/openssl/ca-dir.patch b/testing/openssl/ca-dir.patch
deleted file mode 100644
index 41d1386d3..000000000
--- a/testing/openssl/ca-dir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- apps/CA.pl.in	2006-04-28 02:30:49.000000000 +0200
-+++ apps/CA.pl.in	2010-04-01 00:35:02.600553509 +0200
-@@ -53,7 +53,7 @@
- $X509="$openssl x509";
- $PKCS12="$openssl pkcs12";
- 
--$CATOP="./demoCA";
-+$CATOP="/etc/ssl";
- $CAKEY="cakey.pem";
- $CAREQ="careq.pem";
- $CACERT="cacert.pem";
---- apps/CA.sh	2009-10-15 19:27:47.000000000 +0200
-+++ apps/CA.sh	2010-04-01 00:35:02.600553509 +0200
-@@ -68,7 +68,7 @@
- X509="$OPENSSL x509"
- PKCS12="openssl pkcs12"
- 
--if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
-+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
- CAKEY=./cakey.pem
- CAREQ=./careq.pem
- CACERT=./cacert.pem
---- apps/openssl.cnf	2009-04-04 20:09:43.000000000 +0200
-+++ apps/openssl.cnf	2010-04-01 00:35:02.607220681 +0200
-@@ -39,7 +39,7 @@
- ####################################################################
- [ CA_default ]
- 
--dir		= ./demoCA		# Where everything is kept
-+dir		= /etc/ssl		# Where everything is kept
- certs		= $dir/certs		# Where the issued certs are kept
- crl_dir		= $dir/crl		# Where the issued crl are kept
- database	= $dir/index.txt	# database index file.
diff --git a/testing/openssl/disable-tls12-client.patch b/testing/openssl/disable-tls12-client.patch
deleted file mode 100644
index edb87e77f..000000000
--- a/testing/openssl/disable-tls12-client.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: openssl/ssl/t1_lib.c
-RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
-rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
---- t1_lib.c	2012/02/27 16:38:10	1.64.2.14.2.31
-+++ t1_lib.c	2012/03/21 21:32:57	1.64.2.14.2.32
-@@ -544,7 +544,7 @@
- 		}
- 		skip_ext:
- 
--	if (TLS1_get_version(s) >= TLS1_2_VERSION)
-+	if (TLS1_get_client_version(s) >= TLS1_2_VERSION)
- 		{
- 		if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6)
- 			return NULL; 
-Index: openssl/ssl/s23_clnt.c
-RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v
-rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u '/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2>/dev/null
---- s23_clnt.c	2011/05/19 18:22:15	1.43.2.4.2.5
-+++ s23_clnt.c	2012/03/29 19:08:54	1.43.2.4.2.6
-@@ -287,12 +287,14 @@
- 
- 	if (ssl2_compat && ssl23_no_ssl2_ciphers(s))
- 		ssl2_compat = 0;
--
-+#ifndef OPENSSL_NO_TLS1_2_CLIENT
- 	if (!(s->options & SSL_OP_NO_TLSv1_2))
- 		{
- 		version = TLS1_2_VERSION;
- 		}
--	else if (!(s->options & SSL_OP_NO_TLSv1_1))
-+	else
-+#endif
-+	if (!(s->options & SSL_OP_NO_TLSv1_1))
- 		{
- 		version = TLS1_1_VERSION;
- 		}
diff --git a/testing/openssl/fix-manpages.patch b/testing/openssl/fix-manpages.patch
deleted file mode 100644
index 0a300f3b9..000000000
--- a/testing/openssl/fix-manpages.patch
+++ /dev/null
@@ -1,1920 +0,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org>
-Date: 2005-11-13
-Initial Package Version: 0.9.8a
-Upstream Status: Submitted upstream
-Origin: Anderson Lizardo
-Description: This patch fixes conflicts between man pages
-	     installed by OpenSSL and those found on other
-	     packages (particulary Shadow, Perl, and
-	     Man-pages). It also fixes syntax errors on some
-	     POD files that generates slightly broken man
-	     pages. Rediffed for 1.0.0a by Ken Moffat
-
-diff -Naur openssl-1.0.0a.orig//crypto/rand/md_rand.c openssl-1.0.0a/crypto/rand/md_rand.c
---- openssl-1.0.0a.orig//crypto/rand/md_rand.c	2009-01-03 09:25:32.000000000 +0000
-+++ openssl-1.0.0a/crypto/rand/md_rand.c	2010-09-01 19:36:31.604126440 +0100
-@@ -196,7 +196,7 @@
- 	int do_not_lock;
- 
- 	/*
--	 * (Based on the rand(3) manpage)
-+	 * (Based on the openssl_rand(3) manpage)
- 	 *
- 	 * The input is chopped up into units of 20 bytes (or less for
- 	 * the last block).  Each of these blocks is run through the hash
-@@ -361,7 +361,7 @@
- 	num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2);
- 
- 	/*
--	 * (Based on the rand(3) manpage:)
-+	 * (Based on the openssl_rand(3) manpage)
- 	 *
- 	 * For each group of 10 bytes (or less), we do the following:
- 	 *
-diff -Naur openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod openssl-1.0.0a/doc/apps/openssl-passwd.pod
---- openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/apps/openssl-passwd.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -0,0 +1,82 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl-passwd - compute password hashes
-+
-+=head1 SYNOPSIS
-+
-+B<openssl passwd>
-+[B<-crypt>]
-+[B<-1>]
-+[B<-apr1>]
-+[B<-salt> I<string>]
-+[B<-in> I<file>]
-+[B<-stdin>]
-+[B<-noverify>]
-+[B<-quiet>]
-+[B<-table>]
-+{I<password>}
-+
-+=head1 DESCRIPTION
-+
-+The B<passwd> command computes the hash of a password typed at
-+run-time or the hash of each password in a list.  The password list is
-+taken from the named file for option B<-in file>, from stdin for
-+option B<-stdin>, or from the command line, or from the terminal otherwise.
-+The Unix standard algorithm B<crypt> and the MD5-based BSD password
-+algorithm B<1> and its Apache variant B<apr1> are available.
-+
-+=head1 OPTIONS
-+
-+=over 4
-+
-+=item B<-crypt>
-+
-+Use the B<crypt> algorithm (default).
-+
-+=item B<-1>
-+
-+Use the MD5 based BSD password algorithm B<1>.
-+
-+=item B<-apr1>
-+
-+Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
-+
-+=item B<-salt> I<string>
-+
-+Use the specified salt.
-+When reading a password from the terminal, this implies B<-noverify>.
-+
-+=item B<-in> I<file>
-+
-+Read passwords from I<file>.
-+
-+=item B<-stdin>
-+
-+Read passwords from B<stdin>.
-+
-+=item B<-noverify>
-+
-+Don't verify when reading a password from the terminal.
-+
-+=item B<-quiet>
-+
-+Don't output warnings when passwords given at the command line are truncated.
-+
-+=item B<-table>
-+
-+In the output list, prepend the cleartext password and a TAB character
-+to each password hash.
-+
-+=back
-+
-+=head1 EXAMPLES
-+
-+B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>.
-+
-+B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>.
-+
-+B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/apps/openssl.pod openssl-1.0.0a/doc/apps/openssl.pod
---- openssl-1.0.0a.orig//doc/apps/openssl.pod	2010-01-21 18:46:28.000000000 +0000
-+++ openssl-1.0.0a/doc/apps/openssl.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -163,7 +163,7 @@
- 
- Online Certificate Status Protocol utility.
- 
--=item L<B<passwd>|passwd(1)>
-+=item L<B<passwd>|openssl-passwd(1)>
- 
- Generation of hashed passwords.
- 
-@@ -401,7 +401,7 @@
- L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>,
- L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>,
- L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>,
--L<passwd(1)|passwd(1)>,
-+L<openssl-passwd(1)|openssl-passwd(1)>,
- L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>,
- L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
- L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
-diff -Naur openssl-1.0.0a.orig//doc/apps/passwd.pod openssl-1.0.0a/doc/apps/passwd.pod
---- openssl-1.0.0a.orig//doc/apps/passwd.pod	2002-10-04 13:59:00.000000000 +0100
-+++ openssl-1.0.0a/doc/apps/passwd.pod	1970-01-01 01:00:00.000000000 +0100
-@@ -1,82 +0,0 @@
--=pod
--
--=head1 NAME
--
--passwd - compute password hashes
--
--=head1 SYNOPSIS
--
--B<openssl passwd>
--[B<-crypt>]
--[B<-1>]
--[B<-apr1>]
--[B<-salt> I<string>]
--[B<-in> I<file>]
--[B<-stdin>]
--[B<-noverify>]
--[B<-quiet>]
--[B<-table>]
--{I<password>}
--
--=head1 DESCRIPTION
--
--The B<passwd> command computes the hash of a password typed at
--run-time or the hash of each password in a list.  The password list is
--taken from the named file for option B<-in file>, from stdin for
--option B<-stdin>, or from the command line, or from the terminal otherwise.
--The Unix standard algorithm B<crypt> and the MD5-based BSD password
--algorithm B<1> and its Apache variant B<apr1> are available.
--
--=head1 OPTIONS
--
--=over 4
--
--=item B<-crypt>
--
--Use the B<crypt> algorithm (default).
--
--=item B<-1>
--
--Use the MD5 based BSD password algorithm B<1>.
--
--=item B<-apr1>
--
--Use the B<apr1> algorithm (Apache variant of the BSD algorithm).
--
--=item B<-salt> I<string>
--
--Use the specified salt.
--When reading a password from the terminal, this implies B<-noverify>.
--
--=item B<-in> I<file>
--
--Read passwords from I<file>.
--
--=item B<-stdin>
--
--Read passwords from B<stdin>.
--
--=item B<-noverify>
--
--Don't verify when reading a password from the terminal.
--
--=item B<-quiet>
--
--Don't output warnings when passwords given at the command line are truncated.
--
--=item B<-table>
--
--In the output list, prepend the cleartext password and a TAB character
--to each password hash.
--
--=back
--
--=head1 EXAMPLES
--
--B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>.
--
--B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>.
--
--B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod openssl-1.0.0a/doc/crypto/BN_generate_prime.pod
---- openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod	2003-01-13 13:18:22.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/BN_generate_prime.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -90,7 +90,7 @@
- 
- =head1 SEE ALSO
- 
--L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>
-+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/bn.pod openssl-1.0.0a/doc/crypto/bn.pod
---- openssl-1.0.0a.orig//doc/crypto/bn.pod	2008-07-03 20:59:24.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/bn.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -167,7 +167,7 @@
- =head1 SEE ALSO
- 
- L<bn_internal(3)|bn_internal(3)>,
--L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>,
- L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>,
- L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_rand.pod openssl-1.0.0a/doc/crypto/BN_rand.pod
---- openssl-1.0.0a.orig//doc/crypto/BN_rand.pod	2002-09-25 14:33:26.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/BN_rand.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -45,7 +45,7 @@
- 
- =head1 SEE ALSO
- 
--L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod openssl-1.0.0a/doc/crypto/CONF_modules_free.pod
---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod	2006-12-21 21:13:27.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/CONF_modules_free.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -37,7 +37,7 @@
- =head1 SEE ALSO
- 
- L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>,
--L<CONF_modules_load_file(3), CONF_modules_load_file(3)>
-+L<CONF_modules_load_file(3)|CONF_modules_load_file(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod
---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod	2004-03-02 13:31:32.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -51,7 +51,7 @@
- =head1 SEE ALSO
- 
- L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>,
--L<CONF_free(3), CONF_free(3)>, L<err(3),err(3)>
-+L<CONF_free(3)|CONF_free(3)>, L<openssl_err(3)|openssl_err(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/crypto.pod openssl-1.0.0a/doc/crypto/crypto.pod
---- openssl-1.0.0a.orig//doc/crypto/crypto.pod	2002-10-06 13:59:25.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/crypto.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -46,7 +46,7 @@
- 
- =item AUXILIARY FUNCTIONS
- 
--L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)>
- 
- =item INPUT/OUTPUT, DATA ENCODING
-diff -Naur openssl-1.0.0a.orig//doc/crypto/des.pod openssl-1.0.0a/doc/crypto/des.pod
---- openssl-1.0.0a.orig//doc/crypto/des.pod	2003-10-01 16:02:45.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/des.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -115,7 +115,7 @@
- the key; it is used to speed the encryption process.
- 
- DES_random_key() generates a random key.  The PRNG must be seeded
--prior to using this function (see L<rand(3)|rand(3)>).  If the PRNG
-+prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>).  If the PRNG
- could not generate a secure key, 0 is returned.
- 
- Before a DES key can be used, it must be converted into the
-@@ -317,7 +317,7 @@
- 
- =head1 SEE ALSO
- 
--crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
-+crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod openssl-1.0.0a/doc/crypto/DH_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod	2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DH_generate_key.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -40,7 +40,7 @@
- 
- =head1 SEE ALSO
- 
--L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<DH_size(3)|DH_size(3)>
-+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<DH_size(3)|DH_size(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod
---- openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod	2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -59,7 +59,7 @@
- 
- =head1 SEE ALSO
- 
--L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DH_free(3)|DH_free(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/dh.pod openssl-1.0.0a/doc/crypto/dh.pod
---- openssl-1.0.0a.orig//doc/crypto/dh.pod	2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/dh.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -67,8 +67,8 @@
- 
- =head1 SEE ALSO
- 
--L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>,
--L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
-+L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
- L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>,
- L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>,
- L<DH_generate_parameters(3)|DH_generate_parameters(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod openssl-1.0.0a/doc/crypto/DSA_do_sign.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod	2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_do_sign.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -36,7 +36,7 @@
- 
- =head1 SEE ALSO
- 
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_SIG_new(3)|DSA_SIG_new(3)>,
- L<DSA_sign(3)|DSA_sign(3)>
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod openssl-1.0.0a/doc/crypto/DSA_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod	2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_generate_key.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -24,7 +24,7 @@
- 
- =head1 SEE ALSO
- 
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_generate_parameters(3)|DSA_generate_parameters(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod	2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -90,7 +90,7 @@
- 
- =head1 SEE ALSO
- 
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_free(3)|DSA_free(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/dsa.pod openssl-1.0.0a/doc/crypto/dsa.pod
---- openssl-1.0.0a.orig//doc/crypto/dsa.pod	2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/dsa.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -100,7 +100,7 @@
- 
- =head1 SEE ALSO
- 
--L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>,
-+L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>,
- L<DSA_new(3)|DSA_new(3)>,
- L<DSA_size(3)|DSA_size(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod openssl-1.0.0a/doc/crypto/DSA_sign.pod
---- openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod	2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/DSA_sign.pod	2010-09-01 19:36:31.608126088 +0100
-@@ -55,7 +55,7 @@
- 
- =head1 SEE ALSO
- 
--L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>,
-+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<DSA_do_sign(3)|DSA_do_sign(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/engine.pod openssl-1.0.0a/doc/crypto/engine.pod
---- openssl-1.0.0a.orig//doc/crypto/engine.pod	2007-11-19 09:18:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/engine.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -594,6 +594,6 @@
- 
- =head1 SEE ALSO
- 
--L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)>
-+L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)>
- 
- =cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod openssl-1.0.0a/doc/crypto/ERR_clear_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod	2000-02-01 01:36:58.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_clear_error.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -20,7 +20,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod openssl-1.0.0a/doc/crypto/ERR_error_string.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod	2004-11-14 15:11:37.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_error_string.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -60,7 +60,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
- L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
- L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
- L<ERR_print_errors(3)|ERR_print_errors(3)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod openssl-1.0.0a/doc/crypto/ERR_get_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod	2002-11-29 14:21:54.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_get_error.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -61,7 +61,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
- L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod	2000-02-01 01:36:58.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -41,7 +41,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod	2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -35,7 +35,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_strings.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod	2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_load_strings.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -43,7 +43,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/err.pod openssl-1.0.0a/doc/crypto/err.pod
---- openssl-1.0.0a.orig//doc/crypto/err.pod	2002-07-10 20:35:46.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/err.pod	1970-01-01 01:00:00.000000000 +0100
-@@ -1,187 +0,0 @@
--=pod
--
--=head1 NAME
--
--err - error codes
--
--=head1 SYNOPSIS
--
-- #include <openssl/err.h>
--
-- unsigned long ERR_get_error(void);
-- unsigned long ERR_peek_error(void);
-- unsigned long ERR_get_error_line(const char **file, int *line);
-- unsigned long ERR_peek_error_line(const char **file, int *line);
-- unsigned long ERR_get_error_line_data(const char **file, int *line,
--         const char **data, int *flags);
-- unsigned long ERR_peek_error_line_data(const char **file, int *line,
--         const char **data, int *flags);
--
-- int ERR_GET_LIB(unsigned long e);
-- int ERR_GET_FUNC(unsigned long e);
-- int ERR_GET_REASON(unsigned long e);
--
-- void ERR_clear_error(void);
--
-- char *ERR_error_string(unsigned long e, char *buf);
-- const char *ERR_lib_error_string(unsigned long e);
-- const char *ERR_func_error_string(unsigned long e);
-- const char *ERR_reason_error_string(unsigned long e);
--
-- void ERR_print_errors(BIO *bp);
-- void ERR_print_errors_fp(FILE *fp);
--
-- void ERR_load_crypto_strings(void);
-- void ERR_free_strings(void);
--
-- void ERR_remove_state(unsigned long pid);
--
-- void ERR_put_error(int lib, int func, int reason, const char *file,
--         int line);
-- void ERR_add_error_data(int num, ...);
--
-- void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-- unsigned long ERR_PACK(int lib, int func, int reason);
-- int ERR_get_next_error_library(void);
--
--=head1 DESCRIPTION
--
--When a call to the OpenSSL library fails, this is usually signalled
--by the return value, and an error code is stored in an error queue
--associated with the current thread. The B<err> library provides
--functions to obtain these error codes and textual error messages.
--
--The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to
--access error codes.
--
--Error codes contain information about where the error occurred, and
--what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to
--extract this information. A method to obtain human-readable error
--messages is described in L<ERR_error_string(3)|ERR_error_string(3)>.
--
--L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the
--error queue.
--
--Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to
--avoid memory leaks when threads are terminated.
--
--=head1 ADDING NEW ERROR CODES TO OPENSSL
--
--See L<ERR_put_error(3)> if you want to record error codes in the
--OpenSSL error system from within your application.
--
--The remainder of this section is of interest only if you want to add
--new error codes to OpenSSL or add error codes from external libraries.
--
--=head2 Reporting errors
--
--Each sub-library has a specific macro XXXerr() that is used to report
--errors. Its first argument is a function code B<XXX_F_...>, the second
--argument is a reason code B<XXX_R_...>. Function codes are derived
--from the function names; reason codes consist of textual error
--descriptions. For example, the function ssl23_read() reports a
--"handshake failure" as follows:
--
-- SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE);
--
--Function and reason codes should consist of upper case characters,
--numbers and underscores only. The error file generation script translates
--function codes into function names by looking in the header files
--for an appropriate function name, if none is found it just uses
--the capitalized form such as "SSL23_READ" in the above example.
--
--The trailing section of a reason code (after the "_R_") is translated
--into lower case and underscores changed to spaces.
--
--When you are using new function or reason codes, run B<make errors>.
--The necessary B<#define>s will then automatically be added to the
--sub-library's header file.
--
--Although a library will normally report errors using its own specific
--XXXerr macro, another library's macro can be used. This is normally
--only done when a library wants to include ASN1 code which must use
--the ASN1err() macro.
--
--=head2 Adding new libraries
--
--When adding a new sub-library to OpenSSL, assign it a library number
--B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its
--name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add
--C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function
--(in B<crypto/err/err_all.c>). Finally, add an entry
--
-- L	XXX	xxx.h	xxx_err.c
--
--to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile.
--Running B<make errors> will then generate a file B<xxx_err.c>, and
--add all error codes used in the library to B<xxx.h>.
--
--Additionally the library include file must have a certain form.
--Typically it will initially look like this:
--
-- #ifndef HEADER_XXX_H
-- #define HEADER_XXX_H
--
-- #ifdef __cplusplus
-- extern "C" {
-- #endif
--
-- /* Include files */
--
-- #include <openssl/bio.h>
-- #include <openssl/x509.h>
--
-- /* Macros, structures and function prototypes */
--
--
-- /* BEGIN ERROR CODES */
--
--The B<BEGIN ERROR CODES> sequence is used by the error code
--generation script as the point to place new error codes, any text
--after this point will be overwritten when B<make errors> is run.
--The closing #endif etc will be automatically added by the script.
--
--The generated C error code file B<xxx_err.c> will load the header
--files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the
--header file must load any additional header files containing any
--definitions it uses.
--
--=head1 USING ERROR CODES IN EXTERNAL LIBRARIES
--
--It is also possible to use OpenSSL's error code scheme in external
--libraries. The library needs to load its own codes and call the OpenSSL
--error code insertion script B<mkerr.pl> explicitly to add codes to
--the header file and generate the C error code file. This will normally
--be done if the external library needs to generate new ASN1 structures
--but it can also be used to add more general purpose error code handling.
--
--TBA more details
--
--=head1 INTERNALS
--
--The error queues are stored in a hash table with one B<ERR_STATE>
--entry for each pid. ERR_get_state() returns the current thread's
--B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error
--codes. When more error codes are added, the old ones are overwritten,
--on the assumption that the most recent errors are most important.
--
--Error strings are also stored in hash table. The hash tables can
--be obtained by calling ERR_get_err_state_table(void) and
--ERR_get_string_table(void) respectively.
--
--=head1 SEE ALSO
--
--L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>,
--L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>,
--L<ERR_get_error(3)|ERR_get_error(3)>,
--L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>,
--L<ERR_clear_error(3)|ERR_clear_error(3)>,
--L<ERR_error_string(3)|ERR_error_string(3)>,
--L<ERR_print_errors(3)|ERR_print_errors(3)>,
--L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
--L<ERR_remove_state(3)|ERR_remove_state(3)>,
--L<ERR_put_error(3)|ERR_put_error(3)>,
--L<ERR_load_strings(3)|ERR_load_strings(3)>,
--L<SSL_get_error(3)|SSL_get_error(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod openssl-1.0.0a/doc/crypto/ERR_print_errors.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod	2000-02-01 01:36:59.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_print_errors.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -38,7 +38,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
- L<ERR_get_error(3)|ERR_get_error(3)>,
- L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
- L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod openssl-1.0.0a/doc/crypto/ERR_put_error.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod	2000-02-24 11:55:08.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/ERR_put_error.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -34,7 +34,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod openssl-1.0.0a/doc/crypto/ERR_remove_state.pod
---- openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod	2000-05-19 08:54:42.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/ERR_remove_state.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -25,7 +25,7 @@
- 
- =head1 SEE ALSO
- 
--L<err(3)|err(3)>
-+L<openssl_err(3)|openssl_err(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod	2004-11-25 17:47:30.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -59,7 +59,7 @@
- 
- =head1 SEE ALSO
- 
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod	2000-09-23 08:16:14.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -54,7 +54,7 @@
- 
- =head1 SEE ALSO
- 
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
- L<EVP_SealInit(3)|EVP_SealInit(3)>
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod openssl-1.0.0a/doc/crypto/EVP_SealInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod	2005-03-29 18:50:08.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_SealInit.pod	2010-09-01 19:36:31.612125737 +0100
-@@ -74,7 +74,7 @@
- 
- =head1 SEE ALSO
- 
--L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
-+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
- L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
- L<EVP_OpenInit(3)|EVP_OpenInit(3)>
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod openssl-1.0.0a/doc/crypto/EVP_SignInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod	2006-07-12 13:31:29.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_SignInit.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -89,7 +89,7 @@
- =head1 SEE ALSO
- 
- L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>,
--L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
-+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
- L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
- L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
- L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod
---- openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod	2006-07-12 13:31:30.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -80,7 +80,7 @@
- 
- L<evp(3)|evp(3)>,
- L<EVP_SignInit(3)|EVP_SignInit(3)>,
--L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
-+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
- L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
- L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
- L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
-diff -Naur openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod openssl-1.0.0a/doc/crypto/OPENSSL_config.pod
---- openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod	2005-06-03 00:19:56.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/OPENSSL_config.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -73,7 +73,7 @@
- =head1 SEE ALSO
- 
- L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>,
--L<CONF_modules_free(3),CONF_modules_free(3)>
-+L<CONF_modules_free(3)|CONF_modules_free(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_err.pod openssl-1.0.0a/doc/crypto/openssl_err.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_err.pod	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_err.pod	2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,187 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl_err - error codes
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/err.h>
-+
-+ unsigned long ERR_get_error(void);
-+ unsigned long ERR_peek_error(void);
-+ unsigned long ERR_get_error_line(const char **file, int *line);
-+ unsigned long ERR_peek_error_line(const char **file, int *line);
-+ unsigned long ERR_get_error_line_data(const char **file, int *line,
-+         const char **data, int *flags);
-+ unsigned long ERR_peek_error_line_data(const char **file, int *line,
-+         const char **data, int *flags);
-+
-+ int ERR_GET_LIB(unsigned long e);
-+ int ERR_GET_FUNC(unsigned long e);
-+ int ERR_GET_REASON(unsigned long e);
-+
-+ void ERR_clear_error(void);
-+
-+ char *ERR_error_string(unsigned long e, char *buf);
-+ const char *ERR_lib_error_string(unsigned long e);
-+ const char *ERR_func_error_string(unsigned long e);
-+ const char *ERR_reason_error_string(unsigned long e);
-+
-+ void ERR_print_errors(BIO *bp);
-+ void ERR_print_errors_fp(FILE *fp);
-+
-+ void ERR_load_crypto_strings(void);
-+ void ERR_free_strings(void);
-+
-+ void ERR_remove_state(unsigned long pid);
-+
-+ void ERR_put_error(int lib, int func, int reason, const char *file,
-+         int line);
-+ void ERR_add_error_data(int num, ...);
-+
-+ void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-+ unsigned long ERR_PACK(int lib, int func, int reason);
-+ int ERR_get_next_error_library(void);
-+
-+=head1 DESCRIPTION
-+
-+When a call to the OpenSSL library fails, this is usually signalled
-+by the return value, and an error code is stored in an error queue
-+associated with the current thread. The B<err> library provides
-+functions to obtain these error codes and textual error messages.
-+
-+The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to
-+access error codes.
-+
-+Error codes contain information about where the error occurred, and
-+what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to
-+extract this information. A method to obtain human-readable error
-+messages is described in L<ERR_error_string(3)|ERR_error_string(3)>.
-+
-+L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the
-+error queue.
-+
-+Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to
-+avoid memory leaks when threads are terminated.
-+
-+=head1 ADDING NEW ERROR CODES TO OPENSSL
-+
-+See L<ERR_put_error(3)> if you want to record error codes in the
-+OpenSSL error system from within your application.
-+
-+The remainder of this section is of interest only if you want to add
-+new error codes to OpenSSL or add error codes from external libraries.
-+
-+=head2 Reporting errors
-+
-+Each sub-library has a specific macro XXXerr() that is used to report
-+errors. Its first argument is a function code B<XXX_F_...>, the second
-+argument is a reason code B<XXX_R_...>. Function codes are derived
-+from the function names; reason codes consist of textual error
-+descriptions. For example, the function ssl23_read() reports a
-+"handshake failure" as follows:
-+
-+ SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE);
-+
-+Function and reason codes should consist of upper case characters,
-+numbers and underscores only. The error file generation script translates
-+function codes into function names by looking in the header files
-+for an appropriate function name, if none is found it just uses
-+the capitalized form such as "SSL23_READ" in the above example.
-+
-+The trailing section of a reason code (after the "_R_") is translated
-+into lower case and underscores changed to spaces.
-+
-+When you are using new function or reason codes, run B<make errors>.
-+The necessary B<#define>s will then automatically be added to the
-+sub-library's header file.
-+
-+Although a library will normally report errors using its own specific
-+XXXerr macro, another library's macro can be used. This is normally
-+only done when a library wants to include ASN1 code which must use
-+the ASN1err() macro.
-+
-+=head2 Adding new libraries
-+
-+When adding a new sub-library to OpenSSL, assign it a library number
-+B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its
-+name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add
-+C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function
-+(in B<crypto/err/err_all.c>). Finally, add an entry
-+
-+ L	XXX	xxx.h	xxx_err.c
-+
-+to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile.
-+Running B<make errors> will then generate a file B<xxx_err.c>, and
-+add all error codes used in the library to B<xxx.h>.
-+
-+Additionally the library include file must have a certain form.
-+Typically it will initially look like this:
-+
-+ #ifndef HEADER_XXX_H
-+ #define HEADER_XXX_H
-+
-+ #ifdef __cplusplus
-+ extern "C" {
-+ #endif
-+
-+ /* Include files */
-+
-+ #include <openssl/bio.h>
-+ #include <openssl/x509.h>
-+
-+ /* Macros, structures and function prototypes */
-+
-+
-+ /* BEGIN ERROR CODES */
-+
-+The B<BEGIN ERROR CODES> sequence is used by the error code
-+generation script as the point to place new error codes, any text
-+after this point will be overwritten when B<make errors> is run.
-+The closing #endif etc will be automatically added by the script.
-+
-+The generated C error code file B<xxx_err.c> will load the header
-+files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the
-+header file must load any additional header files containing any
-+definitions it uses.
-+
-+=head1 USING ERROR CODES IN EXTERNAL LIBRARIES
-+
-+It is also possible to use OpenSSL's error code scheme in external
-+libraries. The library needs to load its own codes and call the OpenSSL
-+error code insertion script B<mkerr.pl> explicitly to add codes to
-+the header file and generate the C error code file. This will normally
-+be done if the external library needs to generate new ASN1 structures
-+but it can also be used to add more general purpose error code handling.
-+
-+TBA more details
-+
-+=head1 INTERNALS
-+
-+The error queues are stored in a hash table with one B<ERR_STATE>
-+entry for each pid. ERR_get_state() returns the current thread's
-+B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error
-+codes. When more error codes are added, the old ones are overwritten,
-+on the assumption that the most recent errors are most important.
-+
-+Error strings are also stored in hash table. The hash tables can
-+be obtained by calling ERR_get_err_state_table(void) and
-+ERR_get_string_table(void) respectively.
-+
-+=head1 SEE ALSO
-+
-+L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>,
-+L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>,
-+L<ERR_clear_error(3)|ERR_clear_error(3)>,
-+L<ERR_error_string(3)|ERR_error_string(3)>,
-+L<ERR_print_errors(3)|ERR_print_errors(3)>,
-+L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
-+L<ERR_remove_state(3)|ERR_remove_state(3)>,
-+L<ERR_put_error(3)|ERR_put_error(3)>,
-+L<ERR_load_strings(3)|ERR_load_strings(3)>,
-+L<SSL_get_error(3)|SSL_get_error(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod openssl-1.0.0a/doc/crypto/openssl_rand.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_rand.pod	2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,175 @@
-+=pod
-+
-+=head1 NAME
-+
-+openssl_rand - pseudo-random number generator
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/rand.h>
-+
-+ int  RAND_set_rand_engine(ENGINE *engine);
-+
-+ int  RAND_bytes(unsigned char *buf, int num);
-+ int  RAND_pseudo_bytes(unsigned char *buf, int num);
-+
-+ void RAND_seed(const void *buf, int num);
-+ void RAND_add(const void *buf, int num, int entropy);
-+ int  RAND_status(void);
-+
-+ int  RAND_load_file(const char *file, long max_bytes);
-+ int  RAND_write_file(const char *file);
-+ const char *RAND_file_name(char *file, size_t num);
-+
-+ int  RAND_egd(const char *path);
-+
-+ void RAND_set_rand_method(const RAND_METHOD *meth);
-+ const RAND_METHOD *RAND_get_rand_method(void);
-+ RAND_METHOD *RAND_SSLeay(void);
-+
-+ void RAND_cleanup(void);
-+
-+ /* For Win32 only */
-+ void RAND_screen(void);
-+ int RAND_event(UINT, WPARAM, LPARAM);
-+
-+=head1 DESCRIPTION
-+
-+Since the introduction of the ENGINE API, the recommended way of controlling
-+default implementations is by using the ENGINE API functions. The default
-+B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by
-+RAND_get_rand_method(), is only used if no ENGINE has been set as the default
-+"rand" implementation. Hence, these two functions are no longer the recommened
-+way to control defaults.
-+
-+If an alternative B<RAND_METHOD> implementation is being used (either set
-+directly or as provided by an ENGINE module), then it is entirely responsible
-+for the generation and management of a cryptographically secure PRNG stream. The
-+mechanisms described below relate solely to the software PRNG implementation
-+built in to OpenSSL and used by default.
-+
-+These functions implement a cryptographically secure pseudo-random
-+number generator (PRNG). It is used by other library functions for
-+example to generate random keys, and applications can use it when they
-+need randomness.
-+
-+A cryptographic PRNG must be seeded with unpredictable data such as
-+mouse movements or keys pressed at random by the user. This is
-+described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file
-+(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the
-+seeding process whenever the application is started.
-+
-+L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the
-+PRNG. 
-+
-+=head1 INTERNALS
-+
-+The RAND_SSLeay() method implements a PRNG based on a cryptographic
-+hash function.
-+
-+The following description of its design is based on the SSLeay
-+documentation:
-+
-+First up I will state the things I believe I need for a good RNG.
-+
-+=over 4
-+
-+=item 1
-+
-+A good hashing algorithm to mix things up and to convert the RNG 'state'
-+to random numbers.
-+
-+=item 2
-+
-+An initial source of random 'state'.
-+
-+=item 3
-+
-+The state should be very large.  If the RNG is being used to generate
-+4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum).
-+If your RNG state only has 128 bits, you are obviously limiting the
-+search space to 128 bits, not 2048.  I'm probably getting a little
-+carried away on this last point but it does indicate that it may not be
-+a bad idea to keep quite a lot of RNG state.  It should be easier to
-+break a cipher than guess the RNG seed data.
-+
-+=item 4
-+
-+Any RNG seed data should influence all subsequent random numbers
-+generated.  This implies that any random seed data entered will have
-+an influence on all subsequent random numbers generated.
-+
-+=item 5
-+
-+When using data to seed the RNG state, the data used should not be
-+extractable from the RNG state.  I believe this should be a
-+requirement because one possible source of 'secret' semi random
-+data would be a private key or a password.  This data must
-+not be disclosed by either subsequent random numbers or a
-+'core' dump left by a program crash.
-+
-+=item 6
-+
-+Given the same initial 'state', 2 systems should deviate in their RNG state
-+(and hence the random numbers generated) over time if at all possible.
-+
-+=item 7
-+
-+Given the random number output stream, it should not be possible to determine
-+the RNG state or the next random number.
-+
-+=back
-+
-+The algorithm is as follows.
-+
-+There is global state made up of a 1023 byte buffer (the 'state'), a
-+working hash value ('md'), and a counter ('count').
-+
-+Whenever seed data is added, it is inserted into the 'state' as
-+follows.
-+
-+The input is chopped up into units of 20 bytes (or less for
-+the last block).  Each of these blocks is run through the hash
-+function as follows:  The data passed to the hash function
-+is the current 'md', the same number of bytes from the 'state'
-+(the location determined by in incremented looping index) as
-+the current 'block', the new key data 'block', and 'count'
-+(which is incremented after each use).
-+The result of this is kept in 'md' and also xored into the
-+'state' at the same locations that were used as input into the
-+hash function. I
-+believe this system addresses points 1 (hash function; currently
-+SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash
-+function and xor).
-+
-+When bytes are extracted from the RNG, the following process is used.
-+For each group of 10 bytes (or less), we do the following:
-+
-+Input into the hash function the local 'md' (which is initialized from
-+the global 'md' before any bytes are generated), the bytes that are to
-+be overwritten by the random bytes, and bytes from the 'state'
-+(incrementing looping index). From this digest output (which is kept
-+in 'md'), the top (up to) 10 bytes are returned to the caller and the
-+bottom 10 bytes are xored into the 'state'.
-+
-+Finally, after we have finished 'num' random bytes for the caller,
-+'count' (which is incremented) and the local and global 'md' are fed
-+into the hash function and the results are kept in the global 'md'.
-+
-+I believe the above addressed points 1 (use of SHA-1), 6 (by hashing
-+into the 'state' the 'old' data from the caller that is about to be
-+overwritten) and 7 (by not using the 10 bytes given to the caller to
-+update the 'state', but they are used to update 'md').
-+
-+So of the points raised, only 2 is not addressed (but see
-+L<RAND_add(3)|RAND_add(3)>).
-+
-+=head1 SEE ALSO
-+
-+L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
-+L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>,
-+L<RAND_bytes(3)|RAND_bytes(3)>,
-+L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>,
-+L<RAND_cleanup(3)|RAND_cleanup(3)> 
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod openssl-1.0.0a/doc/crypto/openssl_threads.pod
---- openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod	1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/openssl_threads.pod	2010-09-01 19:36:31.624124669 +0100
-@@ -0,0 +1,175 @@
-+=pod
-+
-+=head1 NAME
-+
-+CRYPTO_set_locking_callback, CRYPTO_set_id_callback, CRYPTO_num_locks,
-+CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
-+CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
-+CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
-+
-+=head1 SYNOPSIS
-+
-+ #include <openssl/crypto.h>
-+
-+ void CRYPTO_set_locking_callback(void (*locking_function)(int mode,
-+        int n, const char *file, int line));
-+
-+ void CRYPTO_set_id_callback(unsigned long (*id_function)(void));
-+
-+ int CRYPTO_num_locks(void);
-+
-+
-+ /* struct CRYPTO_dynlock_value needs to be defined by the user */
-+ struct CRYPTO_dynlock_value;
-+
-+ void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *
-+	(*dyn_create_function)(char *file, int line));
-+ void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
-+	(int mode, struct CRYPTO_dynlock_value *l,
-+	const char *file, int line));
-+ void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
-+	(struct CRYPTO_dynlock_value *l, const char *file, int line));
-+
-+ int CRYPTO_get_new_dynlockid(void);
-+
-+ void CRYPTO_destroy_dynlockid(int i);
-+
-+ void CRYPTO_lock(int mode, int n, const char *file, int line);
-+
-+ #define CRYPTO_w_lock(type)	\
-+	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-+ #define CRYPTO_w_unlock(type)	\
-+	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-+ #define CRYPTO_r_lock(type)	\
-+	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-+ #define CRYPTO_r_unlock(type)	\
-+	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-+ #define CRYPTO_add(addr,amount,type)	\
-+	CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-+
-+=head1 DESCRIPTION
-+
-+OpenSSL can safely be used in multi-threaded applications provided
-+that at least two callback functions are set.
-+
-+locking_function(int mode, int n, const char *file, int line) is
-+needed to perform locking on shared data structures. 
-+(Note that OpenSSL uses a number of global data structures that
-+will be implicitly shared whenever multiple threads use OpenSSL.)
-+Multi-threaded applications will crash at random if it is not set.
-+
-+locking_function() must be able to handle up to CRYPTO_num_locks()
-+different mutex locks. It sets the B<n>-th lock if B<mode> &
-+B<CRYPTO_LOCK>, and releases it otherwise.
-+
-+B<file> and B<line> are the file number of the function setting the
-+lock. They can be useful for debugging.
-+
-+id_function(void) is a function that returns a thread ID, for example
-+pthread_self() if it returns an integer (see NOTES below).  It isn't
-+needed on Windows nor on platforms where getpid() returns a different
-+ID for each thread (see NOTES below).
-+
-+Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
-+of OpenSSL need it for better performance.  To enable this, the following
-+is required:
-+
-+=over 4
-+
-+=item *
-+Three additional callback function, dyn_create_function, dyn_lock_function
-+and dyn_destroy_function.
-+
-+=item *
-+A structure defined with the data that each lock needs to handle.
-+
-+=back
-+
-+struct CRYPTO_dynlock_value has to be defined to contain whatever structure
-+is needed to handle locks.
-+
-+dyn_create_function(const char *file, int line) is needed to create a
-+lock.  Multi-threaded applications might crash at random if it is not set.
-+
-+dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line)
-+is needed to perform locking off dynamic lock numbered n. Multi-threaded
-+applications might crash at random if it is not set.
-+
-+dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is
-+needed to destroy the lock l. Multi-threaded applications might crash at
-+random if it is not set.
-+
-+CRYPTO_get_new_dynlockid() is used to create locks.  It will call
-+dyn_create_function for the actual creation.
-+
-+CRYPTO_destroy_dynlockid() is used to destroy locks.  It will call
-+dyn_destroy_function for the actual destruction.
-+
-+CRYPTO_lock() is used to lock and unlock the locks.  mode is a bitfield
-+describing what should be done with the lock.  n is the number of the
-+lock as returned from CRYPTO_get_new_dynlockid().  mode can be combined
-+from the following values.  These values are pairwise exclusive, with
-+undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
-+should not be used together):
-+
-+	CRYPTO_LOCK	0x01
-+	CRYPTO_UNLOCK	0x02
-+	CRYPTO_READ	0x04
-+	CRYPTO_WRITE	0x08
-+
-+=head1 RETURN VALUES
-+
-+CRYPTO_num_locks() returns the required number of locks.
-+
-+CRYPTO_get_new_dynlockid() returns the index to the newly created lock.
-+
-+The other functions return no values.
-+
-+=head1 NOTES
-+
-+You can find out if OpenSSL was configured with thread support:
-+
-+ #define OPENSSL_THREAD_DEFINES
-+ #include <openssl/opensslconf.h>
-+ #if defined(OPENSSL_THREADS)
-+   // thread support enabled
-+ #else
-+   // no thread support
-+ #endif
-+
-+Also, dynamic locks are currently not used internally by OpenSSL, but
-+may do so in the future.
-+
-+Defining id_function(void) has it's own issues.  Generally speaking,
-+pthread_self() should be used, even on platforms where getpid() gives
-+different answers in each thread, since that may depend on the machine
-+the program is run on, not the machine where the program is being
-+compiled.  For instance, Red Hat 8 Linux and earlier used
-+LinuxThreads, whose getpid() returns a different value for each
-+thread.  Red Hat 9 Linux and later use NPTL, which is
-+Posix-conformant, and has a getpid() that returns the same value for
-+all threads in a process.  A program compiled on Red Hat 8 and run on
-+Red Hat 9 will therefore see getpid() returning the same value for
-+all threads.
-+
-+There is still the issue of platforms where pthread_self() returns
-+something other than an integer.  This is a bit unusual, and this
-+manual has no cookbook solution for that case.
-+
-+=head1 EXAMPLES
-+
-+B<crypto/threads/mttest.c> shows examples of the callback functions on
-+Solaris, Irix and Win32.
-+
-+=head1 HISTORY
-+
-+CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are
-+available in all versions of SSLeay and OpenSSL.
-+CRYPTO_num_locks() was added in OpenSSL 0.9.4.
-+All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
-+
-+=head1 SEE ALSO
-+
-+L<crypto(3)|crypto(3)>
-+
-+=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_add.pod openssl-1.0.0a/doc/crypto/RAND_add.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_add.pod	2000-03-22 15:30:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_add.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -65,7 +65,7 @@
- 
- =head1 SEE ALSO
- 
--L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
- L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod openssl-1.0.0a/doc/crypto/RAND_bytes.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod	2007-09-24 12:01:18.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RAND_bytes.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -38,7 +38,7 @@
- 
- =head1 SEE ALSO
- 
--L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
- L<RAND_add(3)|RAND_add(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod openssl-1.0.0a/doc/crypto/RAND_cleanup.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod	2000-01-27 01:25:06.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_cleanup.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -20,7 +20,7 @@
- 
- =head1 SEE ALSO
- 
--L<rand(3)|rand(3)>
-+L<openssl_rand(3)|openssl_rand(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod openssl-1.0.0a/doc/crypto/RAND_egd.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod	2008-11-10 11:26:44.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_egd.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -72,7 +72,7 @@
- 
- =head1 SEE ALSO
- 
--L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
- L<RAND_cleanup(3)|RAND_cleanup(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod openssl-1.0.0a/doc/crypto/RAND_load_file.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod	2001-03-21 15:25:56.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_load_file.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -43,7 +43,7 @@
- 
- =head1 SEE ALSO
- 
--L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/rand.pod openssl-1.0.0a/doc/crypto/rand.pod
---- openssl-1.0.0a.orig//doc/crypto/rand.pod	2002-08-05 17:27:01.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/rand.pod	1970-01-01 01:00:00.000000000 +0100
-@@ -1,175 +0,0 @@
--=pod
--
--=head1 NAME
--
--rand - pseudo-random number generator
--
--=head1 SYNOPSIS
--
-- #include <openssl/rand.h>
--
-- int  RAND_set_rand_engine(ENGINE *engine);
--
-- int  RAND_bytes(unsigned char *buf, int num);
-- int  RAND_pseudo_bytes(unsigned char *buf, int num);
--
-- void RAND_seed(const void *buf, int num);
-- void RAND_add(const void *buf, int num, int entropy);
-- int  RAND_status(void);
--
-- int  RAND_load_file(const char *file, long max_bytes);
-- int  RAND_write_file(const char *file);
-- const char *RAND_file_name(char *file, size_t num);
--
-- int  RAND_egd(const char *path);
--
-- void RAND_set_rand_method(const RAND_METHOD *meth);
-- const RAND_METHOD *RAND_get_rand_method(void);
-- RAND_METHOD *RAND_SSLeay(void);
--
-- void RAND_cleanup(void);
--
-- /* For Win32 only */
-- void RAND_screen(void);
-- int RAND_event(UINT, WPARAM, LPARAM);
--
--=head1 DESCRIPTION
--
--Since the introduction of the ENGINE API, the recommended way of controlling
--default implementations is by using the ENGINE API functions. The default
--B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by
--RAND_get_rand_method(), is only used if no ENGINE has been set as the default
--"rand" implementation. Hence, these two functions are no longer the recommened
--way to control defaults.
--
--If an alternative B<RAND_METHOD> implementation is being used (either set
--directly or as provided by an ENGINE module), then it is entirely responsible
--for the generation and management of a cryptographically secure PRNG stream. The
--mechanisms described below relate solely to the software PRNG implementation
--built in to OpenSSL and used by default.
--
--These functions implement a cryptographically secure pseudo-random
--number generator (PRNG). It is used by other library functions for
--example to generate random keys, and applications can use it when they
--need randomness.
--
--A cryptographic PRNG must be seeded with unpredictable data such as
--mouse movements or keys pressed at random by the user. This is
--described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file
--(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the
--seeding process whenever the application is started.
--
--L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the
--PRNG. 
--
--=head1 INTERNALS
--
--The RAND_SSLeay() method implements a PRNG based on a cryptographic
--hash function.
--
--The following description of its design is based on the SSLeay
--documentation:
--
--First up I will state the things I believe I need for a good RNG.
--
--=over 4
--
--=item 1
--
--A good hashing algorithm to mix things up and to convert the RNG 'state'
--to random numbers.
--
--=item 2
--
--An initial source of random 'state'.
--
--=item 3
--
--The state should be very large.  If the RNG is being used to generate
--4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum).
--If your RNG state only has 128 bits, you are obviously limiting the
--search space to 128 bits, not 2048.  I'm probably getting a little
--carried away on this last point but it does indicate that it may not be
--a bad idea to keep quite a lot of RNG state.  It should be easier to
--break a cipher than guess the RNG seed data.
--
--=item 4
--
--Any RNG seed data should influence all subsequent random numbers
--generated.  This implies that any random seed data entered will have
--an influence on all subsequent random numbers generated.
--
--=item 5
--
--When using data to seed the RNG state, the data used should not be
--extractable from the RNG state.  I believe this should be a
--requirement because one possible source of 'secret' semi random
--data would be a private key or a password.  This data must
--not be disclosed by either subsequent random numbers or a
--'core' dump left by a program crash.
--
--=item 6
--
--Given the same initial 'state', 2 systems should deviate in their RNG state
--(and hence the random numbers generated) over time if at all possible.
--
--=item 7
--
--Given the random number output stream, it should not be possible to determine
--the RNG state or the next random number.
--
--=back
--
--The algorithm is as follows.
--
--There is global state made up of a 1023 byte buffer (the 'state'), a
--working hash value ('md'), and a counter ('count').
--
--Whenever seed data is added, it is inserted into the 'state' as
--follows.
--
--The input is chopped up into units of 20 bytes (or less for
--the last block).  Each of these blocks is run through the hash
--function as follows:  The data passed to the hash function
--is the current 'md', the same number of bytes from the 'state'
--(the location determined by in incremented looping index) as
--the current 'block', the new key data 'block', and 'count'
--(which is incremented after each use).
--The result of this is kept in 'md' and also xored into the
--'state' at the same locations that were used as input into the
--hash function. I
--believe this system addresses points 1 (hash function; currently
--SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash
--function and xor).
--
--When bytes are extracted from the RNG, the following process is used.
--For each group of 10 bytes (or less), we do the following:
--
--Input into the hash function the local 'md' (which is initialized from
--the global 'md' before any bytes are generated), the bytes that are to
--be overwritten by the random bytes, and bytes from the 'state'
--(incrementing looping index). From this digest output (which is kept
--in 'md'), the top (up to) 10 bytes are returned to the caller and the
--bottom 10 bytes are xored into the 'state'.
--
--Finally, after we have finished 'num' random bytes for the caller,
--'count' (which is incremented) and the local and global 'md' are fed
--into the hash function and the results are kept in the global 'md'.
--
--I believe the above addressed points 1 (use of SHA-1), 6 (by hashing
--into the 'state' the 'old' data from the caller that is about to be
--overwritten) and 7 (by not using the 10 bytes given to the caller to
--update the 'state', but they are used to update 'md').
--
--So of the points raised, only 2 is not addressed (but see
--L<RAND_add(3)|RAND_add(3)>).
--
--=head1 SEE ALSO
--
--L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
--L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>,
--L<RAND_bytes(3)|RAND_bytes(3)>,
--L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>,
--L<RAND_cleanup(3)|RAND_cleanup(3)> 
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod
---- openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod	2007-11-19 09:18:03.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -67,7 +67,7 @@
- 
- =head1 SEE ALSO
- 
--L<rand(3)|rand(3)>, L<engine(3)|engine(3)>
-+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod	2000-02-24 11:55:10.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -34,7 +34,7 @@
- 
- =head1 SEE ALSO
- 
--L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)>
-+L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod openssl-1.0.0a/doc/crypto/RSA_generate_key.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod	2002-09-25 14:33:27.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RSA_generate_key.pod	2010-09-01 19:36:31.616125383 +0100
-@@ -59,7 +59,7 @@
- 
- =head1 SEE ALSO
- 
--L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<RSA_free(3)|RSA_free(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/rsa.pod openssl-1.0.0a/doc/crypto/rsa.pod
---- openssl-1.0.0a.orig//doc/crypto/rsa.pod	2002-08-04 22:08:36.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/rsa.pod	2010-09-01 19:36:31.624124669 +0100
-@@ -108,7 +108,7 @@
- =head1 SEE ALSO
- 
- L<rsa(1)|rsa(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>,
--L<rand(3)|rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>,
- L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>,
- L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>,
- L<RSA_generate_key(3)|RSA_generate_key(3)>,
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod	2004-03-23 21:01:34.000000000 +0000
-+++ openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -73,7 +73,7 @@
- 
- =head1 SEE ALSO
- 
--L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
-+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
- L<RSA_size(3)|RSA_size(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
---- openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod	2002-09-25 14:33:28.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -48,7 +48,7 @@
- =head1 SEE ALSO
- 
- L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>,
--L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
-+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
- L<RSA_verify(3)|RSA_verify(3)>
- 
- =head1 HISTORY
-diff -Naur openssl-1.0.0a.orig//doc/crypto/threads.pod openssl-1.0.0a/doc/crypto/threads.pod
---- openssl-1.0.0a.orig//doc/crypto/threads.pod	2009-10-01 00:40:52.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/threads.pod	1970-01-01 01:00:00.000000000 +0100
-@@ -1,210 +0,0 @@
--=pod
--
--=head1 NAME
--
--CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback,
--CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy,
--CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks,
--CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
--CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
--CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
--
--=head1 SYNOPSIS
--
-- #include <openssl/crypto.h>
--
-- /* Don't use this structure directly. */
-- typedef struct crypto_threadid_st
--         {
--         void *ptr;
--         unsigned long val;
--         } CRYPTO_THREADID;
-- /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-- void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
-- void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
-- int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
-- void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
-- void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
-- int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a,
--                         const CRYPTO_THREADID *b);
-- void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest,
--                          const CRYPTO_THREADID *src);
-- unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
--
-- int CRYPTO_num_locks(void);
--
-- /* struct CRYPTO_dynlock_value needs to be defined by the user */
-- struct CRYPTO_dynlock_value;
--
-- void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *
--	(*dyn_create_function)(char *file, int line));
-- void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
--	(int mode, struct CRYPTO_dynlock_value *l,
--	const char *file, int line));
-- void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
--	(struct CRYPTO_dynlock_value *l, const char *file, int line));
--
-- int CRYPTO_get_new_dynlockid(void);
--
-- void CRYPTO_destroy_dynlockid(int i);
--
-- void CRYPTO_lock(int mode, int n, const char *file, int line);
--
-- #define CRYPTO_w_lock(type)	\
--	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-- #define CRYPTO_w_unlock(type)	\
--	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-- #define CRYPTO_r_lock(type)	\
--	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-- #define CRYPTO_r_unlock(type)	\
--	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-- #define CRYPTO_add(addr,amount,type)	\
--	CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
--
--=head1 DESCRIPTION
--
--OpenSSL can safely be used in multi-threaded applications provided
--that at least two callback functions are set, locking_function and
--threadid_func.
--
--locking_function(int mode, int n, const char *file, int line) is
--needed to perform locking on shared data structures. 
--(Note that OpenSSL uses a number of global data structures that
--will be implicitly shared whenever multiple threads use OpenSSL.)
--Multi-threaded applications will crash at random if it is not set.
--
--locking_function() must be able to handle up to CRYPTO_num_locks()
--different mutex locks. It sets the B<n>-th lock if B<mode> &
--B<CRYPTO_LOCK>, and releases it otherwise.
--
--B<file> and B<line> are the file number of the function setting the
--lock. They can be useful for debugging.
--
--threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing
--thread's identifier into B<id>. The implementation of this callback should not
--fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread
--IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based.
--If the application does not register such a callback using
--CRYPTO_THREADID_set_callback(), then a default implementation is used - on
--Windows and BeOS this uses the system's default thread identifying APIs, and on
--all other platforms it uses the address of B<errno>. The latter is satisfactory
--for thread-safety if and only if the platform has a thread-local error number
--facility.
--
--Once threadid_func() is registered, or if the built-in default implementation is
--to be used;
--
--=over 4
--
--=item *
--CRYPTO_THREADID_current() records the currently-executing thread ID into the
--given B<id> object.
--
--=item *
--CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie.
--the same semantics as memcmp()).
--
--=item *
--CRYPTO_THREADID_cpy() duplicates a thread ID value,
--
--=item *
--CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This
--is usually the exact numeric or pointer-based thread ID used internally, however
--this also handles the unusual case where pointers are larger than 'long'
--variables and the platform's thread IDs are pointer-based - in this case, mixing
--is done to attempt to produce a unique numeric value even though it is not as
--wide as the platform's true thread IDs.
--
--=back
--
--Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
--of OpenSSL need it for better performance.  To enable this, the following
--is required:
--
--=over 4
--
--=item *
--Three additional callback function, dyn_create_function, dyn_lock_function
--and dyn_destroy_function.
--
--=item *
--A structure defined with the data that each lock needs to handle.
--
--=back
--
--struct CRYPTO_dynlock_value has to be defined to contain whatever structure
--is needed to handle locks.
--
--dyn_create_function(const char *file, int line) is needed to create a
--lock.  Multi-threaded applications might crash at random if it is not set.
--
--dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line)
--is needed to perform locking off dynamic lock numbered n. Multi-threaded
--applications might crash at random if it is not set.
--
--dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is
--needed to destroy the lock l. Multi-threaded applications might crash at
--random if it is not set.
--
--CRYPTO_get_new_dynlockid() is used to create locks.  It will call
--dyn_create_function for the actual creation.
--
--CRYPTO_destroy_dynlockid() is used to destroy locks.  It will call
--dyn_destroy_function for the actual destruction.
--
--CRYPTO_lock() is used to lock and unlock the locks.  mode is a bitfield
--describing what should be done with the lock.  n is the number of the
--lock as returned from CRYPTO_get_new_dynlockid().  mode can be combined
--from the following values.  These values are pairwise exclusive, with
--undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
--should not be used together):
--
--	CRYPTO_LOCK	0x01
--	CRYPTO_UNLOCK	0x02
--	CRYPTO_READ	0x04
--	CRYPTO_WRITE	0x08
--
--=head1 RETURN VALUES
--
--CRYPTO_num_locks() returns the required number of locks.
--
--CRYPTO_get_new_dynlockid() returns the index to the newly created lock.
--
--The other functions return no values.
--
--=head1 NOTES
--
--You can find out if OpenSSL was configured with thread support:
--
-- #define OPENSSL_THREAD_DEFINES
-- #include <openssl/opensslconf.h>
-- #if defined(OPENSSL_THREADS)
--   // thread support enabled
-- #else
--   // no thread support
-- #endif
--
--Also, dynamic locks are currently not used internally by OpenSSL, but
--may do so in the future.
--
--=head1 EXAMPLES
--
--B<crypto/threads/mttest.c> shows examples of the callback functions on
--Solaris, Irix and Win32.
--
--=head1 HISTORY
--
--CRYPTO_set_locking_callback() is
--available in all versions of SSLeay and OpenSSL.
--CRYPTO_num_locks() was added in OpenSSL 0.9.4.
--All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
--B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0
--to replace (actually, deprecate) the previous CRYPTO_set_id_callback(),
--CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed
--thread IDs to always be represented by 'unsigned long'.
--
--=head1 SEE ALSO
--
--L<crypto(3)|crypto(3)>
--
--=cut
-diff -Naur openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod
---- openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod	2006-05-14 12:27:59.000000000 +0100
-+++ openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod	2010-09-01 19:36:31.620125025 +0100
-@@ -65,7 +65,7 @@
- =head1 SEE ALSO
- 
- L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>,
--L<OBJ_nid2obj(3),OBJ_nid2obj(3)>
-+L<OBJ_nid2obj(3)|OBJ_nid2obj(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod openssl-1.0.0a/doc/ssl/SSL_get_error.pod
---- openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod	2005-03-30 12:50:14.000000000 +0100
-+++ openssl-1.0.0a/doc/ssl/SSL_get_error.pod	2010-09-01 19:36:40.259360162 +0100
-@@ -105,7 +105,7 @@
- 
- =head1 SEE ALSO
- 
--L<ssl(3)|ssl(3)>, L<err(3)|err(3)>
-+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>
- 
- =head1 HISTORY
- 
-diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_want.pod openssl-1.0.0a/doc/ssl/SSL_want.pod
---- openssl-1.0.0a.orig//doc/ssl/SSL_want.pod	2005-03-30 12:50:14.000000000 +0100
-+++ openssl-1.0.0a/doc/ssl/SSL_want.pod	2010-09-01 19:36:40.259360162 +0100
-@@ -72,6 +72,6 @@
- 
- =head1 SEE ALSO
- 
--L<ssl(3)|ssl(3)>, L<err(3)|err(3)>, L<SSL_get_error(3)|SSL_get_error(3)>
-+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)>
- 
- =cut
-diff -Naur openssl-1.0.0a.orig//FAQ openssl-1.0.0a/FAQ
---- openssl-1.0.0a.orig//FAQ	2010-06-01 14:31:36.000000000 +0100
-+++ openssl-1.0.0a/FAQ	2010-09-01 19:39:19.677244857 +0100
-@@ -724,7 +724,7 @@
- CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
- including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
- and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
--and friends. This is described in the threads(3) manpage.
-+and friends. This is described in the openssl_threads(3) manpage.
- 
- * I've compiled a program under Windows and it crashes: why?
- 
diff --git a/testing/openssl/no-rpath.patch b/testing/openssl/no-rpath.patch
deleted file mode 100644
index ebd95e23d..000000000
--- a/testing/openssl/no-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.shared.no-rpath	2005-06-23 22:47:54.000000000 +0200
-+++ Makefile.shared	2005-11-16 22:35:37.000000000 +0100
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/testing/ppl/PKGBUILD b/testing/ppl/PKGBUILD
deleted file mode 100644
index b8a21419c..000000000
--- a/testing/ppl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 151630 2012-02-28 23:12:18Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: ezzetabi <ezzetabi at gawab dot com>
-
-pkgname=ppl
-pkgver=0.12
-pkgrel=1
-pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
-arch=('i686' 'x86_64')
-url="http://bugseng.com/products/ppl"
-license=('GPL3')
-depends=('gmp>=5.0')
-options=('!docs' '!libtool')
-source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
-md5sums=('47a5548d4e3d98cf6b97e4fd3e5db513'
-         '41869f374e70d0a4d2faa61566365b9d')
-
-build() {
-  cd $srcdir/ppl-$pkgver
-  ./configure --prefix=/usr --enable-interfaces="c,cxx"
-  make
-}
-
-check() {
-  cd $srcdir/ppl-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/ppl-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD
deleted file mode 100644
index 6dfb27d2c..000000000
--- a/testing/proftpd/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 153556 2012-03-16 00:18:26Z eric $
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=proftpd
-pkgver=1.3.4a
-pkgrel=4
-epoch=1
-pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64')
-url="http://www.proftpd.org"
-license=('GPL')
-depends=('libldap' 'libmysqlclient' 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
-sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25'
-          '195b06e28e503f5e5ef355c3332884cc5e7954a9'
-          'b7819d725817e55b69c73e2572c21a05db48cc86'
-          '83c38ec40efb7cc09d9824b98e65cd948a195cc6'
-          'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --disable-pam \
-    --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
-    --sysconfdir=/etc \
-    --localstatedir=/var/run \
-    --enable-ctrls \
-    --enable-ipv6 \
-    --with-includes=/usr/include/mysql:/usr/include/postgresql \
-    --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
-    --enable-nls
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
-
-  install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
-  install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
-  install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
-  install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-}
diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd
deleted file mode 100755
index 357a7663d..000000000
--- a/testing/proftpd/proftpd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-PROFTPD_ARGS=
-[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ProFTPd Server"
-    /usr/sbin/proftpd ${PROFTPD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon proftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ProFTPd Server"
-    [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/proftpd.pid
-      rm_daemon proftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d
deleted file mode 100644
index 1a5a8a201..000000000
--- a/testing/proftpd/proftpd.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to proftpd
-#
-PROFTPD_ARGS=""
diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate
deleted file mode 100644
index 7b6d7a87b..000000000
--- a/testing/proftpd/proftpd.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/xferlog {
-   postrotate
-      /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD
deleted file mode 100644
index 911e2c403..000000000
--- a/testing/psmisc/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 153643 2012-03-17 02:47:43Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=psmisc
-pkgver=22.16
-pkgrel=1
-pkgdesc="Miscellaneous procfs tools"
-arch=('i686' 'x86_64')
-url="http://psmisc.sourceforge.net/index.html"
-license=('GPL')
-groups=('base')
-depends=('ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('27f1c8deab06e79101af1914ff81a9d561f2fcfe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/r/PKGBUILD b/testing/r/PKGBUILD
deleted file mode 100644
index 0fb507a08..000000000
--- a/testing/r/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 150251 2012-02-15 21:44:40Z 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=3
-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/raptor/PKGBUILD b/testing/raptor/PKGBUILD
deleted file mode 100644
index 847fff43b..000000000
--- a/testing/raptor/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 154298 2012-03-25 15:22:16Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor
-pkgver=2.0.7
-pkgrel=1
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
-arch=('i686' 'x86_64')
-url="http://librdf.org/raptor"
-depends=('curl' 'libxslt' 'icu')
-license=('LGPL')
-options=('!libtool')
-source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
-
-build() {
-  cd "${srcdir}"/raptor2-${pkgver}
-
-  ./configure --prefix=/usr \
-    --disable-static \
-    --with-yajl=no \
-    --with-icu-config=/usr/bin/icu-config
-  make
-}
-
-#check() {
-#	make -C "raptor2-$pkgver" check // currently does not work
-#}
-
-package() {
-  cd "${srcdir}"/raptor2-${pkgver}
-  make prefix="${pkgdir}"/usr install
-}
-md5sums=('699073463467dc8eded2ca89de2ab2ea')
diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD
deleted file mode 100644
index d2470708d..000000000
--- a/testing/samba/PKGBUILD
+++ /dev/null
@@ -1,153 +0,0 @@
-# $Id: PKGBUILD 152742 2012-03-09 13:35:22Z heftig $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-pkgbase=samba
-pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.3
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.3
-pkgrel=4
-arch=(i686 x86_64)
-url="http://www.samba.org"
-license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-        samba samba.logrotate
-        swat.xinetd
-        samba.pam
-        samba.conf.d)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib/ \
-              --localstatedir=/var \
-              --with-configdir=/etc/samba \
-              --with-lockdir=/var/cache/samba \
-              --with-piddir=/var/run/samba \
-              --with-fhs \
-              --with-pam \
-              --with-pam_smbpass \
-              --with-pammodulesdir=/lib/security \
-              --with-dnsupdate \
-              --with-automount \
-              --with-quotas \
-              --with-ads \
-              --with-acl-support \
-              --with-libsmbclient \
-              --with-syslog \
-              --enable-external-libtalloc \
-              --disable-dnssd \
-              --disable-avahi \
-              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
-              --enable-external-libtdb
-  make
-}
-
-package_libwbclient () {
-pkgdesc="Samba winbind client library"
-depends=('glibc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/lib  
-  for i in libwbclient*; do
-      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-}
-
-package_smbclient () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
-  for i in libnetapi* libsmbclient*;do
-      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-  install -m755 script/smbtar ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/cups/backend
-  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
-  mkdir -p ${pkgdir}/usr/include
-  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
-  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
-  mkdir -p ${pkgdir}/usr/share/man/man{1,7}
-  for man in rpcclient smbcacls smbclient smbcquotas smbget \
-      smbtree smbtar nmblookup; do
-      install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
-  done
-  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
-}
-
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba
-        etc/pam.d/samba
-        etc/samba/smb.conf
-        etc/xinetd.d/swat
-        etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/samba-${_realver}/source3
-  mkdir -p ${pkgdir}/etc/samba/private
-  chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install
-  chmod 644 ${pkgdir}/usr/include/*.h
-  rm -rf ${pkgdir}/usr/var
-  rm -rf ${pkgdir}/var/run/samba
-  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
-  install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
-  install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
-  mkdir -p ${pkgdir}/etc/samba
-  cat ../examples/smb.conf.default | \
-    sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
-  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
-  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
-  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
-  # spool directory
-  install -d -m1777 ${pkgdir}/var/spool/samba
-  sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
-  # fix logrotate
-  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
-  # nsswitch libraries
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
-  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
-  ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2
-  # winbind krb5 locator
-  mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
-  install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
-  install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so
-  # remove conflict files of smbclient
-  for man in libsmbclient smbspool \
-      mount.cifs net cifs.upcall; do
-      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
-  done
-  for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do
-      rm -f ${pkgdir}/usr/lib/$i
-  done
-  for bin in net \
-      nmblookup rpcclient smbcacls smbclient \
-      smbcquotas smbget smbspool smbtar smbtree; do
-      rm -f ${pkgdir}/usr/bin/$bin
-  done
-  rm -f ${pkgdir}/usr/sbin/cifs.upcall
-  rm -f ${pkgdir}/usr/include/netapi.h
-  for man in rpcclient smbcacls smbclient smbcquotas \
-      smbtree smbtar nmblookup smbget; do
-      rm -f ${pkgdir}/usr/share/man/man1/${man}.1
-  done
-  for man in tdbbackup tdbdump tdbtool; do
-      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
-  done
-  rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
-  rm -f ${pkgdir}/usr/include/libsmbclient.h
-  # copy ldap example
-  install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
-}
-md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1'
-         'dfc6f9018c556b9783c7140de183727f'
-         '5697da77590ec092cc8a883bae06093c'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828')
diff --git a/testing/samba/samba b/testing/samba/samba
deleted file mode 100755
index 2a04bfec4..000000000
--- a/testing/samba/samba
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
-	start)
-		rc=0
-		stat_busy "Starting Samba Server"
-		if [ ! -x /var/run/samba ] ; then
-			install -m755 -d /var/run/samba
-		fi
-                if [ ! -x /var/log/samba ] ; then
-                        install -m755 -d /var/log/samba
-                fi
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] && /usr/sbin/$d -D
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon samba
-			stat_done
-		fi
-	;;
-	stop)
-		rc=0
-		stat_busy "Stopping Samba Server"
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] || kill $PID &> /dev/null
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			rm /var/run/samba/smbd.pid &>/dev/null
-			rm /var/run/samba/nmbd.pid &>/dev/null
-			rm /var/run/samba/winbindd.pid &>/dev/null
-			rm_daemon samba
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d
deleted file mode 100644
index 8721f956a..000000000
--- a/testing/samba/samba.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Configuration for the samba init script
-#
-
-# space separated list of daemons to launch
-SAMBA_DAEMONS=(smbd nmbd)
-#SAMBA_DAEMONS=(smbd nmbd winbindd)
diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate
deleted file mode 100644
index 581f4c33b..000000000
--- a/testing/samba/samba.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
-   notifempty
-   missingok
-   sharedscripts
-   copytruncate
-   postrotate
-      /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/testing/samba/samba.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd
deleted file mode 100644
index 2e62a82b2..000000000
--- a/testing/samba/swat.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service swat
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/swat
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE
deleted file mode 100644
index c5ab15a56..000000000
--- a/testing/shadow/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 1990 - 1994, Julianne Frances Haugh
- * Copyright (c) 1996 - 2000, Marek Michałkiewicz
- * Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2009, Nicolas François
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the copyright holders or contributors may not be used to
- *    endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
deleted file mode 100644
index 5757df664..000000000
--- a/testing/shadow/PKGBUILD
+++ /dev/null
@@ -1,132 +0,0 @@
-# $Id: PKGBUILD 151351 2012-02-25 15:53:24Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=shadow
-pkgver=4.1.5
-pkgrel=4
-pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
-url='http://pkg-shadow.alioth.debian.org/'
-license=('BSD')
-groups=('base')
-depends=('bash' 'pam' 'acl')
-backup=(etc/login.defs
-        etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel}
-        etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
-        etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
-        etc/default/useradd)
-options=('!libtool')
-install='shadow.install'
-source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
-        LICENSE
-        adduser
-        chgpasswd
-        chpasswd
-        defaults.pam
-        login
-        login.defs
-        newusers
-        passwd
-        shadow.cron.daily
-        useradd.defaults
-        nscd-error-reporting.patch
-        xstrdup.patch
-        shadow-strncpy-usage.patch
-        shadow-add-missing-include.patch
-        userdel-avoid-bad-mem-access.patch
-        write-utmp-wtmp-entries.patch)
-sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41'
-          '0a31aafceb948a91fe7370a6378cafd6fd883145'
-          '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
-          '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
-          '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          '895aad07c192b288b457e19dd7b8c55841b4ad22'
-          'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
-          '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
-          '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
-          'ae6eebb842c433ac4022c493294a13ed68e06acc'
-          '6010fffeed1fc6673ad9875492e1193b1a847b53'
-          '21e12966a6befb25ec123b403cd9b5c492fe5b16'
-          '0697a21f7519de30821da7772677035652df4ad2'
-          'e1dd93d82c6eba76b5f17a9fefad4bbc513cff5b'
-          'bcef8558c9123b396d2d4df26c815a951f97a91a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # avoid transitive linking issues with binutils 2.22
-  sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
-
-  # link to glibc's crypt(3)
-  LDFLAGS+=" -lcrypt"
-
-  # need to offer these upstream
-  patch -Np1 <"$srcdir/xstrdup.patch"
-  patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
-
-  # backports queued for 4.1.5.1
-  patch -Np1 <"$srcdir/shadow-add-missing-include.patch"
-  patch -Np1 <"$srcdir/nscd-error-reporting.patch"
-
-  # sent to ML
-  patch -Np0 <"$srcdir/userdel-avoid-bad-mem-access.patch"
-
-  # revert to fix FS#28543
-  patch -RNp1 <"$srcdir/write-utmp-wtmp-entries.patch"
-
-  # supress etc/pam.d/*, we provide our own
-  sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc \
-    --with-libpam \
-    --without-selinux
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
-
-  # interactive useradd
-  install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
-  # useradd defaults
-  install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
-
-  # cron job
-  install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow"
-
-  # login.defs
-  install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
-
-  # PAM config - custom
-  install -dm755 "$pkgdir/etc/pam.d"
-  install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{login,passwd,chgpasswd,chpasswd,newusers}
-
-  # PAM config - from tarball
-  install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems"
-
-  # we use the 'useradd' PAM file for other similar utilities
-  for file in chage chfn chsh groupadd groupdel groupmod shadow \
-      useradd usermod userdel; do
-    install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
-  done
-
-  # Remove su - using su from coreutils instead
-  rm "$pkgdir/bin/su"
-  find "$pkgdir/usr/share/man" -name 'su.1' -delete
-}
diff --git a/testing/shadow/adduser b/testing/shadow/adduser
deleted file mode 100644
index a5d7fd4fa..000000000
--- a/testing/shadow/adduser
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/bin/bash
-#
-# Copyright 1995  Hrvoje Dogan, Croatia.
-# Copyright 2002, 2003, 2004  Stuart Winter, West Midlands, England, UK.
-# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-##########################################################################
-# Program: /usr/sbin/adduser
-# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
-# Author : Stuart Winter <stuart@polplex.co.uk>
-#          Based on the original Slackware adduser by Hrvoje Dogan
-#          with modifications by Patrick Volkerding
-# Version: 1.09
-##########################################################################
-# Usage..: adduser [<new_user_name>]
-##########################################################################
-# History #
-###########
-# v1.09 - 07/06/04 
-#       * Added standard Slackware script licence to the head of this file.
-# v1.08 - 25/04/04
-#       * Disallow user names that begin with a numeric because useradd 
-#         (from shadow v4.03) does not allow them. <sw>
-# v1.07 - 07/03/03
-#       * When supplying a null string for the uid (meaning 'Choose next available'), 
-#         if there were file names in the range 'a-z' in the pwd then the 
-#         egrep command considered these files rather than the null string. 
-#         The egrep expression is now in quotes.  
-#         Reported & fixed by Vadim O. Ustiansky <sw>
-# v1.06 - 31/03/03
-#       * Ask to chown user.group the home directory if it already exists.
-#         This helps reduce later confusion when adding users whose home dir
-#         already exists (mounted partition for example) and is owned
-#         by a user other than the user to which the directory is being
-#         assigned as home.  Default is not to chown.
-#         Brought to my attention by mRgOBLIN. <sw>
-# v1.05 - 04/01/03
-#       * Advise & prevent users from creating logins with '.' characters
-#         in the user name. <sw>
-#       * Made pending account creation info look neater <sw>
-# v1.04 - 09/06/02
-#       * Catered for shadow-4.0.3's 'useradd' binary that no longer
-#         will let you create a user that has any uppercase chars in it
-#         This was reported on the userlocal.org forums
-#         by 'xcp' - thanks. <sw,pjv>
-# v1.03 - 20/05/02
-#       * Support 'broken' (null lines in) /etc/passwd and 
-#         /etc/group files <sw>       
-#       * For recycling UIDs (default still 'off'), we now look in 
-#         /etc/login.defs for the UID_MIN value and use it
-#         If not found then default to 1000 <sw>
-# v1.02 - 10/04/02
-#       * Fix user-specified UID bug. <pjv>
-# v1.01 - 23/03/02
-#       * Match Slackware indenting style, simplify. <pjv>
-# v1.00 - 22/03/02
-#       * Created
-#######################################################################
-
-# Path to files
-pfile=/etc/passwd
-gfile=/etc/group
-sfile=/etc/shells
-
-# Paths to binaries
-useradd=/usr/sbin/useradd
-chfn=/usr/bin/chfn
-passwd=/usr/bin/passwd
-
-# Defaults
-defhome=/home
-defshell=/bin/bash
-defgroup=users
-
-# Determine what the minimum UID is (for UID recycling)
-# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
-export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
-# If we couldn't find it, set it to the default of 1000
-if [ -z "$recycleUIDMIN" ]; then
-   export recycleUIDMIN=1000  # this is the default from Slackware's /etc/login.defs
-fi
-
-
-# This setting enables the 'recycling' of older unused UIDs.
-# When you userdel a user, it removes it from passwd and shadow but it will
-# never get used again unless you specify it expliticly -- useradd (appears to) just
-# look at the last line in passwd and increment the uid.  I like the idea of 
-# recycling uids but you may have very good reasons not to (old forgotten
-# confidential files still on the system could then be owned by this new user).
-# We'll set this to no because this is what the original adduser shell script
-# did and it's what users expect.
-recycleuids=no
-
-# Function to read keyboard input.
-# bash1 is broken (even ash will take read -ep!), so we work around
-# it (even though bash1 is no longer supported on Slackware).
-function get_input() { 
-  local output
-  if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
-    echo -n "${1} " >&2 # fudge for use with bash v1
-    read output
-  else # this should work with any other /bin/sh
-    read -ep "${1} " output
-  fi
-  echo $output
-}
-
-# Function to display the account info
-function display () {
-  local goose
-  goose="$(echo $2 | cut -d ' ' -f 2-)"  # lop off the prefixed argument useradd needs
-  echo -n "$1 "
-  # If it's null then display the 'other' information
-  if [ -z "$goose" -a ! -z "$3" ]; then 
-    echo "$3" 
-  else 
-    echo "$goose" 
-  fi
-}
-
-# Function to check whether groups exist in the /etc/group file
-function check_group () {
-  local got_error group
-  if [ ! -z "$@" ]; then  
-  for group in $@ ; do
-    local uid_not_named="" uid_not_num=""
-    grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes  
-    grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
-    if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
-      echo "- Group '$group' does not exist"
-      got_error=yes
-    fi
-  done
-  fi
-  # Return exit code of 1 if at least one of the groups didn't exist
-  if [ ! -z "$got_error" ]; then
-    return 1
-  fi
-}   
-
-#: Read the login name for the new user :#
-#
-# Remember that most Mail Transfer Agents are case independant, so having
-# 'uSer' and 'user' may cause confusion/things to break.  Because of this,
-# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
-# and we must reject them, too.
-
-# Set the login variable to the command line param
-echo
-LOGIN="$1"
-needinput=yes
-while [ ! -z $needinput ]; do
-  if [ -z "$LOGIN" ]; then 
-    while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
-  fi
-  grep "^${LOGIN}:" $pfile >/dev/null 2>&1  # ensure it's not already used
-  if [ $? -eq 0 ]; then
-    echo "- User '$LOGIN' already exists; please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
-    echo "- User names cannot begin with a number; please choose another"
-    unset LOGIN
-  elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
-    echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
-    echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
-    unset LOGIN
-  else
-    unset needinput
-  fi
-done
-
-# Display the user name passed from the shell if it hasn't changed
-if [ "$1" = "$LOGIN" ]; then
-  echo "Login name for new user: $LOGIN"
-fi
-
-#: Get the UID for the user & ensure it's not already in use :#
-#
-# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
-# when you change password for the uid, it finds the first match in /etc/passwd 
-# which isn't necessarily the correct user
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
-  grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    echo "- That UID is already in use; please choose another"
-  elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
-    echo "- UIDs are numerics only"         
-  else
-    unset needinput
-  fi
-done
-# If we were given a UID, then syntax up the variable to pass to useradd
-if [ ! -z "$_UID" ]; then 
-  U_ID="-u ${_UID}"
-else
-  # Will we be recycling UIDs?
-  if [ "$recycleuids" = "yes" ]; then
-    U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
-  fi   
-fi
-
-#: Get the initial group for the user & ensure it exists :#
-#
-# We check /etc/group for both the text version and the group ID number 
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  GID="$(get_input "Initial group [ ${defgroup} ]:")"
-  check_group "$GID"
-  if [ $? -gt 0 ]; then
-    echo "- Please choose another"
-  else
-    unset needinput 
-  fi
-done
-# Syntax the variable ready for useradd
-if [ -z "$GID" ]; then
-  GID="-g ${defgroup}"
-else
-  GID="-g ${GID}"
-fi
-
-#: Get additional groups for the user :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  AGID="$(get_input "Additional groups (comma separated) []:")"
-  AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing 
-  if [ ! -z "$AGID" ]; then
-    check_group "$AGID"  # check all groups at once (treated as N # of params)
-    if [ $? -gt 0 ]; then
-      echo "- Please re-enter the group(s)"
-    else
-      unset needinput # we found all groups specified
-      AGID="-G $(echo "$AGID" | tr ' ' ,)"
-    fi
-  else
-    unset needinput   # we don't *have* to have additional groups
-  fi
-done
-
-#: Get the new user's home dir :#
-#       
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
-  if [ -z "$HME" ]; then
-    HME="${defhome}/${LOGIN}"
-  fi 
-  # Warn the user if the home dir already exists
-  if [ -d "$HME" ]; then
-    echo "- Warning: '$HME' already exists !"
-    getyn="$(get_input "  Do you wish to change the home directory path ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-      # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
-      getyn="$(get_input "  Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
-      if [ "$(echo $getyn | grep -i "y")" ]; then
-         CHOWNHOMEDIR=$HME # set this to the home directory
-      fi
-    fi
-  else
-    unset needinput
-  fi
-done           
-HME="-d ${HME}"  
-    
-#: Get the new user's shell :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  unset got_error
-  SHL="$(get_input "Shell [ ${defshell} ]")"
-  if [ -z "$SHL" ]; then
-    SHL="${defshell}"
-  fi 
-  # Warn the user if the shell doesn't exist in /etc/shells or as a file
-  if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
-    echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
-    got_error=yes
-  fi
-  if [ ! -f "$SHL" ]; then
-    echo "- Warning: ${SHL} does not exist as a file"
-    got_error=yes
-  fi
-  if [ ! -z "$got_error" ]; then
-    getyn="$(get_input "  Do you wish to change the shell ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-    fi
-  else
-    unset needinput
-  fi
-done           
-SHL="-s ${SHL}"
-
-#: Get the expiry date :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
-  if [ ! -z "$EXP" ]; then
-    # Check to see whether the expiry date is in the valid format
-    if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
-      echo "- That is not a valid expiration date"
-    else
-      unset needinput 
-      EXP="-e ${EXP}" 
-    fi
-  else
-    unset needinput
-  fi
-done
-
-# Display the info about the new impending account
-echo
-echo "New account will be created as follows:"
-echo
-echo "---------------------------------------"
-display "Login name.......: " "$LOGIN"
-display "UID..............: " "$_UID" "[ Next available ]"
-display "Initial group....: " "$GID"
-display "Additional groups: " "$AGID" "[ None ]"
-display "Home directory...: " "$HME"
-display "Shell............: " "$SHL"
-display "Expiry date......: " "$EXP" "[ Never ]"
-echo
-
-echo "This is it... if you want to bail out, hit Control-C.  Otherwise, press"
-echo "ENTER to go ahead and make the account."
-read junk
-
-echo
-echo "Creating new account..."
-echo
-echo
-
-# Add the account to the system
-CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
-$CMD
-
-if [ $? -gt 0 ]; then
-  echo "- Error running useradd command -- account not created!"
-  echo "(cmd: $CMD)"
-  exit 1
-fi
-
-# chown the home dir ?  We can only do this once the useradd has
-# completed otherwise the user name doesn't exist.
-if [ ! -z "${CHOWNHOMEDIR}" ]; then
-  chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
-fi
-
-# Set the finger information
-$chfn "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "- Warning: an error occurred while setting finger information"
-fi
-
-# Set a password
-$passwd "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "* WARNING: An error occured while setting the password for"
-  echo "           this account.  Please manually investigate this *"
-  exit 1
-fi
-
-echo
-echo
-echo "Account setup complete."
-exit 0
-
diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd
deleted file mode 100644
index 8f49f5cc8..000000000
--- a/testing/shadow/chgpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-account		required	pam_permit.so
-password	include		system-auth
diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/chpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/shadow/defaults.pam
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/testing/shadow/login b/testing/shadow/login
deleted file mode 100644
index b8555f89c..000000000
--- a/testing/shadow/login
+++ /dev/null
@@ -1,21 +0,0 @@
-#%PAM-1.0
-auth		required	pam_securetty.so
-auth		requisite	pam_nologin.so
-auth		required	pam_unix.so nullok
-auth		required	pam_tally.so onerr=succeed file=/var/log/faillog
-# use this to lockout accounts for 10 minutes after 3 failed attempts
-#auth		required	pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog
-account		required	pam_access.so
-account		required	pam_time.so
-account		required	pam_unix.so
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so sha512 shadow use_authtok
-session		required	pam_unix.so
-session		required	pam_env.so
-session		required	pam_motd.so
-session		required	pam_limits.so
-session		optional	pam_mail.so dir=/var/spool/mail standard
-session		optional	pam_lastlog.so
-session		optional	pam_loginuid.so
--session	optional	pam_ck_connector.so nox11
--session	optional	pam_systemd.so
diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs
deleted file mode 100644
index 2500ee447..000000000
--- a/testing/shadow/login.defs
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-#
-# Delay in seconds before being allowed another attempt after a login failure
-#
-FAIL_DELAY		3
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-CONSOLE		/etc/securetty
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# *REQUIRED*
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
-#   QMAIL_DIR is for Qmail
-#
-#QMAIL_DIR	Maildir
-MAIL_DIR	/var/spool/mail
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH	PATH=/bin:/usr/bin
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-UMASK		077
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-# System accounts
-SYS_UID_MIN		  500
-SYS_UID_MAX		  999
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			 1000
-GID_MAX			60000
-# System accounts
-SYS_GID_MIN		  500
-SYS_GID_MAX		  999
-
-#
-# Max number of login retries if password is bad
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
-
diff --git a/testing/shadow/newusers b/testing/shadow/newusers
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/newusers
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/nscd-error-reporting.patch b/testing/shadow/nscd-error-reporting.patch
deleted file mode 100644
index a4075756e..000000000
--- a/testing/shadow/nscd-error-reporting.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c
-index 227c205..7adb58f 100644
---- a/lib/nscd.c
-+++ b/lib/nscd.c
-@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service)
- 		/* nscd is not installed, or it is installed but uses an
- 		   interpreter that is missing.  Probably the former. */
- 		return 0;
-+	} else if (code == 1) {
-+		/* nscd is installed, but it isn't active. */
-+		return 0;
- 	} else if (code != 0) {
--		(void) fprintf (stderr, _("%s: nscd exited with status %d"),
-+		(void) fprintf (stderr, _("%s: nscd exited with status %d\n"),
- 		                Prog, code);
- 		(void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog);
- 		return -1;
diff --git a/testing/shadow/passwd b/testing/shadow/passwd
deleted file mode 100644
index ab56da496..000000000
--- a/testing/shadow/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so sha512 shadow use_authtok
-password	required	pam_unix.so sha512 shadow nullok
diff --git a/testing/shadow/shadow-add-missing-include.patch b/testing/shadow/shadow-add-missing-include.patch
deleted file mode 100644
index 5c9e946ef..000000000
--- a/testing/shadow/shadow-add-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c
---- shadow-4.1.4.2+svn3283/libmisc/copydir.c	2010-09-05 11:35:26.000000000 -0400
-+++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c	2011-06-26 01:26:52.000000000 -0400
-@@ -34,6 +34,7 @@
- 
- #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $"
- 
-+#include <stdarg.h>
- #include <assert.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch
deleted file mode 100644
index 5aba8fa01..000000000
--- a/testing/shadow/shadow-strncpy-usage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c
---- shadow-4.1.5/src/usermod.c.orig	2012-02-13 08:19:43.792146449 -0500
-+++ shadow-4.1.5/src/usermod.c	2012-02-13 08:21:19.375114500 -0500
-@@ -182,7 +182,7 @@
- 	struct tm *tp;
- 
- 	if (date < 0) {
--		strncpy (buf, "never", maxsize);
-+		strncpy (buf, "never", maxsize - 1);
- 	} else {
- 		time_t t = (time_t) date;
- 		tp = gmtime (&t);
-diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c
---- shadow-4.1.5/src/login.c.orig	2012-02-13 08:19:50.951994454 -0500
-+++ shadow-4.1.5/src/login.c	2012-02-13 08:21:04.490430937 -0500
-@@ -752,7 +752,8 @@
- 			          _("%s login: "), hostn);
- 		} else {
- 			strncpy (loginprompt, _("login: "),
--			         sizeof (loginprompt));
-+			         sizeof (loginprompt) - 1);
-+			loginprompt[sizeof (loginprompt) - 1] = '\0';
- 		}
- 
- 		retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily
deleted file mode 100755
index 1931a793e..000000000
--- a/testing/shadow/shadow.cron.daily
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
-
diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install
deleted file mode 100644
index 14384c333..000000000
--- a/testing/shadow/shadow.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  grpck -r >/dev/null 2>&1
-  if [ $? -eq 2 ]; then
-    printf '%s\n' \
-      "==> Warning: /etc/group or /etc/gshadow are inconsistent." \
-      "    Run 'grpck' to correct this."
-  fi
-  return 0
-}
diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults
deleted file mode 100644
index b800b1777..000000000
--- a/testing/shadow/useradd.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# useradd defaults file for ArchLinux
-# original changes by TomK
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no
diff --git a/testing/shadow/userdel-avoid-bad-mem-access.patch b/testing/shadow/userdel-avoid-bad-mem-access.patch
deleted file mode 100644
index 1d36562b2..000000000
--- a/testing/shadow/userdel-avoid-bad-mem-access.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: src/userdel.c
-===================================================================
---- src/userdel.c	(revision 3713)
-+++ src/userdel.c	(working copy)
-@@ -329,26 +329,33 @@
- 	}
- 
- 	if (NULL == pwd) {
-+		char gr_name[GROUP_NAME_MAX_LENGTH + 1];
-+
-+		/* make a copy of the group name before we delete it.
-+		 * we can't use ->gr_name after the group is deleted
-+		 * for logging purposes */
-+		snprintf(gr_name, GROUP_NAME_MAX_LENGTH, "%s", grp->gr_name);
-+
- 		/*
- 		 * We can remove this group, it is not the primary
- 		 * group of any remaining user.
- 		 */
--		if (gr_remove (grp->gr_name) == 0) {
-+		if (gr_remove (gr_name) == 0) {
- 			fprintf (stderr,
- 			         _("%s: cannot remove entry '%s' from %s\n"),
--			         Prog, grp->gr_name, gr_dbname ());
-+			         Prog, gr_name, gr_dbname ());
- 			fail_exit (E_GRP_UPDATE);
- 		}
- 
- #ifdef WITH_AUDIT
- 		audit_logger (AUDIT_DEL_GROUP, Prog,
- 		              "deleting group",
--		              grp->gr_name, AUDIT_NO_ID,
-+		              gr_name, AUDIT_NO_ID,
- 		              SHADOW_AUDIT_SUCCESS);
- #endif				/* WITH_AUDIT */
- 		SYSLOG ((LOG_INFO,
- 		         "removed group '%s' owned by '%s'\n",
--		         grp->gr_name, user_name));
-+		         gr_name, user_name));
- 
- #ifdef	SHADOWGRP
- 		if (sgr_locate (user_name) != NULL) {
-@@ -361,12 +368,12 @@
- #ifdef WITH_AUDIT
- 			audit_logger (AUDIT_DEL_GROUP, Prog,
- 			              "deleting shadow group",
--			              grp->gr_name, AUDIT_NO_ID,
-+			              gr_name, AUDIT_NO_ID,
- 			              SHADOW_AUDIT_SUCCESS);
- #endif				/* WITH_AUDIT */
- 			SYSLOG ((LOG_INFO,
- 			         "removed shadow group '%s' owned by '%s'\n",
--			         grp->gr_name, user_name));
-+			         gr_name, user_name));
- 
- 		}
- #endif				/* SHADOWGRP */
diff --git a/testing/shadow/write-utmp-wtmp-entries.patch b/testing/shadow/write-utmp-wtmp-entries.patch
deleted file mode 100644
index b4272ca61..000000000
--- a/testing/shadow/write-utmp-wtmp-entries.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: upstream/trunk/src/login.c
-===================================================================
---- a/src/login.c	(revision 3437)
-+++ b/src/login.c	(revision 3438)
-@@ -126,10 +126,12 @@
- static void setup_tty (void);
- static void process_flags (int argc, char *const *argv);
- static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *user);
-+#ifndef USE_PAM
- static void update_utmp (const char *user,
-                          const char *tty,
-                          const char *host,
-                          /*@null@*/const struct utmp *utent);
-+#endif				/* ! USE_PAM */
- 
- #ifndef USE_PAM
- static struct faillog faillog;
-@@ -471,6 +473,7 @@
- 	return failent_user;
- }
- 
-+#ifndef USE_PAM
- /*
-  * update_utmp - Update or create an utmp entry in utmp, wtmp, utmpw, and
-  *               wtmpx
-@@ -496,6 +499,7 @@
- 	free (utx);
- #endif				/* USE_UTMPX */
- }
-+#endif				/* ! USE_PAM */
- 
- /*
-  * login - create a new login session for a user
-@@ -1208,11 +1212,13 @@
- 		}
- 	}
- 
-+#ifndef USE_PAM
- 	/*
- 	 * The utmp entry needs to be updated to indicate the new status
- 	 * of the session, the new PID and SID.
- 	 */
- 	update_utmp (username, tty, hostname, utent);
-+#endif				/* ! USE_PAM */
- 
- 	/* The pwd and spwd entries for the user have been copied.
- 	 *
diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch
deleted file mode 100644
index bce434264..000000000
--- a/testing/shadow/xstrdup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- shadow-4.1.2.1/libmisc/xmalloc.c	2008-08-30 21:55:44.000000000 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new	2008-08-30 21:55:36.000000000 -0500
-@@ -61,5 +61,6 @@
- 
- char *xstrdup (const char *str)
- {
-+	if(str == NULL) return NULL;
- 	return strcpy (xmalloc (strlen (str) + 1), str);
- }
diff --git a/testing/source-highlight/PKGBUILD b/testing/source-highlight/PKGBUILD
deleted file mode 100644
index 32c6d6a76..000000000
--- a/testing/source-highlight/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151827 2012-03-03 08:09:13Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.6
-pkgrel=2
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('gcc-libs' 'bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('44856c15a5dc8694e30d92f640ed348f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-	      --with-bash-completion=${pkgdir}/etc/bash_completion.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/testing/source-highlight/source-highlight.install b/testing/source-highlight/source-highlight.install
deleted file mode 100644
index 4fd1b3005..000000000
--- a/testing/source-highlight/source-highlight.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=usr/share/info
-info_files=(source-highlight.info source-highlight-lib.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
deleted file mode 100644
index 85996bf3c..000000000
--- a/testing/sqlite3/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 154034 2012-03-21 19:28:02Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3071100
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}	#3070700
-#pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.11
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline>=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
-	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-	#http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
-	http://www.sqlite.org/sqlite-doc-${_docver}.zip
-	license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('0552d71bda98ebdcaea305cd6058221b'
-         'c1fb48beff33612b2c7f5ae6ab17a601'
-         'c1cdbc5544034d9012e421e75a5e4890')
-
-build() {
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-
-  # build sqlite
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
-  ./configure --prefix=/usr \
-	--disable-static
-  make
-  
-  # build the tcl extension    
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-	--with-system-sqlite
-  make
-
-}
-
-package_sqlite3() {
- 
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline>=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
-  make DESTDIR=${pkgdir} install
-  
-  # license
-  install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
- 
- pkgdesc="sqlite3 Tcl Extension Architecture (TEA)"
- depends=('sqlite3>=3.7.5')
-
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
-}
-
-package_sqlite3-doc() {
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
-
-  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
-  cd ${srcdir}/sqlite-doc-${_docver}
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-  
-  # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
-  find ${pkgdir} -type f -perm 755 -exec ls -lha {} \;
-  find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \;
-
-  find ${pkgdir} -type f -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -type d -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -name '*~' -exec rm -f {} \;
-
-  find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg#
-  find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \;
-  find ${pkgdir} -name '.~*' -exec rm -f {} \;
-}
diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt
deleted file mode 100644
index 118c5d5e6..000000000
--- a/testing/sqlite3/license.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain 
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. 
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. 
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. 
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: 
-You are using SQLite in a jurisdiction that does not recognize the public domain. 
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. 
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. 
-Your legal department tells you that you have to purchase a license. 
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. 
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: 
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. 
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA 
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html
\ No newline at end of file
diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD
deleted file mode 100644
index 8eccbbaf7..000000000
--- a/testing/subversion/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 152716 2012-03-09 01:48:25Z stephane $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.7.4
-pkgrel=1
-pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
-license=('APACHE')
-depends=('neon' 'apr-util' 'sqlite3' 'file')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
-            'python2: for some hook scripts' 'ruby: for some hook scripts')
-makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
-             'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
-backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
-url="http://subversion.apache.org/"
-provides=('svn')
-options=('!makeflags' '!libtool')
-source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
-        svnserve svn svnserve.conf subversion.rpath.fix.patch)
-sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527'
-          'eebe0be6d539bf7dc37cf01b3c738072f1d9197b'
-          '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
-          '73b36c046c09cec2093354911c89e3ba8056af6c'
-          'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
-          '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   export PYTHON=/usr/bin/python2
-
-   patch -p0 -i ../subversion.rpath.fix.patch
-   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
-
-   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
-               --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
-               --enable-javahl --with-gnome-keyring --with-kwallet
-
-   make external-all
-   make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
-   make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb
-}
-
-#check() {
-#   cd "${srcdir}/${pkgname}-${pkgver}"
-#   export LANG=C LC_ALL=C
-#   make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb
-#}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH
-   make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
-     swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
-     install install-swig-py install-swig-pl install-javahl # install-swig-rb
-
-   install -d "${pkgdir}"/usr/share/subversion
-   cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
-   rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
-
-   rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
-
-   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
-   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
-   install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
-
-   # bash completion
-   install -Dm 644 tools/client-side/bash_completion \
-     "${pkgdir}"/etc/bash_completion.d/subversion
-}
diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch
deleted file mode 100644
index ba6ee9e4e..000000000
--- a/testing/subversion/subversion.rpath.fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-02-16 14:10:48.000000000 -0200
-+++ Makefile.in	2009-06-04 00:56:29.000000000 -0300
-@@ -678,6 +678,7 @@
- 
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
-+	cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
- 
- swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
-   $(SWIG_PL_DIR)/native/Makefile
diff --git a/testing/subversion/svn b/testing/subversion/svn
deleted file mode 100644
index 8988aaf63..000000000
--- a/testing/subversion/svn
+++ /dev/null
@@ -1,11 +0,0 @@
-service svn
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/bin/svnserve
-	server_args		= -i
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve
deleted file mode 100755
index 670fee742..000000000
--- a/testing/subversion/svnserve
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/svnserve
-
-PID=`pidof -o %PPID /usr/bin/svnserve`
-case "$1" in
-  start)
-    stat_busy "Starting svnserve"
-    if [ -z "$PID" ]; then 
-      if [ -n "$SVNSERVE_USER" ]; then
-        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
-      else
-        /usr/bin/svnserve -d $SVNSERVE_ARGS &
-      fi
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon svnserve
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping svnserve"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon svnserve
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf
deleted file mode 100644
index 37fb7ea10..000000000
--- a/testing/subversion/svnserve.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters to be passed to svnserve
-#
-#SVNSERVE_ARGS="-r /path/to/some/repos"
-SVNSERVE_ARGS=""
-
-#SVNSERVE_USER="svn"
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
deleted file mode 100644
index 1eb0a1b55..000000000
--- a/testing/sudo/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 153416 2012-03-13 05:01:37Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sudo
-_ver=1.8.4p4
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=1
-pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
-license=('custom')
-depends=('glibc' 'pam')
-backup=('etc/sudoers' 'etc/pam.d/sudo')
-options=('!libtool' '!makeflags')
-source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
-        sudo.pam)
-md5sums=('b9be6df7ecefedff2263052ed9fc5e93'
-         '24da0bf96506b81678726778aad9ea4c'
-         '4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
-
-build() {
-  cd "$srcdir/$pkgname-$_ver"
-
-  ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \
-    --with-env-editor --with-all-insults --with-logfac=auth
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$_ver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_ver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
-
-  install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
-}
diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam
deleted file mode 100644
index 4e586cd22..000000000
--- a/testing/sudo/sudo.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
diff --git a/testing/tzdata/Makefile.patch b/testing/tzdata/Makefile.patch
deleted file mode 100644
index e88f9d907..000000000
--- a/testing/tzdata/Makefile.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Naur src/Makefile src-p/Makefile
---- src/Makefile	2007-08-20 16:47:41.000000000 +0200
-+++ src-p/Makefile	2007-10-02 04:07:44.000000000 +0200
-@@ -34,17 +34,17 @@
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=		/usr/local
-+TOPDIR=		$(DESTDIR)/usr
- 
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
--TZDIR=		$(TOPDIR)/etc/zoneinfo
-+TZDIR=		$(TOPDIR)/share/zoneinfo
- 
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
- 
--ETCDIR=		$(TOPDIR)/etc
-+SBINDIR=		$(TOPDIR)/sbin
- 
- # If you "make INSTALL", the "date" command gets installed in. . .
- 
-@@ -52,7 +52,7 @@
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=		$(TOPDIR)/man
-+MANDIR=		$(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -83,7 +83,7 @@
- 
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
- 
- # Add the following to the end of the "CFLAGS=" line as needed.
- #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
-@@ -211,7 +211,7 @@
- # before the first Monday in January when a "%V" format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
- 
--CFLAGS=
-+CFLAGS += -std=gnu99
- 
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS=	-s
-@@ -220,7 +220,7 @@
- ZIC=		$(zic) $(ZFLAGS)
- 
- # The name of a Posix-compliant `awk' on your system.
--AWK=		nawk
-+AWK=		awk
- 
- # The path where SGML DTDs are kept.
- SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
-@@ -241,8 +241,10 @@
- 
- ###############################################################################
- 
--cc=		cc
--CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+=		-DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
- 
- TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -282,14 +284,16 @@
- 
- ALL:		all date
- 
--install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
- 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- 		cp iso3166.tab zone.tab $(TZDIR)/.
--		-mkdir $(TOPDIR) $(ETCDIR)
--		cp tzselect zic zdump $(ETCDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) \
-+		-mkdir -p $(TOPDIR) $(SBINDIR)
-+		cp zic zdump $(SBINDIR)/.
-+		-mkdir -p $(TOPDIR) $(BINDIR)
-+		cp tzselect $(BINDIR)/.
-+		-mkdir -p $(TOPDIR) $(MANDIR) \
- 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
- 		-rm -f $(MANDIR)/man3/newctime.3 \
- 			$(MANDIR)/man3/newtzset.3 \
-@@ -298,13 +302,11 @@
- 			$(MANDIR)/man8/zdump.8 \
- 			$(MANDIR)/man8/zic.8
- 		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
--		cp tzfile.5 $(MANDIR)/man5/.
--		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
- 
- INSTALL:	ALL install date.1
--		-mkdir $(TOPDIR) $(BINDIR)
-+		-mkdir -p $(TOPDIR) $(BINDIR)
- 		cp date $(BINDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-+		-mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
- 		-rm -f $(MANDIR)/man1/date.1
- 		cp date.1 $(MANDIR)/man1/.
- 
-@@ -334,9 +336,9 @@
- # You must replace all of $(TZDIR) to switch from not using leap seconds
- # to using them, or vice versa.
- other_two:	zic leapseconds $(TDATA)
--		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
--			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+			-d $(TZDIR)/right -L leapseconds $(TDATA)
- 
- posix_right:	posix_only other_two
- 
-@@ -367,7 +369,7 @@
- 			<$? >$@
- 		chmod +x $@
- 
--check:		check_tables check_web
-+check:		check_tables
- 
- check_tables:	checktab.awk $(PRIMARY_YDATA)
- 		$(AWK) -f checktab.awk $(PRIMARY_YDATA)
-diff -Naur src/tzselect.ksh src-p/tzselect.ksh
---- src/tzselect.ksh	2007-08-20 16:47:42.000000000 +0200
-+++ src-p/tzselect.ksh	2007-10-02 04:07:44.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /bin/ksh
-+#! /bin/bash
- 
- # '@(#)tzselect.ksh	8.1'
- 
diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD
deleted file mode 100644
index d51cfa78d..000000000
--- a/testing/tzdata/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 151775 2012-03-02 14:25:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=tzdata
-pkgver=2012b
-pkgrel=1
-_tzcode=2012b
-_tzdata=2012b
-pkgdesc="Sources for time zone and daylight saving time data"
-arch=('i686' 'x86_64')
-url="http://www.iana.org/time-zones"
-license=('GPL')
-depends=()
-makedepends=()
-optdepends=('bash: required by tzselect')
-options=('!emptydirs')
-source=(#http://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz
-		ftp://munnari.oz.au/pub/tzcode${_tzcode}.tar.gz
-        #http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz
-        ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz
-        Makefile.patch)
-md5sums=('6137322ffd36e1fd5128885be1c57008'
-         '0615fd29def380a917e528433c820368'
-         'a64ed97d1fc03c66ee8612c0d9f40507')
-
-build() {
-  cd ${srcdir}
-
-  tar -xf tzcode${_tzcode}.tar.gz
-  tar -xf ${pkgname}${_tzdata}.tar.gz
-
-  patch -Np1 -i "${srcdir}/Makefile.patch"
-
-  make
-}
-
-check() {
-  cd ${srcdir}
-  make -k check # || /bin/true
-}
-
-package() {
-  cd ${srcdir}
-  make DESTDIR="${pkgdir}" install
-
-  rm "${pkgdir}/usr/share/zoneinfo/localtime"
-}
diff --git a/testing/udev/0001-reinstate-TIMEOUT-handling.patch b/testing/udev/0001-reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 9b251b283..000000000
--- a/testing/udev/0001-reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 86617453cd78bf88d347f0e75a5be8b5ebac6c2e Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Thu, 15 Mar 2012 02:12:43 +0100
-Subject: [PATCH] reinstate TIMEOUT= handling
-
-This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
-57c6f8ae5f52a6e8ffc66a54966346f733dded39.
-
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- src/libudev-device.c  |   19 +++++++++++++++++++
- src/libudev-private.h |    1 +
- src/udevd.c           |   13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev-device.c b/src/libudev-device.c
-index 10f28b8..639c367 100644
---- a/src/libudev-device.c
-+++ b/src/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
-         struct udev_list tags_list;
-         unsigned long long int seqnum;
-         unsigned long long int usec_initialized;
-+        int timeout;
-         int devlink_priority;
-         int refcount;
-         dev_t devnum;
-@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
-         return 0;
- }
- 
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+        return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+        char num[32];
-+
-+        udev_device->timeout = timeout;
-+        snprintf(num, sizeof(num), "%u", timeout);
-+        udev_device_add_property(udev_device, "TIMEOUT", num);
-+        return 0;
-+}
-+
- const char *udev_device_get_devpath_old(struct udev_device *udev_device)
- {
-         return udev_device->devpath_old;
-@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
-                 udev_device_set_devpath_old(udev_device, &property[12]);
-         } else if (strncmp(property, "SEQNUM=", 7) == 0) {
-                 udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
-+        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (strncmp(property, "IFINDEX=", 8) == 0) {
-                 udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (strncmp(property, "DEVMODE=", 8) == 0) {
-@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev)
-         udev_list_init(udev, &udev_device->sysattr_value_list, true);
-         udev_list_init(udev, &udev_device->sysattr_list, false);
-         udev_list_init(udev, &udev_device->tags_list, true);
-+        udev_device->timeout = -1;
-         udev_device->watch_handle = -1;
-         /* copy global properties */
-         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev-private.h b/src/libudev-private.h
-index 5f5c64a..ec63b67 100644
---- a/src/libudev-private.h
-+++ b/src/libudev-private.h
-@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udevd.c b/src/udevd.c
-index 1702217..88e9272 100644
---- a/src/udevd.c
-+++ b/src/udevd.c
-@@ -401,7 +401,7 @@ out:
-         }
- }
- 
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
-         struct udev_list_node *loop;
- 
-@@ -427,7 +427,7 @@ static void event_run(struct event *event)
-                 return;
-         }
- 
--        if (children >= children_max) {
-+        if (!force && children >= children_max) {
-                 if (children_max > 1)
-                         info(event->udev, "maximum number (%i) of children reached\n", children);
-                 return;
-@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev)
- 
-         event->state = EVENT_QUEUED;
-         udev_list_node_append(&event->node, &event_list);
-+
-+        /* run all events with a timeout set immediately */
-+        if (udev_device_get_timeout(dev) > 0) {
-+                event_run(event, true);
-+                return 0;
-+        }
-+
-         return 0;
- }
- 
-@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev)
-                         continue;
-                 }
- 
--                event_run(event);
-+                event_run(event, false);
-         }
- }
- 
--- 
-1.7.9.4
-
diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD
deleted file mode 100644
index 0fc3645c1..000000000
--- a/testing/usbutils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 153397 2012-03-12 21:43:35Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
-pkgname=usbutils
-pkgver=005
-pkgrel=1
-pkgdesc="USB Device Utilities"
-arch=(i686 x86_64)
-license=('GPL')
-groups=('base')
-depends=('libusb')
-optdepends=('python2: for lsusb.py usage'
-            'coreutils: for lsusb.py usage'
-            'wget: for update-usbids.sh usage')
-url="http://linux-usb.sourceforge.net/"
-# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        fix-python2.patch)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # patch lsusb.py to use correct usb.ids file and python2 interpreter
-  patch -Np1 -i $srcdir/fix-python2.patch
-  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-md5sums=('6a21f7b6c02b76df5e8a7c208d746654'
-         '45766196895b4cc50b53cd56e1bbf3d1')
diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch
deleted file mode 100644
index 7e2875e99..000000000
--- a/testing/usbutils/fix-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- usbutils-002/lsusb.py	2010-12-16 01:07:09.000000000 +0100
-+++ usbutils-002/lsusb.py	2011-04-09 22:43:59.043828595 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # lsusb.py
- # Displays your USB devices in reasonable form.
- # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
-@@ -16,7 +16,7 @@
- warnsort = False
- 
- prefix = "/sys/bus/usb/devices/"
--usbids = "/usr/share/usb.ids"
-+usbids = "/usr/share/hwdata/usb.ids"
- 
- esc = chr(27)
- norm = esc + "[0;0m"
diff --git a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch b/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch
deleted file mode 100644
index 3b830a2ad..000000000
--- a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 28074a0952469aebf021821d95238cfb964d13ff Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 21:26:11 +0100
-Subject: [PATCH 09/12] lib/canonicalize: always remove tailing slash
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- lib/canonicalize.c |   13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/lib/canonicalize.c b/lib/canonicalize.c
-index ab32c10..fd18af4 100644
---- a/lib/canonicalize.c
-+++ b/lib/canonicalize.c
-@@ -174,9 +174,16 @@ canonicalize_path(const char *path)
- 	if (path == NULL)
- 		return NULL;
- 
--	if (!myrealpath(path, canonical, PATH_MAX+1))
--		return strdup(path);
--
-+	if (!myrealpath(path, canonical, PATH_MAX+1)) {
-+		char *res = strdup(path);
-+		if (res) {
-+			p = strrchr(res, '/');
-+			/* delete trailing slash */
-+			if (p && p > res && *(p + 1) == '\0')
-+				*p = '\0';
-+		}
-+		return res;
-+	}
- 
- 	p = strrchr(canonical, '/');
- 	if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) {
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch b/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch
deleted file mode 100644
index 97f5dc925..000000000
--- a/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 772cce373f693096c2ae6f156306acf9e20c09e8 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 28 Feb 2012 00:02:30 +0100
-Subject: [PATCH] libmount: allow empty source for mount(2) syscall
-
-Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797438
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/context_mount.c |    4 +++-
- sys-utils/mount.c            |    6 +++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
-index a0c5951..098243b 100644
---- a/libmount/src/context_mount.c
-+++ b/libmount/src/context_mount.c
-@@ -451,8 +451,10 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type)
- 	src = mnt_fs_get_srcpath(cxt->fs);
- 	target = mnt_fs_get_target(cxt->fs);
- 
--	if (!src || !target)
-+	if (!target)
- 		return -EINVAL;
-+	if (!src)
-+		src = "none";
- 
- 	type = try_type ? : mnt_fs_get_fstype(cxt->fs);
- 
-diff --git a/sys-utils/mount.c b/sys-utils/mount.c
-index 3fbac04..23abc91 100644
---- a/sys-utils/mount.c
-+++ b/sys-utils/mount.c
-@@ -347,7 +347,11 @@ try_readonly:
- 			return MOUNT_EX_USAGE;
- 		}
- 
--		if (src == NULL || tgt == NULL) {
-+		/*
-+		 * TODO: add mnt_context_fstab_applied() to check if we found
-+		 *       target/source in the file.
-+		 */
-+		if (!tgt) {
- 			if (mflags & MS_REMOUNT)
- 				warnx(_("%s not mounted"), src ? src : tgt);
- 			else
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch b/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch
deleted file mode 100644
index 05961aa35..000000000
--- a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 59e32a1f240c5f6a1d64d5e71a4a357245c34eaf Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 20:25:43 +0100
-Subject: [PATCH 07/12] libmount: canonicalize all paths from (fs)tab
-
-Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797216
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/tab.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmount/src/tab.c b/libmount/src/tab.c
-index 37f47bd..f10c1de 100644
---- a/libmount/src/tab.c
-+++ b/libmount/src/tab.c
-@@ -456,7 +456,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
- 		char *p;
- 
--		if (!fs->target || !mnt_fs_is_swaparea(fs) ||
-+		if (!fs->target || mnt_fs_is_swaparea(fs) ||
- 		    (*fs->target == '/' && *(fs->target + 1) == '\0'))
- 		       continue;
- 
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch b/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch
deleted file mode 100644
index 46ff55260..000000000
--- a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6eba938376c2c870d9258ef9d7b6a3690cfa78dd Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 22:52:45 +0100
-Subject: [PATCH 11/12] libmount: canonicalize targets from fstab on mount -a
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/tab.c |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/libmount/src/tab.c b/libmount/src/tab.c
-index 66a9e4d..21b05c7 100644
---- a/libmount/src/tab.c
-+++ b/libmount/src/tab.c
-@@ -830,8 +830,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- {
- 	char *root = NULL;
- 	struct libmnt_fs *src_fs;
--	const char *src, *tgt;
--	char *xsrc = NULL;
-+	const char *src;
-+	char *xsrc = NULL, *tgt;
- 	int flags = 0, rc = 0;
- 
- 	assert(tb);
-@@ -852,7 +852,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 		src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fstab_fs),
- 					      tb->cache);
- 
--	tgt = mnt_fs_get_target(fstab_fs);
-+	tgt = mnt_resolve_path(mnt_fs_get_target(fstab_fs), tb->cache);
- 
- 	if (tgt && src && root) {
- 		struct libmnt_iter itr;
-@@ -870,7 +870,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 			 * network filesystem source paths.
- 			 */
- 			if (t && s && r &&
--			    strcmp(t, tgt) == 0 &&
-+			    streq_except_trailing_slash(t, tgt) &&
- 			    streq_except_trailing_slash(s, src) &&
- 			    strcmp(r, root) == 0)
- 				break;
-@@ -881,6 +881,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 
- 	if (xsrc && !tb->cache)
- 		free(xsrc);
-+	if (!tb->cache)
-+		free(tgt);
- 
- 	free(root);
- 	return rc;
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch b/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch
deleted file mode 100644
index 9041ab742..000000000
--- a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9bf9690114b7432144caf815e149e35640bc3ad0 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 27 Feb 2012 16:43:12 +0100
-Subject: [PATCH] libmount: use mount.<type> -s for NFS only
-
-Unfortunately, it seems that for example mount.cifs don't care about
-the API, so we need exception like the original mount(8).
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/context_mount.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
-index 8cbc25b..a0c5951 100644
---- a/libmount/src/context_mount.c
-+++ b/libmount/src/context_mount.c
-@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt)
- 		args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */
- 		args[i++] = mnt_fs_get_target(cxt->fs);	/* 3 */
- 
--		if (mnt_context_is_sloppy(cxt))
-+		/*
-+		 * TODO: remove the exception for "nfs", -s is documented
-+		 *       for years should be usable everywhere.
-+		 */
-+		if (mnt_context_is_sloppy(cxt) &&
-+		    type && startswith(type, "nfs"))
- 			args[i++] = "-s";		/* 4 */
- 		if (mnt_context_is_fake(cxt))
- 			args[i++] = "-f";		/* 5 */
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch b/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch
deleted file mode 100644
index 274246416..000000000
--- a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 16b73aae8cb73df2974fd75c2a42ec3b92535851 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 23:03:22 +0100
-Subject: [PATCH 12/12] mount: (new) cleanup mount -a return codes
-
-New return codes:
-
-  0 : all mounted (or all ignored)
- 64 : some mounted, some failed
- 32 : all failed
-
-Note that already mounted or ignored (filtered out by -t or -O)
-filesystems don't affect the final return code.
-
-The original mount(8) returns 0 instead of 64, so the situation
-"some mounted, some failed" cannot be detected.
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/mount.8 |    4 ++++
- sys-utils/mount.c |   23 +++++++++++++++++------
- 2 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
-index f1cff74..d18881b 100644
---- a/sys-utils/mount.8
-+++ b/sys-utils/mount.8
-@@ -2759,6 +2759,10 @@ mount failure
- .TP
- .BR 64
- some mount succeeded
-+.RE
-+
-+The command mount -a returns 0 (all success), 32 (all failed) or 64 (some
-+failed, some success).
- 
- .SH NOTES
- The syntax of external mount helpers is:
-diff --git a/sys-utils/mount.c b/sys-utils/mount.c
-index 17991b0..3fbac04 100644
---- a/sys-utils/mount.c
-+++ b/sys-utils/mount.c
-@@ -182,6 +182,8 @@ static int mount_all(struct libmnt_context *cxt)
- 	struct libmnt_fs *fs;
- 	int mntrc, ignored, rc = MOUNT_EX_SUCCESS;
- 
-+	int nsucc = 0, nerrs = 0;
-+
- 	itr = mnt_new_iter(MNT_ITER_FORWARD);
- 	if (!itr) {
- 		warn(_("failed to initialize libmount iterator"));
-@@ -197,31 +199,40 @@ static int mount_all(struct libmnt_context *cxt)
- 				printf(ignored == 1 ? _("%-25s: ignored\n") :
- 						      _("%-25s: already mounted\n"),
- 						tgt);
--
- 		} else if (mnt_context_is_fork(cxt)) {
- 			if (mnt_context_is_verbose(cxt))
- 				printf("%-25s: mount successfully forked\n", tgt);
- 		} else {
--			rc |= mk_exit_code(cxt, mntrc);
-+			mk_exit_code(cxt, mntrc);	/* to print warnings */
- 
- 			if (mnt_context_get_status(cxt)) {
--				rc |= MOUNT_EX_SOMEOK;
-+				nsucc++;
- 
- 				if (mnt_context_is_verbose(cxt))
- 					printf("%-25s: successfully mounted\n", tgt);
--			}
-+			} else
-+				nerrs++;
- 		}
- 	}
- 
- 	if (mnt_context_is_parent(cxt)) {
- 		/* wait for mount --fork children */
--		int nerrs = 0, nchildren = 0;
-+		int nchildren = 0;
-+
-+		nerrs = 0, nsucc = 0;
- 
- 		rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs);
- 		if (!rc && nchildren)
--			rc = nchildren == nerrs ? MOUNT_EX_FAIL : MOUNT_EX_SOMEOK;
-+			nsucc = nchildren - nerrs;
- 	}
- 
-+	if (nerrs == 0)
-+		rc = MOUNT_EX_SUCCESS;		/* all success */
-+	else if (nsucc == 0)
-+		rc = MOUNT_EX_FAIL;		/* all failed */
-+	else
-+		rc = MOUNT_EX_SOMEOK;		/* some success, some failed */
-+
- 	mnt_free_iter(itr);
- 	return rc;
- }
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/stable-fixes-2.21.patch b/testing/util-linux/stable-fixes-2.21.patch
deleted file mode 100644
index 3c6c32483..000000000
--- a/testing/util-linux/stable-fixes-2.21.patch
+++ /dev/null
@@ -1,1516 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d3b298c..9da5b24 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -387,6 +387,8 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier],
-       [scanf_cv_alloc_modifier=as],
-       [scanf_cv_alloc_modifier=no]
-     )
-+    ,
-+    [scanf_cv_alloc_modifier=no]
-   )
- )
- 
-@@ -833,6 +835,8 @@ AC_ARG_ENABLE([ddate],
- )
- UL_BUILD_INIT([ddate])
- AM_CONDITIONAL(BUILD_DDATE, test "x$build_ddate" = xyes)
-+ruman1dir='${mandir}/ru/man1'
-+AC_SUBST([ruman1dir])
- 
- 
- AC_ARG_ENABLE([agetty],
-diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
-index 9f9e091..e58e2ff 100644
---- a/fdisk/fdiskbsdlabel.h
-+++ b/fdisk/fdiskbsdlabel.h
-@@ -46,7 +46,7 @@
- 
- #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
- 
--#if defined (i386) || defined (__sparc__) || defined (__arm__) || \
-+#if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
-     defined (__mips__) || defined (__s390__) || defined (__sh__) || \
-     defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
- #define BSD_LABELSECTOR   1
-diff --git a/include/list.h b/include/list.h
-index 3ce46ca..d8c3bf0 100644
---- a/include/list.h
-+++ b/include/list.h
-@@ -166,6 +166,10 @@ _INLINE_ void list_splice(struct list_head *list, struct list_head *head)
- #define list_entry(ptr, type, member) \
- 	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
- 
-+
-+#define list_first_entry(head, type, member) \
-+	((head) && (head)->next != (head) ? list_entry((head)->next, type, member) : NULL)
-+
- /**
-  * list_for_each - iterate over elements in a list
-  * @pos:	the &struct list_head to use as a loop counter.
-diff --git a/lib/canonicalize.c b/lib/canonicalize.c
-index ab32c10..fd18af4 100644
---- a/lib/canonicalize.c
-+++ b/lib/canonicalize.c
-@@ -174,9 +174,16 @@ canonicalize_path(const char *path)
- 	if (path == NULL)
- 		return NULL;
- 
--	if (!myrealpath(path, canonical, PATH_MAX+1))
--		return strdup(path);
--
-+	if (!myrealpath(path, canonical, PATH_MAX+1)) {
-+		char *res = strdup(path);
-+		if (res) {
-+			p = strrchr(res, '/');
-+			/* delete trailing slash */
-+			if (p && p > res && *(p + 1) == '\0')
-+				*p = '\0';
-+		}
-+		return res;
-+	}
- 
- 	p = strrchr(canonical, '/');
- 	if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) {
-diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
-index 763f75c..6bd69d3 100644
---- a/libblkid/src/probe.c
-+++ b/libblkid/src/probe.c
-@@ -388,6 +388,7 @@ void blkid_reset_probe(blkid_probe pr)
- 		return;
- 
- 	blkid_probe_reset_vals(pr);
-+	blkid_probe_set_wiper(pr, 0, 0);
- 
- 	pr->cur_chain = NULL;
- 
-@@ -989,7 +990,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun)
- 		len = sizeof(buf);
- 
- 	DBG(DEBUG_LOWPROBE, printf(
--	    "wiping [offset=0x%jx, len=%zd, chain=%s, idx=%d, dryrun=%s]\n",
-+	    "do_wipe [offset=0x%jx, len=%zd, chain=%s, idx=%d, dryrun=%s]\n",
- 	    offset, len, chn->driver->name, chn->idx, dryrun ? "yes" : "not"));
- 
- 	l = lseek(fd, offset, SEEK_SET);
-@@ -1008,10 +1009,23 @@ int blkid_do_wipe(blkid_probe pr, int dryrun)
- 		if (chn->idx >= 0) {
- 			chn->idx--;
- 			DBG(DEBUG_LOWPROBE,
--				printf("wipe: moving %s chain index to %d\n",
-+				printf("do_wipe: moving %s chain index to %d\n",
- 				chn->driver->name,
- 				chn->idx));
- 		}
-+		if (chn->idx == -1) {
-+			/* blkid_do_probe() goes to the next chain if the index
-+			 * of the current chain is -1, so we have to set the
-+			 * chain pointer to the previos chain.
-+			 */
-+			size_t idx = chn->driver->id > 0 ?
-+					chn->driver->id - 1 : 0;
-+
-+			if (idx > 0)
-+				pr->cur_chain = &pr->chains[idx];
-+			else if (idx == 0)
-+				pr->cur_chain = NULL;
-+		}
- 	}
- 	return 0;
- }
-@@ -1579,8 +1593,9 @@ size_t blkid_rtrim_whitespace(unsigned char *str)
-  * for later resolution to conflicts between superblocks.
-  *
-  * For example we found valid LVM superblock, LVM wipes 8KiB at the begin of
-- * the device. If we found another signature (for example MBR) this wiped area
-- * then the signature has been added later and LVM superblock should be ignore.
-+ * the device. If we found another signature (for example MBR) within the
-+ * wiped area then the signature has been added later and LVM superblock
-+ * should be ignore.
-  *
-  * Note that this heuristic is not 100% reliable, for example "pvcreate --zero
-  * n" allows to keep the begin of the device unmodified. It's probably better
-@@ -1588,6 +1603,16 @@ size_t blkid_rtrim_whitespace(unsigned char *str)
-  * than for conflicts between filesystem superblocks -- existence of unwanted
-  * partition table is very unusual, because PT is pretty visible (parsed and
-  * interpreted by kernel).
-+ *
-+ * Note that we usually expect only one signature on the device, it means that
-+ * we have to remember only one wiped area from previously successfully
-+ * detected signature.
-+ *
-+ * blkid_probe_set_wiper() -- defines wiped area (e.g. LVM)
-+ * blkid_probe_use_wiper() -- try to use area (e.g. MBR)
-+ *
-+ * Note that there is not relation between _wiper and blkid_to_wipe().
-+ *
-  */
- void blkid_probe_set_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size)
- {
-@@ -1638,12 +1663,17 @@ int blkid_probe_is_wiped(blkid_probe pr, struct blkid_chain **chn,
- 	return 0;
- }
- 
-+/*
-+ *  Try to use any area -- if the area has been previously wiped then the
-+ *  previous probing result should be ignored (reseted).
-+ */
- void blkid_probe_use_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size)
- {
- 	struct blkid_chain *chn = NULL;
- 
- 	if (blkid_probe_is_wiped(pr, &chn, off, size) && chn) {
--		DBG(DEBUG_LOWPROBE, printf("wiped area detected -- ignore previous results\n"));
-+		DBG(DEBUG_LOWPROBE, printf("previously wiped area modified "
-+				       " -- ignore previous results\n"));
- 		blkid_probe_set_wiper(pr, 0, 0);
- 		blkid_probe_chain_reset_vals(pr, chn);
- 	}
-diff --git a/libmount/src/context.c b/libmount/src/context.c
-index 1f30292..f97dd36 100644
---- a/libmount/src/context.c
-+++ b/libmount/src/context.c
-@@ -1165,6 +1165,10 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt)
- 
- 	src = mnt_fs_get_source(cxt->fs);
- 
-+	if (!src && (cxt->mountflags & MS_PROPAGATION))
-+		/* mount --make-{shared,private,...} */
-+		return mnt_fs_set_source(cxt->fs, "none");
-+
- 	/* ignore filesystems without source or filesystems
- 	 * where the source is quasi-path (//foo/bar)
- 	 */
-@@ -1203,7 +1207,7 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt)
- 
- 	if ((cxt->mountflags & (MS_BIND | MS_MOVE | MS_PROPAGATION)) ||
- 	    mnt_fs_is_pseudofs(cxt->fs)) {
--		DBG(CXT, mnt_debug_h(cxt, "PROPAGATION/pseudo FS source: %s", path));
-+		DBG(CXT, mnt_debug_h(cxt, "BIND/MOVE/pseudo FS source: %s", path));
- 		return rc;
- 	}
- 
-diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
-index 8cbc25b..c56ffd4 100644
---- a/libmount/src/context_mount.c
-+++ b/libmount/src/context_mount.c
-@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt)
- 		args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */
- 		args[i++] = mnt_fs_get_target(cxt->fs);	/* 3 */
- 
--		if (mnt_context_is_sloppy(cxt))
-+		/*
-+		 * TODO: remove the exception for "nfs", -s is documented
-+		 *       for years should be usable everywhere.
-+		 */
-+		if (mnt_context_is_sloppy(cxt) &&
-+		    type && startswith(type, "nfs"))
- 			args[i++] = "-s";		/* 4 */
- 		if (mnt_context_is_fake(cxt))
- 			args[i++] = "-f";		/* 5 */
-@@ -446,9 +451,14 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type)
- 	src = mnt_fs_get_srcpath(cxt->fs);
- 	target = mnt_fs_get_target(cxt->fs);
- 
--	if (!src || !target)
-+	if (!target)
- 		return -EINVAL;
--
-+	if (!src) {
-+		/* unnecessary, should be already resolved in
-+		 * mnt_context_prepare_srcpath(), but for sure... */
-+		DBG(CXT, mnt_debug_h(cxt, "WARNING: source is NULL -- using \"none\"!"));
-+		src = "none";
-+	}
- 	type = try_type ? : mnt_fs_get_fstype(cxt->fs);
- 
- 	if (!(flags & MS_MGC_MSK))
-diff --git a/libmount/src/fs.c b/libmount/src/fs.c
-index a28e66c..19650cb 100644
---- a/libmount/src/fs.c
-+++ b/libmount/src/fs.c
-@@ -304,11 +304,7 @@ int __mnt_fs_set_source_ptr(struct libmnt_fs *fs, char *source)
- 
- 	assert(fs);
- 
--	if (source && !strcmp(source, "none")) {
--		free(source);
--		source = NULL;
--
--	} else if (source && strchr(source, '=')) {
-+	if (source && strchr(source, '=')) {
- 		if (blkid_parse_tag_string(source, &t, &v) != 0)
- 			return -1;
- 	}
-@@ -341,6 +337,7 @@ int mnt_fs_set_source(struct libmnt_fs *fs, const char *source)
- 
- 	if (!fs)
- 		return -EINVAL;
-+
- 	if (source) {
- 		p = strdup(source);
- 		if (!p)
-@@ -353,6 +350,41 @@ int mnt_fs_set_source(struct libmnt_fs *fs, const char *source)
- 	return rc;
- }
- 
-+/*
-+ * Compares @fs source path with @path. The tailing slash is ignored.
-+ * See also mnt_fs_match_source().
-+ *
-+ * Returns: 1 if @fs source path equal to @path, otherwise 0.
-+ */
-+int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path)
-+{
-+	const char *p;
-+
-+	if (!fs)
-+		return 0;
-+
-+	p = mnt_fs_get_srcpath(fs);
-+
-+	if (!mnt_fs_is_pseudofs(fs))
-+		return streq_except_trailing_slash(p, path);
-+
-+	if (!p && !path)
-+		return 1;
-+
-+	return p && path && strcmp(p, path) == 0;
-+}
-+
-+/*
-+ * Compares @fs target path with @path. The tailing slash is ignored.
-+ * See also mnt_fs_match_target().
-+ *
-+ * Returns: 1 if @fs target path equal to @path, otherwise 0.
-+ */
-+int mnt_fs_streq_target(struct libmnt_fs *fs, const char *path)
-+{
-+	return fs && streq_except_trailing_slash(mnt_fs_get_target(fs), path);
-+}
-+
- /**
-  * mnt_fs_get_tag:
-  * @fs: fs
-@@ -1114,7 +1146,7 @@ int mnt_fs_match_target(struct libmnt_fs *fs, const char *target,
- 		return 0;
- 
- 	/* 1) native paths */
--	rc = !strcmp(target, fs->target);
-+	rc = mnt_fs_streq_target(fs, target);
- 
- 	if (!rc && cache) {
- 		/* 2) - canonicalized and non-canonicalized */
-@@ -1146,10 +1178,6 @@ int mnt_fs_match_target(struct libmnt_fs *fs, const char *target,
-  * The 2nd, 3rd and 4th attempts are not performed when @cache is NULL. The
-  * 2nd and 3rd attempts are not performed if @fs->source is tag.
-  *
-- * Note that valid source path is NULL; the libmount uses NULL instead of
-- * "none".  The "none" is used in /proc/{mounts,self/mountninfo} for pseudo
-- * filesystems.
-- *
-  * Returns: 1 if @fs source is equal to @source else 0.
-  */
- int mnt_fs_match_source(struct libmnt_fs *fs, const char *source,
-@@ -1161,15 +1189,15 @@ int mnt_fs_match_source(struct libmnt_fs *fs, const char *source,
- 	if (!fs)
- 		return 0;
- 
--	/* undefined source -- "none" in /proc */
--	if (source == NULL && fs->source == NULL)
-+	/* 1) native paths... */
-+	if (mnt_fs_streq_srcpath(fs, source) == 1)
- 		return 1;
- 
--	if (source == NULL || fs->source == NULL)
-+	if (!source || !fs->source)
- 		return 0;
- 
--	/* 1) native paths/tags */
--	if (streq_except_trailing_slash(source, fs->source))
-+	/* ... and tags */
-+	if (fs->tagname && strcmp(source, fs->source) == 0)
- 		return 1;
- 
- 	if (!cache)
-@@ -1183,7 +1211,7 @@ int mnt_fs_match_source(struct libmnt_fs *fs, const char *source,
- 
- 	/* 2) canonicalized and native */
- 	src = mnt_fs_get_srcpath(fs);
--	if (src && streq_except_trailing_slash(cn, src))
-+	if (src && mnt_fs_streq_srcpath(fs, cn))
- 		return 1;
- 
- 	/* 3) canonicalized and canonicalized */
-diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
-index fa0edf5..a7b5c0d 100644
---- a/libmount/src/mountP.h
-+++ b/libmount/src/mountP.h
-@@ -367,6 +367,11 @@ extern struct libmnt_fs *mnt_copy_mtab_fs(const struct libmnt_fs *fs);
- extern int __mnt_fs_set_source_ptr(struct libmnt_fs *fs, char *source);
- extern int __mnt_fs_set_fstype_ptr(struct libmnt_fs *fs, char *fstype);
- 
-+/* exported in v2.22 */
-+extern int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path);
-+extern int mnt_fs_streq_target(struct libmnt_fs *fs, const char *path);
-+
-+
- /* context.c */
- extern int mnt_context_prepare_srcpath(struct libmnt_context *cxt);
- extern int mnt_context_prepare_target(struct libmnt_context *cxt);
-diff --git a/libmount/src/tab.c b/libmount/src/tab.c
-index 37f47bd..f3ec573 100644
---- a/libmount/src/tab.c
-+++ b/libmount/src/tab.c
-@@ -286,6 +286,11 @@ int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr,
- 
- 		id = mnt_fs_get_id(fs);
- 
-+		/* avoid infinite loop. This only happens in rare cases
-+		 * such as in early userspace when the rootfs is its own parent */
-+		if (id == parent_id)
-+			continue;
-+
- 		if ((!lastchld_id || id > lastchld_id) &&
- 		    (!*chld || id < chld_id)) {
- 			*chld = fs;
-@@ -438,7 +443,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
- 	/* native @target */
- 	mnt_reset_iter(&itr, direction);
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
--		if (fs->target && strcmp(fs->target, path) == 0)
-+		if (mnt_fs_streq_target(fs, path))
- 			return fs;
- 	}
- 	if (!tb->cache || !(cn = mnt_resolve_path(path, tb->cache)))
-@@ -447,7 +452,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
- 	/* canonicalized paths in struct libmnt_table */
- 	mnt_reset_iter(&itr, direction);
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
--		if (fs->target && strcmp(fs->target, cn) == 0)
-+		if (mnt_fs_streq_target(fs, cn))
- 			return fs;
- 	}
- 
-@@ -456,12 +461,13 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
- 		char *p;
- 
--		if (!fs->target || !mnt_fs_is_swaparea(fs) ||
-+		if (!fs->target || mnt_fs_is_swaparea(fs) ||
- 		    (*fs->target == '/' && *(fs->target + 1) == '\0'))
- 		       continue;
- 
- 		p = mnt_resolve_path(fs->target, tb->cache);
--		if (strcmp(cn, p) == 0)
-+		/* both canonicalized, strcmp() is fine here */
-+		if (p && strcmp(cn, p) == 0)
- 			return fs;
- 	}
- 	return NULL;
-@@ -480,9 +486,8 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
-  * The 2nd, 3rd and 4th iterations are not performed when @tb cache is not
-  * set (see mnt_table_set_cache()).
-  *
-- * Note that valid source path is NULL; the libmount uses NULL instead of
-- * "none".  The "none" is used in /proc/{mounts,self/mountninfo} for pseudo
-- * filesystems.
-+ * Note that NULL is a valid source path; it will be replaced with "none". The
-+ * "none" is used in /proc/{mounts,self/mountinfo} for pseudo filesystems.
-  *
-  * Returns: a tab entry or NULL.
-  */
-@@ -501,16 +506,10 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa
- 	/* native paths */
- 	mnt_reset_iter(&itr, direction);
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
--		const char *src = mnt_fs_get_source(fs);
--
--		p = mnt_fs_get_srcpath(fs);
--
--		if (path == NULL && src == NULL)
--			return fs;			/* source is "none" */
--		if (path && p && streq_except_trailing_slash(p, path))
-+		if (mnt_fs_streq_srcpath(fs, path))
- 			return fs;
--		if (!p && src)
--			ntags++;			/* mnt_fs_get_srcpath() returs nothing, it's TAG */
-+		if (mnt_fs_get_tag(fs, NULL, NULL) == 0)
-+			ntags++;
- 	}
- 
- 	if (!path || !tb->cache || !(cn = mnt_resolve_path(path, tb->cache)))
-@@ -520,8 +519,7 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa
- 	if (ntags < mnt_table_get_nents(tb)) {
- 		mnt_reset_iter(&itr, direction);
- 		while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
--			p = mnt_fs_get_srcpath(fs);
--			if (p && streq_except_trailing_slash(p, cn))
-+			if (mnt_fs_streq_srcpath(fs, cn))
- 				return fs;
- 		}
- 	}
-@@ -552,7 +550,9 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa
- 				 if (mnt_fs_get_tag(fs, &t, &v))
- 					 continue;
- 				 x = mnt_resolve_tag(t, v, tb->cache);
--				 if (x && streq_except_trailing_slash(x, cn))
-+
-+				 /* both canonicalized, strcmp() is fine here */
-+				 if (x && strcmp(x, cn) == 0)
- 					 return fs;
- 			 }
- 		}
-@@ -567,7 +567,9 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa
- 			p = mnt_fs_get_srcpath(fs);
- 			if (p)
- 				p = mnt_resolve_path(p, tb->cache);
--			if (p && streq_except_trailing_slash(cn, p))
-+
-+			/* both canonicalized, strcmp() is fine here */
-+			if (p && strcmp(p, cn) == 0)
- 				return fs;
- 		}
- 	}
-@@ -702,16 +704,18 @@ struct libmnt_fs *mnt_table_find_pair(struct libmnt_table *tb, const char *sourc
- }
- 
- /*
-- * @tb: /proc/self/mountinfo
-- * @fs: filesystem
-- * @mountflags: MS_BIND or 0
-- * @fsroot: fs-root that will be probably used in the mountinfo file
-+ * tb: /proc/self/mountinfo
-+ * fs: filesystem
-+ * mountflags: MS_BIND or 0
-+ * fsroot: fs-root that will be probably used in the mountinfo file
-  *          for @fs after mount(2)
-  *
-  * For btrfs subvolumes this function returns NULL, but @fsroot properly set.
-  *
-  * Returns: entry from @tb that will be used as a source for @fs if the @fs is
-  *          bindmount.
-+ *
-+ * Don't export to library API!
-  */
- struct libmnt_fs *mnt_table_get_fs_root(struct libmnt_table *tb,
- 					struct libmnt_fs *fs,
-@@ -814,6 +818,20 @@ err:
- 	return NULL;
- }
- 
-+static int is_mountinfo(struct libmnt_table *tb)
-+{
-+	struct libmnt_fs *fs;
-+
-+	if (!tb)
-+		return 0;
-+
-+	fs = list_first_entry(&tb->ents, struct libmnt_fs, ents);
-+	if (fs && mnt_fs_is_kernel(fs) && mnt_fs_get_root(fs))
-+		return 1;
-+
-+	return 0;
-+}
-+
- /**
-  * mnt_table_is_mounted:
-  * @tb: /proc/self/mountinfo file
-@@ -829,10 +847,9 @@ err:
- int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- {
- 	char *root = NULL;
--	struct libmnt_fs *src_fs;
--	const char *src, *tgt;
--	char *xsrc = NULL;
--	int flags = 0, rc = 0;
-+	const char *src = NULL;
-+	char *xsrc = NULL, *tgt;
-+	int rc = 0;
- 
- 	assert(tb);
- 	assert(fstab_fs);
-@@ -840,39 +857,49 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 	if (mnt_fs_is_swaparea(fstab_fs))
- 		return 0;
- 
--	if (mnt_fs_get_option(fstab_fs, "bind", NULL, NULL) == 0)
--		flags = MS_BIND;
-+	if (is_mountinfo(tb)) {
-+		/* @tb is mountinfo, so we can try to use fs-roots */
-+		struct libmnt_fs *fs;
-+		int flags = 0;
-+
-+		if (mnt_fs_get_option(fstab_fs, "bind", NULL, NULL) == 0)
-+			flags = MS_BIND;
- 
--	src_fs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root);
--	if (src_fs)
--		src = mnt_fs_get_srcpath(src_fs);
-+		fs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root);
-+		if (fs)
-+			src = mnt_fs_get_srcpath(fs);
-+	}
-+
-+	if (src)
-+		src = xsrc = mnt_resolve_spec(src, tb->cache);
- 	else if (mnt_fs_is_pseudofs(fstab_fs))
- 		src = mnt_fs_get_source(fstab_fs);
- 	else
- 		src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fstab_fs),
- 					      tb->cache);
- 
--	tgt = mnt_fs_get_target(fstab_fs);
-+	tgt = mnt_resolve_path(mnt_fs_get_target(fstab_fs), tb->cache);
- 
--	if (tgt && src && root) {
-+	if (tgt && src) {
- 		struct libmnt_iter itr;
- 		struct libmnt_fs *fs;
- 
- 		mnt_reset_iter(&itr, MNT_ITER_FORWARD);
- 
- 		while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
--			const char *s = mnt_fs_get_srcpath(fs),
--				   *t = mnt_fs_get_target(fs),
--				   *r = mnt_fs_get_root(fs);
--
--			/*
--			 * Note that kernel can add tailing slash to the
--			 * network filesystem source paths.
--			 */
--			if (t && s && r &&
--			    strcmp(t, tgt) == 0 &&
--			    streq_except_trailing_slash(s, src) &&
--			    strcmp(r, root) == 0)
-+
-+			if (root) {
-+				/* mountinfo: compare root, source and target */
-+				const char *r = mnt_fs_get_root(fs);
-+
-+				if (r && strcmp(r, root) == 0 &&
-+				    mnt_fs_streq_srcpath(fs, src) &&
-+				    mnt_fs_streq_target(fs, tgt))
-+					break;
-+			}
-+			/* mtab: compare source and target */
-+			else if (mnt_fs_streq_srcpath(fs, src) &&
-+				 mnt_fs_streq_target(fs, tgt))
- 				break;
- 		}
- 		if (fs)
-@@ -881,6 +908,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 
- 	if (xsrc && !tb->cache)
- 		free(xsrc);
-+	if (!tb->cache)
-+		free(tgt);
- 
- 	free(root);
- 	return rc;
-diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
-index 0f618bb..28c8536 100644
---- a/libmount/src/tab_parse.c
-+++ b/libmount/src/tab_parse.c
-@@ -180,12 +180,7 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
- 		unmangle_string(fs->vfs_optstr);
- 		unmangle_string(fstype);
- 		unmangle_string(src);
--
--		if (!strcmp(fs->fs_optstr, "none")) {
--			free(fs->fs_optstr);
--			fs->fs_optstr = NULL;
--		} else
--			unmangle_string(fs->fs_optstr);
-+		unmangle_string(fs->fs_optstr);
- 
- 		rc = __mnt_fs_set_fstype_ptr(fs, fstype);
- 		if (!rc) {
-@@ -733,21 +728,14 @@ static struct libmnt_fs *mnt_table_merge_user_fs(struct libmnt_table *tb, struct
- 	mnt_reset_iter(&itr, MNT_ITER_BACKWARD);
- 
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
--		const char *s = mnt_fs_get_srcpath(fs),
--			   *t = mnt_fs_get_target(fs),
--			   *r = mnt_fs_get_root(fs);
-+		const char *r = mnt_fs_get_root(fs);
- 
- 		if (fs->flags & MNT_FS_MERGED)
- 			continue;
- 
--		/*
--		 * Note that kernel can add tailing slash to the network
--		 * filesystem source path
--		 */
--		if (s && t && r &&
--		    strcmp(t, target) == 0 &&
--		    streq_except_trailing_slash(s, src) &&
--		    strcmp(r, root) == 0)
-+		if (r && strcmp(r, root) == 0
-+		    && mnt_fs_streq_target(fs, target)
-+		    && mnt_fs_streq_srcpath(fs, src))
- 			break;
- 	}
- 
-diff --git a/libmount/src/utils.c b/libmount/src/utils.c
-index c7a1fd1..4d316d1 100644
---- a/libmount/src/utils.c
-+++ b/libmount/src/utils.c
-@@ -235,6 +235,7 @@ int mnt_fstype_is_pseudofs(const char *type)
- 	    strcmp(type, "binfmt_misc") == 0 ||
- 	    strcmp(type, "fuse.gvfs-fuse-daemon") == 0 ||
- 	    strcmp(type, "debugfs") == 0 ||
-+	    strcmp(type, "nfsd") == 0 ||
- 	    strcmp(type, "spufs") == 0)
- 		return 1;
- 	return 0;
-diff --git a/login-utils/login.c b/login-utils/login.c
-index 84d8b1b..4f448f8 100644
---- a/login-utils/login.c
-+++ b/login-utils/login.c
-@@ -128,6 +128,22 @@ static int timeout = LOGIN_TIMEOUT;
- static int child_pid = 0;
- static volatile int got_sig = 0;
- 
-+#ifdef LOGIN_CHOWN_VCS
-+/* true if the filedescriptor fd is a console tty, very Linux specific */
-+static int is_consoletty(int fd)
-+{
-+	struct stat stb;
-+
-+	if ((fstat(fd, &stb) >= 0)
-+	    && (major(stb.st_rdev) == TTY_MAJOR)
-+	    && (minor(stb.st_rdev) < 64)) {
-+		return 1;
-+	}
-+	return 0;
-+}
-+#endif
-+
-+
- /*
-  * Robert Ambrose writes:
-  * A couple of my users have a problem with login processes hanging around
-@@ -316,15 +332,15 @@ static void chown_tty(struct login_context *cxt)
- 
- #ifdef LOGIN_CHOWN_VCS
- 	if (is_consoletty(0)) {
--		if (chown(cxt->vcs, uid, gid))			/* vcs */
--			chown_err(cxt->vcs, uid, gid);
--		if (chmod(cxt->vcs, cxt->tty_mode))
--			chmod_err(cxt->vcs, cxt->tty_mode);
--
--		if (chown(cxt->vcsa, uid, gid))			/* vcsa */
--			chown_err(cxt->vcsa, uid, gid);
--		if (chmod(cxt->vcsa, cxt->tty_mode))
--			chmod_err(cxt->vcsa, cxt->tty_mode);
-+		if (chown(cxt->vcsn, uid, gid))			/* vcs */
-+			chown_err(cxt->vcsn, uid, gid);
-+		if (chmod(cxt->vcsn, cxt->tty_mode))
-+			chmod_err(cxt->vcsn, cxt->tty_mode);
-+
-+		if (chown(cxt->vcsan, uid, gid))			/* vcsa */
-+			chown_err(cxt->vcsan, uid, gid);
-+		if (chmod(cxt->vcsan, cxt->tty_mode))
-+			chmod_err(cxt->vcsan, cxt->tty_mode);
- 	}
- #endif
- }
-@@ -403,21 +419,6 @@ static void init_tty(struct login_context *cxt)
- }
- 
- 
--#ifdef LOGIN_CHOWN_VCS
--/* true if the filedescriptor fd is a console tty, very Linux specific */
--static int is_consoletty(int fd)
--{
--	struct stat stb;
--
--	if ((fstat(fd, &stb) >= 0)
--	    && (major(stb.st_rdev) == TTY_MAJOR)
--	    && (minor(stb.st_rdev) < 64)) {
--		return 1;
--	}
--	return 0;
--}
--#endif
--
- /*
-  * Log failed login attempts in _PATH_BTMP if that exists.
-  * Must be called only with username the name of an actual user.
-@@ -1145,13 +1146,10 @@ static void init_environ(struct login_context *cxt)
- 	setenv("TERM", termenv, 1);
- 
- 	if (pwd->pw_uid)
--		setenv("PATH", getlogindefs_str("ENV_PATH", _PATH_DEFPATH), 1);
--	else {
--		const char *x = getlogindefs_str("ENV_ROOTPATH", NULL);
--		if (!x)
--			x = getlogindefs_str("ENV_SUPATH", _PATH_DEFPATH_ROOT);
--		setenv("PATH", x, 1);
--	}
-+		logindefs_setenv("PATH", "ENV_PATH", _PATH_DEFPATH);
-+
-+	else if (logindefs_setenv("PATH", "ENV_ROOTPATH", NULL) != 0)
-+		logindefs_setenv("PATH", "ENV_SUPATH", _PATH_DEFPATH_ROOT);
- 
- 	/* mailx will give a funny error msg if you forget this one */
- 	len = snprintf(tmp, sizeof(tmp), "%s/%s", _PATH_MAILDIR, pwd->pw_name);
-diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c
-index fe590e9..e9517ac 100644
---- a/login-utils/logindefs.c
-+++ b/login-utils/logindefs.c
-@@ -211,6 +211,43 @@ const char *getlogindefs_str(const char *name, const char *dflt)
- 	return ptr->value;
- }
- 
-+/*
-+ * For compatibililty with shadow-utils we have tu support additional
-+ * syntax for environment variables in login.defs(5) file. The standard
-+ * syntax is:
-+ *
-+ *	ENV_FOO   data
-+ *
-+ * but shadow-utils supports also
-+ *
-+ *	ENV_FOO FOO=data
-+ *
-+ * the FOO= prefix has to be remove before we call setenv().
-+ */
-+int logindefs_setenv(const char *name, const char *conf, const char *dflt)
-+{
-+	const char *val = getlogindefs_str(conf, dflt);
-+	const char *p;
-+
-+	if (!val)
-+		return -1;
-+
-+	p = strchr(val, '=');
-+	if (p) {
-+		size_t sz = strlen(name);
-+
-+		if (strncmp(val, name, sz) == 0 && *(p + 1)) {
-+			val = p + 1;
-+			if (*val == '"')
-+				val++;
-+			if (!*val)
-+				val = dflt;
-+		}
-+	}
-+
-+	return val ? setenv(name, val, 1) : -1;
-+}
-+
- #ifdef TEST_PROGRAM
- int main(int argc, char *argv[])
- {
-diff --git a/login-utils/logindefs.h b/login-utils/logindefs.h
-index 37d19e1..163869d 100644
---- a/login-utils/logindefs.h
-+++ b/login-utils/logindefs.h
-@@ -5,5 +5,6 @@ extern int getlogindefs_bool(const char *name, int dflt);
- extern long getlogindefs_num(const char *name, long dflt);
- extern const char *getlogindefs_str(const char *name, const char *dflt);
- extern void free_getlogindefs_data(void);
-+extern int logindefs_setenv(const char *name, const char *conf, const char *dflt);
- 
- #endif /* UTIL_LINUX_LOGINDEFS_H */
-diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am
-index 799feca..281ec23 100644
---- a/man/ru/Makefile.am
-+++ b/man/ru/Makefile.am
-@@ -1,9 +1,6 @@
- include $(top_srcdir)/config/include-Makefile.am
- 
--mandir = @mandir@/ru
--
--dist_man_MANS =
--
- if BUILD_DDATE
--dist_man_MANS += ddate.1
-+ruman1_DATA = ddate.1
-+EXTRA_DIST = $(ruman1_DATA)
- endif
-diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
-index 028b19f..286d54b 100644
---- a/misc-utils/lsblk.8
-+++ b/misc-utils/lsblk.8
-@@ -59,7 +59,7 @@ Use key="value" output format.
- Use the raw output format.
- .IP "\fB\-t, \-\-topology\fP"
- Output info about block device topology.
--This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED".
-+This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE".
- .SH NOTES
- For the partitions are some information (e.g. queue attributes) inherited from
- parental device.
-diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
-index 8468b3f..54bf360 100644
---- a/misc-utils/lsblk.c
-+++ b/misc-utils/lsblk.c
-@@ -478,9 +478,14 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
- 	switch(id) {
- 	case COL_NAME:
- 		if (cxt->dm_name) {
--			snprintf(buf, sizeof(buf), "%s (%s)",
-+			if ((lsblk->tt->flags & TT_FL_RAW) ||
-+			    (lsblk->tt->flags & TT_FL_EXPORT))
-+				tt_line_set_data(ln, col, xstrdup(cxt->dm_name));
-+			else {
-+				snprintf(buf, sizeof(buf), "%s (%s)",
- 					cxt->dm_name, cxt->name);
--			tt_line_set_data(ln, col, xstrdup(buf));
-+				tt_line_set_data(ln, col, xstrdup(buf));
-+			}
- 			break;
- 		}
- 	case COL_KNAME:
-diff --git a/mount/fstab.5 b/mount/fstab.5
-index b0cd763..c618947 100644
---- a/mount/fstab.5
-+++ b/mount/fstab.5
-@@ -167,7 +167,7 @@ support filesystem
- The subtype is defined by '.subtype' suffix.  For
- example 'fuse.sshfs'. It's recommended to use subtype notation rather than add
- any prefix to the first fstab field (for example 'sshfs#example.com' is
--depreacated). 
-+deprecated).
- .RE
- 
- .B The fourth field
-diff --git a/sys-utils/losetup.8 b/sys-utils/losetup.8
-index a68836e..f50b072 100644
---- a/sys-utils/losetup.8
-+++ b/sys-utils/losetup.8
-@@ -80,6 +80,8 @@ for non-root users.
- force loop driver to reread size of the file associated with the specified loop device
- .IP "\fB\-d, \-\-detach\fP \fIloopdev\fP..."
- detach the file or device associated with the specified loop device(s)
-+.IP "\fB\-D, \-\-detach-all\fP"
-+detach all associated loop devices
- .IP "\fB\-e, \-E, \-\-encryption \fIencryption_type\fP"
- enable data encryption with specified name or number
- .IP "\fB\-f, \-\-find\fP"
-diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
-index 16ace6f..9f03151 100644
---- a/sys-utils/losetup.c
-+++ b/sys-utils/losetup.c
-@@ -362,7 +362,7 @@ int main(int argc, char **argv)
- 			if (flags & LOOPDEV_FL_OFFSET)
- 				loopcxt_set_offset(&lc, offset);
- 			if (flags & LOOPDEV_FL_SIZELIMIT)
--				loopcxt_set_offset(&lc, sizelimit);
-+				loopcxt_set_sizelimit(&lc, sizelimit);
- 			if (lo_flags)
- 				loopcxt_set_flags(&lc, lo_flags);
- 			if ((res = loopcxt_set_backing_file(&lc, file))) {
-diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
-index 78e7a41..44d4402 100644
---- a/sys-utils/mount.8
-+++ b/sys-utils/mount.8
-@@ -2760,6 +2760,10 @@ mount failure
- .TP
- .BR 64
- some mount succeeded
-+.RE
-+
-+The command mount -a returns 0 (all success), 32 (all failed) or 64 (some
-+failed, some success).
- 
- .SH NOTES
- The syntax of external mount helpers is:
-diff --git a/sys-utils/mount.c b/sys-utils/mount.c
-index 15510e0..12ec372 100644
---- a/sys-utils/mount.c
-+++ b/sys-utils/mount.c
-@@ -182,6 +182,8 @@ static int mount_all(struct libmnt_context *cxt)
- 	struct libmnt_fs *fs;
- 	int mntrc, ignored, rc = MOUNT_EX_SUCCESS;
- 
-+	int nsucc = 0, nerrs = 0;
-+
- 	itr = mnt_new_iter(MNT_ITER_FORWARD);
- 	if (!itr) {
- 		warn(_("failed to initialize libmount iterator"));
-@@ -197,31 +199,40 @@ static int mount_all(struct libmnt_context *cxt)
- 				printf(ignored == 1 ? _("%-25s: ignored\n") :
- 						      _("%-25s: already mounted\n"),
- 						tgt);
--
- 		} else if (mnt_context_is_fork(cxt)) {
- 			if (mnt_context_is_verbose(cxt))
- 				printf("%-25s: mount successfully forked\n", tgt);
- 		} else {
--			rc |= mk_exit_code(cxt, mntrc);
-+			mk_exit_code(cxt, mntrc);	/* to print warnings */
- 
- 			if (mnt_context_get_status(cxt)) {
--				rc |= MOUNT_EX_SOMEOK;
-+				nsucc++;
- 
- 				if (mnt_context_is_verbose(cxt))
- 					printf("%-25s: successfully mounted\n", tgt);
--			}
-+			} else
-+				nerrs++;
- 		}
- 	}
- 
- 	if (mnt_context_is_parent(cxt)) {
- 		/* wait for mount --fork children */
--		int nerrs = 0, nchildren = 0;
-+		int nchildren = 0;
-+
-+		nerrs = 0, nsucc = 0;
- 
- 		rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs);
- 		if (!rc && nchildren)
--			rc = nchildren == nerrs ? MOUNT_EX_FAIL : MOUNT_EX_SOMEOK;
-+			nsucc = nchildren - nerrs;
- 	}
- 
-+	if (nerrs == 0)
-+		rc = MOUNT_EX_SUCCESS;		/* all success */
-+	else if (nsucc == 0)
-+		rc = MOUNT_EX_FAIL;		/* all failed */
-+	else
-+		rc = MOUNT_EX_SOMEOK;		/* some success, some failed */
-+
- 	mnt_free_iter(itr);
- 	return rc;
- }
-@@ -290,6 +301,25 @@ static void selinux_warning(struct libmnt_context *cxt, const char *tgt)
- # define selinux_warning(_x, _y)
- #endif
- 
-+/* temporary in mount(8) for v2.21.x releases, in v2.22 will be in libmount
-+ */
-+static int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path)
-+{
-+	const char *p;
-+
-+	if (!fs)
-+		return 0;
-+
-+	p = mnt_fs_get_srcpath(fs);
-+
-+	if (!mnt_fs_is_pseudofs(fs))
-+		return streq_except_trailing_slash(p, path);
-+
-+	if (!p && !path)
-+		return 1;
-+
-+	return p && path && strcmp(p, path) == 0;
-+}
- 
- /*
-  * rc = 0 success
-@@ -336,7 +366,11 @@ try_readonly:
- 			return MOUNT_EX_USAGE;
- 		}
- 
--		if (src == NULL || tgt == NULL) {
-+		/*
-+		 * TODO: add mnt_context_fstab_applied() to check if we found
-+		 *       target/source in the file.
-+		 */
-+		if (!tgt) {
- 			if (mflags & MS_REMOUNT)
- 				warnx(_("%s not mounted"), src ? src : tgt);
- 			else
-@@ -408,7 +442,7 @@ try_readonly:
- 				const char *s = mnt_fs_get_srcpath(fs),
- 					   *t = mnt_fs_get_target(fs);
- 
--				if (t && s && streq_except_trailing_slash(s, src))
-+				if (t && s && mnt_fs_streq_srcpath(fs, src))
- 					fprintf(stderr, _(
- 						"       %s is already mounted on %s\n"), s, t);
- 			}
-@@ -697,7 +731,7 @@ int main(int argc, char **argv)
- 					longopts, NULL)) != -1) {
- 
- 		/* only few options are allowed for non-root users */
--		if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpr", c))
-+		if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpri", c))
- 			exit_non_root(option_to_longopt(c, longopts));
- 
- 		switch(c) {
-diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
-index 5cc833d..d0a0069 100644
---- a/sys-utils/mountpoint.c
-+++ b/sys-utils/mountpoint.c
-@@ -40,12 +40,12 @@
- 
- static int quiet;
- 
--static dev_t dir_to_device(const char *spec)
-+static int dir_to_device(const char *spec, dev_t *dev)
- {
- 	struct libmnt_table *tb = mnt_new_table_from_file("/proc/self/mountinfo");
- 	struct libmnt_fs *fs;
- 	struct libmnt_cache *cache;
--	dev_t res = 0;
-+	int rc = -1;
- 
- 	if (!tb) {
- 		/*
-@@ -57,7 +57,7 @@ static dev_t dir_to_device(const char *spec)
- 		int len;
- 
- 		if (stat(spec, &st) != 0)
--			return 0;
-+			return -1;
- 
- 		cn = mnt_resolve_path(spec, NULL);	/* canonicalize */
- 
-@@ -65,15 +65,17 @@ static dev_t dir_to_device(const char *spec)
- 		free(cn);
- 
- 		if (len < 0 || (size_t) len + 1 > sizeof(buf))
--			return 0;
-+			return -1;
- 		if (stat(buf, &pst) !=0)
--			return 0;
-+			return -1;
- 
- 		if ((st.st_dev != pst.st_dev) ||
--		    (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino))
--			return st.st_dev;
-+		    (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino)) {
-+			*dev = st.st_dev;
-+			return 0;
-+		}
- 
--		return 0;
-+		return -1;
- 	}
- 
- 	/* to canonicalize all necessary paths */
-@@ -81,12 +83,14 @@ static dev_t dir_to_device(const char *spec)
- 	mnt_table_set_cache(tb, cache);
- 
- 	fs = mnt_table_find_target(tb, spec, MNT_ITER_BACKWARD);
--	if (fs && mnt_fs_get_target(fs))
--		res = mnt_fs_get_devno(fs);
-+	if (fs && mnt_fs_get_target(fs)) {
-+		*dev = mnt_fs_get_devno(fs);
-+		rc = 0;
-+	}
- 
- 	mnt_free_table(tb);
- 	mnt_free_cache(cache);
--	return res;
-+	return rc;
- }
- 
- static int print_devno(const char *devname, struct stat *st)
-@@ -185,8 +189,8 @@ int main(int argc, char **argv)
- 				errx(EXIT_FAILURE, _("%s: not a directory"), spec);
- 			return EXIT_FAILURE;
- 		}
--		src = dir_to_device(spec);
--		if (!src) {
-+
-+		if ( dir_to_device(spec, &src)) {
- 			if (!quiet)
- 				printf(_("%s is not a mountpoint\n"), spec);
- 			return EXIT_FAILURE;
-diff --git a/term-utils/script.c b/term-utils/script.c
-index 58f9790..0d891b8 100644
---- a/term-utils/script.c
-+++ b/term-utils/script.c
-@@ -437,6 +437,16 @@ doshell(void) {
- 	else
- 		shname = shell;
- 
-+	/*
-+	 * When invoked from within /etc/csh.login, script spawns a csh shell
-+	 * that spawns programs that cannot be killed with a SIGTERM. This is
-+	 * because csh has a documented behaviour wherein it disables all
-+	 * signals when processing the /etc/csh.* files.
-+	 *
-+	 * Let's restore the default behavior.
-+	 */
-+	signal(SIGTERM, SIG_DFL);
-+
- 	if (cflg)
- 		execl(shell, shname, "-c", cflg, NULL);
- 	else
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index fd62519..2c72318 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -7,5 +7,5 @@ EXTRA_DIST = 	expected \
- 		functions.sh \
- 		run.sh
- 
--distclean-local:
-+clean-local:
- 	rm -rf output diff
-diff --git a/tests/expected/libmount/tabfiles-find-target2 b/tests/expected/libmount/tabfiles-find-target2
-new file mode 100644
-index 0000000..8a6c57b
---- /dev/null
-+++ b/tests/expected/libmount/tabfiles-find-target2
-@@ -0,0 +1,5 @@
-+------ fs:
-+source: /dev/foo
-+target: /any/foo/
-+fstype: auto
-+optstr: defaults
-diff --git a/tests/expected/libmount/tabfiles-find-target3 b/tests/expected/libmount/tabfiles-find-target3
-new file mode 100644
-index 0000000..8a6c57b
---- /dev/null
-+++ b/tests/expected/libmount/tabfiles-find-target3
-@@ -0,0 +1,5 @@
-+------ fs:
-+source: /dev/foo
-+target: /any/foo/
-+fstype: auto
-+optstr: defaults
-diff --git a/tests/expected/libmount/tabfiles-parse-fstab b/tests/expected/libmount/tabfiles-parse-fstab
-index 14bdfb4..d661526 100644
---- a/tests/expected/libmount/tabfiles-parse-fstab
-+++ b/tests/expected/libmount/tabfiles-parse-fstab
-@@ -58,3 +58,8 @@ target: /mnt/gogogo
- fstype: cifs
- optstr: user=SRGROUP/baby,noauto
- user-optstr: user=SRGROUP/baby,noauto
-+------ fs:
-+source: /dev/foo
-+target: /any/foo/
-+fstype: auto
-+optstr: defaults
-diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo
-index 95182dd..4470801 100644
---- a/tests/expected/libmount/tabfiles-parse-mountinfo
-+++ b/tests/expected/libmount/tabfiles-parse-mountinfo
-@@ -296,7 +296,7 @@ id:     41
- parent: 20
- devno:  253:0
- ------ fs:
--source: (null)
-+source: none
- target: /proc/sys/fs/binfmt_misc
- fstype: binfmt_misc
- optstr: rw,relatime
-diff --git a/tests/expected/libmount/tabfiles-parse-mtab b/tests/expected/libmount/tabfiles-parse-mtab
-index d7171ea..ffd0c13 100644
---- a/tests/expected/libmount/tabfiles-parse-mtab
-+++ b/tests/expected/libmount/tabfiles-parse-mtab
-@@ -42,7 +42,7 @@ fstype: ext4
- optstr: rw,noatime
- VFS-optstr: rw,noatime
- ------ fs:
--source: (null)
-+source: none
- target: /proc/sys/fs/binfmt_misc
- fstype: binfmt_misc
- optstr: rw
-diff --git a/tests/expected/libmount/update-utab-mount b/tests/expected/libmount/update-utab-mount
-index 1784e00..58a0179 100644
---- a/tests/expected/libmount/update-utab-mount
-+++ b/tests/expected/libmount/update-utab-mount
-@@ -1,3 +1,3 @@
- SRC=/dev/sdb1 TARGET=/mnt/bar ROOT=/ OPTS=user
- SRC=/dev/sda2 TARGET=/mnt/xyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal
--TARGET=/proc ROOT=/ OPTS=user
-+SRC=none TARGET=/proc ROOT=/ OPTS=user
-diff --git a/tests/expected/libmount/update-utab-move b/tests/expected/libmount/update-utab-move
-index 12917cc..6008140 100644
---- a/tests/expected/libmount/update-utab-move
-+++ b/tests/expected/libmount/update-utab-move
-@@ -1,3 +1,3 @@
- SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user
- SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal
--TARGET=/proc ROOT=/ OPTS=user
-+SRC=none TARGET=/proc ROOT=/ OPTS=user
-diff --git a/tests/expected/libmount/update-utab-remount b/tests/expected/libmount/update-utab-remount
-index 737e2a3..8e344b3 100644
---- a/tests/expected/libmount/update-utab-remount
-+++ b/tests/expected/libmount/update-utab-remount
-@@ -1,3 +1,3 @@
- SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user
- SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=user
--TARGET=/proc ROOT=/ OPTS=user
-+SRC=none TARGET=/proc ROOT=/ OPTS=user
-diff --git a/tests/expected/mount/fstab-none b/tests/expected/mount/fstab-none
-new file mode 100644
-index 0000000..3582111
---- /dev/null
-+++ b/tests/expected/mount/fstab-none
-@@ -0,0 +1 @@
-+Success
-diff --git a/tests/expected/mount/shared-subtree b/tests/expected/mount/shared-subtree
-new file mode 100644
-index 0000000..3582111
---- /dev/null
-+++ b/tests/expected/mount/shared-subtree
-@@ -0,0 +1 @@
-+Success
-diff --git a/tests/expected/mount/shared-subtree-make-private b/tests/expected/mount/shared-subtree-make-private
-new file mode 100644
-index 0000000..39cdd0d
---- /dev/null
-+++ b/tests/expected/mount/shared-subtree-make-private
-@@ -0,0 +1 @@
-+-
-diff --git a/tests/expected/mount/shared-subtree-make-shared b/tests/expected/mount/shared-subtree-make-shared
-new file mode 100644
-index 0000000..8a205e8
---- /dev/null
-+++ b/tests/expected/mount/shared-subtree-make-shared
-@@ -0,0 +1 @@
-+shared
-diff --git a/tests/expected/mount/shared-subtree-make-unbindable b/tests/expected/mount/shared-subtree-make-unbindable
-new file mode 100644
-index 0000000..376cfac
---- /dev/null
-+++ b/tests/expected/mount/shared-subtree-make-unbindable
-@@ -0,0 +1 @@
-+unbindable
-diff --git a/tests/functions.sh b/tests/functions.sh
-index 85b1621..6556e4e 100644
---- a/tests/functions.sh
-+++ b/tests/functions.sh
-@@ -93,6 +93,8 @@ function ts_init_core_subtest_env {
- 	TS_MOUNTPOINT="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-mnt"
- 
- 	rm -f $TS_OUTPUT $TS_VGDUMP
-+	[ -d "$TS_OUTDIR" ]  || mkdir -p "$TS_OUTDIR"
-+
- 	touch $TS_OUTPUT
- 	[ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP
- }
-@@ -127,8 +129,6 @@ function ts_init_env {
- 
- 	BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab"
- 
--	[ -d "$TS_OUTDIR" ]  || mkdir -p "$TS_OUTDIR"
--	[ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR"
- 
- 	declare -a TS_SUID_PROGS
- 	declare -a TS_SUID_USER
-@@ -141,6 +141,8 @@ function ts_init_env {
- 	export BLKID_FILE
- 
- 	rm -f $TS_OUTPUT $TS_VGDUMP
-+	[ -d "$TS_OUTDIR" ]  || mkdir -p "$TS_OUTDIR"
-+
- 	touch $TS_OUTPUT
- 	[ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP
- 
-@@ -219,8 +221,15 @@ function ts_gen_diff {
- 	local res=0
- 
- 	if [ -s "$TS_OUTPUT" ]; then
-+
-+		[ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR"
- 		diff -u $TS_EXPECTED $TS_OUTPUT > $TS_DIFF
--		[ -s $TS_DIFF ] && res=1
-+
-+		if [ -s $TS_DIFF ]; then
-+			res=1
-+		else
-+			rm -f $TS_DIFF;
-+		fi
- 	else
- 		res=1
- 	fi
-diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config
-index 7ede38c..e2c2b00 100755
---- a/tests/ts/build-sys/config
-+++ b/tests/ts/build-sys/config
-@@ -52,9 +52,18 @@ for conf in $config_gen_dir/config-gen.d/*.conf; do
- 			esac
- 		fi
- 	done
-+
-+	# clean the tree, but exclude tests/{diff,output} dirs
-+	#
-+	[ -d tests/diff ]   && mv tests/diff   tests/diff.save
-+	[ -d tests/output ] && mv tests/output tests/output.save
-+
- 	make -j clean &> /dev/null
--	cd $olddir
- 
-+	[ -d tests/diff.save ]   && mv tests/diff.save   tests/diff
-+	[ -d tests/output.save ] && mv tests/output.save tests/output
-+
-+	cd $olddir
- 	ts_finalize_subtest
- done
- 
-diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
-index aa49806..4c1d117 100755
---- a/tests/ts/libmount/context-utab
-+++ b/tests/ts/libmount/context-utab
-@@ -67,6 +67,8 @@ grep -q $DEVICE /proc/mounts || \
- 	echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1
- ts_finalize_subtest
- 
-+sleep 1
-+
- ts_init_subtest "umount-by-devname"
- ts_valgrind $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1
- grep -q $DEVICE /proc/mounts &&
-@@ -81,6 +83,8 @@ grep -q $DEVICE $LIBMOUNT_UTAB || \
- 	echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
- ts_finalize_subtest
- 
-+sleep 1
-+
- ts_init_subtest "umount"
- ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1
- grep -q $DEVICE $LIBMOUNT_UTAB && \
-@@ -94,6 +98,8 @@ if [ -x "/sbin/mkfs.btrfs" ]; then
- 	/sbin/btrfsctl -S sub $MOUNTPOINT &> /dev/null
- 	umount $MOUNTPOINT &> /dev/null
- 
-+	sleep 1
-+
- 	ts_init_subtest "mount-uhelper-subvol"
- 	mkdir -p $MOUNTPOINT &>  /dev/null
- 	ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> $TS_OUTPUT 2>&1
-@@ -105,6 +111,8 @@ if [ -x "/sbin/mkfs.btrfs" ]; then
- 	$TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1
- 	ts_log "---"
- 
-+	sleep 1
-+
- 	ts_init_subtest "umount-subvol"
- 	ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1
- 	grep -q $DEVICE $LIBMOUNT_UTAB && \
-diff --git a/tests/ts/libmount/files/fstab b/tests/ts/libmount/files/fstab
-index 2503065..a8f73bc 100644
---- a/tests/ts/libmount/files/fstab
-+++ b/tests/ts/libmount/files/fstab
-@@ -10,3 +10,5 @@ proc                    /proc                   proc    defaults        0 0
- 
- foo.com:/mnt/share	/mnt/remote		nfs	noauto
- //bar.com/gogogo        /mnt/gogogo             cifs    user=SRGROUP/baby,noauto
-+
-+/dev/foo		/any/foo/		auto	defaults 0 0
-diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles
-index 7f4913e..671c649 100755
---- a/tests/ts/libmount/tabfiles
-+++ b/tests/ts/libmount/tabfiles
-@@ -47,6 +47,16 @@ ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &>
- sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
- ts_finalize_subtest
- 
-+ts_init_subtest "find-target2"
-+ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> $TS_OUTPUT
-+sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
-+ts_finalize_subtest
-+
-+ts_init_subtest "find-target3"
-+ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> $TS_OUTPUT
-+sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
-+ts_finalize_subtest
-+
- ts_init_subtest "find-pair"
- ts_valgrind $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> $TS_OUTPUT
- sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
-diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none
-new file mode 100755
-index 0000000..62a89ca
---- /dev/null
-+++ b/tests/ts/mount/fstab-none
-@@ -0,0 +1,30 @@
-+#!/bin/bash
-+
-+TS_TOPDIR="$(dirname $0)/../.."
-+TS_DESC="none"
-+
-+. $TS_TOPDIR/functions.sh
-+ts_init "$*"
-+ts_skip_nonroot
-+
-+set -o pipefail
-+
-+ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime"
-+
-+mkdir -p $TS_MOUNTPOINT
-+
-+$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-+
-+$TS_CMD_FINDMNT --target "$TS_MOUNTPOINT" &> /dev/null
-+[ $? -eq 0 ] || ts_die "Not found target (mount failed?)"
-+
-+$TS_CMD_FINDMNT --source "none" --target "$TS_MOUNTPOINT" &> /dev/null
-+[ $? -eq 0 ] || ts_die "Not found source and target"
-+
-+$TS_CMD_UMOUNT $TS_MOUNTPOINT || ts_die "Cannot umount $TS_MOUNTPOINT"
-+
-+ts_fstab_clean
-+
-+ts_log "Success"
-+ts_finalize
-+
-diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
-new file mode 100755
-index 0000000..a0a76c5
---- /dev/null
-+++ b/tests/ts/mount/shared-subtree
-@@ -0,0 +1,58 @@
-+#!/bin/bash
-+
-+TS_TOPDIR="$(dirname $0)/../.."
-+TS_DESC="shared-subtree"
-+
-+. $TS_TOPDIR/functions.sh
-+ts_init "$*"
-+ts_skip_nonroot
-+
-+function get_attr() 
-+{
-+	# It's usually stupid idea to use 'grep | awk',
-+	# but use paths in awk /regex/ is too tricky...
-+	#
-+	# TODO; improve libmount and findmnt to return the
-+	#       shared-subtree flags
-+	#
-+	echo $(grep "$1" /proc/self/mountinfo | \
-+		awk '{print $7}' | \
-+		awk -F ':' '{ print $1 }')
-+}
-+
-+[ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT
-+
-+# bind
-+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT $TS_MOUNTPOINT
-+
-+# check the bind
-+$TS_CMD_FINDMNT --kernel --target $TS_MOUNTPOINT  &> /dev/null
-+[ "$?" == "0" ] || ts_die "Cannot find binded $TS_MOUNTPOINT in /proc/self/mountinfo"
-+
-+# use the same mounpoint for all sub-tests
-+MOUNTPOINT="$TS_MOUNTPOINT"
-+
-+
-+ts_init_subtest "make-shared"
-+$TS_CMD_MOUNT --make-shared $MOUNTPOINT >> $TS_OUTPUT 2>&1
-+echo  "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT
-+ts_finalize_subtest
-+
-+ts_init_subtest "make-private"
-+$TS_CMD_MOUNT --make-private $MOUNTPOINT >> $TS_OUTPUT 2>&1
-+echo  "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT
-+ts_finalize_subtest
-+
-+ts_init_subtest "make-unbindable"
-+$TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> $TS_OUTPUT 2>&1
-+echo  "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT
-+ts_finalize_subtest
-+
-+
-+# clean up
-+$TS_CMD_UMOUNT $TS_MOUNTPOINT
-+rmdir $TS_MOUNTPOINT
-+
-+ts_log "Success"
-+ts_finalize
-+
diff --git a/testing/wpa_supplicant/PKGBUILD b/testing/wpa_supplicant/PKGBUILD
deleted file mode 100644
index e8c2f5b24..000000000
--- a/testing/wpa_supplicant/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 150324 2012-02-16 20:41:55Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=wpa_supplicant
-pkgver=0.7.3
-pkgrel=5
-pkgdesc="A utility providing key negotiation for WPA wireless networks"
-url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
-depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl')
-optdepends=('wpa_supplicant_gui: wpa_gui program')
-license=('GPL')
-groups=('base')
-backup=('etc/wpa_supplicant.conf')
-source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz
-        config dbus.patch hostap_allow-linking-with-libnl-3.2.patch)
-sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443'
-            'd00f306e53c22cc0d7352a0d4ed701fd77b9ff20e3a2422d81ac1fddcc11dff4'
-            '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a'
-            'ac805bf6e5aaec733dfc2c333417e519239cd58663a6e1cb34a54fd0f2bcc3c5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
-  cd ${pkgname}
-  # Required by NetworkManager 0.8.995
-  patch -Np2 -i "$srcdir/dbus.patch"
-  cp "${srcdir}/config" ./.config
-  sed -i 's@/usr/local@$(PREFIX)@g' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc"
-  install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf"
-  install -d -m755 "${pkgdir}/usr/share/man/man"{5,8}
-  install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/"
-  install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/"
-  rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8
-
-  install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services"
-  install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/"
-  sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service
-  install -m755 -d "${pkgdir}/etc/dbus-1/system.d"
-  install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf"
-}
diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config
deleted file mode 100644
index eef35d045..000000000
--- a/testing/wpa_supplicant/config
+++ /dev/null
@@ -1,406 +0,0 @@
-# Example wpa_supplicant build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cases, these lines should use += in order not
-# to override previous values of the variables.
-
-
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
-# the kerberos files are not in the default include path. Following line can be
-# used to fix build issues on such systems (krb5.h not found).
-#CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-#	-I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for old Broadcom driver
-# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
-# Linux wireless extensions and does not need (or even work) with the old
-# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_IPW=y
-
-# Driver interface for Ralink driver
-#CONFIG_DRIVER_RALINK=y
-
-# Driver interface for generic Linux wireless extensions
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-#LIBS_p += -L/usr/local/lib
-#LIBS_c += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-# By default, driver_ndis uses WinPcap for low-level operations. This can be
-# replaced with the following option which replaces WinPcap calls with NDISUIO.
-# However, this requires that WZC is disabled (net stop wzcsvc) before starting
-# wpa_supplicant.
-# CONFIG_USE_NDISUIO=y
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Include client MLME (management frame processing) for test driver
-# This can be used to test MLME operations in hostapd with the test interface.
-# space.
-#CONFIG_CLIENT_MLME=y
-
-# Driver interface for wired Ethernet drivers
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for the Broadcom RoboSwitch family
-#CONFIG_DRIVER_ROBOSWITCH=y
-
-# Driver interface for no driver (e.g., WPS ER only)
-#CONFIG_DRIVER_NONE=y
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-FAST
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
-# to add the needed functions.
-#CONFIG_EAP_FAST=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
-
-# EAP-SAKE
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-TNC and related Trusted Network Connect support (experimental)
-#CONFIG_EAP_TNC=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
-CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testing
-#CONFIG_EAPOL_TEST=y
-
-# Select control interface backend for external programs, e.g, wpa_cli:
-# unix = UNIX domain sockets (default for Linux/*BSD)
-# udp = UDP sockets using localhost (127.0.0.1)
-# named_pipe = Windows Named Pipe (default for Windows)
-# y = use default (backwards compatibility)
-# If this option is commented out, control interface is not included in the
-# build.
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-CONFIG_READLINE=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
-# save about 1 kB in code size when building only WPA-Personal (no EAP support)
-# or 6 kB if building for WPA-Enterprise.
-#CONFIG_NO_WPA2=y
-
-# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
-# This option can be used to reduce code size by removing support for
-# converting ASCII passphrases into PSK. If this functionality is removed, the
-# PSK can only be configured as the 64-octet hexstring (e.g., from
-# wpa_passphrase). This saves about 0.5 kB in code size.
-#CONFIG_NO_WPA_PASSPHRASE=y
-
-# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
-# This can be used if ap_scan=1 mode is never enabled.
-#CONFIG_NO_SCAN_PROCESSING=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
-#	path is given on command line, not here; this option is just used to
-#	select the backend that allows configuration files to be used)
-# winreg = Windows registry (see win_example.reg for an example)
-CONFIG_BACKEND=file
-
-# Remove configuration write functionality (i.e., to allow the configuration
-# file to be updated based on runtime configuration changes). The runtime
-# configuration can still be changed, the changes are just not going to be
-# persistent over restarts. This option can be used to reduce code size by
-# about 3.5 kB.
-#CONFIG_NO_CONFIG_WRITE=y
-
-# Remove support for configuration blobs to reduce code size by about 1.5 kB.
-#CONFIG_NO_CONFIG_BLOBS=y
-
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
-#CONFIG_ELOOP=eloop
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-#CONFIG_GNUTLS_EXTRA=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-#CONFIG_INTERNAL_LIBTOMMATH=y
-#ifndef CONFIG_INTERNAL_LIBTOMMATH
-#LTM_PATH=/usr/src/libtommath-0.39
-#CFLAGS += -I$(LTM_PATH)
-#LIBS += -L$(LTM_PATH)
-#LIBS_p += -L$(LTM_PATH)
-#endif
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
-
-# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
-# This is only for Windows builds and requires WMI-related header files and
-# WbemUuid.Lib from Platform SDK even when building with MinGW.
-#CONFIG_NDIS_EVENTS_INTEGRATED=y
-#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-
-# Add support for old DBus control interface
-# (fi.epitest.hostap.WPASupplicant)
-CONFIG_CTRL_IFACE_DBUS=y
-
-# Add support for new DBus control interface
-# (fi.w1.hostap.wpa_supplicant1)
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-
-# Add introspection support for new DBus control interface
-CONFIG_CTRL_IFACE_DBUS_INTRO=y
-
-# Add support for loading EAP methods dynamically as shared libraries.
-# When this option is enabled, each EAP method can be either included
-# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
-# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
-# be loaded in the beginning of the wpa_supplicant configuration file
-# (see load_dynamic_eap parameter in the example file) before being used in
-# the network blocks.
-#
-# Note that some shared parts of EAP methods are included in the main program
-# and in order to be able to use dynamic EAP methods using these parts, the
-# main program must have been build with the EAP method enabled (=y or =dyn).
-# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
-# unless at least one of them was included in the main build to force inclusion
-# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
-# in the main build to be able to load these methods dynamically.
-#
-# Please also note that using dynamic libraries will increase the total binary
-# size. Thus, it may not be the best option for targets that have limited
-# amount of memory/flash.
-#CONFIG_DYNAMIC_EAP_METHODS=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
-CONFIG_DEBUG_FILE=y
-
-# Enable privilege separation (see README 'Privilege separation' for details)
-#CONFIG_PRIVSEP=y
-
-# Enable mitigation against certain attacks against TKIP by delaying Michael
-# MIC error reports by a random amount of time between 0 and 60 seconds
-#CONFIG_DELAYED_MIC_ERROR_REPORT=y
-
-# Enable tracing code for developer debugging
-# This tracks use of memory allocations and other registrations and reports
-# incorrect use with a backtrace of call (or allocation) location.
-#CONFIG_WPA_TRACE=y
-# For BSD, comment out these.
-#LIBS += -lexecinfo
-#LIBS_p += -lexecinfo
-#LIBS_c += -lexecinfo
-
-# Use libbfd to get more details for developer debugging
-# This enables use of libbfd to get more detailed symbols for the backtraces
-# generated by CONFIG_WPA_TRACE=y.
-#CONFIG_WPA_TRACE_BFD=y
-# For BSD, comment out these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
-
-CONFIG_LIBNL32=y
diff --git a/testing/wpa_supplicant/dbus.patch b/testing/wpa_supplicant/dbus.patch
deleted file mode 100644
index 4c5002003..000000000
--- a/testing/wpa_supplicant/dbus.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Fri, 17 Dec 2010 15:56:01 +0200
-Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
-
-The supplicant was not emitting property changed events when the BSSs
-property changed.
-
-Signed-off-by: Dan Williams <dcbw@redhat.com>
-(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
----
- wpa_supplicant/dbus/dbus_new.c |    6 ++++++
- wpa_supplicant/dbus/dbus_new.h |    1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
-index bdfbbac..c66640a 100644
---- a/wpa_supplicant/dbus/dbus_new.c
-+++ b/wpa_supplicant/dbus/dbus_new.c
-@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
- 			wpas_dbus_getter_current_network;
- 		prop = "CurrentNetwork";
- 		break;
-+	case WPAS_DBUS_PROP_BSSS:
-+		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
-+		prop = "BSSs";
-+		break;
- 	default:
- 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
- 			   __func__, property);
-@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- }
-@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
- 	}
- 
- 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
-+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
- 
- 	return 0;
- 
-diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
-index 80ea98c..9cdefcb 100644
---- a/wpa_supplicant/dbus/dbus_new.h
-+++ b/wpa_supplicant/dbus/dbus_new.h
-@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
- 	WPAS_DBUS_PROP_STATE,
- 	WPAS_DBUS_PROP_CURRENT_BSS,
- 	WPAS_DBUS_PROP_CURRENT_NETWORK,
-+	WPAS_DBUS_PROP_BSSS,
- };
- 
- enum wpas_dbus_bss_prop {
--- 
-1.7.4-rc1
-
diff --git a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
deleted file mode 100644
index 8e7cd9a97..000000000
--- a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: [RFC] hostap: Allow linking with libnl-3.
-Date: Tue, 15 Nov 2011 14:30:04 -0000
-From: Ben Greear <greearb@candelatech.com>
-
-I needed this patch to compile against the latest
-libnl code.  I added this to my config file:
-
-CONFIG_LIBNL32=y
-
-Signed-hostap: Ben Greear <greearb@candelatech.com>
-rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de>
-
----
-:100644 100644 5caeec5... 0cc81f9... M  src/drivers/drivers.mak
- src/drivers/drivers.mak |   21 ++++++++++++++-------
- 2 files changed, 29 insertions(+), 14 deletions(-)
-
---- a/src/drivers/drivers.mak
-+++ b/src/drivers/drivers.mak
-@@ -31,11 +31,18 @@ NEED_SME=y
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
--DRV_LIBS += -lnl
-+ifdef CONFIG_LIBNL32
-+  DRV_LIBS += -lnl-3
-+  DRV_LIBS += -lnl-genl-3
-+  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -I/usr/include/libnl3/
-+else
-+  DRV_LIBS += -lnl
- 
--ifdef CONFIG_LIBNL20
--DRV_LIBS += -lnl-genl
--DRV_CFLAGS += -DCONFIG_LIBNL20
-+  ifdef CONFIG_LIBNL20
-+    DRV_LIBS += -lnl-genl
-+    DRV_CFLAGS += -DCONFIG_LIBNL20
-+  endif
- endif
- endif
- 
diff --git a/testing/xf86-input-acecad/PKGBUILD b/testing/xf86-input-acecad/PKGBUILD
deleted file mode 100644
index 6a1a53766..000000000
--- a/testing/xf86-input-acecad/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 150002 2012-02-12 09:44:03Z 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/testing/xf86-input-acecad/assign-local-private-after-allocating.patch b/testing/xf86-input-acecad/assign-local-private-after-allocating.patch
deleted file mode 100644
index e3e635a6f..000000000
--- a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 27 Jun 2011 03:13:54 +0000
-Subject: Assign local->private after allocating.
-
-It is detrimental to the user experience when the driver tries to derefernce
-null pointers.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/acecad.c b/src/acecad.c
-index ad6d793..604fe91 100644
---- a/src/acecad.c
-+++ b/src/acecad.c
-@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
-         return BadAlloc;
- 
-     memset(priv, 0, sizeof(AceCadPrivateRec));
-+    local->private = priv;
- 
-     local->device_control = DeviceControl;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/xf86-input-aiptek/PKGBUILD b/testing/xf86-input-aiptek/PKGBUILD
deleted file mode 100644
index a317aafb6..000000000
--- a/testing/xf86-input-aiptek/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 150004 2012-02-12 09:44:04Z 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/testing/xf86-input-evdev/PKGBUILD b/testing/xf86-input-evdev/PKGBUILD
deleted file mode 100644
index b1c5e6159..000000000
--- a/testing/xf86-input-evdev/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 152652 2012-03-07 19:49:46Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <Alexander@archlinux.org
-
-pkgname=xf86-input-evdev
-pkgver=2.7.0
-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=('f0cb2d8400c33e8e83b538b53512e77ba73367fa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-joystick/50-joystick.conf b/testing/xf86-input-joystick/50-joystick.conf
deleted file mode 100644
index 95a295ab0..000000000
--- a/testing/xf86-input-joystick/50-joystick.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-	Identifier "joystick catchall"
-	MatchIsJoystick "on"
-	MatchDevicePath "/dev/input/event*"
-	Driver "joystick"
-EndSection
diff --git a/testing/xf86-input-joystick/PKGBUILD b/testing/xf86-input-joystick/PKGBUILD
deleted file mode 100644
index 86faad029..000000000
--- a/testing/xf86-input-joystick/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 153029 2012-03-11 12:07:31Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-joystick
-pkgver=1.6.1
-pkgrel=1
-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=('0712652ec6cdb2fca6ad888548b232a4de9cf580'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-joystick/git-fixes.patch b/testing/xf86-input-joystick/git-fixes.patch
deleted file mode 100644
index b3afa06cc..000000000
--- a/testing/xf86-input-joystick/git-fixes.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
-From: Terry Lambert <tlambert@chromium.org>
-Date: Sat, 16 Jul 2011 00:23:22 +0000
-Subject: Return proper default for unknown values in pInfo->device_control.
-
-Signed-off-by: Terry Lambert <tlambert@chromium.org>
-Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/jstk.c b/src/jstk.c
-index ec6b79a..6db0e7c 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
- 
-     default:
-         ErrorF("unsupported mode=%d\n", what);
--        return !Success;
--        break;
-+        return BadValue;
-     } /* switch (what) */
-     return Success;
- }
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index 3c471ce..d699dcd 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
-         DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n"));
-         dev->public.on = FALSE;
-         break;
-+    default:
-+        return BadValue;
-     }
- 
-     return Success;
---
-cgit v0.9.0.2-2-gbebe
-From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
-From: Devin J. Pohly <djpohly+xorg@gmail.com>
-Date: Sat, 03 Sep 2011 23:00:07 +0000
-Subject: unify capitalization of joystick properties
-
-the axis keys high/low properties were inconsistently capitalized,
-leading to potential confusion as to why one works but not the other.
-
-Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/include/joystick-properties.h b/include/joystick-properties.h
-index 49ef800..36f4082 100644
---- a/include/joystick-properties.h
-+++ b/include/joystick-properties.h
-@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
- 
- /** Scancodes for axis in high position */
- /* 8 bit, 4 per axis */
--#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)"
-+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)"
- 
- /** Set the mapping of each button to
-     none, x, y, zx, zy, button, key, speed_multiply,
---
-cgit v0.9.0.2-2-gbebe
-From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sat, 15 Oct 2011 22:47:52 +0000
-Subject: label buttons and axes
-
-Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
-Mapping can be changed while running so the labels will be constant.
-
-Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
-data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
-and "Rel Y", representing the aggregated post-calculation data from all axes.
-
-Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
----
-diff --git a/man/joystick.man b/man/joystick.man
-index da92ceb..b401de5 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -140,7 +140,11 @@ Neither
- .B mode
- nor
- .B axis
--needs to be set to generate extra valuator events.
-+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with 
-+.I 1
-+, i.e.
-+.I \*qAxis 1\*q
-+for the first axis (being the 3rd valuator).
- Default: not set.
- .TP 7
- .BI "\*qaxis="[<factor>]<axis> \*q
-@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys
- The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
- The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.
- 
-+.SH "XI2 Events"
-+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons:
-+
-+.nf
-+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=none valuator" \*q
-+\ \ ...
-+.BI "  Option  \*qMapButton1\*q      \*q" "button=1" \*q
-+.BI "  Option  \*qMapButton2\*q      \*q" "button=2" \*q
-+.BI "  Option  \*qMapButton3\*q      \*q" "button=3" \*q
-+.BI "  Option  \*qMapButton4\*q      \*q" "button=4" \*q
-+.BI "  Option  \*qMapButton5\*q      \*q" "button=5" \*q
-+\ \ ...
-+.fi
-+
-+You might also want to set the device "floating" to stop it from reporting core events:
-+.nf
-+.BI "  Option  \*qFloating\*q      \*q" "true" \*q
-+.fi
-+
- .SH "NOTES"
- Configuration through
- .I InputClass
-diff --git a/src/jstk.c b/src/jstk.c
-index 6db0e7c..772683f 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-  * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
-  *                                                                            
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -21,7 +21,6 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-     switch (what) {
-     case DEVICE_INIT: {
-         int m;
-+        char str[32];
-         CARD8 buttonmap[BUTTONMAP_SIZE+1];
-         DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-         /* Probe device and return if error */
-@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-         }
- 
-         for (m=0; m<=BUTTONMAP_SIZE; m++) {
-+            sprintf(str, "Button %d", m);
-+
-             buttonmap[m] = m;
--	}
-+            btn_labels[m] = MakeAtom(str, strlen(str), TRUE);
-+        }
-+
-+
- 
--            
--            
-         if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-             btn_labels,
-             buttonmap) == FALSE) {
-@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-             if (priv->axis[i].valuator != -1)
-         {
-             DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m));
-+            sprintf(str, "Axis %d", i + 1);
-             priv->axis[i].valuator = m++;
-+            axes_labels[i] = MakeAtom(str, strlen(str), TRUE);
-         }
- 
-         if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
-@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec =
-                    /* a tool */
- };
- 
--
- /*
-  ***************************************************************************
-  *
-@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
-     jstkDriverPlug,
-     jstkDriverUnplug
- };
-+
-+/* vim: set filetype=c.doxygen ts=4 et: */
-+
---
-cgit v0.9.0.2-2-gbebe
-From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:27:22 +0000
-Subject: Fix option type for option duplication
-
-xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
-list.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index d699dcd..e842941 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *options;
-     InputOption *iopts = NULL, *tmp;
-     DeviceIntPtr dev;
-+    XF86OptionPtr opts;
- 
-     /* duplicate option list, append to name */
--    options = xf86OptionListDuplicate(pInfo->options);
-+    opts = xf86OptionListDuplicate(pInfo->options);
-     strcpy(name, pInfo->name);
-     strcat(name, " (keys)");
--    options = xf86ReplaceStrOption(options, "Name", name);
--    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");
-+    opts = xf86ReplaceStrOption(opts, "Name", name);
-+    opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
- 
--    while(options)
-+    while(opts)
-     {
-         tmp = calloc(1, sizeof(InputOption));
- 
--        tmp->key = xf86OptionName(options);
--        tmp->value = xf86OptionValue(options);
-+        tmp->key = xf86OptionName(opts);
-+        tmp->value = xf86OptionValue(opts);
-         tmp->next = iopts;
-         iopts = tmp;
--        options = xf86NextOption(options);
-+        opts = xf86NextOption(opts);
-     }
- 
-     /* duplicate attribute list */
---
-cgit v0.9.0.2-2-gbebe
-From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:33:08 +0000
-Subject: Deal with opaque input option types.
-
-ABI 14 made the InputOption type opaque, move the existing code to ifdefs
-and use the new function calls otherwise.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index e842941..a71275a 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-     return Success;
- }
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
-+static InputOption*
-+input_option_new(InputOption* list, char *key, char *value)
-+{
-+    InputOption *tmp;
-+
-+    tmp = calloc(1, sizeof(*tmp));
-+    tmp->key = key;
-+    tmp->value = value;
-+    tmp->next = list;
-+
-+    return tmp;
-+}
-+
-+static void
-+input_option_free_list(InputOption **list)
-+{
-+    InputOption *iopts = *list;
-+
-+    while(iopts)
-+    {
-+        InputOption *tmp = iopts->next;
-+        free(iopts->key);
-+        free(iopts->value);
-+        free(iopts);
-+        iopts = tmp;
-+    }
-+
-+    *list = NULL;
-+}
-+
-+#endif
-+
- InputInfoPtr
- jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- {
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *iopts = NULL, *tmp;
-+    InputOption *iopts = NULL;
-     DeviceIntPtr dev;
-     XF86OptionPtr opts;
- 
-@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     while(opts)
-     {
--        tmp = calloc(1, sizeof(InputOption));
--
--        tmp->key = xf86OptionName(opts);
--        tmp->value = xf86OptionValue(opts);
--        tmp->next = iopts;
--        iopts = tmp;
-+        iopts = input_option_new(iopts,
-+                                 xf86OptionName(opts),
-+                                 xf86OptionValue(opts));
-         opts = xf86NextOption(opts);
-     }
- 
-@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     rc = NewInputDeviceRequest(iopts, attrs, &dev);
- 
--    while(iopts)
--    {
--        tmp = iopts->next;
--        free(iopts->key);
--        free(iopts->value);
--        free(iopts);
--        iopts = tmp;
--    }
-+    input_option_free_list(&iopts);
- 
-     FreeInputAttributes(attrs);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 17:04:25 +0000
-Subject: man: valuators are not added automatically
-
----
-diff --git a/man/joystick.man b/man/joystick.man
-index b401de5..9f38ceb 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -129,9 +129,6 @@ can be one of:
- 
- .B none, relative, accelerated, absolute
- 
--Every axis which's mode is not
--.B none
--will be reported as an additional valuator.
- .TP 7
- .B \*qvaluator\*q
- Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always 
---
-cgit v0.9.0.2-2-gbebe
-From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 19:36:07 +0000
-Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device
-
-udev does copy the Driver line to the list of options, but when manually
-specifying the driver in xorg.conf, the option "Driver" is unset. Because we
-do hotplug a sub-device from within the core device, we need the "Driver"
-option to be present in the list.
-
-This should fix archlinux bug #23577:
-  https://bugs.archlinux.org/task/23577
-
-Thanks to Malek for coming up with a fix.
-
-Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index a71275a..241b15d 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     strcat(name, " (keys)");
-     opts = xf86ReplaceStrOption(opts, "Name", name);
-     opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
-+    opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
- 
-     while(opts)
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-input-keyboard/PKGBUILD b/testing/xf86-input-keyboard/PKGBUILD
deleted file mode 100644
index aed5d63c3..000000000
--- a/testing/xf86-input-keyboard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150010 2012-02-12 09:44:11Z 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/testing/xf86-input-mouse/PKGBUILD b/testing/xf86-input-mouse/PKGBUILD
deleted file mode 100644
index c61c24faf..000000000
--- a/testing/xf86-input-mouse/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150012 2012-02-12 09:44:14Z 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/testing/xf86-input-synaptics/10-synaptics.conf b/testing/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb81..000000000
--- a/testing/xf86-input-synaptics/10-synaptics.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad catchall"
-        Driver "synaptics"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-EndSection
diff --git a/testing/xf86-input-synaptics/PKGBUILD b/testing/xf86-input-synaptics/PKGBUILD
deleted file mode 100644
index 582c0e728..000000000
--- a/testing/xf86-input-synaptics/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 153531 2012-03-15 17:47:06Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski  <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.5.99.901
-pkgrel=2
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel>=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
-        10-synaptics.conf
-        synaptics-Fix-inverted-circular-scrolling-direction.patch)
-sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0'
-          '68e1f4ef5e1038231d210eb422fa4d18c5922f0f'
-          '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.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}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}
diff --git a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch
deleted file mode 100644
index fee383855..000000000
--- a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From patchwork Wed Mar 14 03:27:29 2012
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [synaptics] Fix inverted circular scrolling direction
-Date: Wed, 14 Mar 2012 03:27:29 -0000
-From: Peter Hutterer <peter.hutterer@who-t.net>
-X-Patchwork-Id: 9512
-Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com>
-To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org>
-Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas@archlinux.org>
-
-Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10.
-In said commit, the old-style button events were changed to delta
-accumulation. Alas, for circular scrolling, a positive delta is up whereas
-for everything else a positive delta is down.
-
-Reported-by: Thomas Bächler <thomas@archlinux.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
----
-src/synaptics.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/synaptics.c b/src/synaptics.c
-index fa46f0d..c9609cd 100644
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
- 	double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y));
- 	if (delta >= 0.005 && diff != 0.0) {
- 	    if (priv->circ_scroll_vert)
--		priv->scroll.delta_y += diff / delta * para->scroll_dist_vert;
-+		priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert;
- 	    else
--		priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;;
-+		priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;;
- 	    priv->scroll.last_a = angle(priv, hw->x, hw->y);
- 	    DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a);
-         }
diff --git a/testing/xf86-input-void/PKGBUILD b/testing/xf86-input-void/PKGBUILD
deleted file mode 100644
index d6505b833..000000000
--- a/testing/xf86-input-void/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150018 2012-02-12 09:44:20Z 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/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules
deleted file mode 100644
index f6aa20835..000000000
--- a/testing/xf86-input-wacom/70-wacom.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-ACTION!="add|change", GOTO="wacom_end"
-
-# Match all serial wacom tablets with a serial ID starting with WACf
-# Notes: We assign NAME though we shouldn't, but currently the server requires it
-#        We assign the lot to subsystem pnp too because server reads NAME from
-#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
-#        will do and the ENV{NAME} can be removed.
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-
-LABEL="wacom_end"
-
diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD
deleted file mode 100644
index 29be22670..000000000
--- a/testing/xf86-input-wacom/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 152851 2012-03-10 08:19:24Z heftig $
-# 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.14.0
-pkgrel=1
-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.12.0' 'libxext')
-conflicts=('xorg-server<1.12.0')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        70-wacom.rules)
-md5sums=('23d19a2b50a86b848df17297c745144f'
-         '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/lib/udev/rules.d"
-  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
-}
diff --git a/testing/xf86-video-apm/PKGBUILD b/testing/xf86-video-apm/PKGBUILD
deleted file mode 100644
index 9f7234691..000000000
--- a/testing/xf86-video-apm/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150022 2012-02-12 09:44:25Z 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/testing/xf86-video-apm/apm-1.2.3-git.patch b/testing/xf86-video-apm/apm-1.2.3-git.patch
deleted file mode 100644
index 1c6afb29d..000000000
--- a/testing/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/testing/xf86-video-ark/PKGBUILD b/testing/xf86-video-ark/PKGBUILD
deleted file mode 100644
index 97370566a..000000000
--- a/testing/xf86-video-ark/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 150024 2012-02-12 09:44:29Z 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/testing/xf86-video-ark/git-fixes.patch b/testing/xf86-video-ark/git-fixes.patch
deleted file mode 100644
index 2de0f64be..000000000
--- a/testing/xf86-video-ark/git-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
-From: Ondrej Zary <linux@rainbow-software.org>
-Date: Sat, 04 Dec 2010 00:23:51 +0000
-Subject: Don't assume that FB address registers are initialized properly
-
-https://bugs.freedesktop.org/show_bug.cgi?id=28249
-
-ark driver does not work with Hercules Stingray 64 card (ark2000pv).
-X fails to start with:
-
-[...]
-(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is
-0x0000
-(II) ark(0): Creating default Display subsection in Screen section
-        "Default Screen Section" for depth/fbbpp 24/32
-(==) ark(0): Depth 24, (--) framebuffer bpp 32
-(==) ark(0): RGB weight 888
-(==) ark(0): Default visual is TrueColor
-(**) ark(0): Chipset: "ark2000pv"
-(--) ark(0): Framebuffer @ 0xe5e50000
-(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
-(--) ark(0): Detected 2048 bytes video ram
-[...]
-Fatal server error:
-AddScreen/ScreenInit failed for driver 0
-
-Comparing with lspci, the framebuffer address is wrong:
-00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller])
-	Flags: medium devsel
-	Memory at e5000000 (32-bit, prefetchable) [size=4M]
-	[virtual] Expansion ROM at 1c000000 [disabled] [size=64K]
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/ark.h b/src/ark.h
-index de301dc..077f93b 100644
---- a/src/ark.h
-+++ b/src/ark.h
-@@ -34,7 +34,6 @@ typedef struct _ARKRec {
- #endif
- 	EntityInfoPtr		pEnt;
- 	CARD32			IOAddress;
--	CARD32			FBAddress;
- 	unsigned char *		FBBase;
- 	unsigned char *		MMIOBase;
- 	unsigned long		videoRam;
-diff --git a/src/ark_driver.c b/src/ark_driver.c
-index 5de3b9a..fec3e1a 100644
---- a/src/ark_driver.c
-+++ b/src/ark_driver.c
-@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
- 	outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f);
- 	modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
- 
--	/* use membase's later on ??? */
--	pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
--			  (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
--
--	pScrn->memPhysBase = pARK->FBAddress;
-+#ifndef XSERVER_LIBPCIACCESS
-+	pScrn->memPhysBase = pARK->PciInfo->memBase[0];
-+#else
-+	pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr;
-+#endif
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
--		   (unsigned long)pARK->FBAddress);
-+		   (unsigned long)pScrn->memPhysBase);
- 
- 	if (!xf86SetGamma(pScrn, gzeros))
- 		return FALSE;
-@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f;
- 	new->sr10 |= 0x1f;
- 
--	new->sr13 = pARK->FBAddress >> 16;
--	new->sr14 = pARK->FBAddress >> 24;
-+#ifndef XSERVER_LIBPCIACCESS
-+	new->sr13 = pARK->PciInfo->memBase[0] >> 16;
-+	new->sr14 = pARK->PciInfo->memBase[0] >> 24;
-+#else
-+	new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16;
-+	new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24;
-+#endif
- 
- 	new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03;
- 	switch (pScrn->videoRam) {
-@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 					     pARK->PciTag, 0xb8000, 0x8000);
- 
- 	pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
--				     pARK->PciTag, pARK->FBAddress,
-+				     pARK->PciTag, pARK->PciInfo->memBase[0],
- 				     pScrn->videoRam * 1024);
- #else
- 
-@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 	{
- 		void** result = (void**)&pARK->FBBase;
- 		int err = pci_device_map_range(pARK->PciInfo,
--					       pARK->FBAddress,
-+					       pARK->PciInfo->regions[0].base_addr,
- 					       pScrn->videoRam * 1024,
- 					       PCI_DEV_MAP_FLAG_WRITABLE |
- 					       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
- 					       result);
- 		
--		if (err) 
-+		if (err) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+			   "Cound not map framebuffer: %d\n", err);
- 			return FALSE;
-+		}
- 	}
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-ast/PKGBUILD b/testing/xf86-video-ast/PKGBUILD
deleted file mode 100644
index c2bc925cc..000000000
--- a/testing/xf86-video-ast/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150026 2012-02-12 09:44:33Z 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/testing/xf86-video-ast/ast-0.93.9-vga.patch b/testing/xf86-video-ast/ast-0.93.9-vga.patch
deleted file mode 100644
index e05a78f56..000000000
--- a/testing/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/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD
deleted file mode 100644
index 8d6cd0d84..000000000
--- a/testing/xf86-video-ati/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 150028 2012-02-12 09:44:37Z 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/testing/xf86-video-chips/PKGBUILD b/testing/xf86-video-chips/PKGBUILD
deleted file mode 100644
index b4db68965..000000000
--- a/testing/xf86-video-chips/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 150030 2012-02-12 09:44:42Z 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/testing/xf86-video-chips/chips-1.2.4-git.patch b/testing/xf86-video-chips/chips-1.2.4-git.patch
deleted file mode 100644
index 9d8e856a3..000000000
--- a/testing/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/testing/xf86-video-cirrus/PKGBUILD b/testing/xf86-video-cirrus/PKGBUILD
deleted file mode 100644
index 89c58466b..000000000
--- a/testing/xf86-video-cirrus/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150032 2012-02-12 09:44:48Z 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/testing/xf86-video-cirrus/cirrus-1.3.2-git.patch b/testing/xf86-video-cirrus/cirrus-1.3.2-git.patch
deleted file mode 100644
index 5701a8473..000000000
--- a/testing/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/testing/xf86-video-dummy/PKGBUILD b/testing/xf86-video-dummy/PKGBUILD
deleted file mode 100644
index 13906ed33..000000000
--- a/testing/xf86-video-dummy/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150034 2012-02-12 09:44:52Z 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/testing/xf86-video-fbdev/PKGBUILD b/testing/xf86-video-fbdev/PKGBUILD
deleted file mode 100644
index 8fe5012b9..000000000
--- a/testing/xf86-video-fbdev/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150036 2012-02-12 09:44:56Z 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/testing/xf86-video-glint/PKGBUILD b/testing/xf86-video-glint/PKGBUILD
deleted file mode 100644
index f749217b0..000000000
--- a/testing/xf86-video-glint/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150435 2012-02-17 17:32:58Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-glint
-pkgver=1.2.7
-pkgrel=1
-pkgdesc="X.org GLINT/Permedia video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.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=('9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-i128/PKGBUILD b/testing/xf86-video-i128/PKGBUILD
deleted file mode 100644
index ae2d800e9..000000000
--- a/testing/xf86-video-i128/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150041 2012-02-12 09:45:03Z 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/testing/xf86-video-i128/i128-1.3.4-git.patch b/testing/xf86-video-i128/i128-1.3.4-git.patch
deleted file mode 100644
index 581ed7bb7..000000000
--- a/testing/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/testing/xf86-video-i740/PKGBUILD b/testing/xf86-video-i740/PKGBUILD
deleted file mode 100644
index 24edf52e9..000000000
--- a/testing/xf86-video-i740/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150043 2012-02-12 09:45:06Z 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/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD
deleted file mode 100644
index ae7ba48b9..000000000
--- a/testing/xf86-video-intel/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 151053 2012-02-24 15:04:28Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.18.0
-pkgrel=1
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=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=('77fae98e73414140bf214dca5da32bcf079c4463')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD
deleted file mode 100644
index 4341bcce1..000000000
--- a/testing/xf86-video-mach64/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150047 2012-02-12 09:45:12Z 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/testing/xf86-video-mga/PKGBUILD b/testing/xf86-video-mga/PKGBUILD
deleted file mode 100644
index 59d9bcd29..000000000
--- a/testing/xf86-video-mga/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 153627 2012-03-16 18:24:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mga
-pkgver=1.4.13
-pkgrel=6
-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'
-          'f2f07d2ab7c4fccd127fc890e074049962819ccf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./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/testing/xf86-video-mga/git-fixes.patch b/testing/xf86-video-mga/git-fixes.patch
deleted file mode 100644
index 70650b0d1..000000000
--- a/testing/xf86-video-mga/git-fixes.patch
+++ /dev/null
@@ -1,5192 +0,0 @@
-From 951474c7fcd1b28d3178a6644d58958cb3bdf5a8 Mon Sep 17 00:00:00 2001
-From: Yannick Heneault <yheneaul@matrox.com>
-Date: Wed, 25 Aug 2010 15:16:27 +0000
-Subject: modified G200SE conditionnal statement about revision register for products compatibility.
-
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 5a1e9b4..83649ee 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1081,7 +1081,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;
-@@ -3253,7 +3253,7 @@ MGA_HAL(
-     MGA_NOT_HAL(
- 	if (pMga->is_G200SE) {
-             OUTREG8(0x1FDE, 0x06);
--	    if (pMga->reg_1e24 == 0x01)
-+	    if (pMga->reg_1e24 >= 0x01)
- 		OUTREG8(0x1FDF, 0x03);
- 	    else 
- 		OUTREG8(0x1FDF, 0x14);
-@@ -4326,7 +4326,7 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
- 	    return MODE_VIRTUAL_X;
- 	if (mode->VDisplay > 1200)
- 	    return MODE_VIRTUAL_Y;
--	if (pMga->reg_1e24 == 0x01 &&
-+	if (pMga->reg_1e24 >= 0x01 &&
- 	    xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244)
- 	    return MODE_BANDWIDTH;
-     } else if (pMga->is_G200WB){
---
-cgit v0.9.0.2-2-gbebe
-From 0bd44fad450843b7f1c35c70ab356a2b250d107d Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-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..7725b56 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
-  *
-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_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 83649ee..72e7acc 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
-  *
-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_reg.h b/src/mga_reg.h
-index 6251976..ffe4723 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
-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/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>
---
-cgit v0.9.0.2-2-gbebe
-From 636c3c88e7e9cb30010fe1731cd7356849f3f172 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 14 Oct 2010 18:36:06 +0000
-Subject: Don't allow the config file to override BIOS location
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 72e7acc..37bf847 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1779,23 +1779,16 @@ 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;
--	    pMga->BiosFrom = X_PROBED;
--	} else if (pMga->Primary) {
--	    pMga->BiosAddress = 0xc0000;
--	    pMga->BiosFrom = X_DEFAULT;
--	}
-+    /* details: rombase sdk pp 4-15 */
-+    if (pMga->PciInfo->biosBase != 0) {
-+	pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
-+	pMga->BiosFrom = X_PROBED;
-+    } else if (pMga->Primary) {
-+	pMga->BiosAddress = 0xc0000;
-+	pMga->BiosFrom = X_DEFAULT;
-     }
-     if (pMga->BiosAddress) {
- 	xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n",
---
-cgit v0.9.0.2-2-gbebe
-From f7a2ef60e18e2cc464f69c1cad4681096c645651 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 30 Oct 2010 16:38:31 +0000
-Subject: Sun's copyrights now belong to Oracle
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-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)
- 
---
-cgit v0.9.0.2-2-gbebe
-From 5f1b04e86e79938c8158055a777280a649f95510 Mon Sep 17 00:00:00 2001
-From: Yannick Heneault <yheneaul@matrox.com>
-Date: Fri, 17 Dec 2010 14:00:46 +0000
-Subject: added support for G200ER.
-
----
-diff --git a/src/mga.h b/src/mga.h
-index 7725b56..c520e86 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -136,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 
-  */
-@@ -199,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;
-@@ -478,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_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_driver.c b/src/mga_driver.c
-index 37bf847..7232c73 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -403,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
-@@ -432,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
-@@ -449,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" },
-@@ -471,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,
-@@ -912,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;
-@@ -1285,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) {
-@@ -1326,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);
-@@ -1619,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) {
-@@ -1782,14 +1819,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-      * use the VGA default.
-      */
- 
--    /* details: rombase sdk pp 4-15 */
--    if (pMga->PciInfo->biosBase != 0) {
--	pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
--	pMga->BiosFrom = X_PROBED;
--    } else if (pMga->Primary) {
--	pMga->BiosAddress = 0xc0000;
--	pMga->BiosFrom = X_DEFAULT;
--    }
-+	/* details: rombase sdk pp 4-15 */
-+	if (pMga->PciInfo->biosBase != 0) {
-+	    pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
-+	    pMga->BiosFrom = X_PROBED;
-+	} else if (pMga->Primary) {
-+	    pMga->BiosAddress = 0xc0000;
-+	    pMga->BiosFrom = X_DEFAULT;
-+	}
-     if (pMga->BiosAddress) {
- 	xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n",
- 		   (unsigned long)pMga->BiosAddress);
-@@ -2134,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);
-@@ -2247,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;
-@@ -2424,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;
-@@ -4332,10 +4372,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_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 ffe4723..5a37db6 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -369,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
-@@ -429,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_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);
---
-cgit v0.9.0.2-2-gbebe
-From 43280e6521815582f219d42821d896093c9c0d5f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 22 Jun 2011 21:02:29 +0000
-Subject: Don't include xf86Priv.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-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"
---
-cgit v0.9.0.2-2-gbebe
-From c083bf0a66bef9a4345847f39be5fb895c211f79 Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Wed, 03 Aug 2011 13:45:13 +0000
-Subject: Added support for G200SE Pilot3
-
-Optimize use of bandwidth and increase maximum resolution to 1920x1200
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 7232c73..b140013 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -3282,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;
- 
-@@ -4354,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;
---
-cgit v0.9.0.2-2-gbebe
-From 01ca2186ea028b2549de509b51726aa08519fce0 Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Tue, 20 Sep 2011 17:07:16 +0000
-Subject: Reset tagfifo for renesas.
-
-For renesas, we need to reset tagfifo after a mode switch.
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index b140013..58a1390 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -3282,6 +3282,28 @@ MGA_HAL(
- 	    outb(0xfac, 0x02);
-     }
- 
-+    /* Reset tagfifo*/ 
-+	if (pMga->is_G200ER) 
-+    {
-+        CARD32 ulMemCtl = INREG(MGAREG_MEMCTL);
-+        CARD8  ucSeq1;
-+
-+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Reset tagfifo\n");
-+        /* Screen off */
-+    	OUTREG8(MGAREG_SEQ_INDEX, 0x01);	/* Select SEQ1 */
-+	    ucSeq1 = INREG8(MGAREG_SEQ_DATA) | 0x20;
-+    	OUTREG8(MGAREG_SEQ_DATA, ucSeq1);
-+
-+        /* Reset tagfifo */
-+        OUTREG(MGAREG_MEMCTL, ulMemCtl | 0x002000000);
-+        usleep(1000); /* wait 1ms */
-+        OUTREG(MGAREG_MEMCTL, ulMemCtl & ~0x002000000);
-+
-+        /* Screen on */
-+    	OUTREG8(MGAREG_SEQ_DATA, ucSeq1 & ~0x20);
-+
-+    }
-+
-     /* 
-      This function optimize the Priority Request control
-      Higher HiPriLvl will reduce drawing performance
-diff --git a/src/mga_reg.h b/src/mga_reg.h
-index 5a37db6..ae0fe8c 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -119,6 +119,9 @@
- #define MGAREG_WACCEPTSEQ       0x1dd4
- #define MGAREG_WMISC            0x1e70
- 
-+
-+#define MGAREG_MEMCTL           0x2E08
-+
- /* OPMODE register additives */
- 
- #define MGAOPM_DMA_GENERAL	(0x00 << 2)
---
-cgit v0.9.0.2-2-gbebe
-From ae90c47503bc1015a50e7ea6d22ec10e5e0d4113 Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Tue, 13 Sep 2011 21:01:57 +0000
-Subject: Nothing uses clientlx.c, so delete it.
-
-Adam Jackson wrote:
-
-	Hey, so, remember back in the dark ages when dualhead was this
-	insanely wild differentiating feature?  Matrox thought it was so
-	special, in fact, that they hid most of the implementation of it
-	(and a bunch of other stuff) in a binary-only blob called the
-	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-	the relevant Windows code, and then some open glue to keep it
-	working; clientlx.c is that glue.
-
-	I guess the theory was that if you don't tell people which
-	registers to duplicate to implement a second pipe in their own
-	hardware, they won't figure it out?  A pretty eyeroll-worthy
-	idea even at the time, and definitely not something we should be
-	condoning anymore.
-
-	Kill it with fire ...
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 17211bb..44417de 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -32,7 +32,6 @@ mga_drv_la_LIBADD = $(noinst_LTLIBRARIES)
- mga_drv_la_SOURCES = \
-          binding.h \
-          client.h \
--         clientlx.c \
-          mga_arc.c \
-          mga_bios.c \
-          mga_common.h \
-diff --git a/src/binding.h b/src/binding.h
-index 57e9b92..616aed7 100644
---- a/src/binding.h
-+++ b/src/binding.h
-@@ -37,37 +37,6 @@ typedef char            CHAR;
- typedef unsigned char   UCHAR;
- typedef unsigned char   FAR*LPUCHAR;
- 
--typedef struct TAGCLIENTTABLE{
--    ULONG (DECL *ClientReadConfigSpaceByte       )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadConfigSpaceDword      )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteConfigSpaceByte      )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteConfigSpaceDword     )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenRegisterBase          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseRegisterBase         )(LPVOID );                        
--    ULONG (DECL *ClientReadRegisterByte          )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadRegisterDword         )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteRegisterByte         )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteRegisterDword        )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenMemoryBase            )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseMemoryBase           )(LPVOID );                        
--    ULONG (DECL *ClientReadMemoryByte            )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadMemoryDword           )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteMemoryByte           )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteMemoryDword          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenSystemDevice          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseSystemDevice         )(LPVOID );                        
--    ULONG (DECL *ClientReadSystemDeviceByte      )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadSystemDeviceDword     )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteSystemDeviceByte     )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteSystemDeviceDword    )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientWait                      )(LPVOID , ULONG);                 
--    ULONG (DECL *ClientGetBiosInfo               ) (LPVOID, LPVOID, LPVOID);        
--    ULONG (DECL *ClientReadDDCEdid               ) (LPVOID, LPVOID, ULONG);         
--#ifdef DEBUG
--    ULONG (DECL *ClientDebug                     ) (LPVOID, ULONG, LPVOID, ULONG, LPVOID);
--#endif
--} CLIENTTABLE, FAR *LPCLIENTTABLE;
--
- #endif /* _INTERNALBINDING */
- 
- /***************************************************************************************************
-diff --git a/src/client.h b/src/client.h
-index 8348b64..59aca5d 100644
---- a/src/client.h
-+++ b/src/client.h
-@@ -17,46 +17,6 @@ typedef struct TAGCLIENTDATA
-     pointer        pMga;
- } CLIENTDATA, *LPCLIENTDATA;
- 
--extern ULONG DECL ClientReadConfigSpaceByte(LPBOARDHANDLE, ULONG, LPUCHAR);
--extern ULONG DECL ClientReadConfigSpaceDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteConfigSpaceByte (LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteConfigSpaceDword(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenRegisterBase(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseRegisterBase (LPBOARDHANDLE );
--extern ULONG DECL ClientReadRegisterByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadRegisterDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteRegisterByte (LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteRegisterDword(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenMemoryBase(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseMemoryBase(LPBOARDHANDLE );
--extern ULONG DECL ClientReadMemoryByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadMemoryDword (LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteMemoryByte(LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteMemoryDword (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenSystemDevice (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseSystemDevice (LPBOARDHANDLE );
--extern ULONG DECL ClientReadSystemDeviceByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadSystemDeviceDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteSystemDeviceByte(LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteSystemDeviceDword (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientWait (LPBOARDHANDLE , ULONG);
--extern ULONG DECL ClientLocateFirstTwisterOfQuad(ULONG);
--extern ULONG DECL ClientSearchDevNode(ULONG, UCHAR, UCHAR);
--extern ULONG DECL ClientGetBiosInfo(LPBOARDHANDLE, LPUCHAR, LPULONG );
--extern ULONG DECL ClientDebug (LPBOARDHANDLE , ULONG, LPUCHAR, ULONG, LPVOID);
--extern ULONG DECL ClientCallBiosInt10(LPBOARDHANDLE, LPBIOSREGS);
--extern ULONG DECL ClientReadDDCEdid(LPBOARDHANDLE, LPUCHAR, ULONG);
--extern ULONG DECL ClientCustomCall(LPBOARDHANDLE, ULONG, LPVOID, LPVOID);
--extern ULONG DECL ClientApplyEpromPatch(LPBOARDHANDLE);
--extern ULONG DECL ClientDetectHostInterface(LPBOARDHANDLE, LPULONG);
--extern ULONG DECL ClientHSLPatchFunction(LPBOARDHANDLE, ULONG, ULONG, LPUCHAR);
--extern ULONG DECL InitClientFunctions(LPBOARDHANDLE, ULONG);
--extern ULONG DECL ClientInitTimeBase(LPBOARDHANDLE);
--extern ULONG DECL ClientOpenDMABase(LPBOARDHANDLE, ULONG, ULONG);
--extern ULONG DECL ClientReadDMAByte(LPBOARDHANDLE, ULONG, LPUCHAR);
--extern ULONG DECL ClientReadBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG, LPUCHAR);
--extern ULONG DECL ClientWriteBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG);
--
- #if defined(__cplusplus)
-     }
- #endif
-diff --git a/src/clientlx.c b/src/clientlx.c
-deleted file mode 100644
-index 9c6ab50..0000000
---- a/src/clientlx.c
-+++ b/dev/null
-@@ -1,848 +0,0 @@
--/******************************************************************************\
--
--    clientlx.c
--
--    Copyright © 1997, Matrox Graphics Inc.
--
--    All Rights Reserved.
--
--\******************************************************************************/
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
--#include "xf86_OSproc.h"
--#include "xf86Pci.h"
--#include "client.h"
--#include "mga.h"
--
--CLIENTTABLE ClientFunctions = {
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadConfigSpaceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadConfigSpaceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteConfigSpaceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteConfigSpaceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenRegisterBase,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseRegisterBase,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadRegisterByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadRegisterDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteRegisterByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteRegisterDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenMemoryBase,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseMemoryBase,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadMemoryByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadMemoryDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteMemoryByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteMemoryDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenSystemDevice,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseSystemDevice,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadSystemDeviceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadSystemDeviceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteSystemDeviceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteSystemDeviceDword,
--    (ULONG (DECL *)(LPVOID,ULONG))           ClientWait,
--    (ULONG (DECL *)(LPVOID,LPVOID,LPVOID))   ClientGetBiosInfo,
--    (ULONG (DECL *)(LPVOID,LPVOID,ULONG))    ClientReadDDCEdid
--};
--
--/******************************************************************************\
--
--    Function      : ClientReadConfigSpaceByte
--
--    Description   : Read a Byte from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specifib board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *pucByte | pointer to a byte that will receive
--                    the data
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_read_u8(pMga->PciInfo, pucByte, ulOffset);
--#else
--    *pucByte = pciReadByte(pMga->PciTag,ulOffset);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadConfigSpaceDword
--
--    Description   : Read a Dword from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset  | Offset of the Byte to be read.
--                    ULONG *pulDword | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_read_u32(pMga->PciInfo, (uint32_t *) pulDword, ulOffset);
--#else
--    *pulDword = pciReadLong(pMga->PciTag,ulOffset);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteConfigSpaceByte
--
--    Description   : Write a Byte from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | Byte to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_write_u8(pMga->PciInfo, ucByte, ulOffset);
--#else
--    pciWriteByte(pMga->PciTag,ulOffset, ucByte);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteConfigSpaceDword
--
--    Description   : Write a Dword from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword containing the data to  be written
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_write_u32(pMga->PciInfo, (uint32_t) ulDword, ulOffset);
--#else
--    pciWriteLong(pMga->PciTag,ulOffset, ulDword);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenRegisterBase
--
--    Description   : Map the register base for future call to ClientReadRegisterX
--                    and ClientWriteRegisterX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenRegisterBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--    pClientStruct->ulRegisterBase = (ULONG) pMga->IOBase;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseRegisterBase
--
--    Description   : Unmap the register base address and free resources needed
--                    to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseRegisterBase(LPBOARDHANDLE pBoard)
--{
--    ASSERT_HANDLER(pBoard);
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadRegisterByte
--
--    Description   : Read a byte from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure.
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *pucByte | pointer to the byte that will receive
--                    the data.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                             UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pucByte = *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadRegisterDword
--
--    Description   : Read a Dword from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset  | Offset of the Byte to be read.
--                    ULONG *pulDword | pointer to the dword that will receive
--                    the data.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientReadRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                              ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pulDword = *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteRegisterByte
--
--    Description   : Write a Byte from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | CHAR to receive the data.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                              UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset)) = ucByte;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteRegisterSpaceDword
--
--    Description   : Write a Dword from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE *| pBoard  | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to receive the data
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                               ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset)) = ulDword;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenMemoryBase
--
--    Description   : Map the Memory base for future call to ClientReadMemoryX
--                    and ClientWriteMemoryX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenMemoryBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr) pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--    pClientStruct->ulFrameBufferBase = (ULONG) pMga->FbBase;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseMemoryBase
--
--    Description   : Unmap the Frame Buffer aperture and free resources
--                    needed to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseMemoryBase(LPBOARDHANDLE pBoard)
--{
--    ASSERT_HANDLER(pBoard);
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadMemoryByte
--
--    Description   : Read a Byte from the Frame Buffer space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *ucByte  | CHAR to receive the data
--
--    Return Val : ULONG
--\******************************************************************************/
--ULONG ClientReadMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pucByte = *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadMemoryDword
--
--    Description   : Read a Dword from the Frame Buffer Space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG *uDword  | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                            ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pulDword = *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--   Function      : ClientWriteMemoryByte
--
--   Description   : Write a Byte from the Frame Buffer space.
--
--   I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                   containing all the information about a specific board.
--                   ULONG ulOffset | Offset of the Byte to be read.
--                   UCHAR ucByte   | CHAR to receive the data
--
--   Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ucByte;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteMemoryDword
--
--    Description   : Write a Dword from the Frame Buffer space.
--
--    I/O desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                            ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ulDword;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenSystemDevice
--
--    Description   : Map a System device aperture for future call to
--                    ClientReadSystemDeviceX and ClientWriteSystemDeviceX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenSystemDevice(LPBOARDHANDLE pBoard, ULONG ulAddress,
--                                    ULONG ulSize)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseSystemDevice
--
--    Description   : Unmap the System Device aperture address and free
--                    resources needed to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseSystemDevice (LPBOARDHANDLE pBoard)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadSystemDeviceByte
--
--    Description   : Read a Byte from the device Space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG pucByte  | Byte to read the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 UCHAR *pucByte)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadSystemDeviceDword
--
--    Description   : Read a Dword from the Frame Buffer Space
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to Read the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  ULONG *pulDword)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteSystemByte
--
--    Description   : Write a Byte from the System Device Aperture
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | Byte to receive the data
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  UCHAR ucByte)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteSystemDword
--
--    Description   : Write a Dword from the System Device Aperture.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG uDword   | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                   ULONG ulDword)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWait
--
--    Description   : Wait for ulDelayus micro-seconds.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulDelayus | Delay in uSec
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWait (LPBOARDHANDLE pBoard, ULONG ulDelayus)
--{
--    int i;
--    ULONG ulTmp;
--
--    ASSERT_HANDLER(pBoard);
--
--    for(i = 0; i < ulDelayus * 3; i++)
--    {
--        ClientReadRegisterDword(pBoard,0x1e14,&ulTmp);
--    }
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientGetBiosInfo
--
--    Description   : This function will be call if no PINS can be found
--                    in physical EEPROM.
--
--    I/O Desc.     :  LPBOARDHANDLE pBoard | Handle to the board structure
--                     containing all the information about a specific board.
--                     LPUCHAR    | Buffer where we copy bios pins.
--                     ULONG      | Bios version
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVersion)
--{
--    Bool bNotFound = TRUE;
--    UCHAR ucBIOS[32768];
--    UCHAR ucTmpByte;
--    UCHAR ucCheckSum;
--    UCHAR ucPinsIndex;
--    UCHAR ucPinsSize;
--    ULONG ulTmpDword;
--    ULONG ulPinsOffset = 0;
--    ULONG ulPCIINFOffset;
--
--    ASSERT_HANDLER(pBoard);
--
--    xf86ReadBIOS(0xc0000,0,ucBIOS,32768);
--
--    if(ucBIOS[0] == 0x55)
--    {
--        if(ucBIOS[1] == 0xaa)
--        {
--            while((ulPinsOffset < 0x10000) && bNotFound)
--            {
--                ulTmpDword = *(ULONG *)(ucBIOS + ulPinsOffset);
--                ucPinsSize = (UCHAR) (ulTmpDword >> 16);
--                if(((ulTmpDword & 0x0000ffff) == 0x0000412e)
--                    && ucPinsSize <= 128)
--                {
--                    ucCheckSum = 0;
--                    for(ucPinsIndex = 0;ucPinsIndex < ucPinsSize; ucPinsIndex++)
--                    {
--                        pucPins[ucPinsIndex] = ucBIOS[ulPinsOffset +
--                                               ucPinsIndex];
--                        ucCheckSum += pucPins[ucPinsIndex];
--                    }
--                    if(ucCheckSum == 0)
--                    {
--                        bNotFound = FALSE;
--                    }
--                }
--                ulPinsOffset++;
--            }
--
--            if(bNotFound)
--            {
--                return 1;
--            }
--
--            ulPCIINFOffset = *(ULONG *)(ucBIOS + 0x18);
--            ulPCIINFOffset &= 0x0000ffff;
--            ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset);
--
--            if(ulTmpDword == 0x52494350)  /* "PCIR" */
--            {
--                ulPCIINFOffset += 0x12;
--                ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset);
--                *pulBIOSVersion = ((ULONG) ((ulTmpDword & 0xf0) >> 4) << 16) |
--                                  ((ulTmpDword &0xf) << 12) | ((ulTmpDword >> 8)
--                                  & 0xff);
--            }
--            else
--            {
--                return 1;
--            }
--        }
--        else
--        {
--           return 1;
--        }
--    }
--    else
--    {
--        return 1;
--    }
--
--    if(!*pulBIOSVersion)
--    {
--        ucTmpByte = ucBIOS[5];
--        *pulBIOSVersion = ((ULONG) (ucTmpByte >> 4) << 16) | ((ULONG)
--                          (ucTmpByte & 0x0f) << 12);
--    }
--
--    return 0;
--}
--
--/******************************************************************************\
--
--    Function      : ClientCallBiosInt10
--
--    Description   : Call the BIOS Int10h with specified parameters.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCallBiosInt10(LPBOARDHANDLE pBoard, LPBIOSREGS pBiosRegs)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadDDCEdid
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadDDCEdid(LPBOARDHANDLE pBoard, LPUCHAR pEdid,
--                               ULONG ulMonitorIndex)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCustomCall
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCustomCall(LPBOARDHANDLE pBoard, ULONG ulServiceNumber,
--                       LPVOID pInData, LPVOID pOutData)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientApplyEpromPatch
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientApplyEpromPatch(LPBOARDHANDLE pBoard)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientDetectHostInterface
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientDetectHostInterface(LPBOARDHANDLE pBoard, LPULONG pulData)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
---
-cgit v0.9.0.2-2-gbebe
-From 94bbeb132c7eda912d1b402a1a91ca7cbbf5e6a1 Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Thu, 15 Sep 2011 15:29:11 +0000
-Subject: Delete support for MGA's proprietary HAL: unifdef USEMGAHAL.
-
-This patch produced with:
-	for f in `git grep -Fwl USEMGAHAL`; do
-		unifdef -B -UUSEMGAHAL $f | sponge $f
-	done
-
-Adam Jackson wrote:
-
-	Hey, so, remember back in the dark ages when dualhead was this
-	insanely wild differentiating feature?  Matrox thought it was so
-	special, in fact, that they hid most of the implementation of it
-	(and a bunch of other stuff) in a binary-only blob called the
-	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-	the relevant Windows code, and then some open glue to keep it
-	working; clientlx.c is that glue.
-
-	I guess the theory was that if you don't tell people which
-	registers to duplicate to implement a second pipe in their own
-	hardware, they won't figure it out?  A pretty eyeroll-worthy
-	idea even at the time, and definitely not something we should be
-	condoning anymore.
-
-	Kill it with fire, but while you're at it, untangle the hideous
-	mess of MGA_HAL() macros too.
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Cc: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/mga.h b/src/mga.h
-index c520e86..fced6aa 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -42,10 +42,6 @@
- #include "mga_dri.h"
- #endif
- 
--#ifdef USEMGAHAL
--#include "client.h"
--#endif
--
- typedef enum {
-     OPTION_SW_CURSOR,
-     OPTION_HW_CURSOR,
-@@ -329,11 +325,6 @@ typedef enum {
- 
- typedef struct {
-     int			lastInstance;
--#ifdef USEMGAHAL
--    LPCLIENTDATA	pClientStruct;
--    LPBOARDHANDLE	pBoard;
--    LPMGAHWINFO		pMgaHwInfo;
--#endif
-     int			refCount;
-     CARD32		masterFbAddress;
-     long		masterFbMapSize;
-@@ -459,12 +450,6 @@ struct mga_device_attributes {
- };
- 
- typedef struct {
--#ifdef USEMGAHAL
--    LPCLIENTDATA	pClientStruct;
--    LPBOARDHANDLE	pBoard;
--    LPMGAMODEINFO	pMgaModeInfo;
--    LPMGAHWINFO		pMgaHwInfo;
--#endif
-     EntityInfoPtr	pEnt;
-     struct mga_bios_values bios;
-     CARD8               BiosOutputMode;
-@@ -650,9 +635,6 @@ typedef struct {
-     MGAPaletteInfo	palinfo[256];  /* G400 hardware bug workaround */
-     FBLinearPtr		LinearScratch;
-     Bool                softbooted;
--#ifdef USEMGAHAL
--    Bool                HALLoaded;
--#endif
-     OptionInfoPtr	Options;
- 
-     /* Exa */
-@@ -810,26 +792,6 @@ void MGAG200SESaveMode(ScrnInfoPtr, vgaRegPtr);
- void MGAG200SERestoreMode(ScrnInfoPtr, vgaRegPtr);
- void MGAG200SEHWProtect(ScrnInfoPtr, Bool);
- 
--#ifdef USEMGAHAL
--/************ ESC Call Definition ***************/
--typedef struct {
--    char *function;
--    void (*funcptr)(ScrnInfoPtr pScrn, unsigned long *param, char *out, DisplayModePtr pMode);
--} MGAEscFuncRec, *MGAEscFuncPtr;
--
--typedef struct {
--    char function[32];
--    unsigned long parameters[32];
--} EscCmdStruct;
--
--extern LPMGAMODEINFO pMgaModeInfo[2];
--extern MGAMODEINFO   TmpMgaModeInfo[2];
--
--extern void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode);
--void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo);
--/************************************************/
--#endif
--
- static __inline__ void
- MGA_MARK_SYNC(MGAPtr pMga, ScrnInfoPtr pScrn)
- {
-diff --git a/src/mga_dacG.c b/src/mga_dacG.c
-index fca1031..b489dea 100644
---- a/src/mga_dacG.c
-+++ b/src/mga_dacG.c
-@@ -1001,9 +1001,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 		break;
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
--#ifdef USEMGAHAL
--	       MGA_HAL(break;);
--#endif
- 	       if (MGAISGx50(pMga))
- 		       break;
- 
-@@ -1046,9 +1043,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 		break;
- 	case PCI_CHIP_MGAG200_SE_A_PCI:
- 	case PCI_CHIP_MGAG200_SE_B_PCI:
--#ifdef USEMGAHAL
--		MGA_HAL(break;);
--#endif
-         pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03;
-                 pReg->DacRegs[MGA1064_PIX_CLK_CTL] =
-                     MGA1064_PIX_CLK_CTL_SEL_PLL;
-@@ -1097,9 +1091,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	case PCI_CHIP_MGAG200:
- 	case PCI_CHIP_MGAG200_PCI:
- 	default:
--#ifdef USEMGAHAL
--		MGA_HAL(break;);
--#endif
- 		if(pMga->OverclockMem) {
-                      /* 143 Mhz */
- 		    pReg->DacRegs[ MGA1064_SYS_PLL_M ] = 0x06;
-@@ -1496,21 +1487,6 @@ MGA_NOT_HAL(
-                MGAG200EHPIXPLLSET(pScrn, mgaReg);
-            }
- );	/* MGA_NOT_HAL */
--#ifdef USEMGAHAL
--          /* 
--	   * Work around another bug in HALlib: it doesn't restore the
--	   * DAC width register correctly. MATROX: hint, hint.
--	   */
--           MGA_HAL(	 
--    	       outMGAdac(MGA1064_MUL_CTL,mgaReg->DacRegs[0]);
--  	       outMGAdac(MGA1064_MISC_CTL,mgaReg->DacRegs[1]); 
--	       if (!MGAISGx50(pMga)) {
--		   outMGAdac(MGA1064_PIX_PLLC_M,mgaReg->DacRegs[2]);
--		   outMGAdac(MGA1064_PIX_PLLC_N,mgaReg->DacRegs[3]);
--		   outMGAdac(MGA1064_PIX_PLLC_P,mgaReg->DacRegs[4]);
--	       } 
--	       ); 
--#endif
- 	   /* restore CRTCEXT regs */
-            for (i = 0; i < 6; i++)
- 	      OUTREG16(MGAREG_CRTCEXT_INDEX, (mgaReg->ExtVga[i] << 8) | i);
-@@ -1650,24 +1626,6 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg,
- 	 * DAC width register correctly.
- 	 */
- 
--#ifdef USEMGAHAL
--	/* 
--	 * Work around another bug in HALlib: it doesn't restore the
--	 * DAC width register correctly (s.o.). MATROX: hint, hint.
--	 */
--  	MGA_HAL(
--  	    if (mgaReg->DacRegs == NULL) {
--  		mgaReg->DacRegs = xnfcalloc(MGAISGx50(pMga) ? 2 : 5, 1);
--  	    }
--    	    mgaReg->DacRegs[0] = inMGAdac(MGA1064_MUL_CTL);
--  	    mgaReg->DacRegs[1] = inMGAdac(MGA1064_MISC_CTL);
--	    if (!MGAISGx50(pMga)) {
--		mgaReg->DacRegs[2] = inMGAdac(MGA1064_PIX_PLLC_M);
--		mgaReg->DacRegs[3] = inMGAdac(MGA1064_PIX_PLLC_N);
--		mgaReg->DacRegs[4] = inMGAdac(MGA1064_PIX_PLLC_P);
--	    } 
--  	);
--#endif
- 	MGA_NOT_HAL(
- 	/*
- 	 * The port I/O code necessary to read in the extended registers.
-@@ -1793,12 +1751,6 @@ MGAGSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
-     x += 64;
-     y += 64;
- 
--#ifdef USEMGAHAL
--    MGA_HAL(
--	    x += pMga->HALGranularityOffX;
--	    y += pMga->HALGranularityOffY;
--    );
--#endif
-     /* cursor update must never occurs during a retrace period (pp 4-160) */
-     while( INREG( MGAREG_Status ) & 0x08 );
-     
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 58a1390..d770031 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1509,10 +1509,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     int flags24;
-     MGAEntPtr pMgaEnt = NULL;
-     Bool Default;
--#ifdef USEMGAHAL
--    ULONG status;
--    CARD8 MiscCtlReg;
--#endif
- 
-     /*
-      * Note: This function is only called once at server startup, and
-@@ -1657,37 +1653,9 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     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) {
--	Bool loadHal = TRUE;
--	
--	from = X_DEFAULT;
--	if (xf86FindOption(pMga->device->options, "NoHal")) {
--	    loadHal = !xf86SetBoolOption(pMga->device->options,
--					 "NoHal", !loadHal);
--	    from = X_CONFIG;
--	} else if (xf86FindOption(pMga->device->options, "Hal")) {
--	    loadHal = xf86SetBoolOption(pMga->device->options,
--					"Hal", loadHal);
--	    from = X_CONFIG;
--	}
--        if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) {
--	  xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n");
--	  pMga->HALLoaded = TRUE;
--	} else {
--	  xf86DrvMsg(pScrn->scrnIndex, from, "Matrox HAL module not loaded "
--		     "- using builtin mode setup instead\n");
--	  pMga->HALLoaded = FALSE;
--	}
--    }
--#endif
--
-     pMga->DualHeadEnabled = FALSE;
-     if (xf86IsEntityShared(pScrn->entityList[0])) {/* dual-head mode requested*/
- 	if (
--#ifdef USEMGAHAL
--	    pMga->HALLoaded ||
--#endif
- 	    !MGA_DH_NEEDS_HAL(pMga)) {
- 	    pMga->DualHeadEnabled = TRUE;
- 	} else if (xf86IsPrimInitDone(pScrn->entityList[0])) {
-@@ -2088,30 +2056,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                 "\"Merged Framebuffer\" mode only supported on G450 and G550 boards.\n");
-         } else { 
--#ifdef USEMGAHAL
--            if(pMga->HALLoaded)
--            { 
--                pMga->MergedFB = TRUE;
--                xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--                        "Using \"Merged Framebuffer\" mode.\n");
--                /*
--                * a few options that won't work well together
--                */
--                if(pMga->HWCursor) /*Should we give the choice? */
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Hardware Cursor disabled.\n");
--                pMga->HWCursor = FALSE; 
--                if(pMga->ShadowFB) 
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Shadow Framebuffer disabled.\n");
--                pMga->ShadowFB = FALSE;
--                if(pMga->FBDev) 
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Framebuffer device disabled.\n");
--                pMga->FBDev = FALSE;
--            } /* MGA_HAL */
--            else
--#endif
-             { 
-                 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                     "HALLib not loaded! NOT using \"Merged Framebuffer\" mode.\n");
-@@ -2404,10 +2348,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     clockRanges->clockIndex = -1;		/* programmable */
-     clockRanges->interlaceAllowed = TRUE;
-     clockRanges->doubleScanAllowed = TRUE;
--#ifdef USEMGAHAL
--    MGA_HAL(clockRanges->interlaceAllowed = FALSE);
--    MGA_HAL(clockRanges->doubleScanAllowed = FALSE);
--#endif
-     if (pMga->SecondCrtc == TRUE) 
- 	clockRanges->interlaceAllowed = FALSE;
- 
-@@ -2513,80 +2453,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	MGAFreeRec(pScrn);
- 	return FALSE;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--
--    if(pMga->SecondCrtc == FALSE) {
--	
--        pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--        pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--        pMga->pClientStruct->pMga = (MGAPtr) pMga;
--
--        MGAMapMem(pScrn);
--	/* 
--	 * For some reason the MGAOPM_DMA_BLIT bit needs to be set
--	 * on G200 before opening the HALlib. I don't know why.
--	 * MATROX: hint, hint.
--	 */
--	/*if (pMga->Chipset == PCI_CHIP_MGAG200 ||
--	  pMga->Chipset == PCI_CHIP_MGAG200_PCI) */{
--	    CARD32 opmode;
--	    opmode = INREG(MGAREG_OPMODE);
--	    OUTREG(MGAREG_OPMODE,  MGAOPM_DMA_BLIT | opmode);
--	}
--	/* wrapping OpenLibrary to fix broken registers. MATROX: hint, hint. */
--	MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--        MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--        MGAUnmapMem(pScrn);
--        pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--        MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--
--        /* copy the board handles */
--        if (pMga->DualHeadEnabled) {
--            pMgaEnt->pClientStruct = pMga->pClientStruct;
--            pMgaEnt->pBoard = pMga->pBoard;
--            pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo;
--        }
--
--    } else { /* Second CRTC && entity is shared */ 
--        pMga->pBoard = pMgaEnt->pBoard;
--        pMga->pClientStruct = pMgaEnt->pClientStruct;
--        pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo;
--
--    }
--
--    MGAFillModeInfoStruct(pScrn,NULL);
--    /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable
--     * because no mode is given
--     */
--    pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY;
--
--    
--    if (ISDIGITAL1(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "Digital screen detected on first head.\n");
--    if (ISTV1(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "TV detected on first head.\n");
--    if (ISDIGITAL2(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "Digital screen detected on second head.\n");
--    if (ISTV2(pMga))
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "TV detected on second head.\n");
--
--    
--    if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGAValidateMode from HALlib found the mode to be invalid.\n"
--		   "\tError: 0x%lx\n", status);
--        return FALSE;
--    }
--    pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch;
--    );	/* MGA_HAL */
--#endif
- 
-     /* If the Device section explicitly set HasSDRAM, don't bother checking.
-      */
-@@ -2620,9 +2486,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-      * driver and if the driver doesn't provide code to set them.  They
-      * are not pre-initialised at all.
-      */
--#ifdef USEMGAHAL
--    MGA_HAL(xf86SetCrtcForModes(pScrn, 0));
--#endif
-     MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V));
- 
-     /* Set the current mode to the first in the list */
-@@ -2790,46 +2653,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     };
- 
-     
--#ifdef USEMGAHAL
--    MGA_HAL(
--    /* Close the library after preinit */
--    /* This needs to only happen after this board has completed preinit
--     * both times
--     */
--
--      if(pMga->DualHeadEnabled) {
--	  /* Entity is shared make sure refcount == 2 */
--	  /* If ref count is 2 then reset it to 0 */
--	  if(pMgaEnt->refCount == 2) {
--	      /* Both boards have done there initialization */
--	      MGACloseLibrary(pMga->pBoard);
--
--	      if (pMga->pBoard)
--	        xfree(pMga->pBoard);
--	      if (pMga->pClientStruct)
--	        xfree(pMga->pClientStruct);
--	      if (pMga->pMgaModeInfo)
--	        xfree(pMga->pMgaModeInfo);
--	      if (pMga->pMgaHwInfo)
--	        xfree(pMga->pMgaHwInfo);
--	      pMgaEnt->refCount = 0;
--	  }
--      } else {
--	  MGACloseLibrary(pMga->pBoard);
--
--	  if (pMga->pBoard)
--	    xfree(pMga->pBoard);
--	  if (pMga->pClientStruct)
--	    xfree(pMga->pClientStruct);
--	  if (pMga->pMgaModeInfo)
--	    xfree(pMga->pMgaModeInfo);
--	  if (pMga->pMgaHwInfo)
--	    xfree(pMga->pMgaHwInfo);
--      }
--
--    );	/* MGA_HAL */
--#endif
--
-     xf86SetPrimInitDone(pScrn->entityList[0]);
-     
-     return TRUE;
-@@ -2995,9 +2818,6 @@ MGASave(ScrnInfoPtr pScrn)
-     MGARegPtr mgaReg = &pMga->SavedReg;
- 
-     if(pMga->SecondCrtc == TRUE) return;
--#ifdef USEMGAHAL
--    MGA_HAL(if (pMga->pBoard != NULL) MGASaveVgaState(pMga->pBoard));
--#endif
- 
-     /* I need to save the registers for the second head also */
-     /* Save the register for 0x80 to 0xa0 */
-@@ -3007,135 +2827,6 @@ MGASave(ScrnInfoPtr pScrn)
-     (*pMga->Save)(pScrn, vgaReg, mgaReg, pMga->Primary);
- }
- 
--#ifdef USEMGAHAL
--/* Convert DisplayModeRec parameters in MGAMODEINFO parameters.
--*  mode parameter optionnal. */
--void
--MGAFillModeInfoStruct(ScrnInfoPtr pScrn, DisplayModePtr mode)
--{
--     const char *s;
--    MGAPtr pMga = MGAPTR(pScrn);
--
--    Bool digital1 = FALSE;
--    Bool digital2 = FALSE;
--    Bool tv1 = FALSE;
--    Bool tv2 = FALSE;
--    Bool swap_head
--      = xf86ReturnOptValBool(pMga->Options, OPTION_SWAPPED_HEAD, FALSE);
--        
--    if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) {
--        mode = pMga->SecondCrtc ? 
--             ((MergedDisplayModePtr)mode->Private)->Monitor2
--            : ((MergedDisplayModePtr)mode->Private)->Monitor1;
--    }
--    
--    
--    if (pMga->pMgaHwInfo)
--    {
--	digital1 = ISDIGITAL1(pMga);
--	digital2 = ISDIGITAL2(pMga);
--	tv1 = ISTV1(pMga);
--	tv2 = ISTV2(pMga);
--    }
--
--    /*FIXME: causes segfault elsewhere if not commented*/
--    /*if(!pMga->pMgaModeInfo)*/ pMga->pMgaModeInfo = xalloc(sizeof(MGAMODEINFO));
--    pMga->pMgaModeInfo->flOutput = 0;
--    pMga->pMgaModeInfo->ulDeskWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDeskHeight = pScrn->virtualY;
--    pMga->pMgaModeInfo->ulFBPitch = 0;
--    pMga->pMgaModeInfo->ulBpp = pScrn->bitsPerPixel;
--    pMga->pMgaModeInfo->ulZoom = 1;
--    pMga->pMgaModeInfo->flSignalMode = 0x10;
--
--    /* Set TV standard */
--    if ((s = xf86GetOptValString(pMga->Options, OPTION_TVSTANDARD))) {
--    	if (!xf86NameCmp(s, "PAL")) {
--    		pMga->pMgaModeInfo->flSignalMode = 0x00;
--    		pMga->pMgaModeInfo->ulRefreshRate = 50;
--    		pMga->pMgaModeInfo->ulTVStandard = TV_PAL;
--    	} else {
--    		pMga->pMgaModeInfo->ulRefreshRate = 60;
--    		pMga->pMgaModeInfo->ulTVStandard = TV_NTSC;
--    	}
--    } else {
--    	pMga->pMgaModeInfo->ulRefreshRate = 0;
--    	pMga->pMgaModeInfo->ulTVStandard = TV_NTSC;
--    }
--
--    /* Set Cable Type */
--    if ((s = xf86GetOptValString(pMga->Options, OPTION_CABLETYPE))) {
--    	if (!xf86NameCmp(s, "SCART_RGB")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_RGB;
--    	} else if (!xf86NameCmp(s, "SCART_COMPOSITE")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_COMPOSITE;
--    	} else if (!xf86NameCmp(s, "SCART_TYPE2")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_TYPE2;
--    	} else {
--    		pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE;
--    	}
--    } else {
--    	pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE;
--    }
--
--    if(mode) {
--        pMga->pMgaModeInfo->ulHorizRate = 0;
--        pMga->pMgaModeInfo->ulDispWidth = mode->HDisplay;
--        pMga->pMgaModeInfo->ulDispHeight = mode->VDisplay;
--        pMga->pMgaModeInfo->ulPixClock = mode->Clock;
--        pMga->pMgaModeInfo->ulHFPorch = mode->HSyncStart - mode->HDisplay;
--        pMga->pMgaModeInfo->ulHSync = mode->HSyncEnd - mode->HSyncStart;
--        pMga->pMgaModeInfo->ulHBPorch = mode->HTotal - mode->HSyncEnd;
--        pMga->pMgaModeInfo->ulVFPorch = mode->VSyncStart - mode->VDisplay;
--        pMga->pMgaModeInfo->ulVSync = mode->VSyncEnd - mode->VSyncStart;
--        pMga->pMgaModeInfo->ulVBPorch = mode->VTotal - mode->VSyncEnd;
--    }
--    /* Use DstOrg directly */
--    /* This is an offset in pixels not memory */
--    pMga->pMgaModeInfo->ulDstOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8);
--    pMga->pMgaModeInfo->ulDisplayOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8);
--    pMga->pMgaModeInfo->ulPanXGran = 0;
--    pMga->pMgaModeInfo->ulPanYGran = 0;
--
--    if(pMga->SecondCrtc == TRUE) {
--	pMga->pMgaModeInfo->flOutput = MGAMODEINFO_SECOND_CRTC |
--				       MGAMODEINFO_FORCE_PITCH |
--				       MGAMODEINFO_FORCE_DISPLAYORG;
--	if (digital2) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2;
--	} else if (tv2) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV;
--	} else {
--            if (!swap_head) {
--	      pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2;
--            } else {
--              pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1;
--            }
--	}
--    } else { 
--	pMga->pMgaModeInfo->flOutput = MGAMODEINFO_FORCE_PITCH;
--        if (digital1) {
--	    if ((pMga->Chipset == PCI_CHIP_MGAG200) ||
--		(pMga->Chipset == PCI_CHIP_MGAG200_PCI)) {
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_FLATPANEL1;
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2;
--	    } else {
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL1;
--	    }
--        } else if (tv1) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV;
--       	} else {
--            if (!swap_head) {
--	        pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1;
--            } else {
--                pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2;
--            }
--        }
--    }
--    pMga->pMgaModeInfo->ulFBPitch = pScrn->displayWidth;
--}
--#endif
--
- /*
-  * Initialise a new mode.  This is currently still using the old
-  * "initialise struct, restore/write struct to HW" model.  That could
-@@ -3150,9 +2841,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGARegPtr mgaReg;
- 
--#ifdef USEMGAHAL
--   ULONG status;
--#endif
-     vgaHWUnlock(hwp);
- 
- /*    if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) {
-@@ -3175,56 +2863,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     }
-     vgaReg = &hwp->ModeReg;
-     mgaReg = &pMga->ModeReg;
--#ifdef USEMGAHAL
--    MGA_HAL( 
--        MGAFillModeInfoStruct(pScrn,mode);
--                    
--        /* Validate the parameters */
--        if ((status = MGAValidateMode(pMga->pBoard, pMga->pMgaModeInfo)) != 0) {
--            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                    "MGAValidateMode from HALlib found the mode to be invalid.\n"
--                    "\tError: %lx\n", status);
--            return FALSE;
--        }
--
--        /*
--         * Find mode for second head. 
--         */
--        if(pMga->MergedFB) {
--    
--            MGAFillModeInfoStruct(pMga->pScrn2,mode);
--            /* Validates the Video parameters */
--            if ((status = MGAValidateVideoParameters(pMga->pBoard, MGAPTR(pMga->pScrn2)->pMgaModeInfo))
--                != 0) {
--                xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        "MGAValidateVideoParameters from HALlib found the mode to be invalid.\n\tError: %lx\n", status);
--                return FALSE;
--            }
--        }
--    );	 /*MGA_HAL */
--    
--#endif
--
--#ifdef USEMGAHAL
--MGA_HAL(
--
--    /*************************** ESC *****************************/
--    TmpMgaModeInfo[0] =  *pMga->pMgaModeInfo;
--	
--    if(pMga->SecondCrtc == TRUE)
--        pMgaModeInfo[1] = pMga->pMgaModeInfo;
--    else
--        pMgaModeInfo[0] = pMga->pMgaModeInfo;
--    
--	TmpMgaModeInfo[0].ulDispWidth = 0;
--    
--    if(!pMga->MergedFB) /* FIXME: Must deal with this once PowerDesk & MergedFB 
--                           compatibility will exist */
--        MGAFillDisplayModeStruct(mode, pMga->pMgaModeInfo);  
--    /*************************************************************/
--
--);	/* MGA_HAL */
--#endif
- 
- #ifdef XF86DRI
-    if (pMga->directRenderingEnabled) {
-@@ -3232,38 +2870,6 @@ MGA_HAL(
-    }
- #endif
- 
--#ifdef USEMGAHAL
--    MGA_HAL(
--    /* Initialize the board */
--    if(MGASetMode(pMga->pBoard,pMga->pMgaModeInfo) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		"MGASetMode returned an error."
--		"  Make sure to validate the mode before.\n");
--	return FALSE;
--    }
--    if(pMga->MergedFB
--       && MGASetMode(pMga->pBoard,MGAPTR(pMga->pScrn2)->pMgaModeInfo) != 0) {
--  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGASetMode returned an error."
--		   "  Make sure to validate the mode before.\n");
--    }
--
--    );	/* MGA_HAL */
--
--    /* getting around bugs in the HAL lib. MATROX: hint, hint. */
--    MGA_HAL(
--	    if (pMga->chip_attribs->hwcursor_1064) {
--		if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
--		outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, 
--			  pMga->FbCursorOffset >> 10);
--		outMGAdac(MGA1064_CURSOR_BASE_ADR_HI, 
--			  pMga->FbCursorOffset >> 18);
--		outMGAdac(MGA1064_CURSOR_CTL, 0x00);
--	      }
--	    }
--    );	/* MGA_HAL */
--#endif
--
-     MGA_NOT_HAL((*pMga->Restore)(pScrn, vgaReg, mgaReg, FALSE));
- 
-     MGAStormSync(pScrn);
-@@ -3472,14 +3078,6 @@ MGARestore(ScrnInfoPtr pScrn)
- 	vgaHWProtect(pScrn, TRUE);
-     }
-     if (pMga->Primary) {
--#ifdef USEMGAHAL
--	MGA_HAL(
--	    if(pMga->pBoard != NULL) {
--		MGASetVgaMode(pMga->pBoard);
--		MGARestoreVgaState(pMga->pBoard);
--	    }
--	    );	/* MGA_HAL */
--#endif
-         (*pMga->Restore)(pScrn, vgaReg, mgaReg, TRUE);
-     } else {
-         vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
-@@ -3588,81 +3186,12 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-        pPriv = xf86GetEntityPrivate(pScrn->entityList[0], MGAEntityIndex);
-        pMgaEnt = pPriv->ptr;
-        pMgaEnt->refCount++;
--#ifdef USEMGAHAL
--       MGA_HAL(
--       if(pMgaEnt->refCount == 1) {
--	   CARD8 MiscCtlReg;
--	  pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--	  pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--	  pMga->pClientStruct->pMga = (MGAPtr) pMga;
--	  
--	  /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/
--          MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--	  MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	  outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--	  pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--	  MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--
--	  /* Detecting for type of display */
--	  if (pMga->pMgaHwInfo->ulCapsSecondOutput & MGAHWINFOCAPS_OUTPUT_TV) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "TV detected\n");
--	  }
--	  if (pMga->pMgaHwInfo->ulCapsFirstOutput &
--			MGAHWINFOCAPS_OUTPUT_DIGITAL) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
--				"Digital Screen detected\n");
--	  }
--	  if (pMga->pMgaHwInfo->ulCapsSecondOutput &
--			MGAHWINFOCAPS_OUTPUT_DIGITAL) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
--				"Digital Screen detected\n");
--	  }
--
--	  /* Now copy these to the entitystructure */
--	  pMgaEnt->pClientStruct = pMga->pClientStruct;
--	  pMgaEnt->pBoard = pMga->pBoard;
--	  pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo;
--       } else { /* Ref count is 2 */
--	  pMga->pClientStruct = pMgaEnt->pClientStruct;
--	  pMga->pBoard = pMgaEnt->pBoard;
--	  pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo;
--       }
--       );	/* MGA_HAL */
--#endif
-     } else {
--#ifdef USEMGAHAL
--	CARD8 MiscCtlReg;
--
--	  MGA_HAL(
--	  pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--	  pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--	  pMga->pClientStruct->pMga = (MGAPtr) pMga;
--
--	  MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--	  /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/
--	  MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	  outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--	  pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--	  MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--	  );	/* MGA_HAL */
--#endif
-     }
-     if (pMga->is_G200SE) {
- 	pScrn->videoRam = VRTemp;
- 	pMga->FbMapSize = FBTemp;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--	/* There is a problem in the HALlib: set soft reset bit */
--	/* MATROX: hint, hint. */
--	if (!pMga->Primary && !pMga->FBDev &&
--	    (SUBSYS_ID(pMga->PciInfo) == PCI_CARD_MILL_G200_SG)) {
--	    OUTREG(MGAREG_Reset, 1);
--	    usleep(200);
--	    OUTREG(MGAREG_Reset, 0);
--	}
--    );	/* MGA_HAL */
--#endif
- 
-     /* Initialise the MMIO vgahw functions */
-     vgaHWSetMmioFuncs(hwp, pMga->IOBase, PORT_OFFSET);
-@@ -3969,66 +3498,8 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- Bool
- MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- {
--#ifdef USEMGAHAL
--    char sCmdIn[256];
--    char sCmdOut[256];
--    FILE* fdIn;
--# ifdef MATROX_WRITEBACK
--    FILE* fdOut;
--# endif
--#endif
-  
-     if  (mode->Flags & 0x80000000) {
--#ifdef USEMGAHAL
--
--# ifdef MATROX_WRITEBACK
--#  define MWB(x) { x; }
--#  define MWB_COND(x) x
--# else
--#  define MWB(x)
--#  define MWB_COND(x) 1
--# endif
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--
--	MGA_HAL(
--	fdIn = fopen("/tmp/mgaDriverIn", "rt");
--	MWB(fdOut = fopen("/tmp/mgaDriverOut", "wt"))
--
--	if(fdIn && MWB_COND(fdOut))
--	{
-- 
--	    fgets(sCmdIn, 255, fdIn);
-- 
--	    if(sCmdIn)
--	    {
-- 
--		MGAExecuteEscCmd(xf86Screens[scrnIndex], sCmdIn, sCmdOut, mode);
-- 
--		/* Remove file and close file descriptor */
--		remove("/tmp/mgaDriverIn");
--		fclose(fdIn);
--		MWB(
--		    /* Write output data to output file for
--		       calling application */
--		    fputs(sCmdOut, fdOut);
--		    fclose(fdOut);
--		    )
--		mode->Flags &= 0x7FFFFFFF;
--		return TRUE;
--	    }
--	    else
--	    {
--		mode->Flags &= 0x7FFFFFFF;
--		return FALSE;
--	    }
--	}
--	else
--	{
--	    mode->Flags &= 0x7FFFFFFF;
--	    return FALSE;
--	}
--   )
--#endif
-  	return FALSE; 
-     }   else
- 	return MGAModeInit(xf86Screens[scrnIndex], mode);
-@@ -4040,28 +3511,6 @@ MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- void
- MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y)
- {
--#ifdef USEMGAHAL
--    MGA_HAL(
--	MGAPtr pMga = MGAPTR(pScrn);
--	MGAPtr pMga2;
--	int xg = 1;
--	int yg = 1;
--	if(pMga->pMgaModeInfo && pMga->pMgaModeInfo->ulPanXGran && pMga->pMgaModeInfo->ulPanYGran) {
--	    xg = pMga->pMgaModeInfo->ulPanXGran;
--	    yg = pMga->pMgaModeInfo->ulPanYGran;
--	}
--	if(pMga->pScrn2 && (pMga2 = MGAPTR(pMga->pScrn2)) ) {
--
--	    if(pMga2->pMgaModeInfo && pMga2->pMgaModeInfo->ulPanXGran && pMga2->pMgaModeInfo->ulPanYGran) {
--		xg = max(xg,pMga2->pMgaModeInfo->ulPanXGran);
--		yg = max(yg,pMga2->pMgaModeInfo->ulPanYGran);
--	    }
--	}
--	xg=16; /*ncoder: temporary */ 
--	*x -= *x % xg;
--	*y -= *y % yg;
--	); 
--#endif
- }
- 
- 
-@@ -4087,16 +3536,6 @@ MGAAdjustFrame(int scrnIndex, int x, int y, int flags)
-         /* wanted to improve panning granularity problems without risking
-          * compatibility issues. Existing code looked hardware dependent.
-          */
--#ifdef USEMGAHAL
--    MGA_HAL(
--	    pMga->HALGranularityOffX = x;
--	    pMga->HALGranularityOffY = y;
--        MGAAdjustGranularity(pScrn,&x,&y);
--	    pMga->HALGranularityOffX = pMga->HALGranularityOffX - x;
--	    pMga->HALGranularityOffY = pMga->HALGranularityOffY - y;
--        HALSetDisplayStart(pMga->pBoard,x,y,0);
--    );
--#endif
-     MGA_NOT_HAL(
-         if(pMga->ShowCache && y && pScrn->vtSema)
-             y += pScrn->virtualY - 1;
-@@ -4139,12 +3578,6 @@ MGAAdjustFrameCrtc2(int scrnIndex, int x, int y, int flags)
-     pScrn = xf86Screens[scrnIndex];
-     pMga = MGAPTR(pScrn);
-     pLayout = &pMga->CurrentLayout;
--#ifdef USEMGAHAL
--    MGA_HAL(
--        MGAAdjustGranularity(pScrn,&x,&y);
--        HALSetDisplayStart(pMga->pBoard,x,y,1);
--    );
--#endif
-     MGA_NOT_HAL(
-         if(pMga->ShowCache && y && pScrn->vtSema)
-             y += pScrn->virtualY - 1;
-@@ -4258,9 +3691,6 @@ MGALeaveVT(int scrnIndex, int flags)
-         DRILock(pScreen, 0);
-     }
- #endif
--#ifdef USEMGAHAL
--    MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); );
--#endif
- }
- 
- 
-@@ -4280,9 +3710,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGAEntPtr pMgaEnt = NULL;
- 
--#ifdef USEMGAHAL    
--    MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); );
--#endif
-     if (pMga->MergedFB)
-          MGACloseScreenMerged(scrnIndex, pScreen);
- 
-@@ -4311,37 +3738,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-        pMgaEnt->refCount--;
-    }
- 
--#ifdef USEMGAHAL
--   MGA_HAL(
--   if(pMga->DualHeadEnabled) {
--      if(pMgaEnt->refCount == 0) {
--	 /* Both boards have closed there screen */
--	 MGACloseLibrary(pMga->pBoard);
--
--	 if (pMga->pBoard)
--	   xfree(pMga->pBoard);
--	 if (pMga->pClientStruct)
--	   xfree(pMga->pClientStruct);
--	 if (pMga->pMgaModeInfo)
--	   xfree(pMga->pMgaModeInfo);
--	 if (pMga->pMgaHwInfo)
--	   xfree(pMga->pMgaHwInfo);
--      }
--   } else {
--      MGACloseLibrary(pMga->pBoard);
--
--      if (pMga->pBoard)
--	xfree(pMga->pBoard);
--      if (pMga->pClientStruct)
--	xfree(pMga->pClientStruct);
--      if (pMga->pMgaModeInfo)
--	xfree(pMga->pMgaModeInfo);
--      if (pMga->pMgaHwInfo)
--	xfree(pMga->pMgaHwInfo);
--   }
--   );	/* MGA_HAL */
--#endif
--
- #ifdef USE_XAA
-     if (pMga->AccelInfoRec)
- 	XAADestroyInfoRec(pMga->AccelInfoRec);
-diff --git a/src/mga_esc.c b/src/mga_esc.c
-index e811712..41b734a 100644
---- a/src/mga_esc.c
-+++ b/src/mga_esc.c
-@@ -10,782 +10,4 @@
- #include "config.h"
- #endif
- 
--#ifdef USEMGAHAL
--
--/* All drivers should typically include these */
--#include "xf86.h"
--#include "xf86_OSproc.h"
--
--/* All drivers need this */
--
--#include "compiler.h"
--
--/* Drivers for PCI hardware need this */
--#include "xf86PciInfo.h"
--
--/* Drivers that need to access the PCI config space directly need this */
--#include "xf86Pci.h"
--
--/* All drivers initialising the SW cursor need this */
--#include "mipointer.h"
--
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
--#include "micmap.h"
--
--#include "xf86DDC.h"
--#include "vbe.h"
--
--#include "fb.h"
--#include "dixstruct.h"
--
--#include "mga_reg.h"
--#include "mga.h"
--#include "mga_macros.h"
--
--/* ESC */
--LPMGAMODEINFO pMgaModeInfo[2] = {NULL};
--MGAMODEINFO   TmpMgaModeInfo[2] = {{0}};
--
--/* ESC Implementation */
--static void EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--
--static LPMGAMODEINFO  GetModeInfoPtr(ULONG ulScreen);
--static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult);
--static Bool convertNumber(unsigned long *pulNumber, char *sNumber);
--
--
--static MGAEscFuncRec FunctionTable[] = {
--    {"hal",  EscHal},
--    {"test",  EscTest},
--    {"read",  EscRead},
--	{"write", EscWrite},
--    {"left",  EscHLeft},
--    {"right", EscHRight},
--    {"down",  EscVDown},
--    {"up",    EscVUp},
--    {"h+",    EscHLarger},
--    {"h-",    EscHSmaller},
--    {"v+",    EscVTaller},
--    {"v-",    EscVSmaller},
--    {"refresh", EscRefresh},
--    {"undo",  EscRestoreVidParm},
--    {"merged", EscMerged},
--    {NULL,NULL}
--};
--
--
--void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo)
--{
--   pMode->Clock = pModeInfo->ulPixClock;
--
--   pMode->HDisplay = pModeInfo->ulDispWidth;
--   pMode->HSyncStart =  pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch;
--   pMode->HSyncEnd = pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch
--                        + pModeInfo->ulHSync;
--   pMode->HTotal = pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch
--                       + pModeInfo->ulHSync
--                       + pModeInfo->ulHBPorch;
--
--   pMode->VDisplay = pModeInfo->ulDispHeight;
--   pMode->VSyncStart =  pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch;
--   pMode->VSyncEnd = pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch
--                       + pModeInfo->ulVSync;
--   pMode->VTotal = pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch
--                       + pModeInfo->ulVSync
--                       + pModeInfo->ulVBPorch;
--
--   pMode->VRefresh = pModeInfo->ulRefreshRate;
--}
--
--static LPMGAMODEINFO  GetModeInfoPtr(ULONG ulScreen)
--{
--
--    if ( !TmpMgaModeInfo[ulScreen].ulDispWidth )
--    {
--        TmpMgaModeInfo[ulScreen] = *pMgaModeInfo[ulScreen];
--    }
--
--    return &TmpMgaModeInfo[ulScreen];
--}
--
--
--static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult)
--{
--    sprintf(sResult, "%d %d %d %d %d %d %d %d %d %d %d",
--            pModeInfo->ulDispWidth,
--            pModeInfo->ulDispHeight,
--            pModeInfo->ulBpp,
--            pModeInfo->ulPixClock,
--            pModeInfo->ulHFPorch,
--            pModeInfo->ulHSync,
--            pModeInfo->ulHBPorch,
--            pModeInfo->ulVFPorch,
--            pModeInfo->ulVSync,
--            pModeInfo->ulVBPorch,
--            pModeInfo->flSignalMode);
--}
--
--
--static float  GetVRefresh(LPMGAMODEINFO pModeInfo)
--{
--    ULONG ulHTotal;
--    ULONG ulVTotal;
--
--    ulHTotal =
--        pModeInfo->ulDispWidth +
--        pModeInfo->ulHFPorch +
--        pModeInfo->ulHSync +
--        pModeInfo->ulHBPorch;
--
--    ulVTotal =
--        pModeInfo->ulDispHeight +
--        pModeInfo->ulVFPorch    +
--        pModeInfo->ulVSync      +
--        pModeInfo->ulVBPorch;
--
--    return ((float)pModeInfo->ulPixClock * 1000.0) / (ulHTotal * ulVTotal);
--}
--
--static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--	MGAPtr pMGA = MGAPTR(pScrn);
--
--	if(pMGA->HALLoaded)
--		strcpy(sResult, "YES");
--	else
--		strcpy(sResult, "NO");
--
--}
--
--static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char
--*sResult, DisplayModePtr pMode)
--{
--	strcpy(sResult, "YES");
--}
--
--static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char
--*sResult, DisplayModePtr pMode)
--{
--	strcpy(sResult, "YES");
--}
--
--static void  EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    ULONG  ulSource, ulAddr, ulData;
--    UCHAR  ucIndex;
--
--    if ( (param[0] & 0xffff) < 2 )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--
--    ulSource = param[1] >> 16;
--    ulAddr = param[1] & 0xffff;
--
--
--    switch( ulSource )
--    {
--    case 0:
--        ulData = INREG(ulAddr);
--        sprintf(sResult, "MGA[%04X] = 0x%08X", ulAddr, ulData);
--        break;
--    case 1:
--        ucIndex = INREG8(0x3c00);
--        OUTREG8(0x3c00, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x3c0a);
--        OUTREG8(0x3c00, ucIndex);
--        sprintf(sResult, "DAC[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    case 2:
--        ucIndex = INREG8(0x1fd4);
--        OUTREG8(0x1fd4, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x1fd5);
--        OUTREG8(0x1fd4, ucIndex);
--        sprintf(sResult, "CRTC[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    case 3:
--        ucIndex = INREG8(0x1fde);
--        OUTREG8(0x1fde, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x1fdf);
--        OUTREG8(0x1fde, ucIndex);
--        sprintf(sResult, "CRTCEXT[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    default:
--        strcpy(sResult, "ERROR# 2");
--        break;
--    }
--}
--
--static void  EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    ULONG  ulSource, ulAddr, ulData;
--    UCHAR  ucIndex;
--
--    if ( (param[0] & 0xffff) < 3 )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    ulSource = param[1] >> 16;
--    ulAddr = param[1] & 0xffff;
--    ulData = param[2];
--
--
--    switch( ulSource )
--    {
--    case 0:
--        OUTREG(ulAddr, ulData);
--        strcpy(sResult, "OK");
--        break;
--    case 1:
--        ucIndex = INREG8(0x3c00);
--        OUTREG8(0x3c00, (UCHAR)ulAddr);
--        OUTREG8(0x3c0a, (UCHAR)ulData);
--        OUTREG8(0x3c00, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    case 2:
--        ucIndex = INREG8(0x1fd4);
--        OUTREG8(0x1fd4, (UCHAR)ulAddr);
--        OUTREG8(0x1fd5, (UCHAR)ulData);
--        OUTREG8(0x1fd4, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    case 3:
--        ucIndex = INREG8(0x1fde);
--        OUTREG8(0x1fde, (UCHAR)ulAddr);
--        OUTREG8(0x1fdf, (UCHAR)ulData);
--        OUTREG8(0x1fde, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    default:
--        strcpy(sResult, "ERROR# 2");
--        break;
--    }
--}
--
--static void  EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--
--    if (pModeInfo->ulHBPorch > (8 * param[1]) )
--    {
--        pModeInfo->ulHBPorch -=8 * param[1];
--        pModeInfo->ulHFPorch +=8 * param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void  EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulHFPorch > (8 * param[1]) )
--    {
--        pModeInfo->ulHFPorch -=8 * param[1];
--        pModeInfo->ulHBPorch +=8 * param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--
--static void  EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulVBPorch > (param[1]) )
--    {
--        pModeInfo->ulVBPorch -= param[1];
--        pModeInfo->ulVFPorch += param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void  EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulVFPorch >= (param[1]) )
--    {
--        pModeInfo->ulVFPorch -= param[1];
--        pModeInfo->ulVBPorch += param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1] * 8;
--    }
--    else
--    {
--
--        ulStep = 8;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    if (pModeInfo->ulHBPorch >= ulStep )
--    {
--        pModeInfo->ulHBPorch -= ulStep;
--    }
--    else
--    {
--        pModeInfo->ulHBPorch = 0;
--    }
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1] * 8;
--    }
--    else
--    {
--
--        ulStep = 8;
--    }
--
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulHBPorch += ulStep;
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1];
--    }
--    else
--    {
--
--        ulStep = 1;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--
--    if (pModeInfo->ulVBPorch >= ulStep )
--    {
--        pModeInfo->ulVBPorch -= ulStep;
--    }
--    else
--    {
--        pModeInfo->ulVBPorch = 0;
--    }
--
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1];
--    }
--    else
--    {
--
--        ulStep = 1;
--    }
--
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulVFPorch += ulStep;
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) < 2)
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulPixClock = (ULONG)( ((float)param[1] * fPixelClock) / fRefresh);
--
--    pModeInfo->ulRefreshRate = param[1];
--
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--
--    TmpMgaModeInfo[param[0] >> 16].ulDispWidth = 0;
--    MGASetMode(pMga->pBoard, pMgaModeInfo[param[0] >> 16]);
--
--    MGAFillDisplayModeStruct(pMode, pMgaModeInfo[param[0] >> 16]);
--
--    GetVideoParameterStr(pMgaModeInfo[param[0] >> 16], sResult);
--}
--
--static Bool convertNumber(unsigned long *pulNumber, char *sNumber)
--{
--    unsigned long i, ulDigit, shiftHex;
--    Bool bResult = TRUE;
--
--    if (sNumber == NULL)
--    {
--        return FALSE;
--    }
--
--
--    /* Convert number */
--    if ( (sNumber[0] == '0') && (sNumber[1] == 'x') )
--    {
--        shiftHex = 0;
--        *pulNumber = 0;
--
--        for (i = strlen(sNumber) - 1; i > 1; i--)
--        {
--            if (shiftHex > 28)
--            {
--                bResult = FALSE;
--                break;
--            }
--
--            if ( !isxdigit(sNumber[i]) )
--            {
--                bResult = FALSE;
--                break;
--            }
--
--            ulDigit = toupper(sNumber[i]) - '0';
--            if (ulDigit > 9)
--            {
--                ulDigit -= 7;
--            }
--            *pulNumber += ulDigit << shiftHex;
--            shiftHex += 4;
--        }
--    }
--    else
--    {
--        for (i = 0; i < strlen(sNumber); i++)
--        {
--            if ( !isdigit(sNumber[i]) )
--            {
--                bResult = FALSE;
--                break;
--            }
--        }
--        *pulNumber = atoi(sNumber);
--    }
--
--    return bResult;
--}
--
--static Bool GetEscCommand(char *cmdline, EscCmdStruct *escCmd)
--{
--    unsigned long i, paramIndex, ulHI;
--    Bool bResult;
--    char *pParameter, *function;
--
--    bResult = TRUE; /* success */
--
--    function = strtok(cmdline, " \t\n,");
--
--
--    escCmd->parameters[0] = 0;
--    if (function)
--    {
--        /* Find Screen */
--        if (function[1] == ':' )
--        {
--            escCmd->parameters[0] = (unsigned long)(function[0] - '0') << 16;
--            strncpy(escCmd->function, function+2, 32);
--        }
--        else
--        {
--            strncpy(escCmd->function, function, 32);
--        }
--
--    }
--    else
--    {
--        strcpy(escCmd->function, "#ERROR -1");
--        escCmd->parameters[0] = 0;
--        return FALSE;
--    }
--
--    paramIndex = 1;
--    while ( (pParameter = strtok(NULL, " \t\n,")) != NULL )
--    {
--        if (paramIndex > 31)
--        {
--            /* 32 parameters supported */
--            break;
--        }
--
--        i = 0;
--        while(pParameter[i] && pParameter[i] != ':')
--        {
--            i++;
--        }
--
--        if ( pParameter[i] )
--        {
--            pParameter[i] = '\0';
--            bResult  = convertNumber(&escCmd->parameters[paramIndex], &pParameter[i+1]);
--            bResult |= convertNumber(&ulHI, pParameter);
--            escCmd->parameters[paramIndex] &= 0xffff;
--            escCmd->parameters[paramIndex] += ulHI << 16;
--            pParameter[i] = ':';
--        }
--        else
--        {
--            bResult = convertNumber(&escCmd->parameters[paramIndex], pParameter);
--        }
--
--
--        if (!bResult)
--        {
--            break;
--        }
--        paramIndex++;
--    }
--
--    escCmd->parameters[0] += paramIndex;
--    return bResult;
--
--}
--
--void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode)
--{
--    int i = 0;
--    int ulScreen = 0;
--    MGAPtr pMga = MGAPTR(pScrn);
--    EscCmdStruct EscCmd;
--
--    if (pMga->SecondCrtc)
--    {
--	ulScreen = 1;
--    }
--    else
--    {
--	ulScreen = 0;
--    }
--
--
--    if (FunctionTable[0].function &&  GetEscCommand(cmdline,  &EscCmd) )
--    {
--        i = 0;
--
--        while ( FunctionTable[i].function && strcmp(FunctionTable[i].function, EscCmd.function) )
--        {
--            i++;
--        }
--
--        if (FunctionTable[i].function)
--        {
--	    EscCmd.parameters[0] &= 0xffff;
--	    EscCmd.parameters[0] |= ulScreen << 16;
--
--            FunctionTable[i].funcptr(pScrn, EscCmd.parameters, sResult, pMode);
--        }
--        else
--        {
--            strcpy(sResult, "error# -1");
--        }
--    }
--    else
--    {
--        strcpy(sResult, "error# -1");
--    }
--}
--#else
- int mga_foo;
--#endif
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index bffd063..130651d 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -74,18 +74,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \
- #define CHECK_DMA_QUIESCENT(pMGA, pScrn)
- #endif
- 
--#ifdef USEMGAHAL
--#define MGA_HAL(x) { \
--	MGAPtr pMga = MGAPTR(pScrn); \
--	if (pMga->HALLoaded && pMga->chip_attribs->HAL_chipset) { x; } \
--}
--#define MGA_NOT_HAL(x) { \
--	MGAPtr pMga = MGAPTR(pScrn); \
--	if (!pMga->HALLoaded || !pMga->chip_attribs->HAL_chipset) { x; } \
--}
--#else
- #define MGA_NOT_HAL(x) { x; }
--#endif
- 
- #define MGAISGx50(x) ((x)->is_Gx50)
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 1fd0572..2affe3b 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -236,9 +236,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     int i;
-     char* s;
-     ClockRangePtr clockRanges;
--#ifdef USEMGAHAL
--    ULONG status;
--#endif
-     MgaScrn2Rel Monitor2Pos;
- 
-     xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n");
-@@ -252,9 +249,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     }
- 
-     pMga = MGAPTR(pScrn);
--#ifdef USEMGAHAL
--    pMga->pMgaModeInfo = NULL; /*will be allocated later if NULL*/ 
--#endif
-     pMga1 = MGAPTR(pScrn1);
-     pMga1->pScrn2 = pScrn;
-   
-@@ -456,10 +450,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     clockRanges->clockIndex = -1;		/* programmable */
-     clockRanges->interlaceAllowed = TRUE;
-     clockRanges->doubleScanAllowed = TRUE;
--#ifdef USEMGAHAL
--    MGA_HAL(clockRanges->interlaceAllowed = FALSE);
--    MGA_HAL(clockRanges->doubleScanAllowed = FALSE);
--#endif
-     clockRanges->interlaceAllowed = FALSE; /*no interlace on CRTC2 */
- 
-     clockRanges->ClockMulFactor = 1;
-@@ -562,30 +552,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 	MGAFreeRec(pScrn);
- 	return FALSE;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--
--    pMga->pBoard = pMga1->pBoard;
--    pMga->pClientStruct = pMga1->pClientStruct;
--    pMga->pMgaHwInfo = pMga1->pMgaHwInfo;
--
--
--    MGAFillModeInfoStruct(pScrn,NULL);
--    /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable
--     * because no mode is given
--     */
--    pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY;
--    
--    if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGAValidateMode from HALlib found the mode to be invalid.\n"
--		   "\tError: 0x%lx\n", status);
--        return FALSE;
--    }
--    pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch;
--    );	/* MGA_HAL */
--#endif
- 
-     /*
-      * Set the CRTC parameters for all of the modes based on the type
-@@ -595,9 +561,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-      * driver and if the driver doesn't provide code to set them.  They
-      * are not pre-initialised at all.
-      */
--#ifdef USEMGAHAL
--    MGA_HAL(xf86SetCrtcForModes(pScrn, 0));
--#endif
-     MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V));
- 
-     /* Set the current mode to the first in the list */
---
-cgit v0.9.0.2-2-gbebe
-From ee09a9a340f8946f2d4a71a431b64189dbb5c256 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:22:09 +0000
-Subject: Remove xalloc/xcalloc/xrealloc/xfree
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_dga.c b/src/mga_dga.c
-index d43b96d..224e4ba 100644
---- a/src/mga_dga.c
-+++ b/src/mga_dga.c
-@@ -111,7 +111,7 @@ SECOND_PASS:
- 	    if(secondPitch)
- 		pitch = secondPitch; 
- 
--	    if(!(newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec))))
-+	    if(!(newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec))))
- 		break;
- 
- 	    modes = newmodes;
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 14f342f..957c6df 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -91,24 +91,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
-    case 16:
-       numConfigs = 8;
- 
--      pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig),
-+      pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig),
- 						numConfigs );
-       if ( !pConfigs ) {
- 	 return FALSE;
-       }
- 
--      pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec),
-+      pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec),
- 						 numConfigs );
-       if ( !pMGAConfigs ) {
--	 xfree( pConfigs );
-+	 free(pConfigs);
- 	 return FALSE;
-       }
- 
--      pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr),
-+      pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr),
- 						     numConfigs );
-       if ( !pMGAConfigPtrs ) {
--	 xfree( pConfigs );
--	 xfree( pMGAConfigs );
-+	 free(pConfigs);
-+	 free(pMGAConfigs);
- 	 return FALSE;
-       }
- 
-@@ -182,24 +182,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
-    case 32:
-       numConfigs = 8;
- 
--      pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig),
-+      pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig),
- 						numConfigs );
-       if ( !pConfigs ) {
- 	 return FALSE;
-       }
- 
--      pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec),
-+      pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec),
- 						 numConfigs );
-       if ( !pMGAConfigs ) {
--	 xfree( pConfigs );
-+	 free(pConfigs);
- 	 return FALSE;
-       }
- 
--      pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr),
-+      pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr),
- 						     numConfigs );
-       if ( !pMGAConfigPtrs ) {
--	 xfree( pConfigs );
--	 xfree( pMGAConfigs );
-+	 free(pConfigs);
-+	 free(pMGAConfigs);
- 	 return FALSE;
-       }
- 
-@@ -973,11 +973,11 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 
-         if (nbox>1) {
- 	    /* Keep ordering in each band, reverse order of bands */
--	    pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
-+	    pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
- 	    if (!pboxNew1) return;
--	    pptNew1 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
-+	    pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pptNew1) {
--	        xfree(pboxNew1);
-+	        free(pboxNew1);
- 	        return;
- 	    }
- 	    pboxBase = pboxNext = pbox+nbox-1;
-@@ -1008,14 +1008,14 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 
-         if (nbox > 1) {
- 	    /*reverse orderof rects in each band */
--	    pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
--	    pptNew2 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
-+	    pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
-+	    pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pboxNew2 || !pptNew2) {
--	        if (pptNew2) xfree(pptNew2);
--	        if (pboxNew2) xfree(pboxNew2);
-+	        if (pptNew2) free(pptNew2);
-+	        if (pboxNew2) free(pboxNew2);
- 	        if (pboxNew1) {
--		    xfree(pptNew1);
--		    xfree(pboxNew1);
-+		    free(pptNew1);
-+		    free(pboxNew1);
- 		}
- 	       return;
- 	    }
-@@ -1066,12 +1066,12 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
-     MGASelectBuffer(pScrn, MGA_FRONT);
- 
-     if (pboxNew2) {
--        xfree(pptNew2);
--        xfree(pboxNew2);
-+        free(pptNew2);
-+        free(pboxNew2);
-     }
-     if (pboxNew1) {
--        xfree(pptNew1);
--        xfree(pboxNew1);
-+        free(pptNew1);
-+        free(pboxNew1);
-     }
- 
-     pMga->AccelInfoRec->NeedToSync = TRUE;
-@@ -1150,7 +1150,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
-       pDRIInfo->busIdString = DRICreatePCIBusID(pMga->PciInfo);
-    } else {
--      pDRIInfo->busIdString = xalloc(64);
-+      pDRIInfo->busIdString = malloc(64);
-       sprintf( pDRIInfo->busIdString, "PCI:%d:%d:%d",
- #ifdef XSERVER_LIBPCIACCESS
- 	       ((pMga->PciInfo->domain << 8) | pMga->PciInfo->bus),
-@@ -1198,7 +1198,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
- 
-    pDRIInfo->SAREASize = SAREA_MAX;
- 
--   pMGADRI = (MGADRIPtr)xcalloc( sizeof(MGADRIRec), 1 );
-+   pMGADRI = (MGADRIPtr)calloc( sizeof(MGADRIRec), 1 );
-    if ( !pMGADRI ) {
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-@@ -1208,9 +1208,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    }
- 
-    pMGADRIServer = (MGADRIServerPrivatePtr)
--      xcalloc( sizeof(MGADRIServerPrivateRec), 1 );
-+      calloc( sizeof(MGADRIServerPrivateRec), 1 );
-    if ( !pMGADRIServer ) {
--      xfree( pMGADRI );
-+      free( pMGADRI );
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-       xf86DrvMsg( pScrn->scrnIndex, X_ERROR,
-@@ -1249,9 +1249,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
- 
-    if ( !DRIScreenInit( pScreen, pDRIInfo, &pMga->drmFD ) ) {
--      xfree( pMGADRIServer );
-+      free( pMGADRIServer );
-       pMga->DRIServerInfo = 0;
--      xfree( pDRIInfo->devPrivate );
-+      free( pDRIInfo->devPrivate );
-       pDRIInfo->devPrivate = 0;
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-@@ -1495,20 +1495,20 @@ void MGADRICloseScreen( ScreenPtr pScreen )
- 
-    if ( pMga->pDRIInfo ) {
-       if ( pMga->pDRIInfo->devPrivate ) {
--	 xfree( pMga->pDRIInfo->devPrivate );
-+	 free( pMga->pDRIInfo->devPrivate );
- 	 pMga->pDRIInfo->devPrivate = 0;
-       }
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-    }
-    if ( pMga->DRIServerInfo ) {
--      xfree( pMga->DRIServerInfo );
-+      free(pMga->DRIServerInfo);
-       pMga->DRIServerInfo = 0;
-    }
-    if ( pMga->pVisualConfigs ) {
--      xfree( pMga->pVisualConfigs );
-+      free(pMga->pVisualConfigs);
-    }
-    if ( pMga->pVisualConfigsPriv ) {
--      xfree( pMga->pVisualConfigsPriv );
-+      free( pMga->pVisualConfigsPriv );
-    }
- }
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d770031..d4ae346 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -646,7 +646,7 @@ MGAFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -813,7 +813,7 @@ MGAProbe(DriverPtr drv, int flags)
- 			            MGAChipsets, MGAPciChipsets, devSections,
- 			            numDevSections, drv, &usedChips);
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
- 	return FALSE;
- 
-@@ -971,7 +971,7 @@ MGAProbe(DriverPtr drv, int flags)
- 	    }
-         }
-     }
--    xfree(usedChips);
-+    free(usedChips);
- 
-     return foundScreen;
- }
-@@ -1715,7 +1715,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
-     }
- 
--    if (!(pMga->Options = xalloc(sizeof(MGAOptions))))
-+    if (!(pMga->Options = malloc(sizeof(MGAOptions))))
- 	return FALSE;
-     memcpy(pMga->Options, MGAOptions, sizeof(MGAOptions));
- 
-@@ -2384,7 +2384,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-         switch(pMga->Chipset) {
- 	case PCI_CHIP_MGA2064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches1));
-+		linePitches = malloc(sizeof(Pitches1));
- 		memcpy(linePitches, Pitches1, sizeof(Pitches1));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -2393,7 +2393,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	case PCI_CHIP_MGA2164_AGP:
- 	case PCI_CHIP_MGA1064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches2));
-+		linePitches = malloc(sizeof(Pitches2));
- 		memcpy(linePitches, Pitches2, sizeof(Pitches2));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -2431,7 +2431,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 			      LOOKUP_BEST_REFRESH);
-       
- 	if (linePitches)
--	   xfree(linePitches);
-+	   free(linePitches);
-     }
- 
-     if (i < 1 && pMga->FBDev) {
-@@ -3294,7 +3294,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pMga->ShadowFB) {
-  	pMga->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	pMga->ShadowPtr = xalloc(pMga->ShadowPitch * height);
-+	pMga->ShadowPtr = malloc(pMga->ShadowPitch * height);
- 	displayWidth = pMga->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-         FBStart = pMga->ShadowPtr;
-     } else {
-@@ -3745,21 +3745,21 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- #ifdef USE_EXA
-     if (pMga->ExaDriver) {
- 	exaDriverFini(pScreen);
--	xfree(pMga->ExaDriver);
-+	free(pMga->ExaDriver);
-     }
- #endif
-     if (pMga->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pMga->CursorInfoRec);
-     if (pMga->ShadowPtr)
--	xfree(pMga->ShadowPtr);
-+	free(pMga->ShadowPtr);
-     if (pMga->DGAModes)
--	xfree(pMga->DGAModes);
-+	free(pMga->DGAModes);
-     if (pMga->adaptor)
--	xfree(pMga->adaptor);
-+	free(pMga->adaptor);
-     if (pMga->portPrivate)
--	xfree(pMga->portPrivate);
-+	free(pMga->portPrivate);
-     if (pMga->ScratchBuffer)
--	xfree(pMga->ScratchBuffer);
-+	free(pMga->ScratchBuffer);
- 
-     pScrn->vtSema = FALSE;
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 2affe3b..e3216c9 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -70,9 +70,9 @@ CopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, DisplayModePtr i, DisplayM
-     DisplayModePtr mode;
-     int dx = 0,dy = 0;
-     /* start with first node */
--    mode = xalloc(sizeof(DisplayModeRec));
-+    mode = malloc(sizeof(DisplayModeRec));
-     memcpy(mode,i, sizeof(DisplayModeRec));
--    mode->Private = xalloc(sizeof(MergedDisplayModeRec));
-+    mode->Private = malloc(sizeof(MergedDisplayModeRec));
-     ((MergedDisplayModePtr)mode->Private)->Monitor1 = i;
-     ((MergedDisplayModePtr)mode->Private)->Monitor2 = j;
-     ((MergedDisplayModePtr)mode->Private)->Monitor2Pos = srel;
-@@ -239,7 +239,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     MgaScrn2Rel Monitor2Pos;
- 
-     xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n");
--    pScrn = xalloc(sizeof(ScrnInfoRec));
-+    pScrn = malloc(sizeof(ScrnInfoRec));
-     memcpy(pScrn,pScrn1,sizeof(ScrnInfoRec));
-    
-     pScrn->driverPrivate = NULL; 
-@@ -270,7 +270,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 
-     /* Set pScrn->monitor */
-     {
--        pScrn->monitor = xalloc(sizeof(MonRec));
-+        pScrn->monitor = malloc(sizeof(MonRec));
-         /* copy everything we don't care about */
-         memcpy(pScrn->monitor,pScrn1->monitor,sizeof(MonRec));
-         pScrn->monitor->DDC = NULL;   /*FIXME:have to try this */ 
-@@ -484,7 +484,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-         switch(pMga->Chipset) {
- 	case PCI_CHIP_MGA2064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches1));
-+		linePitches = malloc(sizeof(Pitches1));
- 		memcpy(linePitches, Pitches1, sizeof(Pitches1));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -493,7 +493,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 	case PCI_CHIP_MGA2164_AGP:
- 	case PCI_CHIP_MGA1064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches2));
-+		linePitches = malloc(sizeof(Pitches2));
- 		memcpy(linePitches, Pitches2, sizeof(Pitches2));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -529,7 +529,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 			      LOOKUP_BEST_REFRESH);
-         
- 	if (linePitches)
--	   xfree(linePitches);
-+	   free(linePitches);
-     }
- 
- 
-@@ -881,10 +881,10 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-     ScrnInfoPtr pScrn2 = pMga->pScrn2;
- 
-     if(pScrn2) {
--        xfree(pScrn2->monitor);
-+        free(pScrn2->monitor);
-         pScrn2->monitor = NULL;
- 
--        xfree(pScrn2);
-+        free(pScrn2);
-         pMga->pScrn2 = NULL;
-     }
- 
-@@ -893,8 +893,8 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-         do {
-             DisplayModePtr p = pScrn1->currentMode->next; 
-             if(pScrn1->currentMode->Private) 
--                xfree(pScrn1->currentMode->Private);
--            xfree(pScrn1->currentMode);
-+                free(pScrn1->currentMode->Private);
-+            free(pScrn1->currentMode);
-             pScrn1->currentMode = p;
-         }while( pScrn1->currentMode != pScrn1->modes);
-     }
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index db7fae7..f0e6194 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -583,7 +583,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
-     BoxRec AvailFBArea;
-     int i;
- 
--    pMga->ScratchBuffer = xalloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3);
-+    pMga->ScratchBuffer = malloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3);
-     if(!pMga->ScratchBuffer) return FALSE;
- 
-     pMga->AccelInfoRec = infoPtr = XAACreateInfoRec();
-diff --git a/src/mga_vga.c b/src/mga_vga.c
-index 9f00b3d..0ac8bf7 100644
---- a/src/mga_vga.c
-+++ b/src/mga_vga.c
-@@ -197,17 +197,17 @@ MGAG200SESaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save)
-     hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */
-     hwp->writeGr(hwp, 0x05, 0x00);  /* write mode 0, read mode 0 */
-     hwp->writeGr(hwp, 0x06, 0x05);  /* set graphics */
--    if (hwp->FontInfo1 || (hwp->FontInfo1 = xalloc(FONT_AMOUNT))) {
-+    if (hwp->FontInfo1 || (hwp->FontInfo1 = malloc(FONT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */
- 	hwp->writeGr(hwp, 0x04, 0x02);  /* read plane 2 */
- 	slowbcopy_frombus(hwp->Base, hwp->FontInfo1, FONT_AMOUNT);
-     }
--    if (hwp->FontInfo2 || (hwp->FontInfo2 = xalloc(FONT_AMOUNT))) {
-+    if (hwp->FontInfo2 || (hwp->FontInfo2 = malloc(FONT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */
- 	hwp->writeGr(hwp, 0x04, 0x03);  /* read plane 3 */
- 	slowbcopy_frombus(hwp->Base, hwp->FontInfo2, FONT_AMOUNT);
-     }
--    if (hwp->TextInfo || (hwp->TextInfo = xalloc(2 * TEXT_AMOUNT))) {
-+    if (hwp->TextInfo || (hwp->TextInfo = malloc(2 * TEXT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */
- 	hwp->writeGr(hwp, 0x04, 0x00);  /* read plane 0 */
- 	slowbcopy_frombus(hwp->Base, hwp->TextInfo, TEXT_AMOUNT);
-diff --git a/src/mga_video.c b/src/mga_video.c
-index a69c973..beb5a3c 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -131,8 +131,8 @@ void MGAInitVideo(ScreenPtr pScreen)
- 	    num_adaptors = 1;
- 	    adaptors = &newAdaptor;
- 	} else {
--	    newAdaptors =  /* need to free this someplace */
--		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+	    /* need to free this someplace */
-+	    newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
- 	    if(newAdaptors) {
- 		memcpy(newAdaptors, adaptors, num_adaptors * 
- 					sizeof(XF86VideoAdaptorPtr));
-@@ -147,7 +147,7 @@ void MGAInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
-@@ -231,10 +231,10 @@ MGAAllocAdaptor(ScrnInfoPtr pScrn, Bool doublebuffer)
-     if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
- 	return NULL;
- 
--    if(!(pPriv = xcalloc(1, sizeof(MGAPortPrivRec) + 
-+    if(!(pPriv = calloc(1, sizeof(MGAPortPrivRec) +
- 			(sizeof(DevUnion) * MGA_MAX_PORTS)))) 
-     {
--	xfree(adapt);
-+	free(adapt);
- 	return NULL;
-     }
- 
-@@ -1082,18 +1082,18 @@ MGAAllocateSurface(
-     surface->width = w;
-     surface->height = h;
- 
--    if(!(surface->pitches = xalloc(sizeof(int)))) {
-+    if(!(surface->pitches = malloc(sizeof(int)))) {
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
--    if(!(surface->offsets = xalloc(sizeof(int)))) {
--	xfree(surface->pitches);
-+    if(!(surface->offsets = malloc(sizeof(int)))) {
-+	free(surface->pitches);
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
--    if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
-+	free(surface->pitches);
-+	free(surface->offsets);
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
-@@ -1137,9 +1137,9 @@ MGAFreeSurface(
-     if(pPriv->isOn)
- 	MGAStopSurface(surface);
-     MGAFreeMemory(pScrn, pPriv->surface_memory);
--    xfree(surface->pitches);
--    xfree(surface->offsets);
--    xfree(surface->devPrivate.ptr);
-+    free(surface->pitches);
-+    free(surface->offsets);
-+    free(surface->devPrivate.ptr);
- 
-     return Success;
- }
-@@ -1231,7 +1231,7 @@ MGAInitOffscreenImages(ScreenPtr pScreen)
-     XF86OffscreenImagePtr offscreenImages;
- 
-     /* need to free this someplace */
--    if(!(offscreenImages = xalloc(num * sizeof(XF86OffscreenImageRec))))
-+    if(!(offscreenImages = malloc(num * sizeof(XF86OffscreenImageRec))))
- 	return;
- 
-     offscreenImages[0].image = &Images[0];
---
-cgit v0.9.0.2-2-gbebe
-From 1036e32e006d496023553ea566cb13ae93933719 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:35:48 +0000
-Subject: Remove if(E != NULL) checks around free(E)
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 957c6df..1454994 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -1011,8 +1011,8 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 	    pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
- 	    pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pboxNew2 || !pptNew2) {
--	        if (pptNew2) free(pptNew2);
--	        if (pboxNew2) free(pboxNew2);
-+	        free(pptNew2);
-+	        free(pboxNew2);
- 	        if (pboxNew1) {
- 		    free(pptNew1);
- 		    free(pboxNew1);
-@@ -1494,21 +1494,13 @@ void MGADRICloseScreen( ScreenPtr pScreen )
-    DRICloseScreen( pScreen );
- 
-    if ( pMga->pDRIInfo ) {
--      if ( pMga->pDRIInfo->devPrivate ) {
--	 free( pMga->pDRIInfo->devPrivate );
--	 pMga->pDRIInfo->devPrivate = 0;
--      }
-+      free(pMga->pDRIInfo->devPrivate);
-+      pMga->pDRIInfo->devPrivate = 0;
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-    }
--   if ( pMga->DRIServerInfo ) {
--      free(pMga->DRIServerInfo);
--      pMga->DRIServerInfo = 0;
--   }
--   if ( pMga->pVisualConfigs ) {
--      free(pMga->pVisualConfigs);
--   }
--   if ( pMga->pVisualConfigsPriv ) {
--      free( pMga->pVisualConfigsPriv );
--   }
-+   free(pMga->DRIServerInfo);
-+   pMga->DRIServerInfo = 0;
-+   free(pMga->pVisualConfigs);
-+   free(pMga->pVisualConfigsPriv);
- }
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d4ae346..dcbfabf 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -644,8 +644,6 @@ MGAGetRec(ScrnInfoPtr pScrn)
- void
- MGAFreeRec(ScrnInfoPtr pScrn)
- {
--    if (pScrn->driverPrivate == NULL)
--	return;
-     free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
-@@ -2430,8 +2428,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 			      pMga->FbMapSize,
- 			      LOOKUP_BEST_REFRESH);
-       
--	if (linePitches)
--	   free(linePitches);
-+	free(linePitches);
-     }
- 
-     if (i < 1 && pMga->FBDev) {
-@@ -3750,16 +3747,11 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- #endif
-     if (pMga->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pMga->CursorInfoRec);
--    if (pMga->ShadowPtr)
--	free(pMga->ShadowPtr);
--    if (pMga->DGAModes)
--	free(pMga->DGAModes);
--    if (pMga->adaptor)
--	free(pMga->adaptor);
--    if (pMga->portPrivate)
--	free(pMga->portPrivate);
--    if (pMga->ScratchBuffer)
--	free(pMga->ScratchBuffer);
-+    free(pMga->ShadowPtr);
-+    free(pMga->DGAModes);
-+    free(pMga->adaptor);
-+    free(pMga->portPrivate);
-+    free(pMga->ScratchBuffer);
- 
-     pScrn->vtSema = FALSE;
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index e3216c9..c1cf2eb 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -528,8 +528,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 			      pMga->FbMapSize,
- 			      LOOKUP_BEST_REFRESH);
-         
--	if (linePitches)
--	   free(linePitches);
-+	free(linePitches);
-     }
- 
- 
-@@ -892,8 +891,7 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-         pScrn1->currentMode = pScrn1->modes;
-         do {
-             DisplayModePtr p = pScrn1->currentMode->next; 
--            if(pScrn1->currentMode->Private) 
--                free(pScrn1->currentMode->Private);
-+            free(pScrn1->currentMode->Private);
-             free(pScrn1->currentMode);
-             pScrn1->currentMode = p;
-         }while( pScrn1->currentMode != pScrn1->modes);
-diff --git a/src/mga_video.c b/src/mga_video.c
-index beb5a3c..784e7b1 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -146,8 +146,7 @@ void MGAInitVideo(ScreenPtr pScreen)
-     if(num_adaptors)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
--    if(newAdaptors)
--	free(newAdaptors);
-+    free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
---
-cgit v0.9.0.2-2-gbebe
-From 560967b4ffdb103f95121c43708dd5fc680a5045 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:37:04 +0000
-Subject: Fix printf format specifier warning
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_exa.c b/src/mga_exa.c
-index f292327..e5eaa92 100644
---- a/src/mga_exa.c
-+++ b/src/mga_exa.c
-@@ -865,7 +865,7 @@ mgaExaInit(ScreenPtr pScreen)
- 
-     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "X %d Y %d bpp %d\n",
-                pScrn->virtualX, pScrn->virtualY, pScrn->bitsPerPixel);
--    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %x, osb %x\n",
-+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %lx, osb %lx\n",
-                pExa->memoryBase, pExa->memorySize, pExa->offScreenBase);
- 
-     /* In PW24 mode, we need to align to "3 64-bytes" */
---
-cgit v0.9.0.2-2-gbebe
-From 07792ef41f33aa5419168263637e34ee614f26e2 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:38:17 +0000
-Subject: Remove calls to xf86IsPc98()
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index dcbfabf..4af36ca 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2164,7 +2164,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     /*
-      * Reset card if it isn't primary one
-      */
--    if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() )
-+    if ( (!pMga->Primary && !pMga->FBDev) )
-         MGASoftReset(pScrn);
- 
-     if (pScrn->videoRam == 0) {
-@@ -2878,13 +2878,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	vgaHWProtect(pScrn, FALSE);
-     }
- 
--    if (xf86IsPc98()) {
--	if (pMga->Chipset == PCI_CHIP_MGA2064)
--	    outb(0xfac, 0x01);
--	else
--	    outb(0xfac, 0x02);
--    }
--
-     /* Reset tagfifo*/ 
- 	if (pMga->is_G200ER) 
-     {
-@@ -3680,8 +3673,6 @@ MGALeaveVT(int scrnIndex, int flags)
-     MGARestore(pScrn);
-     vgaHWLock(hwp);
- 
--    if (xf86IsPc98())
--	outb(0xfac, 0x00);
- #ifdef XF86DRI
-     if (pMga->directRenderingEnabled) {
-         pScreen = screenInfo.screens[scrnIndex];
-@@ -3755,9 +3746,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- 
-     pScrn->vtSema = FALSE;
- 
--    if (xf86IsPc98())
--	outb(0xfac, 0x00);
--
-     xf86ClearPrimInitDone(pScrn->entityList[0]);
- 
-     if(pMga->BlockHandler)
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index c1cf2eb..aec3443 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -385,7 +385,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     /*
-      * Reset card if it isn't primary one
-      */
--    if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() )
-+    if ( (!pMga->Primary && !pMga->FBDev) )
-         MGASoftReset(pScrn);
- 
-     
---
-cgit v0.9.0.2-2-gbebe
-From f9acf37be49844bea8165be9786afe37fd999229 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat, 29 Oct 2011 23:31:08 +0000
-Subject: Include <unistd.h> for usleep
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/mga_vga.c b/src/mga_vga.c
-index 0ac8bf7..8f52951 100644
---- a/src/mga_vga.c
-+++ b/src/mga_vga.c
-@@ -2,6 +2,8 @@
- #include "config.h"
- #endif
- 
-+#include <unistd.h>
-+
- #include "misc.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
---
-cgit v0.9.0.2-2-gbebe
-From d9cf07a4f424b2beb844ea1b3ec5d468e79a747c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat, 29 Oct 2011 23:34:41 +0000
-Subject: Include "xf86Modes.h" for xf86ModeBandwidth
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 4af36ca..d9f6ea4 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -52,6 +52,10 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
-+#ifdef HAVE_XF86MODEBANDWIDTH
-+#include "xf86Modes.h"
-+#endif
-+
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
- #include "xf86RAC.h"
---
-cgit v0.9.0.2-2-gbebe
-From 644ba5d11049e63ea61b5cc4fb889b0f840965ff Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Wed, 07 Dec 2011 20:42:39 +0000
-Subject: Add support for Video Memory greater then 8M
-
-Expand memory mapping of framebuffer from 8 to 16MB
-
-Fix segfault on redhat distibution
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d9f6ea4..ae36378 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2707,9 +2707,18 @@ MGAMapMem(ScrnInfoPtr pScrn)
- 	if (pMga->IOBase == NULL)
- 	    return FALSE;
- 
--	pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
--				     pMga->PciTag, pMga->FbAddress,
--				     pMga->FbMapSize);
-+    if (pMga->is_G200ER)
-+    {
-+        pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-+                         pMga->PciTag, pMga->FbAddress,
-+                         pMga->FbMapSize);
-+    }
-+    else
-+    {
-+        pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-+                         pMga->PciTag, pMga->FbAddress,
-+                         pMga->FbMapSize);
-+    }
- 	if (pMga->FbBase == NULL)
- 	    return FALSE;
- #endif
-@@ -3139,11 +3148,19 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     pMga = MGAPTR(pScrn);
-     MGAdac = &pMga->Dac;
- 
--    if (pMga->is_G200SE) {
--	VRTemp = pScrn->videoRam;
--	FBTemp = pMga->FbMapSize;
--	pScrn->videoRam = 8192;
--	pMga->FbMapSize = pScrn->videoRam * 1024;
-+    if (pMga->is_G200SE)
-+    {
-+        VRTemp = pScrn->videoRam;
-+        FBTemp = pMga->FbMapSize;
-+        if (pMga->reg_1e24 >= 0x01)
-+        {
-+            pScrn->videoRam = 16384;
-+        }
-+        else
-+        {
-+            pScrn->videoRam = 8192;
-+        }
-+        pMga->FbMapSize = pScrn->videoRam * 1024;
-     }
-     
- 
-@@ -3701,10 +3718,26 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGAEntPtr pMgaEnt = NULL;
-+    CARD32 VRTemp, FBTemp;
- 
-     if (pMga->MergedFB)
-          MGACloseScreenMerged(scrnIndex, pScreen);
- 
-+    if (pMga->is_G200SE)
-+    {
-+        VRTemp = pScrn->videoRam;
-+        FBTemp = pMga->FbMapSize;
-+        if (pMga->reg_1e24 >= 0x01)
-+        {
-+            pScrn->videoRam = 16384;
-+        }
-+        else
-+        {
-+            pScrn->videoRam = 8192;
-+        }
-+        pMga->FbMapSize = pScrn->videoRam * 1024;
-+    }
-+
-     if (pScrn->vtSema) {
- 	if (pMga->FBDev) {
- 	    fbdevHWRestore(pScrn);
-@@ -3716,6 +3749,13 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- 	    vgaHWUnmapMem(pScrn);
- 	}
-     }
-+
-+    if (pMga->is_G200SE)
-+    {
-+        pScrn->videoRam = VRTemp;
-+        pMga->FbMapSize = FBTemp;
-+    }
-+
- #ifdef XF86DRI
-    if (pMga->directRenderingEnabled) {
-        MGADRICloseScreen(pScreen);
---
-cgit v0.9.0.2-2-gbebe
-From cc9d2e808de20723c9035952242d966455d583b7 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Thu, 29 Dec 2011 03:44:40 +0000
-Subject: Check MGAAllocAdaptor() for memory allocation failure
-
-If it couldn't allocate memory, don't attempt to write a bunch of values
-to the NULL pointer before returning it, but just pass the NULL along
-right away.
-
-Resolves parfait warnings of the form:
-
-Error: Null pointer dereference (CWE 476)
-   Write to null pointer 'adapt'
-        at line 322 of src/mga_video.c in function 'MGASetupImageVideoTexture'.
-          Function 'MGAAllocAdaptor' may return constant 'NULL' at line 237, called at line 320.
-          Null pointer introduced at line 237 in function 'MGAAllocAdaptor'.
-
-repeated for every line writing to the adapt pointer in each function.
-
-[ This bug was found by the Parfait 0.4.2 bug checking tool.
-  For more information see http://labs.oracle.com/projects/parfait/ ]
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
----
-diff --git a/src/mga_video.c b/src/mga_video.c
-index 784e7b1..abce31f 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -269,6 +269,8 @@ MGASetupImageVideoOverlay(ScreenPtr pScreen)
-     XF86VideoAdaptorPtr adapt;
- 
-     adapt = MGAAllocAdaptor(pScrn, TRUE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-@@ -316,6 +318,8 @@ MGASetupImageVideoTexture(ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     adapt = MGAAllocAdaptor(pScrn, FALSE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = 0;
-@@ -1298,6 +1302,8 @@ MGASetupImageVideoILOAD(ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     adapt = MGAAllocAdaptor(pScrn, FALSE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = 0;
---
-cgit v0.9.0.2-2-gbebe
-From 9223c44a731f48c66c226eb88dcb6f9d574cb599 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Tue, 03 Jan 2012 22:35:18 +0000
-Subject: When we can't load the xaa or exa modules, use shadowfb instead
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index ae36378..00469e7 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2101,6 +2101,31 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-         }
-     }
- 
-+    /* Load XAA if needed */
-+    if (!pMga->NoAccel) {
-+#ifdef USE_EXA
-+	if (pMga->Exa) {
-+	    if (!xf86LoadSubModule(pScrn, "exa")) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+		           "Falling back to shadowfb\n");
-+		pMga->ShadowFB = TRUE;
-+		pMga->NoAccel = TRUE;
-+	    }
-+	} else {
-+#endif
-+#ifdef USE_XAA
-+	    if (!xf86LoadSubModule(pScrn, "xaa")) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+		           "Falling back to shadowfb\n");
-+		pMga->ShadowFB = TRUE;
-+		pMga->NoAccel = TRUE;
-+	    }
-+#endif
-+#ifdef USE_EXA
-+	}
-+#endif
-+    }
-+
-     switch (pMga->Chipset) {
-     case PCI_CHIP_MGA2064:
-     case PCI_CHIP_MGA2164:
-@@ -2596,27 +2621,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	return FALSE;
-     }
- 
--    /* Load XAA if needed */
--    if (!pMga->NoAccel) {
--#ifdef USE_EXA
--	if (pMga->Exa) {
--	    if (!xf86LoadSubModule(pScrn, "exa")) {
--		MGAFreeRec(pScrn);
--		return FALSE;
--	    }
--	} else {
--#endif
--#ifdef USE_XAA
--	    if (!xf86LoadSubModule(pScrn, "xaa")) {
--		MGAFreeRec(pScrn);
--		return FALSE;
--	    }
--#endif
--#ifdef USE_EXA
--	}
--#endif
--    }
--
-     /* Load ramdac if needed */
-     if (pMga->HWCursor) {
- 	if (!xf86LoadSubModule(pScrn, "ramdac")) {
---
-cgit v0.9.0.2-2-gbebe
-From 4c4beaf628c9c5dd531605e40696ed31db0e97b8 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 04 Jan 2012 05:15:07 +0000
-Subject: Untangle XF86DRI from the driver-specific DRI define
-
-XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
-itself does exactly nothing other than not fill in the CFLAGS
-and thus stop the driver from compiling.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/configure.ac b/configure.ac
-index 540c390..840ff3c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,8 +100,8 @@ AC_MSG_RESULT([$DRI])
- AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
- if test "x$DRI" = xyes; then
-         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
--        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-+        AC_DEFINE(MGADRI,1,[Enable DRI driver support])
-+        AC_DEFINE(MGADRI_DEVEL,1,[Enable developmental DRI driver support])
- fi
- 
- save_CFLAGS="$CFLAGS"
-diff --git a/src/mga.h b/src/mga.h
-index fced6aa..77406f1 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -28,7 +28,11 @@
- #include "xf86DDC.h"
- #include "xf86xv.h"
- 
--#ifdef XF86DRI
-+#ifndef XF86DRI
-+#undef MGADRI
-+#endif
-+
-+#ifdef MGADRI
- #include "xf86drm.h"
- 
- #define _XF86DRI_SERVER_
-@@ -589,7 +593,7 @@ typedef struct {
-     int			expandRemaining;
-     int			expandHeight;
-     int			expandY;
--#ifdef XF86DRI
-+#ifdef MGADRI
-     Bool 		directRenderingEnabled;
-     DRIInfoPtr 		pDRIInfo;
-     int 		drmFD;
-@@ -743,7 +747,7 @@ void MGAPointerMoved(int index, int x, int y);
- void MGAInitVideo(ScreenPtr pScreen);
- void MGAResetVideo(ScrnInfoPtr pScrn);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- 
- #define MGA_FRONT	0x1
- #define MGA_BACK	0x2
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 00469e7..af005f1 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -101,7 +101,7 @@
- #include "shadowfb.h"
- #include "fbdevhw.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "dri.h"
- #endif
- 
-@@ -1532,7 +1532,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     pMga = MGAPTR(pScrn);
-     /* Set here until dri is enabled */
--#ifdef XF86DRI
-+#ifdef MGADRI
-     pMga->haveQuiescense = 1;
- #endif
-     /* Get the entity, and make sure it is PCI. */
-@@ -1706,13 +1706,13 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     }
- 
-     if (pMga->DualHeadEnabled) {
--#ifdef XF86DRI
-+#ifdef MGADRI
-         pMga->GetQuiescence = MGAGetQuiescenceShared;
- #endif
-     } else {                                              /* single-head mode */
-         pMga->SecondCrtc = FALSE;
-         pMga->HWCursor = TRUE;
--#ifdef XF86DRI
-+#ifdef MGADRI
-         pMga->GetQuiescence = MGAGetQuiescence;
- #endif
-     }
-@@ -1942,7 +1942,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     if (pScrn->depth == 8)
- 	pScrn->rgbBits = 8;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     from = X_DEFAULT;
-     pMga->agpMode = MGA_DEFAULT_AGP_MODE;
- 
-@@ -2637,7 +2637,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     /* Load the dri module if requested. */
-     if (xf86ReturnOptValBool(pMga->Options, OPTION_DRI, FALSE)) {
-        xf86LoadSubModule(pScrn, "dri");
-@@ -2878,7 +2878,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     vgaReg = &hwp->ModeReg;
-     mgaReg = &pMga->ModeReg;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled) {
-        DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
-    }
-@@ -2989,7 +2989,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	pMga->M1currentMode = (DisplayModePtr)mode->Private;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled)
-      DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
- #endif
-@@ -3138,7 +3138,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     MGAEntPtr pMgaEnt = NULL;
-     int f;
-     CARD32 VRTemp, FBTemp;
--#ifdef XF86DRI
-+#ifdef MGADRI
-     MessageType driFrom = X_DEFAULT;
- #endif
-     DPMSSetProcPtr mga_dpms_set_proc = NULL;
-@@ -3317,7 +3317,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	FBStart = pMga->FbStart;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-      /*
-       * Setup DRI after visuals have been established.
-       *
-@@ -3473,7 +3473,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     MGAInitVideo(pScreen);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
-        /* Now that mi, drm and others have done their thing,
- 	* complete the DRI setup.
-@@ -3625,7 +3625,7 @@ MGAEnterVT(int scrnIndex, int flags)
- 
-     pMga = MGAPTR(pScrn);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
- 	if (pMga->irq) {
- 	    /* Need to make sure interrupts are enabled */
-@@ -3651,7 +3651,7 @@ static Bool
- MGAEnterVTFBDev(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--#ifdef XF86DRI
-+#ifdef MGADRI
-     ScreenPtr pScreen;
-     MGAPtr pMga;
- 
-@@ -3690,7 +3690,7 @@ MGALeaveVT(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
--#ifdef XF86DRI
-+#ifdef MGADRI
-     MGAPtr pMga = MGAPTR(pScrn);
-     ScreenPtr pScreen;
- #endif
-@@ -3698,7 +3698,7 @@ MGALeaveVT(int scrnIndex, int flags)
-     MGARestore(pScrn);
-     vgaHWLock(hwp);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
-         pScreen = screenInfo.screens[scrnIndex];
-         DRILock(pScreen, 0);
-@@ -3760,7 +3760,7 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-         pMga->FbMapSize = FBTemp;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled) {
-        MGADRICloseScreen(pScreen);
-        pMga->directRenderingEnabled=FALSE;
-diff --git a/src/mga_exa.c b/src/mga_exa.c
-index e5eaa92..ced6452 100644
---- a/src/mga_exa.c
-+++ b/src/mga_exa.c
-@@ -41,7 +41,7 @@
- #include "mga_macros.h"
- 
- #include "exa.h"
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "mga_dri.h"
- #endif
- 
-@@ -763,7 +763,7 @@ mgaWaitMarker(ScreenPtr pScreen, int marker)
-     while (INREG (MGAREG_Status) & 0x10000);
- }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- static void
- init_dri(ScrnInfoPtr pScrn)
- {
-@@ -837,7 +837,7 @@ init_dri(ScrnInfoPtr pScrn)
-                        MGA_BUFFER_ALIGN) & ~MGA_BUFFER_ALIGN;
-     dri->backPitch = widthBytes;
- }
--#endif /* XF86DRI */
-+#endif /* MGADRI */
- 
- Bool
- mgaExaInit(ScreenPtr pScreen)
-@@ -898,7 +898,7 @@ mgaExaInit(ScreenPtr pScreen)
-     pExa->UploadToScreen = mgaUploadToScreen;
-     pExa->DownloadFromScreen = mgaDownloadFromScreen;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled)
-         init_dri(pScrn);
- #endif
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index 130651d..d3b0d0e 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -17,7 +17,7 @@
- 
- #define RGBEQUAL(c) (!((((c) >> 8) ^ (c)) & 0xffff))
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #define MGA_SYNC_XTAG                 0x275f4200
- 
- #define MGABUSYWAIT() do { \
-@@ -64,7 +64,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \
- 	WAITFIFO(1); \
- 	OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #define CHECK_DMA_QUIESCENT(pMGA, pScrn) {	\
-    if (!pMGA->haveQuiescense) {			\
-       pMGA->GetQuiescence( pScrn );		\
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index aec3443..f355f76 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -316,7 +316,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     pMga->Chipset = pMga1->Chipset;
-     pMga->ChipRev = pMga1->ChipRev;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     pMga->agpMode = pMga1->agpMode;
- #endif
- 
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index f0e6194..7ac3ae0 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -24,7 +24,7 @@
- #include "miline.h"
- #include "servermd.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "GL/glxtokens.h"
- #endif
- 
-@@ -32,7 +32,7 @@
- #include "mga_reg.h"
- #include "mga_macros.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "mga_dri.h"
- #endif
- 
-@@ -797,7 +797,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
- 	break;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if ( pMga->directRenderingEnabled ) {
-        MGADRIServerPrivatePtr pMGADRIServer = pMga->DRIServerInfo;
-        BoxRec MemBox;
-@@ -899,7 +899,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
- 		   pMGADRIServer->textureOffset );
-     }
-     else
--#endif /* defined(XF86DRI) */
-+#endif /* defined(MGADRI) */
-     {
-        AvailFBArea.x1 = 0;
-        AvailFBArea.x2 = pScrn->displayWidth;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-neomagic/PKGBUILD b/testing/xf86-video-neomagic/PKGBUILD
deleted file mode 100644
index a98a092a4..000000000
--- a/testing/xf86-video-neomagic/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 153830 2012-03-19 19:44:28Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.5
-pkgrel=7
-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
-        git-fixes.diff)
-sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3'
-          '09a8b2d1b1bd1a2d8bfe7b03ba19947f4461e4b4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git-fixes.diff
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-neomagic/git-fixes.diff b/testing/xf86-video-neomagic/git-fixes.diff
deleted file mode 100644
index dafba0b2f..000000000
--- a/testing/xf86-video-neomagic/git-fixes.diff
+++ /dev/null
@@ -1,616 +0,0 @@
-From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 20:15:29 +0000
-Subject: config: upgrade to util-macros 1.8 for additional man page support
-
-Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
-The value of MAN_SUBST is the same for all X.Org packages.
----
-diff --git a/configure.ac b/configure.ac
-index 38cba3a..a80955b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,10 +34,10 @@ 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.
-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) < $< > $@
---
-cgit v0.9.0.2-2-gbebe
-From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 22:45:19 +0000
-Subject: config: update AC_PREREQ statement to 2.60
-
-Unrelated to the previous patches, the new value simply reflects
-the reality that the minimum level for autoconf to configure
-all x.org modules is 2.60 dated June 2006.
-
-ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index a80955b..1c7ff1a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         1.2.5,
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
---
-cgit v0.9.0.2-2-gbebe
-From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 23:41:31 +0000
-Subject: config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
-
-XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
-AC_PROG_C_C99. This sets gcc with -std=gnu99.
-If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1c7ff1a..aa17100 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
- # Checks for programs.
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
---
-cgit v0.9.0.2-2-gbebe
-From adb592292e40a5e5f032ca95f3371c6b77227c40 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 00:24:42 +0000
-Subject: config: remove unrequired AC_HEADER_STDC
-
-Autoconf says:
-"This macro is obsolescent, as current systems have conforming
-header files. New programs need not use this macro".
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index aa17100..30c0e86 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,8 +79,6 @@ 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])
---
-cgit v0.9.0.2-2-gbebe
-From 5759eca769091518fd54e0d70193edc3c099e9bb Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 01:44:57 +0000
-Subject: config: remove unrequired AC_SUBST([XORG_CFLAGS])
-
-This macro is called by PKG_CHECK_MODULES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 30c0e86..86f016f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,7 +86,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=neomagic
---
-cgit v0.9.0.2-2-gbebe
-From bcfba240265ecd633fcba051591b6c50b9373a53 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 13:27:42 +0000
-Subject: config: complete AC_INIT m4 quoting
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 86f016f..46cb0cc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,9 +22,9 @@
- 
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
--        1.2.5,
-+        [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-neomagic)
-+        [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_CONFIG_HEADER([config.h])
---
-cgit v0.9.0.2-2-gbebe
-From 2f60a6e4c3be390d4cf0648bdffbdbff67def7ee Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:05:22 +0000
-Subject: config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 46cb0cc..7261ed5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_INIT([xf86-video-neomagic],
-         [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
---
-cgit v0.9.0.2-2-gbebe
-From 8486ae164b462d50817b84340af13dccc26384ab Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:37:41 +0000
-Subject: config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 7261ed5..1d0a3d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
- AH_TOP([#include "xorg-server.h"])
- 
- 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"])
---
-cgit v0.9.0.2-2-gbebe
-From 5e0d301758b15fc1916dd0318f2a5549e3482ccf Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:07:00 +0000
-Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1d0a3d3..73dde93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,8 +91,9 @@ AC_SUBST([moduledir])
- DRIVER_NAME=neomagic
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
---
-cgit v0.9.0.2-2-gbebe
-From dd32df772bdf4462b816bfc2f98ccd18dbb4b930 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:49:04 +0000
-Subject: config: add comments for main statements
-
----
-diff --git a/configure.ac b/configure.ac
-index 73dde93..befac41 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,18 +20,18 @@
- #
- # Process this file with autoconf to produce a configure script
- 
-+# Initialize Autoconf
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-         [xf86-video-neomagic])
--
- AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
- # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
- XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
-             AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-@@ -53,14 +54,14 @@ AC_ARG_WITH(xorg-module-dir,
-             [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])
- 
- save_CFLAGS="$CFLAGS"
---
-cgit v0.9.0.2-2-gbebe
-From a9d69f6d0ab4f66b954949cca016ee7b5b6f7adf Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/neomagic.man b/man/neomagic.man
-index 9daffe5..af8181c 100644
---- a/man/neomagic.man
-+++ b/man/neomagic.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH NEOMAGIC __drivermansuffix__ __vendorversion__
---
-cgit v0.9.0.2-2-gbebe
-From c3cf7e328d7e9c276a3e237dbf9d1772b57a370e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:43:51 +0000
-Subject: Use malloc/calloc/realloc/free directly
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_dga.c b/src/neo_dga.c
-index 4227da6..3e2a02e 100644
---- a/src/neo_dga.c
-+++ b/src/neo_dga.c
-@@ -86,10 +86,10 @@ NEODGAInit(ScreenPtr pScreen)
- 
-    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/neo_driver.c b/src/neo_driver.c
-index b12c125..c51dad4 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -475,7 +475,7 @@ NEOFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -551,7 +551,7 @@ NEOProbe(DriverPtr drv, int flags)
- 		    foundScreen = TRUE;
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -584,11 +584,11 @@ NEOProbe(DriverPtr drv, int flags)
- 	    foundScreen = TRUE;
- 	}
-       }
--      xfree(usedChips);
-+      free(usedChips);
-     }
- #endif
- 
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 
-@@ -940,11 +940,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
-     /* Process the options */
-     if (nPtr->NeoChipset == NM2070) {
--	if (!(nPtr->Options = xalloc(sizeof(NEO_2070_Options))))
-+	if (!(nPtr->Options = malloc(sizeof(NEO_2070_Options))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEO_2070_Options, sizeof(NEO_2070_Options));
-     } else {
--	if (!(nPtr->Options = xalloc(sizeof(NEOOptions))))
-+	if (!(nPtr->Options = malloc(sizeof(NEOOptions))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions));
-     }
-@@ -1476,7 +1476,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     
-     if(nPtr->shadowFB) {
- 	nPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	nPtr->ShadowPtr = xalloc(nPtr->ShadowPitch * height);
-+	nPtr->ShadowPtr = malloc(nPtr->ShadowPitch * height);
- 	displayWidth = nPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	FBStart = nPtr->ShadowPtr;
-     } else {
-@@ -1789,7 +1789,7 @@ NEOCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     if (nPtr->CursorInfo)
- 	xf86DestroyCursorInfoRec(nPtr->CursorInfo);
-     if (nPtr->ShadowPtr)
--	xfree(nPtr->ShadowPtr);
-+	free(nPtr->ShadowPtr);
- 
-     pScrn->vtSema = FALSE;
-     pScreen->CloseScreen = nPtr->CloseScreen;
-@@ -2860,7 +2860,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     if (NeoNew->reg) {
- 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		   "Non-NULL reg in NeoInit: reg=%p\n", (void *)NeoNew->reg);
--	xfree(NeoNew->reg);
-+	free(NeoNew->reg);
- 	NeoNew->reg = NULL;
-     }
- 
-diff --git a/src/neo_video.c b/src/neo_video.c
-index a9e1e25..0edae30 100644
---- a/src/neo_video.c
-+++ b/src/neo_video.c
-@@ -99,7 +99,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	    numAdaptors = 1;
- 	    overlayAdaptors = &newAdaptor;
- 	} else {
--	    newAdaptors = xalloc((numAdaptors + 1) 
-+	    newAdaptors = malloc((numAdaptors + 1) 
- 				 * sizeof(XF86VideoAdaptorPtr*));
- 	    if (newAdaptors){
- 		memcpy(newAdaptors, overlayAdaptors, 
-@@ -114,7 +114,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	xf86XVScreenInit(pScreen, overlayAdaptors, numAdaptors);
- 
-     if (newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- static XF86VideoEncodingRec NEOVideoEncodings[] =
-@@ -211,7 +211,7 @@ NEOSetupVideo(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(pScrn->scrnIndex,X_INFO,"NEOSetupVideo\n");
- #endif
--    if ((overlayAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if ((overlayAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) +
- 			      sizeof(DevUnion) + 
- 			      sizeof(NEOPortRec))) == NULL){
- 	return (NULL);
-@@ -918,7 +918,7 @@ NEOInitOffscreenImages(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(xf86Screens[pScreen->myNum]->scrnIndex,X_INFO,"NEOInitOffscreenImages\n");
- #endif
--    if ((offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))) == NULL){
-+    if ((offscreenImages = malloc(sizeof(XF86OffscreenImageRec))) == NULL){
- 	return;
-     }
- 
-@@ -1017,19 +1017,19 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id,
- 
-     surface->width = width;
-     surface->height = height;
--    if ((surface->pitches = xalloc(sizeof(int))) == NULL){
-+    if ((surface->pitches = malloc(sizeof(int))) == NULL){
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
--    if ((surface->offsets = xalloc(sizeof(int))) == NULL){
--	xfree(surface->pitches);
-+    if ((surface->offsets = malloc(sizeof(int))) == NULL){
-+	free(surface->pitches);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
- 
--    if ((pPriv = xalloc(sizeof(NEOOffscreenRec))) == NULL){
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if ((pPriv = malloc(sizeof(NEOOffscreenRec))) == NULL){
-+	free(surface->pitches);
-+	free(surface->offsets);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
-@@ -1057,9 +1057,9 @@ NEOFreeSurface(XF86SurfacePtr surface)
- 	NEOStopSurface(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);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From f2a771c6d2a2308245a0d46301e579b50fb2b6bd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:45:11 +0000
-Subject: Include <stdlib.h> for abs()
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index c51dad4..f8bca2c 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -107,6 +107,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "scrnintstr.h"
- #include "servermd.h"
- 
-+#include <stdlib.h>
- #include <unistd.h>
- 
- /* Mandatory functions */
---
-cgit v0.9.0.2-2-gbebe
-From 07845a120a674380b6b499961e6c81accfdd6a2e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:50:28 +0000
-Subject: Fall back to shadowfb when XAA is unavailable
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index f8bca2c..a034f86 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -1089,6 +1089,18 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (nPtr->showcache)
- 	xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
- 		   "Show chache for debugging\n");
-+
-+    if (!xf86LoadSubModule(pScrn, "xaa")) {
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n");
-+	nPtr->shadowFB = 1;
-+    }
-+
-+    if (nPtr->shadowFB) {
-+	if (!xf86LoadSubModule(pScrn, "shadow")) {
-+	    RETURN;
-+	}
-+    }
-+
-     if (nPtr->shadowFB) {
-         nPtr->noAccel = TRUE;
-         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
-@@ -1314,15 +1326,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
- 	RETURN;
-     }
- 
--    if (!xf86LoadSubModule(pScrn, "xaa")) 
--        RETURN;
--
--    if (nPtr->shadowFB) {
--	if (!xf86LoadSubModule(pScrn, "shadow")) {
--	    RETURN;
--	}
--    }
--    
-     if (!nPtr->swCursor) {
- 	if (!xf86LoadSubModule(pScrn, "ramdac"))
- 	    RETURN;
---
-cgit v0.9.0.2-2-gbebe
-From 819c8f2119b8db10a6a9e4553cf88d66cff6eb8e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:51:31 +0000
-Subject: Fix for new vgahw ABI
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index a034f86..509a77f 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -660,6 +660,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (!vgaHWGetHWRec(pScrn))
- 	return FALSE;
-     hwp = VGAHWPTR(pScrn);
-+    vgaHWSetStdFuncs(hwp);
- 
-     /* Allocate the NeoRec driverPrivate */
-     if (!NEOGetRec(pScrn)) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index 2bba90438..000000000
--- a/testing/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 150053 2012-02-12 09:45:20Z andyrtr $
-# 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/testing/xf86-video-nouveau/xf86-video-nouveau.install b/testing/xf86-video-nouveau/xf86-video-nouveau.install
deleted file mode 100644
index 027154ff3..000000000
--- a/testing/xf86-video-nouveau/xf86-video-nouveau.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
-    cat << _EOF
-  ==> ATTENTION: Usermode support has been dropped
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
- fi
-}
diff --git a/testing/xf86-video-nv/PKGBUILD b/testing/xf86-video-nv/PKGBUILD
deleted file mode 100644
index dea94d6d5..000000000
--- a/testing/xf86-video-nv/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 150055 2012-02-12 09:45:22Z 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/testing/xf86-video-openchrome/PKGBUILD b/testing/xf86-video-openchrome/PKGBUILD
deleted file mode 100644
index e12cf975d..000000000
--- a/testing/xf86-video-openchrome/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 150057 2012-02-12 09:45:24Z 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/testing/xf86-video-r128/PKGBUILD b/testing/xf86-video-r128/PKGBUILD
deleted file mode 100644
index 85d09171a..000000000
--- a/testing/xf86-video-r128/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 150059 2012-02-12 09:45:26Z 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/testing/xf86-video-r128/git-fixes.patch b/testing/xf86-video-r128/git-fixes.patch
deleted file mode 100644
index 933e8fb2a..000000000
--- a/testing/xf86-video-r128/git-fixes.patch
+++ /dev/null
@@ -1,842 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..05bcb74 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,91 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright 2007 George Sapountzis
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
-+                     Precision Insight, Inc., Cedar Park, Texas, and
-+                     VA Linux Systems Inc., Fremont, California.
-+
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation on the rights to use, copy, modify, merge,
-+publish, distribute, sublicense, and/or sell copies of the Software,
-+and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the
-+next paragraph) shall be included in all copies or substantial
-+portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
-+SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+OTHER DEALINGS IN THE SOFTWARE.
-+
-+Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
-+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+DEALINGS IN THE SOFTWARE.
-+
-+Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-+
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation, and
-+that the name of Marc Aurele La France not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Marc Aurele La France makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/Makefile.am b/Makefile.am
-index 1f4c3c4..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,21 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
--if BUILD_LINUXDOC
--README.r128: README.r128.sgml
--	$(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
-+.PHONY: ChangeLog INSTALL
- 
--endif
--
--EXTRA_DIST = README.r128 README.r128.sgml ChangeLog
--CLEANFILES = ChangeLog
--
--.PHONY: ChangeLog
-+INSTALL:
-+	$(INSTALL_CMD)
- 
- ChangeLog:
- 	$(CHANGELOG_CMD)
- 
--dist-hook: ChangeLog
-+dist-hook: ChangeLog INSTALL
-diff --git a/README b/README
-index cb61870..5c6f59d 100644
---- a/README
-+++ b/README
-@@ -1,4 +1,161 @@
--xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
-+  Information for ATI Rage 128 Users
-+  Precision Insight, Inc., SuSE GmbH
-+  13 June 2000
-+  ____________________________________________________________
-+
-+  Table of Contents
-+
-+
-+  1. Supported Hardware
-+  2. Features
-+  3. Technical Notes
-+  4. Reported Working Video Cards
-+  5. Configuration
-+  6. Driver Options
-+  7. Known Limitations
-+  8. Authors
-+
-+
-+  ______________________________________________________________________
-+
-+  1.  Supported Hardware
-+
-+
-+  o  ATI Rage 128 based cards
-+
-+
-+
-+  2.  Features
-+
-+
-+  o  Full support (including hardware accelerated 2D drawing) for 8, 15,
-+     16, 24 bit pixel depths.
-+
-+  o  Hardware cursor support to reduce sprite flicker.
-+
-+  o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
-+
-+  o  Support for doublescan video modes (e.g., 320x200 and 320x240).
-+
-+  o  Support for gamma correction at all pixel depths.
-+
-+  o  Fully programmable clock supported.
-+
-+  o  Robust text mode restore for VT switching.
-+
-+
-+
-+  3.  Technical Notes
-+
-+
-+  o  None
-+
-+
-+
-+  4.  Reported Working Video Cards
-+
-+
-+  o  Rage Fury AGP 32MB
-+
-+  o  XPERT 128 AGP 16MB
-+
-+  o  XPERT 99 AGP 8MB
-+
-+
-+
-+  5.  Configuration
-+
-+  The driver auto-detects all device information necessary to initialize
-+  the card. The only lines you need in the "Device" section of your
-+  xorg.conf file are:
-+
-+         Section "Device"
-+             Identifier "Rage 128"
-+             Driver     "r128"
-+         EndSection
-+
-+
-+  or let xorgconfig do this for you.
-+
-+  However, if you have problems with auto-detection, you can specify:
-+
-+  o  VideoRam - in kilobytes
-+
-+  o  MemBase - physical address of the linear framebuffer
-+
-+  o  IOBase - physical address of the memory mapped IO registers
-+
-+  o  ChipID - PCI DEVICE ID
-+
-+
-+
-+  6.  Driver Options
-+
-+
-+  o  "hw_cursor" - request hardware cursor (default)
-+
-+  o  "sw_cursor" - software cursor only
-+
-+  o  "no_accel" - software rendering only
-+
-+  o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
-+
-+  o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
-+
-+
-+
-+  7.  Known Limitations
-+
-+
-+  o  None
-+
-+
-+
-+  8.  Authors
-+
-+  The X11R7.5 driver was originally part of XFree86 4.4 rc2.
-+
-+  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+  The XFree86 4 driver was funded by ATI and was donated to The XFree86
-+  Project by:
-+
-+      Precision Insight, Inc.
-+      Cedar Park, TX
-+      USA
-+
-+
-+  The XFree86 3.3.x driver used for the port was written by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+     The XFree86 3.3.x driver was funded by ATI and was donated to The
-+     XFree86 Project by Precision Insight, Inc. It was based in part on
-+     an earlier driver that was written by:
-+
-+  o  Alan Hourihane  <mailto:alanh@fairlite.demon.co.uk>
-+
-+  o  Dirk Hohndel  <mailto:hohndel@suse.de>
-+
-+  This early driver was funded and donated to The XFree86 Project by:
-+
-+      SuSE GmbH
-+      Schanzaekerstr. 10
-+      90443 Nuernberg
-+      Germany
-+
-+
-+
-+  http://www.precisioninsight.com
-+
-+  http://www.suse.com
-+
- 
- Please submit bugs & patches to the Xorg bugzilla:
- 
-diff --git a/README.r128 b/README.r128
-deleted file mode 100644
-index dcc2715..0000000
---- a/README.r128
-+++ /dev/null
-@@ -1,160 +0,0 @@
--  Information for ATI Rage 128 Users
--  Precision Insight, Inc., SuSE GmbH
--  13 June 2000
--  ____________________________________________________________
--
--  Table of Contents
--
--
--  1. Supported Hardware
--  2. Features
--  3. Technical Notes
--  4. Reported Working Video Cards
--  5. Configuration
--  6. Driver Options
--  7. Known Limitations
--  8. Authors
--
--
--  ______________________________________________________________________
--
--  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/testing/xf86-video-rendition/PKGBUILD b/testing/xf86-video-rendition/PKGBUILD
deleted file mode 100644
index d0c6ed8cc..000000000
--- a/testing/xf86-video-rendition/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 150061 2012-02-12 09:45:29Z 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/testing/xf86-video-rendition/rendition-4.2.4-git.patch b/testing/xf86-video-rendition/rendition-4.2.4-git.patch
deleted file mode 100644
index 26cff2fd3..000000000
--- a/testing/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/testing/xf86-video-s3/LICENSE b/testing/xf86-video-s3/LICENSE
deleted file mode 100644
index a4c8d5dd4..000000000
--- a/testing/xf86-video-s3/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
-
-     XFree86 4.x driver for S3 chipsets
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation and
-that the name of Ani Joshi not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Ani Joshi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/testing/xf86-video-s3/PKGBUILD b/testing/xf86-video-s3/PKGBUILD
deleted file mode 100644
index 969a50529..000000000
--- a/testing/xf86-video-s3/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 150063 2012-02-12 09:45:32Z 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/testing/xf86-video-s3/git-fixes.patch b/testing/xf86-video-s3/git-fixes.patch
deleted file mode 100644
index 712b3c9c0..000000000
--- a/testing/xf86-video-s3/git-fixes.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..458ab5f 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,70 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+     XFree86 4.x driver for S3 chipsets
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation and
-+that the name of Ani Joshi not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Ani Joshi makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+Copyright 2007 George Sapountzis
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+of the Software, and to permit persons to whom the Software is furnished to do
-+so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall not
-+be used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from the XFree86 Project.
-+
-+
-+Copyright 1995-1997 The XFree86 Project, Inc.
-+Copyright (c) 1999,2000  The XFree86 Project Inc.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index ad0b227..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,133 +0,0 @@
--2009-06-25  Evgeny M. zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	Revert the old behaviour when the BIOS settings are used for
--	intialization of DRAM/VRAM timings, i. e. we don't touch the
--	timings during initialization phase until any memory option (like
--	slow_edodram) is specified.
--	
--	Add manual page.	
--
--2009-05-25  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--	
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	
--	Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for 
--	testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
--	overriding Chipset with "Trio64UV+" but not on real hardware).
--
--	S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
--	as Trio32/64 but only with chip revision greater or eq 0x40. So if 
--	you have problems with NewMMIO, you may override ChipRev in "Device" 
-- 	section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO 
--	also disables overlay video (Xv) because it isn't implemented for
--	Old MMIO yet.
--	
--2009-05-04  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	* src/s3_shadow.c:
--
--	Add shadowFB option. It can be used to speedup drawing when
--	hardware acceleration is undesirable or unavailable (for colour depth
--	24 with 24 bpp framebuffer, for example). shadowFB is disabled by
--	default. Enabling shadowFB option disables HW acceleration. Thanks
--	to Egor Ivanov for initial porting of shadowFB from s3virge.
--
--	Interlace mode support.
--
--	Close bug #14999.
--	
--2008-07-06  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_video.c: 
--
--	Streams Processor initialization.
--
--	XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
--
--	* src/s3_driver.c: 
--
--	Add XVideo option (enabled by default).
--
--	Replace "swcursor" by "hwcursor" option (HW cursor 
--	not implemented yet for all chipsets).
--
--	Close bug #5527: 24-bit colour depth support (24bpp and 
--	32bpp framebuffer) for TRIOs. Acceleration doesn't work
--	with packed colour mode (24 bpp FB) but works with 32bpp 
--	framebuffer mode (hardware limitation? -- need data).
--
--	Fix system hang-up when switching between console and X session.
--
--	Some minor changes of driver messages.
--
--2008-02-23  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
--	others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
--	* src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
--	the 1024x768@16bpp mode work.
--	Thanks to Richard Driscoll for these patches.
--	
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	Bump to 0.4.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/s3_video.c: (S3PutImage):
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	* src/s3_IBMRGB.c:
--	* src/s3_Ti.c:
--	* src/s3_Trio64DAC.c:
--	* src/s3_bios.c:
--	* src/s3_cursor.c:
--	* src/s3_dga.c:
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.4.0.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 7052905..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,5 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
-+
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index 0eecc87..0ac34f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,42 +20,50 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-s3],
--        0.6.3,
-+        [0.6.3],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-s3)
--
-+        [xf86-video-s3])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
-+
-+# Checks for programs.
-+AM_PROG_CC_C_O
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-               [#include "xorg-server.h"])
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=s3
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--XORG_CHECK_LINUXDOC
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/src/s3.h b/src/s3.h
-index 49b8a54..0875fc9 100644
---- a/src/s3.h
-+++ b/src/s3.h
-@@ -113,7 +113,6 @@ typedef struct _S3Rec {
-         XAAInfoRecPtr           pXAA;
- 	xf86CursorInfoPtr	pCurs;
- 	xf86Int10InfoPtr	pInt10;
--	vbeInfoPtr		pVBE;
-         XF86VideoAdaptorPtr     adaptor;
-         S3PortPrivPtr           portPrivate;
- 
-diff --git a/src/s3_driver.c b/src/s3_driver.c
-index 29e343d..4519b33 100644
---- a/src/s3_driver.c
-+++ b/src/s3_driver.c
-@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	S3Ptr pS3;
- 	vgaHWPtr hwp;
- 	ClockRangePtr clockRanges;
-+	vbeInfoPtr pVBE;
- 	rgb zeros = {0, 0, 0};
- 	Gamma gzeros = {0.0, 0.0, 0.0};
- 	int i, vgaCRIndex, vgaCRReg;
-@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	}
- 
- 	if (xf86LoadSubModule(pScrn, "vbe")) {
--		pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		vbeFree(pVBE);
- 	}
- 	
- 	if (pS3->shadowFB) {
diff --git a/testing/xf86-video-s3virge/PKGBUILD b/testing/xf86-video-s3virge/PKGBUILD
deleted file mode 100644
index 04d446f53..000000000
--- a/testing/xf86-video-s3virge/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 150065 2012-02-12 09:45:34Z 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/testing/xf86-video-s3virge/copyright.patch b/testing/xf86-video-s3virge/copyright.patch
deleted file mode 100644
index ba988c6d6..000000000
--- a/testing/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/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch b/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch
deleted file mode 100644
index 3fb1fd6cf..000000000
--- a/testing/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/testing/xf86-video-savage/PKGBUILD b/testing/xf86-video-savage/PKGBUILD
deleted file mode 100644
index 74cb1514d..000000000
--- a/testing/xf86-video-savage/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 150182 2012-02-14 09:08:45Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-savage
-pkgver=2.3.3
-pkgrel=3
-_gitver=c4022796ec69bb3223d435d8442f9168aebe9c3d
-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' 'savage-dri')
-options=(!libtool !makeflags)
-groups=('xorg-drivers' 'xorg')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        #http://cgit.freedesktop.org/xorg/driver/xf86-video-savage/snapshot/xf86-video-savage-${_gitver}.tar.gz
-        ftp://ftp..archlinux.org/other/xf86-video-savage/xf86-video-savage-${_gitver}.tar.gz)
-md5sums=('3a7921de0d365ab5dd1af15010807e36')
-
-build() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  autoreconf -fi
-  ./configure --prefix=/usr --disable-dri
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-siliconmotion/PKGBUILD b/testing/xf86-video-siliconmotion/PKGBUILD
deleted file mode 100644
index 8780c4996..000000000
--- a/testing/xf86-video-siliconmotion/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 150069 2012-02-12 09:45:39Z 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/testing/xf86-video-siliconmotion/smi-1.7.5-vga.patch b/testing/xf86-video-siliconmotion/smi-1.7.5-vga.patch
deleted file mode 100644
index ef353f0df..000000000
--- a/testing/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/testing/xf86-video-sis/PKGBUILD b/testing/xf86-video-sis/PKGBUILD
deleted file mode 100644
index 04bb1d6a0..000000000
--- a/testing/xf86-video-sis/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 150127 2012-02-13 07:58:15Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sis
-pkgver=0.10.3
-pkgrel=7
-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')
-conflicts=('xorg-server<1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-f5dafa24.patch)
-sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5'
-          'b61c6a78723aa59f8c82152fec42475b611cd1e7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-f5dafa24.patch"
-  libtoolize --force --copy
-  aclocal  
-  autoconf
-  automake
-  
-  ./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/testing/xf86-video-sis/git-f5dafa24.patch b/testing/xf86-video-sis/git-f5dafa24.patch
deleted file mode 100644
index 8c15b974b..000000000
--- a/testing/xf86-video-sis/git-f5dafa24.patch
+++ /dev/null
@@ -1,1654 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 33c0d65..62ad933 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"])
-@@ -103,8 +99,8 @@ AC_MSG_RESULT([$DRI])
- AM_CONDITIONAL(DRI, test x$DRI = xyes)
- if test "$DRI" = yes; then
-         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
--        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-+        AC_DEFINE(SISDRI,1,[Enable DRI driver support])
-+        AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support])
- fi
- 
- # technically this should be a configure flag.  meh.
-@@ -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..f2ca3a9 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
-@@ -173,7 +181,13 @@
- 
- #undef SISHAVEDRMWRITE
- #undef SISNEWDRI
--#ifdef XF86DRI
-+
-+/* if the server was built without DRI support, force-disable DRI */
-+#ifndef XF86DRI
-+#undef SISDRI
-+#endif
-+
-+#ifdef SISDRI
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,3,0)
- #define SISHAVEDRMWRITE
- #endif
-@@ -187,7 +201,7 @@
- #include "dri.h"
- #include "GL/glxint.h"
- #include "sis_dri.h"
--#endif /* XF86DRI */
-+#endif /* SISDRI */
- 
- /* Configurable stuff: ------------------------------------- */
- 
-@@ -251,7 +265,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 */
-@@ -805,7 +818,7 @@ typedef struct {
-     ScrnInfoPtr		pScrn_2;
-     UChar		*BIOS;
-     struct SiS_Private	*SiS_Pr;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     SISAGPHTYPE		agpHandle;
-     ULong		agpAddr;
-     UChar		*agpBase;
-@@ -971,7 +984,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
-@@ -1085,7 +1098,7 @@ typedef struct {
-     unsigned int	cmdQueueSize_div2;
-     unsigned int	cmdQueueSize_div4;
-     unsigned int	cmdQueueSize_4_3;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     SISAGPHTYPE		agpHandle;
-     ULong		agpAddr;
-     UChar 		*agpBase;
-@@ -1144,7 +1157,7 @@ typedef struct {
- 
-     /* DRI */
-     Bool		loadDRI;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     Bool		directRenderingEnabled;
-     DRIInfoPtr 		pDRIInfo;
-     int			drmSubFD;
-@@ -1348,7 +1361,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..7a5be4e 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"
- 
-@@ -86,11 +85,35 @@
- #include <X11/extensions/dpms.h>
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-+#include <inputstr.h> /* for inputInfo */
-+#endif
-+
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
- #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 +322,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 +335,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 +350,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 +376,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 +389,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 +403,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 +415,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 
-     if(pScrn->driverPrivate == NULL)
-         return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -501,7 +524,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 +600,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 +665,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 +728,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 +1158,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 +1246,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 +2154,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 +2170,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 +2196,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 +2222,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 +2235,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 +2257,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 +2278,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 +2295,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 +2335,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 +2345,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 +2355,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 +2365,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 +2375,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 +2385,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 +2416,7 @@ SiSXineramaResetProc(ExtensionEntry* extEntry)
- {
-     /* Called by CloseDownExtensions() */
-     if(SiSXineramadataPtr) {
--       Xfree(SiSXineramadataPtr);
-+       free(SiSXineramadataPtr);
-        SiSXineramadataPtr = NULL;
-     }
- }
-@@ -2454,7 +2481,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 +2520,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 +2929,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 +3083,7 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 		      }
- 		   }
- 	        }
--		xfree(mysisfbinfo);
-+		free(mysisfbinfo);
- 		mysisfbinfo = NULL;
- 	     }
- 	     close (fd);
-@@ -3216,7 +3243,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 +4105,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 +4200,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 +5586,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 +5619,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 +5666,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 +6043,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 +6052,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 +6097,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;
-        }
-@@ -6835,8 +6862,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- #ifdef SIS_USE_XAA
-        if(!pSiS->useEXA) {
- 	  if (!xf86LoadSubModule(pScrn, "xaa")) {
--	    SISErrorLog(pScrn, "Could not load xaa module\n");
--	    goto my_error_1;
-+	      xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+			 "Falling back to shadowfb\n");
-+	      pSiS->NoAccel = 1;
-+	      pSiS->ShadowFB = 1;
- 	  }
-        }
- #endif
-@@ -6855,7 +6884,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	  }
-        }
- #endif
--       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
-     }
- 
-     /* Load shadowfb (if needed) */
-@@ -6867,7 +6895,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     }
- 
-     /* Load the dri and glx modules if requested. */
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
-        if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
- 	  if(xf86LoadSubModule(pScrn, "dri")) {
-@@ -7454,7 +7482,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 +8703,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 {
-@@ -8703,7 +8731,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     pSiS->cmdQueueLen = 0; /* Force an EngineIdle() at start */
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
- #ifdef SISDUALHEAD
-        /* No DRI in dual head mode */
-@@ -8849,14 +8877,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;
- 	     }
-@@ -9016,7 +9044,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     }
- #endif
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
-        if(pSiS->directRenderingEnabled) {
-           /* Now that mi, drm and others have done their thing,
-@@ -9322,9 +9350,22 @@ SISMergedPointerMoved(int scrnIndex, int x, int y)
- 	}
-      }
-      if(doit) {
--	UpdateCurrentTime();
- 	sigstate = xf86BlockSIGIO();
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
-+        {
-+            double dx = x, dy = y;
-+            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
-+            x = (int)dx;
-+            y = (int)dy;
-+        }
-+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
-+	miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
-+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-+	miPointerSetPosition(inputInfo.pointer, x, y);
-+#else
-+	UpdateCurrentTime();
- 	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
-+#endif
- 	xf86UnblockSIGIO(sigstate);
- 	return;
-      }
-@@ -9737,7 +9778,7 @@ SISEnterVT(int scrnIndex, int flags)
- 
-     SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->directRenderingEnabled) {
-        DRIUnlock(screenInfo.screens[scrnIndex]);
-     }
-@@ -9763,7 +9804,7 @@ SISLeaveVT(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     SISPtr pSiS = SISPTR(pScrn);
--#ifdef XF86DRI
-+#ifdef SISDRI
-     ScreenPtr pScreen;
- 
-     if(pSiS->directRenderingEnabled) {
-@@ -9847,7 +9888,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-        SiSCtrlExtUnregister(pSiS, pScrn->scrnIndex);
-     }
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->directRenderingEnabled) {
-        SISDRICloseScreen(pScreen);
-        pSiS->directRenderingEnabled = FALSE;
-@@ -9941,7 +9982,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 +9995,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..3fa12c9 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));
- 
-@@ -480,7 +480,7 @@ SiSOptions(ScrnInfoPtr pScrn)
- #endif
-     pSiS->ShadowFB = FALSE;
-     pSiS->loadDRI = FALSE;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     pSiS->agpWantedPages = AGP_PAGES;
- #endif
-     pSiS->VESA = -1;
-@@ -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))) {
-@@ -2034,7 +2034,7 @@ SiSOptions(ScrnInfoPtr pScrn)
-        }
-     }
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     /* DRI */
-     from = X_DEFAULT;
-     if(xf86GetOptValBool(pSiS->Options, OPTION_DRI, &pSiS->loadDRI)) {
-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..a354ac4 100644
---- a/src/sispcirename.h
-+++ b/src/sispcirename.h
-@@ -29,11 +29,40 @@
- #ifndef SISPCIRENAME_H
- #define SISPCIRENAME_H
- 
-+#include <stdint.h>
-+
- enum region_type {
-     REGION_MEM,
-     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/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/xf86-video-sisusb/PKGBUILD b/testing/xf86-video-sisusb/PKGBUILD
deleted file mode 100644
index 8c70334e6..000000000
--- a/testing/xf86-video-sisusb/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150073 2012-02-12 09:45:43Z 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/testing/xf86-video-sisusb/sisusb-0.9.4-git.patch b/testing/xf86-video-sisusb/sisusb-0.9.4-git.patch
deleted file mode 100644
index 24474954a..000000000
--- a/testing/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/testing/xf86-video-tdfx/PKGBUILD b/testing/xf86-video-tdfx/PKGBUILD
deleted file mode 100644
index b84d724e5..000000000
--- a/testing/xf86-video-tdfx/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 150075 2012-02-12 09:45:45Z 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/testing/xf86-video-trident/PKGBUILD b/testing/xf86-video-trident/PKGBUILD
deleted file mode 100644
index cfb5908b5..000000000
--- a/testing/xf86-video-trident/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 150077 2012-02-12 09:45:47Z 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/testing/xf86-video-trident/trident-1.3.4-git.patch b/testing/xf86-video-trident/trident-1.3.4-git.patch
deleted file mode 100644
index 4e0cc27b2..000000000
--- a/testing/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/testing/xf86-video-tseng/PKGBUILD b/testing/xf86-video-tseng/PKGBUILD
deleted file mode 100644
index 24aeede8a..000000000
--- a/testing/xf86-video-tseng/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150079 2012-02-12 09:45:50Z 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/testing/xf86-video-tseng/tseng-1.2.4-git.patch b/testing/xf86-video-tseng/tseng-1.2.4-git.patch
deleted file mode 100644
index 082b2cb0b..000000000
--- a/testing/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/testing/xf86-video-unichrome/LICENSE b/testing/xf86-video-unichrome/LICENSE
deleted file mode 100644
index f4007667b..000000000
--- a/testing/xf86-video-unichrome/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved.
-Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved.
-Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/testing/xf86-video-unichrome/PKGBUILD b/testing/xf86-video-unichrome/PKGBUILD
deleted file mode 100644
index 6f6424407..000000000
--- a/testing/xf86-video-unichrome/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150081 2012-02-12 09:45:52Z 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/testing/xf86-video-v4l/LICENSE b/testing/xf86-video-v4l/LICENSE
deleted file mode 100644
index 535595b88..000000000
--- a/testing/xf86-video-v4l/LICENSE
+++ /dev/null
@@ -1,826 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-                                  Licenses
-
-                            The X.Org Foundation
-
-                                 March 2004
-
-1.  Introduction
-
-The X.org Foundation X Window System distribution is a compilation of code
-and documentation from many sources.  This document is intended primarily as
-a guide to the licenses used in the distribution: you must check each file
-and/or package for precise redistribution terms. None-the-less, this summary
-may be useful to many users.  No software incorporating the XFree86 1.1
-license has been incorporated.
-
-This document is based on the compilation from XFree86.
-
-2.  XFree86 License
-
-XFree86 code without an explicit copyright is covered by the following copy-
-right/license:
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
-
-3.  Other Licenses
-
-Portions of code are covered by the following licenses/copyrights.  See indi-
-vidual files for the copyright dates.
-
-3.1  X/MIT Copyrights
-
-3.1.1  X Consortium
-
-Copyright (C) <date> X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2  The Open Group
-
-Copyright <date>  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-3.2  Berkeley-based copyrights:
-
-o
-
-3.2.1  General
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.2  UCB/LBL
-
-Copyright (c) 1993 The Regents of the University of California.  All rights
-reserved.
-
-This software was developed by the Computer Systems Engineering group at
-Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
-Berkeley.
-
-All advertising materials mentioning features or use of this software must
-display the following acknowledgement: This product includes software devel-
-oped by the University of California, Lawrence Berkeley Laboratory.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the University of California, Berkeley and its con-
-      tributors.
-
-  4.  Neither the name of the University nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS-
-CLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.3  The NetBSD Foundation, Inc.
-
-Copyright (c) 2003 The NetBSD Foundation, Inc.  All rights reserved.
-
-This code is derived from software contributed to The NetBSD Foundation by
-Ben Collver <collver1@attbi.com>
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the NetBSD Foundation, Inc. and its contributors.
-
-  4.   Neither the name of The NetBSD Foundation nor the names of its con-
-      tributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE-
-QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM-
-AGE.
-
-3.2.4  Theodore Ts'o.
-
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      and the entire permission notice in its entirety, including the dis-
-      claimer of warranties.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  he name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.5  Theo de Raadt and Damien Miller
-
-Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.  Copyright (c)
-2001-2002 Damien Miller.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.6  Todd C. Miller
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON-
-TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-3.2.7  Thomas Winischhofer
-
-Copyright (C) 2001-2004 Thomas Winischhofer
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.3  NVIDIA Corp
-
-Copyright (c) 1996 NVIDIA, Corp.  All rights reserved.
-
-NOTICE TO USER: The source code is copyrighted under U.S. and international
-laws.  NVIDIA, Corp. of Sunnyvale, California owns the copyright and as
-design patents pending on the design and interface of the NV chips.  Users
-and possessors of this source code are hereby granted a nonexclusive, roy-
-alty-free copyright and design patent license to use this code in individual
-and commercial software.
-
-Any use of this source code must include, in the user documentation and
-internal comments to the code, notices to the end user as follows:
-
-Copyright (c) 1996 NVIDIA, Corp.  NVIDIA design patents pending in the U.S.
-and foreign countries.
-
-NVIDIA, CORP.  MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
-CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR-
-RANTY OF ANY KIND.  NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL NVIDIA, CORP.  BE LIABLE
-FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM-
-AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-
-3.4  GLX Public License
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below), and to permit persons to whom the Subject Software is furnished in
-accordance with this License to do the same, subject to all of the following
-terms and conditions, which Recipient accepts by engaging in any such use,
-copying, modifying, merging, publishing, distributing, sublicensing or sell-
-ing:
-
-1. Definitions.
-
-     (a) "Original Software" means source code of computer software code
-     which is described in Exhibit A as Original Software.
-
-     (b) "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     (c) "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     (d) "Recipient" means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License.
-     For legal entities, "Recipient" includes any entity which controls,
-     is controlled by, or is under common control with Recipient. For
-     purposes of this definition, "control" of an entity means (a) the
-     power, direct or indirect, to direct or manage such entity, or (b)
-     ownership of fifty percent (50%) or more of the outstanding shares
-     or beneficial ownership of such entity.
-
-2. Redistribution of Source Code Subject to These Terms. Redistributions of
-Subject Software in source code form must retain the notice set forth in
-Exhibit A, below, in every file. A copy of this License must be included in
-any documentation for such Subject Software where the recipients' rights
-relating to Subject Software are described. Recipient may distribute the
-source code version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13
-of this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the source code version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-3. Redistribution in Executable Form. The notice set forth in Exhibit A must
-be conspicuously included in any notice in an executable version of Subject
-Software, related documentation or collateral in which Recipient describes
-the user's rights relating to the Subject Software. Recipient may distribute
-the executable version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of
-this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the executable version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-4. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software which is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-5. No Trademark Rights. This License does not grant any rights to use any
-trade name, trademark or service mark whatsoever. No trade name, trademark or
-service mark of SGI may be used to endorse or promote products derived from
-the Subject Software without prior written permission of SGI.
-
-6. No Other Rights. This License does not grant any rights with respect to
-the OpenGL API or to any software or hardware implementation thereof or to
-any other software whatsoever, nor shall any other rights or licenses not
-expressly granted hereunder arise by implication, estoppel or otherwise with
-respect to the Subject Software. Title to and ownership of the Original Soft-
-ware at all times remains with SGI. All rights in the Original Software not
-expressly granted under this License are reserved.
-
-7. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-8. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Exhibit A notice required under Sec-
-tions 2 and 3, above, and in the text of any related documentation, license
-agreement or collateral in which Recipient describes end user's rights relat-
-ing to the Subject Software. If Recipient obtains such knowledge after it
-makes Subject Software available to any other person or entity, Recipient
-shall take other steps (such as notifying appropriate mailing lists or news-
-groups) reasonably calculated to inform those who received the Subject Soft-
-ware that new knowledge has been obtained.
-
-9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE-
-ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA-
-BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO
-THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc.
-from and against any loss, liability, damages, costs or expenses (including
-the payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Subject Software or out of
-any representation or warranty made by Recipient.
-
-12. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S.  Government End
-Users acquire only the rights set forth in this License and are subject to
-the terms of this License.
-
-13. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable, such provision shall be reformed so as to achieve as nearly as
-possible the same economic effect as the original provision and the remainder
-of this License will remain in effect. This License shall be governed by and
-construed in accordance with the laws of the United States and the State of
-California as applied to agreements entered into and to be performed entirely
-within California between California residents. Any litigation relating to
-this License shall be subject to the exclusive jurisdiction of the Federal
-Courts of the Northern District of California (or, absent subject matter
-jurisdiction in such courts, the courts of the State of California), with
-venue lying exclusively in Santa Clara County, California, with the losing
-party responsible for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is expressly
-excluded. Any law or regulation which provides that the language of a con-
-tract shall be construed against the drafter shall not apply to this License.
-
-Exhibit A
-
-The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and
-13 of the GLX Public License Version 1.0 (the "License"). You may not use
-this file except in compliance with those sections of the License. You may
-obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services,
-2011 N. Shoreline Blvd., Mountain View, CA 94043 or at
-http://www.sgi.com/software/opensource/glx/license.html.
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software is GLX version 1.2 source code, released February,
-1999. The developer of the Original Software is Silicon Graphics, Inc.  Those
-portions of the Subject Software created by Silicon Graphics, Inc.  are Copy-
-right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-3.5  CID Font Code Public License
-
-CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
-
-Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI")
-hereby grants permission to Recipient (defined below), under SGI's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below) in both source code and executable form, and to permit persons to whom
-the Subject Software is furnished in accordance with this License to do the
-same, subject to all of the following terms and conditions, which Recipient
-accepts by engaging in any such use, copying, modifying, merging, publica-
-tion, distributing, sublicensing or selling:
-
-1. Definitions.
-
-     a. "Original Software" means source code of computer software code
-     that is described in Exhibit A as Original Software.
-
-     b. "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     c. "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     d. "Recipient" means an individual or a legal entity exercising
-     rights under the terms of this License. For legal entities, "Recip-
-     ient" includes any entity that controls, is controlled by, or is
-     under common control with Recipient. For purposes of this defini-
-     tion, "control" of an entity means (i) the power, direct or indi-
-     rect, to direct or manage such entity, or (ii) ownership of fifty
-     percent (50%) or more of the outstanding shares or beneficial own-
-     ership of such entity.
-
-     e. "Required Notice" means the notice set forth in Exhibit A to
-     this License.
-
-     f. "Accompanying Technology" means any software or other technology
-     that is not a Modification and that is distributed or made publicly
-     available by Recipient with the Subject Software.  Separate soft-
-     ware files that do not contain any Original Software or any previ-
-     ous Modification shall not be deemed a Modification, even if such
-     software files are aggregated as part of a product, or in any
-     medium of storage, with any file that does contain Original Soft-
-     ware or any previous Modification.
-
-2. License Terms. All distribution of the Subject Software must be made sub-
-ject to the terms of this License. A copy of this License and the Required
-Notice must be included in any documentation for Subject Software where
-Recipient's rights relating to Subject Software and/or any Accompanying Tech-
-nology are described. Distributions of Subject Software in source code form
-must also include the Required Notice in every file distributed. In addition,
-a ReadMe file entitled "Important Legal Notice" must be distributed with each
-distribution of one or more files that incorporate Subject Software. That
-file must be included with distributions made in both source code and exe-
-cutable form. A copy of the License and the Required Notice must be included
-in that file.  Recipient may distribute Accompanying Technology under a
-license of Recipient's choice, which may contain terms different from this
-License, provided that (i) Recipient is in compliance with the terms of this
-License, (ii) such other license terms do not modify or supersede the terms
-of this License as applicable to the Subject Software, (iii) Recipient hereby
-indemnifies SGI for any liability incurred by SGI as a result of the distri-
-bution of Accompanying Technology or the use of other license terms.
-
-3. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software that is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-4. Trademark Rights. This License does not grant any rights to use any trade
-name, trademark or service mark whatsoever. No trade name, trademark or ser-
-vice mark of SGI may be used to endorse or promote products derived from or
-incorporating any Subject Software without prior written permission of SGI.
-
-5. No Other Rights. No rights or licenses not expressly granted hereunder
-shall arise by implication, estoppel or otherwise. Title to and ownership of
-the Original Software at all times remains with SGI. All rights in the Origi-
-nal Software not expressly granted under this License are reserved.
-
-6. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity, or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-7. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Required Notice, and in the text of
-any related documentation, license agreement or collateral in which Recipient
-describes end user's rights relating to the Subject Software. If Recipient
-obtains such knowledge after it makes Subject Software available to any other
-person or entity, Recipient shall take other steps (such as notifying appro-
-priate mailing lists or newsgroups) reasonably calculated to provide such
-knowledge to those who received the Subject Software.
-
-8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
-CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED.
-
-10. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold SGI and its successors and assigns
-harmless from and against any loss, liability, damages, costs or expenses
-(including the payment of reasonable attorneys fees) arising out of (Recipi-
-ent's use, modification, reproduction and distribution of the Subject Soft-
-ware or out of any representation or warranty made by Recipient.
-
-11. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End Users
-acquire only the rights set forth in this License and are subject to the
-terms of this License.
-
-12. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable by any judicial or administrative authority having proper jurisdic-
-tion with respect thereto, such provision shall be reformed so as to achieve
-as nearly as possible the same economic effect as the original provision and
-the remainder of this License will remain in effect. This License shall be
-governed by and construed in accordance with the laws of the United States
-and the State of California as applied to agreements entered into and to be
-performed entirely within California between California residents. Any liti-
-gation relating to this License shall be subject to the exclusive jurisdic-
-tion of the Federal Courts of the Northern District of California (or, absent
-subject matter jurisdiction in such courts, the courts of the State of Cali-
-fornia), with venue lying exclusively in Santa Clara County, California, with
-the losing party responsible for costs, including without limitation, court
-costs and reasonable attorneys fees and expenses. The application of the
-United Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation that provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-Exhibit A
-
-Copyright (c) 1994-1999 Silicon Graphics, Inc.
-
-The contents of this file are subject to the CID Font Code Public License
-Version 1.0 (the "License"). You may not use this file except in compliance
-with the License. You may obtain a copy of the License at Silicon Graphics,
-Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-or at http://www.sgi.com/software/opensource/cid/license.html
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software (as defined in the License) is CID font code that was
-developed by Silicon Graphics, Inc. Those portions of the Subject Software
-(as defined in the License) that were created by Silicon Graphics, Inc. are
-Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
-
-[NOTE: When using this text in connection with Subject Software delivered
-solely in object code form, Recipient may replace the words "this file" with
-"this software" in both the first and second sentences.]
-
-3.6  Bitstream Vera Fonts Copyright
-
-The fonts have a generous copyright, allowing derivative works (as long as
-"Bitstream" or "Vera" are not in the names), and full redistribution (so long
-as they are not *sold* by themselves). They can be be bundled, redistributed
-and sold with any software.
-
-The fonts are distributed under the following copyright:
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated documentation
-files (the "Font Software"), to reproduce and distribute the Font Software,
-including without limitation the rights to use, copy, merge, publish, dis-
-tribute, and/or sell copies of the Font Software, and to permit persons to
-whom the Font Software is furnished to do so, subject to the following condi-
-tions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and addi-
-tional glyphs or characters may be added to the Fonts, only if the fonts are
-renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream Vera"
-names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA-
-TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome Foundation,
-and Bitstream Inc., shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Font Software without prior written
-authorization from the Gnome Foundation or Bitstream Inc., respectively. For
-further information, contact: fonts at gnome dot org.
-
-3.7  Bigelow & Holmes Inc and URW++ GmbH Luxi font license
-
-Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction
-code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis-
-tered trademark of Bigelow & Holmes Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of these Fonts and associated documentation files (the "Font Software"), to
-deal in the Font Software, including without limitation the rights to use,
-copy, merge, publish, distribute, sublicense, and/or sell copies of the Font
-Software, and to permit persons to whom the Font Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software.
-
-The Font Software may not be modified, altered, or added to, and in particu-
-lar the designs of glyphs or characters in the Fonts may not be modified nor
-may additional glyphs or characters be added to the Fonts. This License
-becomes null and void when the Fonts or Font Software have been modified.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++
-GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Bigelow & Holmes Inc. and
-URW++ GmbH. shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Font Software without prior written
-authorization from Bigelow & Holmes Inc. and URW++ GmbH.
-
-For further information, contact:
-
-info@urwpp.de or design@bigelowandholmes.com
-
-     $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $
diff --git a/testing/xf86-video-v4l/PKGBUILD b/testing/xf86-video-v4l/PKGBUILD
deleted file mode 100644
index a947504f5..000000000
--- a/testing/xf86-video-v4l/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 150083 2012-02-12 09:45:54Z 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/testing/xf86-video-v4l/git-fixes.patch b/testing/xf86-video-v4l/git-fixes.patch
deleted file mode 100644
index 2f752fc8c..000000000
--- a/testing/xf86-video-v4l/git-fixes.patch
+++ /dev/null
@@ -1,4362 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index 02fc6fa..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,57 +0,0 @@
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/v4l.c:
--	Bump to 0.1.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/v4l.c: (V4lPutVideo), (V4lPutStill):
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/v4l.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.1.0.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* man/Makefile.am:
--	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 3ae2692..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
--EXTRA_DIST = README
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
-+
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index d9ac542..c490919 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,57 +20,56 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-v4l],
--        0.2.0,
-+        [0.2.0],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-v4l)
--
-+        [xf86-video-v4l])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=v4l
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/v4l.man b/man/v4l.man
-index 7d35b86..dc1e201 100644
---- a/man/v4l.man
-+++ b/man/v4l.man
-@@ -34,6 +34,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details.  This section only covers configuration details specific to this
- driver.
- .SH "SEE ALSO"
--__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
-+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
- .SH AUTHORS
- Authors include: Gerd Knorr <kraxel@bytesex.org>
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ed30a80..08afe60 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,7 +28,6 @@ v4l_drv_la_LTLIBRARIES = v4l_drv.la
- v4l_drv_la_LDFLAGS = -module -avoid-version
- v4l_drv_ladir = @moduledir@/drivers
- 
--v4l_drv_la_SOURCES = \
--         v4l.c
--
--EXTRA_DIST = videodev.h
-+v4l_drv_la_SOURCES =	\
-+	v4l.c		\
-+	videodev.h
-diff --git a/src/v4l.c b/src/v4l.c
-index b827f80..10e782b 100644
---- a/src/v4l.c
-+++ b/src/v4l.c
-@@ -1,6 +1,9 @@
- /*
-- *  video4linux Xv Driver 
-+ *  video4linux Xv Driver
-  *  based on Michael Schimek's permedia 2 driver.
-+ *
-+ * Copyright (c) 2011 Mauro Carvalho Chehab <mchehab@redhat.com> for:
-+ *	- Major rewrite, as driver got ported to V4L2 API
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -9,12 +12,16 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <ctype.h>
-+
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-+#include <unistd.h>
-+#include <sys/ioctl.h>
- 
--#include "videodev.h"
-+#include "videodev2.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "xf86Pci.h"
-@@ -25,8 +32,9 @@
- #include "regionstr.h"
- #include "dgaproc.h"
- #include "xf86str.h"
-+#include "fourcc.h"
- 
--#include <asm/ioctl.h>		/* _IORW(xxx) #defines are here */
-+#include <asm/ioctl.h>          /* _IORW(xxx) #defines are here */
- 
- #if 0
- # define DEBUG(x) (x)
-@@ -34,20 +42,22 @@
- # define DEBUG(x)
- #endif
- 
-+/***************************************************************************/
-+
- static void     V4LIdentify(int flags);
- static Bool     V4LProbe(DriverPtr drv, int flags);
- static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid);
- 
- _X_EXPORT DriverRec V4L = {
--        40000,
--        "v4l",
--        V4LIdentify, /* Identify*/
--        V4LProbe, /* Probe */
--	V4LAvailableOptions,
--        NULL,
--        0
--};    
--
-+    .driverVersion = 50000,
-+    .driverName = "v4l",
-+    .Identify = V4LIdentify,
-+    .Probe = V4LProbe,
-+    .AvailableOptions = V4LAvailableOptions,
-+    .module = NULL,
-+    .refCount = 0,
-+    .driverFunc = NULL,   /* FIXME: Need to implement for new probing mode */
-+};
- 
- #ifdef XFree86LOADER
- 
-@@ -55,16 +65,16 @@ static MODULESETUPPROTO(v4lSetup);
- 
- static XF86ModuleVersionInfo v4lVersRec =
- {
--        "v4l",
--        MODULEVENDORSTRING,
--        MODINFOSTRING1,
--        MODINFOSTRING2,
--        XORG_VERSION_CURRENT,
--        0, 1, 1,
--        ABI_CLASS_VIDEODRV,
--        ABI_VIDEODRV_VERSION,
--        MOD_CLASS_NONE,
--        {0,0,0,0}
-+    "v4l",
-+    MODULEVENDORSTRING,
-+    MODINFOSTRING1,
-+    MODINFOSTRING2,
-+    XORG_VERSION_CURRENT,
-+    0, 1, 1,
-+    ABI_CLASS_VIDEODRV,
-+    ABI_VIDEODRV_VERSION,
-+    MOD_CLASS_NONE,
-+    {0,0,0,0}
- };
- 
- _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
-@@ -72,32 +82,32 @@ _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
- static pointer
- v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- {
--        const char *osname;
--	static Bool setupDone = FALSE;
--
--	if (setupDone) {
--	    if (errmaj)
--		*errmaj = LDR_ONCEONLY;
--	    return NULL;             
--	}
--	
--	setupDone = TRUE;
--
--        /* Check that we're being loaded on a Linux system */
--        LoaderGetOS(&osname, NULL, NULL, NULL);
--        if (!osname || strcmp(osname, "linux") != 0) {
--                if (errmaj)
--                        *errmaj = LDR_BADOS;
--                if (errmin)
--                        *errmin = 0;
--                return NULL;
--        } else {
--                /* OK */
--
--	        xf86AddDriver (&V4L, module, 0);   
--	  
--                return (pointer)1;
--        }
-+    const char *osname;
-+    static Bool setupDone = FALSE;
-+
-+    if (setupDone) {
-+        if (errmaj)
-+            *errmaj = LDR_ONCEONLY;
-+        return NULL;
-+    }
-+
-+    setupDone = TRUE;
-+
-+    /* Check that we're being loaded on a Linux system */
-+    LoaderGetOS(&osname, NULL, NULL, NULL);
-+    if (!osname || strcmp(osname, "linux") != 0) {
-+        if (errmaj)
-+            *errmaj = LDR_BADOS;
-+        if (errmin)
-+            *errmin = 0;
-+        return NULL;
-+    } else {
-+        /* OK */
-+
-+        xf86AddDriver (&V4L, module, 0);
-+
-+        return (pointer)1;
-+    }
- }
- 
- #else
-@@ -112,25 +122,28 @@ v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- #define VIDEO_YUV     2  /* yuv overlay (to offscreen memory + hw scaling) */
- #define VIDEO_RECLIP  3  /* temporarly off, window clipping changes */
- 
-+typedef struct _XvV4LCtrlRec {
-+    struct v4l2_queryctrl       qctrl;
-+    Atom                        xv;
-+} XvV4LCtrlRec, *XvV4LCtrlPtr;
-+
- typedef struct _PortPrivRec {
-     ScrnInfoPtr                 pScrn;
--    FBAreaPtr			pFBArea[2];
--    int				VideoOn;
--    Bool			StreamOn;
-+    FBAreaPtr                   pFBArea[2];
-+    int                         VideoOn;
-+    Bool                        StreamOn;
- 
-     /* file handle */
--    int 			nr;
--    struct video_capability     cap;
-+    int                         nr;
-+    struct v4l2_capability      cap;
- 
-     /* RGB overlay */
--    struct video_buffer		rgb_fbuf;
--    struct video_window		rgb_win;
--    int                         rgbpalette;
-+    struct v4l2_framebuffer     rgb_fbuf;
-+    struct v4l2_window          rgb_win;
-     int                         rgbdepth;
- 
-     /* attributes */
--    struct video_picture	pict;
--    struct video_audio          audio;
-+    CARD32                      pixelformat;
- 
-     XF86VideoEncodingPtr        enc;
-     int                         *input;
-@@ -145,24 +158,21 @@ typedef struct _PortPrivRec {
- 
-     int                         yuv_width,yuv_height;
-     XF86SurfacePtr              surface;
--    struct video_buffer		yuv_fbuf;
--    struct video_window		yuv_win;
--} PortPrivRec, *PortPrivPtr;
-+    struct v4l2_framebuffer     yuv_fbuf;
-+    struct v4l2_window          yuv_win;
-+
-+    struct v4l2_standard        *standard; /* FIXME: can be removed */
- 
--#define XV_ENCODING	"XV_ENCODING"
--#define XV_BRIGHTNESS  	"XV_BRIGHTNESS"
--#define XV_CONTRAST 	"XV_CONTRAST"
--#define XV_SATURATION  	"XV_SATURATION"
--#define XV_HUE		"XV_HUE"
-+    XvV4LCtrlPtr                XvV4LCtrl;
-+    int                         n_qctrl;
-+} PortPrivRec, *PortPrivPtr;
- 
--#define XV_FREQ		"XV_FREQ"
--#define XV_MUTE		"XV_MUTE"
--#define XV_VOLUME      	"XV_VOLUME"
-+#define XV_ENCODING "XV_ENCODING"
-+#define XV_FREQ     "XV_FREQ"
- 
--#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
-+#define MAKE_ATOM(a) MakeAtom(a, strlen(a), TRUE)
- 
--static Atom xvEncoding, xvBrightness, xvContrast, xvSaturation, xvHue;
--static Atom xvFreq, xvMute, xvVolume;
-+static Atom xvEncoding, xvFreq;
- 
- static XF86VideoFormatRec
- InputVideoFormats[] = {
-@@ -176,16 +186,8 @@ InputVideoFormats[] = {
- 
- static const XF86AttributeRec Attributes[] = {
-     {XvSettable | XvGettable, -1000,    1000, XV_ENCODING},
--    {XvSettable | XvGettable, -1000,    1000, XV_BRIGHTNESS},
--    {XvSettable | XvGettable, -1000,    1000, XV_CONTRAST},
--    {XvSettable | XvGettable, -1000,    1000, XV_SATURATION},
--    {XvSettable | XvGettable, -1000,    1000, XV_HUE},
- };
--static const XF86AttributeRec VolumeAttr = 
--    {XvSettable | XvGettable, -1000,    1000, XV_VOLUME};
--static const XF86AttributeRec MuteAttr = 
--    {XvSettable | XvGettable,     0,       1, XV_MUTE};
--static const XF86AttributeRec FreqAttr = 
-+static const XF86AttributeRec FreqAttr =
-     {XvSettable | XvGettable,     0, 16*1000, XV_FREQ};
- 
- 
-@@ -206,59 +208,247 @@ static struct V4L_DEVICE {
- };
- 
- /* ---------------------------------------------------------------------- */
--/* forward decl */
- 
--static void V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
--		 short vid_w, short vid_h, short drw_w, short drw_h,
--		 unsigned int *p_w, unsigned int *p_h, pointer data);
-+static int SetV4LFmt(int fd, CARD32 pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+    char *p = (char *)&pixelformat;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+    if (fbuf.fmt.pixelformat != pixelformat) {
-+        fbuf.fmt.pixelformat = pixelformat;
-+        if (ioctl(fd, VIDIOC_S_FBUF, &fbuf) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't set FBUF to %c%c%c%c\n",
-+                    errno, p[0], p[1], p[2], p[3]);
-+            return errno;
-+        }
-+    }
-+    DEBUG(xf86Msg(X_INFO, "v4l: Set overlay format to %c%c%c%c\n",
-+                  p[0], p[1], p[2], p[3]));
-+    return 0;
-+}
-+static int GetV4LFmt(int fd, CARD32 *pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+
-+    *pixelformat = fbuf.fmt.pixelformat;
-+
-+    return 0;
-+}
-+
-+#define ATTR_NAME_PREFIX "XV_"
-+static int AddControl(PortPrivPtr p, XF86AttributeRec **list, int *count,
-+                      struct v4l2_queryctrl *qctrl, int *n)
-+{
-+    char *ptr;
-+
-+/* v4l_add_attr */
-+    if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)
-+        return 0;
-+    switch (qctrl->type) {
-+    case V4L2_CTRL_TYPE_INTEGER:
-+    case V4L2_CTRL_TYPE_BOOLEAN:
-+    case V4L2_CTRL_TYPE_MENU:
-+    case V4L2_CTRL_TYPE_BUTTON:
-+        break;
-+    default:
-+        return 0;
-+    }
-+
-+    p->XvV4LCtrl = realloc(p->XvV4LCtrl, sizeof(XvV4LCtrlRec) * (*n + 1));
-+    if (!p->XvV4LCtrl) {
-+        if (*list) {
-+            free (*list);
-+            *count = 0;
-+            *n = 0;
-+        }
-+        return -1;
-+    }
-+
-+    *list = realloc(*list, sizeof(XF86AttributeRec) * (*count + 1));
-+    if (NULL == *list) {
-+        if (p->XvV4LCtrl)
-+            free (p->XvV4LCtrl);
-+        *count = 0;
-+        return -1;
-+    }
-+
-+    memset(*list + *count, 0, sizeof(XF86AttributeRec));
-+    (*list)[*count].flags = XvSettable | XvGettable;
-+
-+    if (qctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
-+        (*list)[*count].flags &= ~XvSettable;
-+    if (qctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY)
-+        (*list)[*count].flags &= ~XvGettable;
-+    (*list)[*count].min_value = qctrl->minimum;
-+    (*list)[*count].max_value = qctrl->maximum;
-+    (*list)[*count].name = malloc(strlen((char *)qctrl->name) + 1 + sizeof (ATTR_NAME_PREFIX));
-+    strcpy((*list)[*count].name, ATTR_NAME_PREFIX);
-+    strcat((*list)[*count].name, (char *)qctrl->name);
-+    for (ptr = (*list)[*count].name; *ptr; ptr++) {
-+        *ptr = toupper(*ptr);
-+        if (*ptr == ' ')
-+            *ptr = '_';
-+    }
-+
-+    p->XvV4LCtrl[*n].xv = MAKE_ATOM((*list)[*count].name);
-+    memcpy(&p->XvV4LCtrl[*n].qctrl, qctrl, sizeof(*qctrl));
-+
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            (*list)[*count].name, (int)p->XvV4LCtrl[*n].xv,
-+            p->XvV4LCtrl[*n].qctrl.minimum,
-+            p->XvV4LCtrl[*n].qctrl.maximum);
-+
-+    (*count)++;
-+    (*n)++;
-+
-+    return 0;
-+}
-+
-+static void AddAllV4LControls(PortPrivPtr p, XF86AttributeRec **list,
-+                              int *count, int fd)
-+{
-+    int entries = 0;
-+    CARD32 id;
-+    struct v4l2_queryctrl qctrl;
-+
-+    memset(&qctrl, 0, sizeof(qctrl));
-+    qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
-+    }
-+    if (qctrl.id != V4L2_CTRL_FLAG_NEXT_CTRL)
-+        return;
-+    for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) {
-+        qctrl.id = id;
-+        if (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+            if (AddControl(p, list, count, &qctrl, &entries))
-+                return;
-+        }
-+    }
-+    qctrl.id = V4L2_CID_PRIVATE_BASE;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id++;
-+    }
-+    p->n_qctrl = entries;
-+}
- 
- /* ---------------------------------------------------------------------- */
- 
-+/* setup yuv overlay + hw scaling: look if we find some common video
-+   format which both v4l driver and the X-Server can handle */
-+static int v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
-+                          char *dev, int fd)
-+{
-+    static const struct {
-+        CARD32        v4l_palette;
-+        unsigned int  xv_id;
-+        unsigned int  xv_format;
-+    } yuvlist[] = {
-+        { V4L2_PIX_FMT_YUYV, FOURCC_YUY2, XvPacked },
-+        { V4L2_PIX_FMT_UYVY, FOURCC_UYVY, XvPacked },
-+        { 0 /* end of list */ },
-+    };
-+    /* FIXME: Why pScrn->scrnIndex? */
-+    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+    int fmt,i;
-+
-+    pPPriv->format = xf86XVQueryOffscreenImages(pScreen, &pPPriv->nformat);
-+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                   "v4l: Number of Xv formats: %d\n", pPPriv->nformat);
-+    if (!pPPriv->nformat)
-+        return FALSE;
-+
-+    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
-+        pPPriv->pixelformat = yuvlist[fmt].v4l_palette;
-+        if (-1 == SetV4LFmt(fd, pPPriv->pixelformat))
-+            continue;
-+        GetV4LFmt(fd, &pPPriv->pixelformat);
-+        if (pPPriv->pixelformat != yuvlist[fmt].v4l_palette)
-+            continue;
-+        /* ... works, check available offscreen image formats now ... */
-+        for (i = 0; i < pPPriv->nformat; i++) {
-+            if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id &&
-+                pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
-+                /* ... match found, good. */
-+                pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
-+                pPPriv->myfmt = pPPriv->format+i;
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+                           "v4l[%s]: using hw video scaling [%4.4s].\n",
-+                           dev,(char*)&(pPPriv->format[i].image->id));
-+                return TRUE;
-+            }
-+        }
-+    }
-+    return TRUE;
-+}
-+
- static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     static int first = 1;
- 
-+#if 0
-+    /*
-+     * It may be a good idea to probe here, but this would break
-+     * some things, as initialization uses yuv_format
-+     */
-+    if (!pPPriv->yuv_format && first)
-+        v4l_check_yuv(pScrn, pPPriv, V4L_NAME, V4L_FD);
-+#endif
-     if (-1 == V4L_FD) {
--	V4L_FD = open(V4L_NAME, O_RDWR, 0);
--
--	pPPriv->rgb_fbuf.width        = pScrn->virtualX;
--	pPPriv->rgb_fbuf.height       = pScrn->virtualY;
--	pPPriv->rgb_fbuf.depth        = pScrn->bitsPerPixel;
--	pPPriv->rgb_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
--	pPPriv->rgb_fbuf.base         = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
--	if (first) {
--	    first = 0;
--	    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
--	}
--
--	switch (pScrn->bitsPerPixel) {
--	case 16:
--	    if (pScrn->weight.green == 5) {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB555;
--		pPPriv->rgbdepth   = 16;
--	    } else {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB565;
--		pPPriv->rgbdepth   = 16;
--	    }
--	    break;
--	case 24:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB24;
--	    pPPriv->rgbdepth   = 24;
--	    break;
--	case 32:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB32;
--	    pPPriv->rgbdepth   = 32;
--	    break;
--	}
-+        V4L_FD = open(V4L_NAME, O_RDWR, 0);
-+
-+        if (-1 == V4L_FD)
-+            return errno;
-+
-+        if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->rgb_fbuf)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+            return errno;
-+        }
-+        pPPriv->rgb_fbuf.fmt.width        = pScrn->virtualX;
-+        pPPriv->rgb_fbuf.fmt.height       = pScrn->virtualY;
-+        pPPriv->rgb_fbuf.fmt.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
-+        pPPriv->rgb_fbuf.base             = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
-+        if (first) {
-+            xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                           "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
-+            first = 0;
-+        }
-+
-+        switch (pScrn->bitsPerPixel) {
-+        case 16:
-+            if (pScrn->weight.green == 5) {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB555;
-+            } else {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB565;
-+            }
-+            break;
-+        case 24:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR24;
-+            break;
-+        case 32:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR32;
-+            break;
-+        }
-     }
- 
--    if (-1 == V4L_FD)
--	return errno;
--    
-     V4L_REF++;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/open: refcount=%d\n",V4L_REF));
-+                         "Xv/open: refcount=%d\n",V4L_REF));
- 
-     return 0;
- }
-@@ -267,10 +457,10 @@ static void V4lCloseDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     V4L_REF--;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/close: refcount=%d\n",V4L_REF));
-+                         "Xv/close: refcount=%d\n",V4L_REF));
-     if (0 == V4L_REF && -1 != V4L_FD) {
--	close(V4L_FD);
--	V4L_FD = -1;
-+        close(V4L_FD);
-+        V4L_FD = -1;
-     }
- }
- 
-@@ -280,8 +470,10 @@ V4lPutVideo(ScrnInfoPtr pScrn,
-     short vid_w, short vid_h, short drw_w, short drw_h,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
-+    struct v4l2_format fmt;
-+
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    struct video_clip *clip;
-+    struct v4l2_clip *clip;
-     BoxPtr pBox;
-     RegionRec newReg;
-     BoxRec    newBox;
-@@ -291,179 +483,214 @@ V4lPutVideo(ScrnInfoPtr pScrn,
- 
-     /* Open a file handle to the device */
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	if (V4lOpenDevice(pPPriv, pScrn))
--	    return Success;
-+        if (V4lOpenDevice(pPPriv, pScrn))
-+            return Success;
-     }
- 
-     if (0 != pPPriv->yuv_format) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
--	width  = pPPriv->enc[pPPriv->cenc].width;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
-+        width  = pPPriv->enc[pPPriv->cenc].width;
-         height = pPPriv->enc[pPPriv->cenc].height/2; /* no interlace */
--	if (drw_w < width)
--	    width = drw_w;
--	if (drw_h < height)
--	    height = drw_h;
--	if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
--	    /* new size -- free old surface */
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
--	    if (pPPriv->surface) {
--		pPPriv->VideoOn = VIDEO_OFF;
--		pPPriv->myfmt->stop(pPPriv->surface);
--		pPPriv->myfmt->free_surface(pPPriv->surface);
--		xfree(pPPriv->surface);
--		pPPriv->surface    = NULL;
--	    }
--	    pPPriv->yuv_width  = width;
--	    pPPriv->yuv_height = height;
--	}
--	if (!pPPriv->surface) {
--	    /* allocate + setup offscreen surface */
--	    if (NULL == (pPPriv->surface = xalloc(sizeof(XF86SurfaceRec))))
--		return FALSE;
--	    if (Success != pPPriv->myfmt->alloc_surface
--		(pScrn,pPPriv->myfmt->image->id,
--		 pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
--		xfree(pPPriv->surface);
--		pPPriv->surface = NULL;
--		goto fallback_to_rgb;
--	    }
--	    pPPriv->yuv_fbuf.width        = pPPriv->surface->width;
--	    pPPriv->yuv_fbuf.height       = pPPriv->surface->height;
--	    pPPriv->yuv_fbuf.depth        = 16;
--	    pPPriv->yuv_fbuf.bytesperline = pPPriv->surface->pitches[0];
--	    pPPriv->yuv_fbuf.base         =
--		(pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface: %p+%d = %p, %dx%d, pitch %d\n",
--				 pScrn->memPhysBase,pPPriv->surface->offsets[0],
--				 pScrn->memPhysBase+pPPriv->surface->offsets[0],
--				 pPPriv->surface->width,pPPriv->surface->height,
--				 pPPriv->surface->pitches[0]));
--	    pPPriv->yuv_win.width         = pPPriv->surface->width;
--	    pPPriv->yuv_win.height        = pPPriv->surface->height;
--	}
--
--	/* program driver */
--	if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->yuv_fbuf)))
--	    perror("ioctl VIDIOCSFBUF");
--	if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCGPICT");
--	pPPriv->pict.palette = pPPriv->yuv_format;
--	pPPriv->pict.depth   = 16;
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--	if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->yuv_win)))
--	    perror("ioctl VIDIOCSWIN");
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	    perror("ioctl VIDIOCCAPTURE(1)");
--
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    /* invert cliplist */
--	    newBox.x1 = drw_x;
--	    newBox.y1 = drw_y;
--	    newBox.x2 = drw_x + drw_w;
--	    newBox.y2 = drw_y + drw_h;
--
--	    if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
--		/* trim to the viewport */
--		if(newBox.x1 < pScrn->frameX0)
--		    newBox.x1 = pScrn->frameX0;
--		if(newBox.x2 > pScrn->frameX1)
--		    newBox.x2 = pScrn->frameX1;
--		
--		if(newBox.y1 < pScrn->frameY0)
--		    newBox.y1 = pScrn->frameY0;
--		if(newBox.y2 > pScrn->frameY1)
--		    newBox.y2 = pScrn->frameY1;
--	    }
-+        if (drw_w < width)
-+            width = drw_w;
-+        if (drw_h < height)
-+            height = drw_h;
-+        if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
-+            /* new size -- free old surface */
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
-+            if (pPPriv->surface) {
-+                pPPriv->VideoOn = VIDEO_OFF;
-+                pPPriv->myfmt->stop(pPPriv->surface);
-+                pPPriv->myfmt->free_surface(pPPriv->surface);
-+                free(pPPriv->surface);
-+                pPPriv->surface    = NULL;
-+            }
-+            pPPriv->yuv_width  = width;
-+            pPPriv->yuv_height = height;
-+        }
-+        if (!pPPriv->surface) {
-+            /* allocate + setup offscreen surface */
-+            if (NULL == (pPPriv->surface = malloc(sizeof(XF86SurfaceRec))))
-+                return FALSE;
-+            if (Success != pPPriv->myfmt->alloc_surface
-+                (pScrn,pPPriv->myfmt->image->id,
-+                pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
-+                free(pPPriv->surface);
-+                pPPriv->surface = NULL;
-+                goto fallback_to_rgb;
-+            }
-+
-+            if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->yuv_fbuf)) {
-+                xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return errno;
-+            }
-+            pPPriv->yuv_fbuf.fmt.width        = pPPriv->surface->width;
-+            pPPriv->yuv_fbuf.fmt.height       = pPPriv->surface->height;
-+            pPPriv->yuv_fbuf.fmt.bytesperline = pPPriv->surface->pitches[0];
-+            pPPriv->yuv_fbuf.fmt.pixelformat = pPPriv->yuv_format;
-+            pPPriv->yuv_fbuf.base         =
-+                (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                                 "  surface: %p+%d = %p, %dx%d, pitch %d\n",
-+                                (void *)pScrn->memPhysBase, pPPriv->surface->offsets[0],
-+                                (void *)pScrn->memPhysBase+pPPriv->surface->offsets[0],
-+                                pPPriv->surface->width, pPPriv->surface->height,
-+                                pPPriv->surface->pitches[0]));
-+            memset(&pPPriv->yuv_win, 0, sizeof(pPPriv->yuv_win));
-+            pPPriv->yuv_win.w.left    = 0;
-+            pPPriv->yuv_win.w.top     = 0;
-+            pPPriv->yuv_win.w.width  = pPPriv->surface->width;
-+            pPPriv->yuv_win.w.height = pPPriv->surface->height;
-+        }
- 
--	    REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
--	    REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
--	    clipBoxes = &newReg;
--	}
--	
--	/* start overlay */
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			     "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
--			     drw_x, drw_y,
--			     drw_x+drw_w, drw_y+drw_h,
--			     drw_w, drw_h,
--			     pPPriv->surface->width,pPPriv->surface->height));
--	pPPriv->myfmt->display(pPPriv->surface,
--			       0, 0, drw_x, drw_y,
--			       pPPriv->surface->width,
--			       pPPriv->surface->height,
--			       drw_w, drw_h,
--			       clipBoxes);
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    REGION_UNINIT(pScrn->pScreen, &newReg); 
--	}
--	pPPriv->VideoOn = VIDEO_YUV;
--	return Success;
-+        /* program driver */
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->yuv_fbuf)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+            return BadValue;
-+        }
-+        pPPriv->pixelformat = pPPriv->yuv_format;
-+        if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat))
-+            return BadValue;
-+
-+        memset(&fmt, 0, sizeof(fmt));
-+        fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+        memcpy(&fmt.fmt.win, &pPPriv->yuv_win, sizeof(pPPriv->yuv_win));
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+            return BadValue;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+            return BadValue;
-+        }
-+
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            /* invert cliplist */
-+            newBox.x1 = drw_x;
-+            newBox.y1 = drw_y;
-+            newBox.x2 = drw_x + drw_w;
-+            newBox.y2 = drw_y + drw_h;
-+
-+            if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
-+                /* trim to the viewport */
-+                if(newBox.x1 < pScrn->frameX0)
-+                    newBox.x1 = pScrn->frameX0;
-+                if(newBox.x2 > pScrn->frameX1)
-+                    newBox.x2 = pScrn->frameX1;
-+
-+                if(newBox.y1 < pScrn->frameY0)
-+                    newBox.y1 = pScrn->frameY0;
-+                if(newBox.y2 > pScrn->frameY1)
-+                    newBox.y2 = pScrn->frameY1;
-+            }
-+
-+            REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
-+            REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
-+            clipBoxes = &newReg;
-+        }
-+
-+        /* start overlay */
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                             "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
-+                             drw_x, drw_y,
-+                             drw_x+drw_w, drw_y+drw_h,
-+                             drw_w, drw_h,
-+                             pPPriv->surface->width,pPPriv->surface->height));
-+        pPPriv->myfmt->display(pPPriv->surface,
-+                               0, 0, drw_x, drw_y,
-+                               pPPriv->surface->width,
-+                               pPPriv->surface->height,
-+                               drw_w, drw_h,
-+                               clipBoxes);
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            REGION_UNINIT(pScrn->pScreen, &newReg);
-+        }
-+        pPPriv->VideoOn = VIDEO_YUV;
-+        return Success;
-     }
- 
-- fallback_to_rgb:
-+fallback_to_rgb:
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV rgb\n"));
-     /* FIXME: vid-* is ignored for now, not supported by v4l */
- 
-     dw = (drw_w < pPPriv->enc[pPPriv->cenc].width) ?
--	drw_w : pPPriv->enc[pPPriv->cenc].width;
-+        drw_w : pPPriv->enc[pPPriv->cenc].width;
-     dh = (drw_h < pPPriv->enc[pPPriv->cenc].height) ?
--	drw_h : pPPriv->enc[pPPriv->cenc].height;
-+        drw_h : pPPriv->enc[pPPriv->cenc].height;
-     /* if the window is too big, center the video */
-     dx = drw_x + (drw_w - dw)/2;
-     dy = drw_y + (drw_h - dh)/2;
-     /* bttv prefeares aligned addresses */
-     dx &= ~3;
--    if (dx < drw_x) dx += 4;
--    if (dx+dw > drw_x+drw_w) dw -= 4;
-+    if (dx < drw_x)
-+        dx += 4;
-+    if (dx+dw > drw_x+drw_w)
-+        dw -= 4;
- 
-     /* window */
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  win: %dx%d+%d+%d\n",
--		drw_w,drw_h,drw_x,drw_y));
-+                         drw_w,drw_h,drw_x,drw_y));
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  use: %dx%d+%d+%d\n",
--		dw,dh,dx,dy));
--    pPPriv->rgb_win.x      = dx;
--    pPPriv->rgb_win.y      = dy;
--    pPPriv->rgb_win.width  = dw;
--    pPPriv->rgb_win.height = dh;
--    pPPriv->rgb_win.flags  = 0;
-- 
-+                         dw,dh,dx,dy));
-+    memset(&pPPriv->rgb_win, 0, sizeof(pPPriv->rgb_win));
-+    pPPriv->rgb_win.w.left   = dx;
-+    pPPriv->rgb_win.w.top    = dy;
-+    pPPriv->rgb_win.w.width  = dw;
-+    pPPriv->rgb_win.w.height = dh;
-+
-     /* clipping */
-     if (pPPriv->rgb_win.clips) {
--	xfree(pPPriv->rgb_win.clips);
--	pPPriv->rgb_win.clips = NULL;
-+        free(pPPriv->rgb_win.clips);
-+        pPPriv->rgb_win.clips = NULL;
-     }
-     pPPriv->rgb_win.clipcount = REGION_NUM_RECTS(clipBoxes);
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,"  clip: have #%d\n",
--		pPPriv->rgb_win.clipcount));
-+                         pPPriv->rgb_win.clipcount));
-     if (0 != pPPriv->rgb_win.clipcount) {
--	pPPriv->rgb_win.clips = xalloc(pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	if (NULL != pPPriv->rgb_win.clips) {
--	    memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	    pBox = REGION_RECTS(clipBoxes);
--	    clip = pPPriv->rgb_win.clips;
--	    for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
--		clip->x	 = pBox->x1 - dx;
--		clip->y      = pBox->y1 - dy;
--		clip->width  = pBox->x2 - pBox->x1;
--		clip->height = pBox->y2 - pBox->y1;
--	    }
--	}
-+        pPPriv->rgb_win.clips = malloc(pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+        if (NULL != pPPriv->rgb_win.clips) {
-+            memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+            pBox = REGION_RECTS(clipBoxes);
-+            clip = pPPriv->rgb_win.clips;
-+
-+            /*
-+             * FIXME: This code currently does nothing, as we don't emulate
-+             * The V4L1 clipping stuff
-+             */
-+            for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
-+                clip->c.left   = pBox->x1 - dx;
-+                clip->c.top    = pBox->y1 - dy;
-+                clip->c.width  = pBox->x2 - pBox->x1;
-+                clip->c.height = pBox->y2 - pBox->y1;
-+            }
-+        }
-     }
- 
-     /* start */
--    if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->rgb_fbuf)))
--	perror("ioctl VIDIOCSFBUF");
--    if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCGPICT");
--    pPPriv->pict.palette = pPPriv->rgbpalette;
--    pPPriv->pict.depth   = pPPriv->rgbdepth;
--    if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCSPICT");
--    if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->rgb_win)))
--	perror("ioctl VIDIOCSWIN");
--    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	perror("ioctl VIDIOCCAPTURE(1)");
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->rgb_fbuf)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == GetV4LFmt(V4L_FD, &pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    pPPriv->pixelformat = pPPriv->rgb_fbuf.fmt.pixelformat;
-+    if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    memset(&fmt, 0, sizeof(fmt));
-+    fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+    memcpy(&fmt.fmt.win, &pPPriv->rgb_win, sizeof(pPPriv->rgb_win));
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+        xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+        return BadValue;
-+    }
-     pPPriv->VideoOn = VIDEO_RGB;
- 
-     return Success;
-@@ -476,7 +703,7 @@ V4lPutStill(ScrnInfoPtr pScrn,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
- #if 0
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
- #endif
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PS\n"));
-@@ -488,177 +715,152 @@ V4lPutStill(ScrnInfoPtr pScrn,
- static void
- V4lStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-     int zero=0;
- 
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--	      "Xv/StopVideo called with video already off\n"));
--	return;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+              "Xv/StopVideo called with video already off\n"));
-+        return;
-     }
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo shutdown=%d\n",shutdown));
- 
-     if (!shutdown) {
--	/* just reclipping, we have to stop DMA transfers to the visible screen */
--	if (VIDEO_RGB == pPPriv->VideoOn) {
--	    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--		perror("ioctl VIDIOCCAPTURE(0)");
--	    pPPriv->VideoOn = VIDEO_RECLIP;
--	}
-+        /* just reclipping, we have to stop DMA transfers to the visible screen */
-+        if (VIDEO_RGB == pPPriv->VideoOn) {
-+            if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+                xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
-+            pPPriv->VideoOn = VIDEO_RECLIP;
-+        }
-     } else {
--	/* video stop - turn off and free everything */
--	if (VIDEO_YUV == pPPriv->VideoOn) {
--	    pPPriv->myfmt->stop(pPPriv->surface);
--	    pPPriv->myfmt->free_surface(pPPriv->surface);
--	    xfree(pPPriv->surface);
--	    pPPriv->surface = NULL;
--	}
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--	    perror("ioctl VIDIOCCAPTURE(0)");
--	
--	V4lCloseDevice(pPPriv,pScrn);
--	pPPriv->VideoOn = VIDEO_OFF;
--    }
--}
-+        /* video stop - turn off and free everything */
-+        if (VIDEO_YUV == pPPriv->VideoOn) {
-+            pPPriv->myfmt->stop(pPPriv->surface);
-+            pPPriv->myfmt->free_surface(pPPriv->surface);
-+            free(pPPriv->surface);
-+            pPPriv->surface = NULL;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+            xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
- 
--/* v4l uses range 0 - 65535; Xv uses -1000 - 1000 */
--static int
--v4l_to_xv(int val) {
--    val = val * 2000 / 65536 - 1000;
--    if (val < -1000) val = -1000;
--    if (val >  1000) val =  1000;
--    return val;
--}
--static int
--xv_to_v4l(int val) {
--    val = val * 65536 / 2000 + 32768;
--    if (val <    -0) val =     0;
--    if (val > 65535) val = 65535;
--    return val;
-+        V4lCloseDevice(pPPriv,pScrn);
-+        pPPriv->VideoOn = VIDEO_OFF;
-+    }
- }
- 
- static int
- V4lSetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 value, pointer data)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data; 
--    struct video_channel chan;
--    int ret = Success;
-+    struct v4l2_control ctrl;
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n",
--			 attribute, value));
-+                        (int)attribute, (int)value));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	if (value >= 0 && value < pPPriv->nenc) {
--	    pPPriv->cenc = value;
--	    chan.channel = pPPriv->input[value];
--	    chan.norm    = pPPriv->norm[value];
--	    if (-1 == ioctl(V4L_FD,VIDIOCSCHAN,&chan))
--		perror("ioctl VIDIOCSCHAN");
--	} else {
--	    ret = BadValue;
--	}
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) pPPriv->pict.brightness = xv_to_v4l(value);
--	if (attribute == xvContrast)   pPPriv->pict.contrast   = xv_to_v4l(value);
--	if (attribute == xvSaturation) pPPriv->pict.colour     = xv_to_v4l(value);
--	if (attribute == xvHue)        pPPriv->pict.hue        = xv_to_v4l(value);
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    if (value)
--		pPPriv->audio.flags |= VIDEO_AUDIO_MUTE;
--	    else
--		pPPriv->audio.flags &= ~VIDEO_AUDIO_MUTE;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		pPPriv->audio.volume = xv_to_v4l(value);
--	} else {
--	    ret = BadValue;
--	}
--	if (ret != BadValue)
--	    if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
--		perror("ioctl VIDIOCSAUDIO");
-+        if (value < 0 || value >= pPPriv->nenc)
-+            goto err;
-+        if (ioctl(V4L_FD, VIDIOC_S_INPUT, &pPPriv->input[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting input\n", errno);
-+            goto err;
-+        }
-+        if (ioctl(V4L_FD, VIDIOC_S_STD, &pPPriv->norm[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting standard\n", errno);
-+            goto err;
-+        }
-+        pPPriv->cenc = value;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq = value;
--	if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
--	    perror("ioctl VIDIOCSFREQ");
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->setAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq);
-+        freq.frequency = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_FREQUENCY, &freq) == -1)
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting frequency\n", errno);
-+        else
-+            ret = Success;
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format && pPPriv->myfmt->setAttribute)
-+                ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        ctrl.value = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_CTRL, &ctrl) != 1)
-+            ret = Success;
-     }
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
- 
- static int
--V4lGetPortAttribute(ScrnInfoPtr pScrn, 
-+V4lGetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 *value, pointer data)
- {
-+    struct v4l2_control ctrl;
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    int ret = Success;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d\n",
--			 attribute));
-+                        (int)attribute));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	*value = pPPriv->cenc;
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) *value = v4l_to_xv(pPPriv->pict.brightness);
--	if (attribute == xvContrast)   *value = v4l_to_xv(pPPriv->pict.contrast);
--	if (attribute == xvSaturation) *value = v4l_to_xv(pPPriv->pict.colour);
--	if (attribute == xvHue)        *value = v4l_to_xv(pPPriv->pict.hue);
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    *value = (pPPriv->audio.flags & VIDEO_AUDIO_MUTE) ? 1 : 0;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		*value = v4l_to_xv(pPPriv->audio.volume);
--	} else {
--	    ret = BadValue;
--	}
-+        *value = pPPriv->cenc;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq;
--	ioctl(V4L_FD,VIDIOCGFREQ,&freq);
--	*value = freq;
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->getAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        if (ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq) != -1) {
-+            *value = freq.frequency;
-+            ret = Success;
-+        }
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format &&  pPPriv->myfmt->getAttribute)
-+                ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        if (ioctl(V4L_FD, VIDIOC_G_CTRL, &ctrl) != -1) {
-+            *value = ctrl.value;
-+            ret = Success;
-+        }
-     }
--
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d, %d\n",
--	attribute, *value));
-+        (int)attribute, (int)*value));
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
-@@ -673,15 +875,15 @@ V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
-     int maxy = pPPriv->enc[pPPriv->cenc].height;
- 
-     if (0 != pPPriv->yuv_format) {
--	*p_w = pPPriv->myfmt->max_width;
--	*p_h = pPPriv->myfmt->max_height;
-+        *p_w = pPPriv->myfmt->max_width;
-+        *p_h = pPPriv->myfmt->max_height;
-     } else {
--	*p_w = (drw_w < maxx) ? drw_w : maxx;
--	*p_h = (drw_h < maxy) ? drw_h : maxy;
-+        *p_w = (drw_w < maxx) ? drw_w : maxx;
-+        *p_h = (drw_h < maxy) ? drw_h : maxy;
-     }
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/BS %d %dx%d %dx%d\n",
--			 pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
-+                         pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
- }
- 
- static const OptionInfoRec *
-@@ -693,132 +895,198 @@ V4LAvailableOptions(int chipid, int busid)
- static void
- V4LIdentify(int flags)
- {
--    xf86Msg(X_INFO, "v4l driver for Video4Linux\n");
--}        
-+    xf86Msg(X_INFO, "v4l driver for Video4Linux overlay mode (V4L2)\n");
-+}
- 
- static char*
- fixname(char *str)
- {
-     int s,d;
-     for (s=0, d=0;; s++) {
--	if (str[s] == '-')
--	    continue;
--	str[d++] = tolower(str[s]);
--	if (0 == str[s])
--	    break;
-+        if (str[s] == '-')
-+            continue;
-+        str[d++] = tolower(str[s]);
-+        if (0 == str[s])
-+            break;
-     }
-     return str;
- }
- 
- static int
--v4l_add_enc(XF86VideoEncodingPtr enc, int i,
--	    char *norm, char *input, int width, int height, int n, int d)
-+AddV4LEnc(XF86VideoEncodingPtr enc, int entry,
-+            char *norm, char *input, int width, int height, int n, int d)
- {
--    enc[i].id     = i;
--    enc[i].name   = xalloc(strlen(norm)+strlen(input)+2);
--    if (NULL == enc[i].name)
--	return -1;
--    enc[i].width  = width;
--    enc[i].height = height;
--    enc[i].rate.numerator   = n;
--    enc[i].rate.denominator = d;
--    sprintf(enc[i].name,"%s-%s",norm,fixname(input));
-+    enc->id     = entry;
-+    enc->name   = malloc(strlen(norm) + strlen(input) + 2);
-+    if (!enc->name)
-+        return -1;
-+
-+    enc->width  = width;
-+    enc->height = height;
-+    enc->rate.numerator   = n;
-+    enc->rate.denominator = d * 2; /* Refresh rate is twice, due to interlace */
-+    sprintf(enc->name,"%s-%s",norm,fixname(input));
-+
-+    xf86Msg(X_INFO, "v4l: adding input %s, %dx%d %d fps\n",
-+            enc->name, enc->width, enc->height, (d + n - 1)/n);
-+
-     return 0;
- }
- 
-+static int
-+V4LGetStd(PortPrivPtr p, int fd)
-+{
-+    struct v4l2_standard standard;
-+    int entries = 0;
-+
-+    /*
-+     * 128 is just an arbitrary large number. There aren't that many video stds
-+     * The max value is there just to avoid an endless loop, if the driver is
-+     * broken.
-+     */
-+    for (entries = 0; entries < 128; entries++) {
-+        memset(&standard, 0, sizeof(standard));
-+        standard.index = entries;
-+        if (-1 == ioctl(fd,VIDIOC_ENUMSTD, &standard))
-+            break;
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        memcpy(&p->standard[entries], &standard, sizeof(standard));
-+    }
-+
-+    /*
-+     * Some webcam drivers don't implement VIDIOC_ENUMSTD. Fake it
-+     * This is currently unused, as no webcam driver allows OVERLAY mode,
-+     * but the code is here, in the case some webcam driver starts allowing
-+     * overlay.
-+     * FIXME: Webcam drivers may use VIDIOC_ENUM_FRAMESIZES and
-+     * VIDIOC_ENUM_FRAMEINTERVALS ioctl's that may help to fine-tune
-+     * their needs. Those ioctl's could be used here in order to better
-+     * support webcams.
-+     */
-+    if (!entries) {
-+        xf86Msg(X_INFO, "v4l: VIDIOC_ENUMSTD error %d.\n",errno);
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        p->standard[0].id = V4L2_STD_ALL;
-+        strcpy((char *)p->standard[0].name, "CAMERA");
-+        p->standard[0].frameperiod.numerator = 1001;
-+        p->standard[0].frameperiod.denominator = 300001;
-+        p->standard[0].framelines = 480;
-+        entries++;
-+    }
-+    return entries;
-+}
-+
- static void
--V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
-+V4LBuildEncodings(PortPrivPtr p, int fd)
- {
--    static struct video_channel     channel;
--    int i,entries,have_bttv,bttv_ver;
--
--#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
--    have_bttv = 0;
--    if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
--	have_bttv = 1;
--	
--    entries = (have_bttv ? 7 : 3) * channels;
--    p->enc = xalloc(sizeof(XF86VideoEncodingRec) * entries);
--    if (NULL == p->enc)
--	goto fail;
--    memset(p->enc,0,sizeof(XF86VideoEncodingRec) * entries);
--    p->norm = xalloc(sizeof(int) * entries);
--    if (NULL == p->norm)
--	goto fail;
--    memset(p->norm,0,sizeof(int) * entries);
--    p->input = xalloc(sizeof(int) * entries);
--    if (NULL == p->input)
--	goto fail;
--    memset(p->input,0,sizeof(int) * entries);
-+    unsigned int inp, std, num_std;
-+
-+    num_std =  V4LGetStd(p, fd);
- 
-     p->nenc = 0;
--    for (i = 0; i < channels; i++) {
--	channel.channel = i;
--	if (-1 == ioctl(fd,VIDIOCGCHAN,&channel)) {
--	    perror("ioctl VIDIOCGCHAN");
--	    continue;
--	}
--	
--	v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_PAL;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000);
--	p->norm[p->nenc]  = VIDEO_MODE_NTSC;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_SECAM;
--	p->input[p->nenc] = i;
--	p->nenc++;
--
--	if (have_bttv) {
--	    /* workaround for a v4l design flaw:  The v4l API knows just pal,
--	       ntsc and secam.  But there are a few more norms (pal versions
--	       with a different timings used in south america for example).
--	       The bttv driver can handle these too. */
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 3;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 4;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name,
--				 768,576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 5;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	    
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name,
--				 640,480, 1001,60000))
--		goto fail;
--	    p->norm[p->nenc]  = 6;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	}
-+
-+    /*
-+     * 256 is just an arbitrary large number. There aren't that many video
-+     * inputs on any driver. The max value is there just to avoid an endless
-+     * loop, if the driver is broken.
-+     */
-+    for (inp = 0; inp < 256; inp++) {
-+        struct v4l2_input       input;
-+
-+        memset(&input, 0, sizeof(input));
-+        input.index = inp;
-+        if (ioctl(fd, VIDIOC_ENUMINPUT, &input) == -1)
-+            break;
-+
-+        for (std = 0; std < num_std; std++) {
-+            int width, height;
-+
-+	    /*
-+	     * Currently, this code is not reliable, due to driver
-+	     * non-compliance on both saa7134 and bttv. So, instead,
-+	     * just use the video standard information
-+	     */
-+#if 0
-+	    struct v4l2_framebuffer fbuf;
-+
-+            /* Some webcam drivers will fail here, but that's OK */
-+            ioctl(fd, VIDIOC_S_STD, &p->standard[std].id);
-+
-+            memset(&fbuf, 0, sizeof(fbuf));
-+            if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+                xf86Msg(X_INFO, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return;
-+            }
-+            height = fbuf.fmt.height;
-+            width = fbuf.fmt.width;
-+
-+            /*
-+             * If the overlay method fails, get the resolution
-+             * via checking V4L2_BUF_TYPE_VIDEO_CAPTURE
-+             */
-+            if (!height || !width) {
-+                struct v4l2_format format;
-+
-+                format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                if (ioctl(fd, VIDIOC_G_FMT, &format) == -1) {
-+                    /* Hmm... device doesn't support capture. */
-+                    height = p->standard[std].framelines;
-+                    if (height == 480)
-+                        width = 640;
-+                    else if (height == 576)
-+                        width = 768;
-+                    else
-+                        continue;
-+                } else {
-+                    height = format.fmt.pix.height;
-+                    width = format.fmt.pix.width;
-+                }
-+            }
-+#else
-+	    if (p->standard[std].id & V4L2_STD_525_60) {
-+		height = 480;
-+		width = 640;
-+	    } else {
-+		height = 576;
-+		width = 768;
-+	    }
-+
-+#endif
-+            /* Fixup for some driver bug */
-+            if ((p->standard[std].id & V4L2_STD_525_60) && (height == 576))
-+                height = 480;
-+
-+            p->enc = realloc(p->enc, sizeof(XF86VideoEncodingRec) * (p->nenc + 1));
-+            p->norm = realloc(p->norm, sizeof(int) * (p->nenc + 1));
-+            p->input = realloc(p->input, sizeof(int) * (p->nenc + 1));
-+            if (!p->enc || !p->norm || !p->input)
-+                goto fail;
-+            if (AddV4LEnc(&p->enc[p->nenc], p->nenc,
-+                          (char *)p->standard[std].name,
-+                          (char *)input.name, width, height,
-+                          p->standard[std].frameperiod.numerator,
-+                          p->standard[std].frameperiod.denominator))
-+                goto fail;
-+            p->norm[p->nenc]  = p->standard[std].id;
-+            p->input[p->nenc] = inp;
-+            p->nenc++;
-+        }
-     }
-+
-+    if (!p->nenc)
-+        xf86Msg(X_ERROR, "v4l: couldn't detect any valid input/standard\n");
-     return;
--    
-- fail:
-+
-+fail:
-+    xf86Msg(X_ERROR, "v4l: Fail to get standards: %d\n", errno);
-     if (p->input)
--	xfree(p->input);
-+        free(p->input);
-     p->input = NULL;
-     if (p->norm)
--	xfree(p->norm);
-+        free(p->norm);
-     p->norm = NULL;
-     if (p->enc)
--	xfree(p->enc);
-+        free(p->enc);
-     p->enc = NULL;
-     p->nenc = 0;
- }
-@@ -826,73 +1094,33 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
- /* add a attribute a list */
- static void
- v4l_add_attr(XF86AttributeRec **list, int *count,
--	     const XF86AttributeRec *attr)
-+             const XF86AttributeRec *attr)
- {
-     XF86AttributeRec *oldlist = *list;
-     int i;
-+    Atom gpa;
- 
-     for (i = 0; i < *count; i++) {
--	if (0 == strcmp((*list)[i].name,attr->name)) {
--	    DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
--	    return;
--	}
-+        if (0 == strcmp((*list)[i].name,attr->name)) {
-+            DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
-+            return;
-+        }
-     }
--    
--    DEBUG(xf86Msg(X_INFO, "v4l: add attr %s\n",attr->name));
--    *list = xalloc((*count + 1) * sizeof(XF86AttributeRec));
-+
-+    *list = malloc((*count + 1) * sizeof(XF86AttributeRec));
-     if (NULL == *list) {
--	*count = 0;
--	return;
-+        *count = 0;
-+        return;
-     }
-     if (*count)
--	memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-+        memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-     memcpy(*list + *count, attr, sizeof(XF86AttributeRec));
--    (*count)++;
--}
- 
--/* setup yuv overlay + hw scaling: look if we find some common video
--   format which both v4l driver and the X-Server can handle */
--static void v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
--			  char *dev, int fd)
--{
--    static const struct {
--	unsigned int  v4l_palette;
--	unsigned int  v4l_depth;
--	unsigned int  xv_id;
--	unsigned int  xv_format;
--    } yuvlist[] = {
--	{ VIDEO_PALETTE_YUV422, 16, 0x32595559, XvPacked },
--	{ VIDEO_PALETTE_UYVY,   16, 0x59565955, XvPacked },
--	{ 0 /* end of list */ },
--    };
--    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
--    int fmt,i;
-+    gpa = MAKE_ATOM((*list)[*count].name);
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            attr->name, (int)gpa, attr->min_value, attr->max_value);
- 
--    pPPriv->format = xf86XVQueryOffscreenImages(pScreen,&pPPriv->nformat);
--    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
--	/* check v4l ... */
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	pPPriv->pict.palette = yuvlist[fmt].v4l_palette;
--	pPPriv->pict.depth   = yuvlist[fmt].v4l_depth;
--	if (-1 == ioctl(fd,VIDIOCSPICT,&pPPriv->pict))
--	    continue;
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	if (pPPriv->pict.palette != yuvlist[fmt].v4l_palette)
--	    continue;
--	/* ... works, check available offscreen image formats now ... */
--	for (i = 0; i < pPPriv->nformat; i++) {
--	    if (pPPriv->format[i].image->id     == yuvlist[fmt].xv_id &&
--		pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
--		/* ... match found, good. */
--		pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
--		pPPriv->myfmt = pPPriv->format+i;
--		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--			   "v4l[%s]: using hw video scaling [%4.4s].\n",
--			   dev,(char*)&(pPPriv->format[i].image->id));
--		return;
--	    }
--	}
--    }
-+    (*count)++;
- }
- 
- static int
-@@ -904,118 +1132,114 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
-     char dev[18];
-     int  fd,i,j,d;
- 
--    DEBUG(xf86Msg(X_INFO, "v4l: init start\n"));
--
-     for (i = 0, d = 0; d < MAX_V4L_DEVICES; d++) {
--	sprintf(dev, "/dev/video%d", d);
--	fd = open(dev, O_RDWR, 0);
--	if (fd == -1) {
--	    sprintf(dev, "/dev/v4l/video%d", d);
--	    fd = open(dev, O_RDWR, 0);
--	    if (fd == -1)
--		break;
--	}
--	DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
--
--	/* our private data */
--	pPPriv = xalloc(sizeof(PortPrivRec));
--	if (!pPPriv)
--	    return FALSE;
--	memset(pPPriv,0,sizeof(PortPrivRec));
--	pPPriv->nr = d;
--
--	/* check device */
--	if (-1 == ioctl(fd,VIDIOCGCAP,&pPPriv->cap) ||
--	    0 == (pPPriv->cap.type & VID_TYPE_OVERLAY)) {
--	    DEBUG(xf86Msg(X_INFO,  "v4l: %s: no overlay support\n",dev));
--	    xfree(pPPriv);
--	    close(fd);
--	    continue;
--	}
--	strncpy(V4L_NAME, dev, 16);
--	V4LBuildEncodings(pPPriv,fd,pPPriv->cap.channels);
--	if (NULL == pPPriv->enc)
--	    return FALSE;
--	v4l_check_yuv(pScrn,pPPriv,dev,fd);
--	
--	/* alloc VideoAdaptorRec */
--	VAR = xrealloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
--	VAR[i] = xalloc(sizeof(XF86VideoAdaptorRec));
--	if (!VAR[i])
--	    return FALSE;
--	memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
--
--
--	/* build attribute list */
--	for (j = 0; j < V4L_ATTR; j++) {
--	    /* video attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &Attributes[j]);
--	}
--	if (0 == ioctl(fd,VIDIOCGAUDIO,&pPPriv->audio)) {
--	    /* audio attributes */
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &VolumeAttr);
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_MUTABLE)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &MuteAttr);
--	}
--	if (pPPriv->cap.type & VID_TYPE_TUNER) {
--	    /* tuner attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &FreqAttr);
--	}
--	if (0 != pPPriv->yuv_format) {
--	    /* pass throuth scaler attributes */
--	    for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     pPPriv->myfmt->attributes+j);
--	    }
--	}
--	
--	
--	/* hook in private data */
--	Private = xalloc(sizeof(DevUnion));
--	if (!Private)
--	    return FALSE;
--	memset(Private,0,sizeof(DevUnion));
--	Private->ptr = (pointer)pPPriv;
--	VAR[i]->pPortPrivates = Private;
--	VAR[i]->nPorts = 1;
--
--	/* init VideoAdaptorRec */
--	VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
--	VAR[i]->name  = "video4linux";
--	VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
--
--	VAR[i]->PutVideo = V4lPutVideo;
--	VAR[i]->PutStill = V4lPutStill;
--	VAR[i]->StopVideo = V4lStopVideo;
--	VAR[i]->SetPortAttribute = V4lSetPortAttribute;
--	VAR[i]->GetPortAttribute = V4lGetPortAttribute;
--	VAR[i]->QueryBestSize = V4lQueryBestSize;
--
--	VAR[i]->nEncodings = pPPriv->nenc;
--	VAR[i]->pEncodings = pPPriv->enc;
--	VAR[i]->nFormats =
--		sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
--	VAR[i]->pFormats = InputVideoFormats;
--
--	if (fd != -1)
--	    close(fd);
--	i++;
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
-+
-+        /* our private data */
-+        pPPriv = malloc(sizeof(PortPrivRec));
-+        if (!pPPriv)
-+            return FALSE;
-+        memset(pPPriv,0,sizeof(PortPrivRec));
-+        pPPriv->nr = d;
-+
-+        /* check device capabilities */
-+        memset(&pPPriv->cap, 0, sizeof(&pPPriv->cap));
-+        if (-1 == ioctl(fd, VIDIOC_QUERYCAP, &pPPriv->cap) ||
-+            0 == (pPPriv->cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) {
-+            xf86Msg(X_ERROR, "v4l: %s: no overlay support\n",dev);
-+            free(pPPriv);
-+            close(fd);
-+            continue;
-+        }
-+
-+        if (v4l_check_yuv(pScrn, pPPriv, dev, fd) == FALSE) {
-+                xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                               "Xv Overlay not supported. Can't use v4l driver\n");
-+                free(pPPriv);
-+                close(fd);
-+                continue;
-+        }
-+
-+        xf86Msg(X_INFO, "v4l: enabling overlay mode for %s.\n", dev);
-+        strncpy(V4L_NAME, dev, 16);
-+        V4LBuildEncodings(pPPriv, fd);
-+        if (NULL == pPPriv->enc)
-+            return FALSE;
-+
-+        /* alloc VideoAdaptorRec */
-+        VAR = realloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
-+        VAR[i] = malloc(sizeof(XF86VideoAdaptorRec));
-+        if (!VAR[i])
-+            return FALSE;
-+        memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
-+
-+        /* build attribute list */
-+        AddAllV4LControls(pPPriv, &VAR[i]->pAttributes, &VAR[i]->nAttributes, fd);
-+
-+        for (j = 0; j < V4L_ATTR; j++) {
-+            /* Other video attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &Attributes[j]);
-+        }
-+        if (pPPriv->cap.capabilities & V4L2_CAP_TUNER) {
-+            /* tuner attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &FreqAttr);
-+        }
-+
-+        /* Initialize yuv_format */
-+        if (0 != pPPriv->yuv_format) {
-+            /* pass throuth scaler attributes */
-+            for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
-+                v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                             pPPriv->myfmt->attributes+j);
-+            }
-+        }
-+
-+        DEBUG(xf86Msg(X_INFO, "v4l: saving config into driver data\n"));
-+        /* hook in private data */
-+        Private = malloc(sizeof(DevUnion));
-+        if (!Private)
-+            return FALSE;
-+        memset(Private,0,sizeof(DevUnion));
-+        Private->ptr = (pointer)pPPriv;
-+        VAR[i]->pPortPrivates = Private;
-+        VAR[i]->nPorts = 1;
-+
-+        /* init VideoAdaptorRec */
-+        VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
-+        VAR[i]->name  = "video4linux";
-+        VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
-+
-+        VAR[i]->PutVideo = V4lPutVideo;
-+        VAR[i]->PutStill = V4lPutStill;
-+        VAR[i]->StopVideo = V4lStopVideo;
-+        VAR[i]->SetPortAttribute = V4lSetPortAttribute;
-+        VAR[i]->GetPortAttribute = V4lGetPortAttribute;
-+        VAR[i]->QueryBestSize = V4lQueryBestSize;
-+
-+        VAR[i]->nEncodings = pPPriv->nenc;
-+        VAR[i]->pEncodings = pPPriv->enc;
-+        VAR[i]->nFormats = sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
-+        VAR[i]->pFormats = InputVideoFormats;
-+
-+        if (fd != -1) {
-+            DEBUG(xf86Msg(X_INFO,  "v4l: %s init finished.\n",dev));
-+            close(fd);
-+        }
-+        i++;
-     }
- 
-     xvEncoding   = MAKE_ATOM(XV_ENCODING);
--    xvHue        = MAKE_ATOM(XV_HUE);
--    xvSaturation = MAKE_ATOM(XV_SATURATION);
--    xvBrightness = MAKE_ATOM(XV_BRIGHTNESS);
--    xvContrast   = MAKE_ATOM(XV_CONTRAST);
--
-     xvFreq       = MAKE_ATOM(XV_FREQ);
--    xvMute       = MAKE_ATOM(XV_MUTE);
--    xvVolume     = MAKE_ATOM(XV_VOLUME);
- 
-     DEBUG(xf86Msg(X_INFO, "v4l: init done, %d device(s) found\n",i));
- 
-@@ -1024,10 +1248,43 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
- }
- 
- static Bool
-+V4LDetect(void)
-+{
-+    struct v4l2_capability cap;
-+    int fd, d, n = 0;
-+    char dev[18];
-+
-+    for (d = 0; d < MAX_V4L_DEVICES; d++) {
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        close (fd);
-+        memset(&cap, 0, sizeof(cap));
-+        if (!ioctl(fd, VIDIOC_QUERYCAP, &cap) &&
-+            (cap.capabilities & V4L2_CAP_VIDEO_OVERLAY))
-+            n++;
-+    }
-+    xf86Msg(X_INFO, "v4l: %d video adapters with overlay support detected\n", n);
-+
-+    return (n > 0) ? TRUE : FALSE;
-+}
-+
-+static Bool
- V4LProbe(DriverPtr drv, int flags)
- {
--    if (flags & PROBE_DETECT)
--	return TRUE;
-+    /*
-+     * Don't try to register adapter at the detection phase, as Xv
-+     * extensions won't be there
-+     */
-+    if (flags == PROBE_DETECT)
-+        return V4LDetect();
-+
-+    DEBUG(xf86Msg(X_INFO, "v4l: Initiating device probe\n"));
- 
-     xf86XVRegisterGenericAdaptorDriver(V4LInit);
-     drv->refCount++;
-diff --git a/src/videodev.h b/src/videodev.h
-deleted file mode 100644
-index 3c9a7d8..0000000
---- a/src/videodev.h
-+++ /dev/null
-@@ -1,254 +0,0 @@
--#ifndef __LINUX_VIDEODEV_H
--#define __LINUX_VIDEODEV_H
--
--/* Linux V4L API, Version 1
-- * videodev.h from v4l driver in Linux 2.2.3 
-- *
-- * Used here with the explicit permission of the original author, Alan Cox.
-- *				<alan@lxorguk.ukuu.org.uk>
-- */
--
--#include <X11/Xmd.h>
--
--#define VID_TYPE_CAPTURE	1	/* Can capture */
--#define VID_TYPE_TUNER		2	/* Can tune */
--#define VID_TYPE_TELETEXT	4	/* Does teletext */
--#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
--#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
--#define VID_TYPE_CLIPPING	32	/* Can clip */
--#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
--#define VID_TYPE_SCALES		128	/* Scalable */
--#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
--#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
--
--struct video_capability
--{
--	char name[32];
--	int type;
--	int channels;	/* Num channels */
--	int audios;	/* Num audio devices */
--	int maxwidth;	/* Supported width */
--	int maxheight;	/* And height */
--	int minwidth;	/* Supported width */
--	int minheight;	/* And height */
--};
--
--
--struct video_channel
--{
--	int channel;
--	char name[32];
--	int tuners;
--	CARD32  flags;
--#define VIDEO_VC_TUNER		1	/* Channel has a tuner */
--#define VIDEO_VC_AUDIO		2	/* Channel has audio */
--	CARD16  type;
--#define VIDEO_TYPE_TV		1
--#define VIDEO_TYPE_CAMERA	2	
--	CARD16 norm;			/* Norm set by channel */
--};
--
--struct video_tuner
--{
--	int tuner;
--	char name[32];
--	unsigned long rangelow, rangehigh;	/* Tuner range */
--	CARD32 flags;
--#define VIDEO_TUNER_PAL		1
--#define VIDEO_TUNER_NTSC	2
--#define VIDEO_TUNER_SECAM	4
--#define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
--#define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
--#define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
--	CARD16 mode;			/* PAL/NTSC/SECAM/OTHER */
--#define VIDEO_MODE_PAL		0
--#define VIDEO_MODE_NTSC		1
--#define VIDEO_MODE_SECAM	2
--#define VIDEO_MODE_AUTO		3
--	CARD16 signal;			/* Signal strength 16bit scale */
--};
--
--struct video_picture
--{
--	CARD16	brightness;
--	CARD16	hue;
--	CARD16	colour;
--	CARD16	contrast;
--	CARD16	whiteness;	/* Black and white only */
--	CARD16	depth;		/* Capture depth */
--	CARD16   palette;	/* Palette in use */
--#define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
--#define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
--#define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
--#define VIDEO_PALETTE_RGB24	4	/* 24bit RGB */
--#define VIDEO_PALETTE_RGB32	5	/* 32bit RGB */	
--#define VIDEO_PALETTE_RGB555	6	/* 555 15bit RGB */
--#define VIDEO_PALETTE_YUV422	7	/* YUV422 capture */
--#define VIDEO_PALETTE_YUYV	8
--#define VIDEO_PALETTE_UYVY	9	/* The great thing about standards is ... */
--#define VIDEO_PALETTE_YUV420	10
--#define VIDEO_PALETTE_YUV411	11	/* YUV411 capture */
--#define VIDEO_PALETTE_RAW	12	/* RAW capture (BT848) */
--#define VIDEO_PALETTE_YUV422P	13	/* YUV 4:2:2 Planar */
--#define VIDEO_PALETTE_YUV411P	14	/* YUV 4:1:1 Planar */
--#define VIDEO_PALETTE_YUV420P	15	/* YUV 4:2:0 Planar */
--#define VIDEO_PALETTE_YUV410P	16	/* YUV 4:1:0 Planar */
--#define VIDEO_PALETTE_PLANAR	13	/* start of planar entries */
--#define VIDEO_PALETTE_COMPONENT 7	/* start of component entries */
--};
--
--struct video_audio
--{
--	int	audio;		/* Audio channel */
--	CARD16	volume;		/* If settable */
--	CARD16	bass, treble;
--	CARD32	flags;
--#define VIDEO_AUDIO_MUTE	1
--#define VIDEO_AUDIO_MUTABLE	2
--#define VIDEO_AUDIO_VOLUME	4
--#define VIDEO_AUDIO_BASS	8
--#define VIDEO_AUDIO_TREBLE	16	
--	char    name[16];
--#define VIDEO_SOUND_MONO	1
--#define VIDEO_SOUND_STEREO	2
--#define VIDEO_SOUND_LANG1	4
--#define VIDEO_SOUND_LANG2	8
--        CARD16   mode;
--        CARD16	balance;	/* Stereo balance */
--        CARD16	step;		/* Step actual volume uses */
--};
--
--struct video_clip
--{
--	INT32	x,y;
--	INT32	width, height;
--	struct	video_clip *next;	/* For user use/driver use only */
--};
--
--struct video_window
--{
--	CARD32	x,y;			/* Position of window */
--	CARD32	width,height;		/* Its size */
--	CARD32	chromakey;
--	CARD32	flags;
--	struct	video_clip *clips;	/* Set only */
--	int	clipcount;
--#define VIDEO_WINDOW_INTERLACE	1
--#define VIDEO_CLIP_BITMAP	-1
--/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
--#define VIDEO_CLIPMAP_SIZE	(128 * 625)
--};
--
--struct video_capture
--{
--	CARD32 	x,y;			/* Offsets into image */
--	CARD32	width, height;		/* Area to capture */
--	CARD16	decimation;		/* Decimation divder */
--	CARD16	flags;			/* Flags for capture */
--#define VIDEO_CAPTURE_ODD		0	/* Temporal */
--#define VIDEO_CAPTURE_EVEN		1
--};
--
--struct video_buffer
--{
--	void	*base;
--	int	height,width;
--	int	depth;
--	int	bytesperline;
--};
--
--struct video_mmap
--{
--	unsigned	int frame;		/* Frame (0 - n) for double buffer */
--	int		height,width;
--	unsigned	int format;		/* should be VIDEO_PALETTE_* */
--};
--
--struct video_key
--{
--	CARD8	key[8];
--	CARD32	flags;
--};
--
--
--#define VIDEO_MAX_FRAME		32
--
--struct video_mbuf
--{
--	int	size;		/* Total memory to map */
--	int	frames;		/* Frames */
--	int	offsets[VIDEO_MAX_FRAME];
--};
--	
--
--#define 	VIDEO_NO_UNIT	(-1)
--
--	
--struct video_unit
--{
--	int 	video;		/* Video minor */
--	int	vbi;		/* VBI minor */
--	int	radio;		/* Radio minor */
--	int	audio;		/* Audio minor */
--	int	teletext;	/* Teletext minor */
--};
--
--#define VIDIOCGCAP		_IOR('v',1,struct video_capability)	/* Get capabilities */
--#define VIDIOCGCHAN		_IOWR('v',2,struct video_channel)	/* Get channel info (sources) */
--#define VIDIOCSCHAN		_IOW('v',3,struct video_channel)	/* Set channel 	*/
--#define VIDIOCGTUNER		_IOWR('v',4,struct video_tuner)		/* Get tuner abilities */
--#define VIDIOCSTUNER		_IOW('v',5,struct video_tuner)		/* Tune the tuner for the current channel */
--#define VIDIOCGPICT		_IOR('v',6,struct video_picture)	/* Get picture properties */
--#define VIDIOCSPICT		_IOW('v',7,struct video_picture)	/* Set picture properties */
--#define VIDIOCCAPTURE		_IOW('v',8,int)				/* Start, end capture */
--#define VIDIOCGWIN		_IOR('v',9, struct video_window)	/* Set the video overlay window */
--#define VIDIOCSWIN		_IOW('v',10, struct video_window)	/* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
--#define VIDIOCGFBUF		_IOR('v',11, struct video_buffer)	/* Get frame buffer */
--#define VIDIOCSFBUF		_IOW('v',12, struct video_buffer)	/* Set frame buffer - root only */
--#define VIDIOCKEY		_IOR('v',13, struct video_key)		/* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
--#define VIDIOCGFREQ		_IOR('v',14, unsigned long)		/* Set tuner */
--#define VIDIOCSFREQ		_IOW('v',15, unsigned long)		/* Set tuner */
--#define VIDIOCGAUDIO		_IOR('v',16, struct video_audio)	/* Get audio info */
--#define VIDIOCSAUDIO		_IOW('v',17, struct video_audio)	/* Audio source, mute etc */
--#define VIDIOCSYNC		_IOW('v',18, int)			/* Sync with mmap grabbing */
--#define VIDIOCMCAPTURE		_IOW('v',19, struct video_mmap)		/* Grab frames */
--#define VIDIOCGMBUF		_IOR('v', 20, struct video_mbuf)	/* Memory map buffer info */
--#define VIDIOCGUNIT		_IOR('v', 21, struct video_unit)	/* Get attached units */
--#define VIDIOCGCAPTURE		_IOR('v',22, struct video_capture)	/* Get frame buffer */
--#define VIDIOCSCAPTURE		_IOW('v',23, struct video_capture)	/* Set frame buffer - root only */
--
--#define BASE_VIDIOCPRIVATE	192		/* 192-255 are private */
--
--
--#define VID_HARDWARE_BT848	1
--#define VID_HARDWARE_QCAM_BW	2
--#define VID_HARDWARE_PMS	3
--#define VID_HARDWARE_QCAM_C	4
--#define VID_HARDWARE_PSEUDO	5
--#define VID_HARDWARE_SAA5249	6
--#define VID_HARDWARE_AZTECH	7
--#define VID_HARDWARE_SF16MI	8
--#define VID_HARDWARE_RTRACK	9
--#define VID_HARDWARE_ZOLTRIX	10
--#define VID_HARDWARE_SAA7146    11
--#define VID_HARDWARE_VIDEUM	12	/* Reserved for Winnov videum */
--#define VID_HARDWARE_RTRACK2	13
--#define VID_HARDWARE_PERMEDIA2	14	/* Reserved for Permedia2 */
--#define VID_HARDWARE_RIVA128	15	/* Reserved for RIVA 128 */
--#define VID_HARDWARE_PLANB	16	/* PowerMac motherboard video-in */
--#define VID_HARDWARE_BROADWAY	17	/* Broadway project */
--#define VID_HARDWARE_GEMTEK	18
--#define VID_HARDWARE_TYPHOON	19
--#define VID_HARDWARE_VINO	20	/* Reserved for SGI Indy Vino */
--
--/*
-- *	Initialiser list
-- */
-- 
--struct video_init
--{
--	char *name;
--	int (*init)(struct video_init *);
--};
--
--#endif
-diff --git a/src/videodev2.h b/src/videodev2.h
-new file mode 100644
-index 0000000..bf6dde2
---- /dev/null
-+++ b/src/videodev2.h
-@@ -0,0 +1,1929 @@
-+/*
-+ *  Video for Linux Two header file
-+ *
-+ *  Copyright (C) 1999-2007 the contributors
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  Alternatively you can redistribute this file under the terms of the
-+ *  BSD license as stated below:
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in
-+ *     the documentation and/or other materials provided with the
-+ *     distribution.
-+ *  3. The names of its contributors may not be used to endorse or promote
-+ *     products derived from this software without specific prior written
-+ *     permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *	Header file for v4l or V4L2 drivers and applications
-+ * with public API.
-+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
-+ * no #if __KERNEL tests are allowed here
-+ *
-+ *	See http://linuxtv.org for more info
-+ *
-+ *	Author: Bill Dirks <bill@thedirks.org>
-+ *		Justin Schoeman
-+ *              Hans Verkuil <hverkuil@xs4all.nl>
-+ *		et al.
-+ */
-+#ifndef __LINUX_VIDEODEV2_H
-+#define __LINUX_VIDEODEV2_H
-+
-+#include <linux/ioctl.h>
-+#include <linux/types.h>
-+#include <sys/time.h>
-+
-+/*
-+ * Common stuff for both V4L1 and V4L2
-+ * Moved from videodev.h
-+ */
-+#define VIDEO_MAX_FRAME               32
-+#define VIDEO_MAX_PLANES               8
-+
-+/* These defines are V4L1 specific and should not be used with the V4L2 API!
-+   They will be removed from this header in the future. */
-+
-+#define VID_TYPE_CAPTURE	1	/* Can capture */
-+#define VID_TYPE_TUNER		2	/* Can tune */
-+#define VID_TYPE_TELETEXT	4	/* Does teletext */
-+#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
-+#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
-+#define VID_TYPE_CLIPPING	32	/* Can clip */
-+#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
-+#define VID_TYPE_SCALES		128	/* Scalable */
-+#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
-+#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
-+#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
-+#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
-+#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
-+#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
-+
-+/*
-+ *	M I S C E L L A N E O U S
-+ */
-+
-+/*  Four-character-code (FOURCC) */
-+#define v4l2_fourcc(a, b, c, d)\
-+	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
-+
-+/*
-+ *	E N U M S
-+ */
-+enum v4l2_field {
-+	V4L2_FIELD_ANY           = 0, /* driver can choose from none,
-+					 top, bottom, interlaced
-+					 depending on whatever it thinks
-+					 is approximate ... */
-+	V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
-+	V4L2_FIELD_TOP           = 2, /* top field only */
-+	V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
-+	V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
-+	V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
-+					 buffer, top-bottom order */
-+	V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
-+	V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
-+					 separate buffers */
-+	V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
-+					 first and the top field is
-+					 transmitted first */
-+	V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
-+					 first and the bottom field is
-+					 transmitted first */
-+};
-+#define V4L2_FIELD_HAS_TOP(field)	\
-+	((field) == V4L2_FIELD_TOP 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTTOM(field)	\
-+	((field) == V4L2_FIELD_BOTTOM 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTH(field)	\
-+	((field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB ||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+
-+enum v4l2_buf_type {
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
-+	V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
-+	V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
-+	V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
-+	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
-+	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
-+#if 1
-+	/* Experimental */
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
-+#endif
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
-+	V4L2_BUF_TYPE_PRIVATE              = 0x80,
-+};
-+
-+#define V4L2_TYPE_IS_MULTIPLANAR(type)			\
-+	((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE	\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-+
-+#define V4L2_TYPE_IS_OUTPUT(type)				\
-+	((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY	\
-+	 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
-+
-+enum v4l2_tuner_type {
-+	V4L2_TUNER_RADIO	     = 1,
-+	V4L2_TUNER_ANALOG_TV	     = 2,
-+	V4L2_TUNER_DIGITAL_TV	     = 3,
-+};
-+
-+enum v4l2_memory {
-+	V4L2_MEMORY_MMAP             = 1,
-+	V4L2_MEMORY_USERPTR          = 2,
-+	V4L2_MEMORY_OVERLAY          = 3,
-+};
-+
-+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-+enum v4l2_colorspace {
-+	/* ITU-R 601 -- broadcast NTSC/PAL */
-+	V4L2_COLORSPACE_SMPTE170M     = 1,
-+
-+	/* 1125-Line (US) HDTV */
-+	V4L2_COLORSPACE_SMPTE240M     = 2,
-+
-+	/* HD and modern captures. */
-+	V4L2_COLORSPACE_REC709        = 3,
-+
-+	/* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
-+	V4L2_COLORSPACE_BT878         = 4,
-+
-+	/* These should be useful.  Assume 601 extents. */
-+	V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-+	V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-+
-+	/* I know there will be cameras that send this.  So, this is
-+	 * unspecified chromaticities and full 0-255 on each of the
-+	 * Y'CbCr components
-+	 */
-+	V4L2_COLORSPACE_JPEG          = 7,
-+
-+	/* For RGB colourspaces, this is probably a good start. */
-+	V4L2_COLORSPACE_SRGB          = 8,
-+};
-+
-+enum v4l2_priority {
-+	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-+	V4L2_PRIORITY_BACKGROUND  = 1,
-+	V4L2_PRIORITY_INTERACTIVE = 2,
-+	V4L2_PRIORITY_RECORD      = 3,
-+	V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-+};
-+
-+struct v4l2_rect {
-+	__s32   left;
-+	__s32   top;
-+	__s32   width;
-+	__s32   height;
-+};
-+
-+struct v4l2_fract {
-+	__u32   numerator;
-+	__u32   denominator;
-+};
-+
-+/*
-+ *	D R I V E R   C A P A B I L I T I E S
-+ */
-+struct v4l2_capability {
-+	__u8	driver[16];	/* i.e. "bttv" */
-+	__u8	card[32];	/* i.e. "Hauppauge WinTV" */
-+	__u8	bus_info[32];	/* "PCI:" + pci_name(pci_dev) */
-+	__u32   version;        /* should use KERNEL_VERSION() */
-+	__u32	capabilities;	/* Device capabilities */
-+	__u32	reserved[4];
-+};
-+
-+/* Values for 'capabilities' field */
-+#define V4L2_CAP_VIDEO_CAPTURE		0x00000001  /* Is a video capture device */
-+#define V4L2_CAP_VIDEO_OUTPUT		0x00000002  /* Is a video output device */
-+#define V4L2_CAP_VIDEO_OVERLAY		0x00000004  /* Can do video overlay */
-+#define V4L2_CAP_VBI_CAPTURE		0x00000010  /* Is a raw VBI capture device */
-+#define V4L2_CAP_VBI_OUTPUT		0x00000020  /* Is a raw VBI output device */
-+#define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
-+#define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
-+#define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
-+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
-+#define V4L2_CAP_HW_FREQ_SEEK		0x00000400  /* Can do hardware frequency seek  */
-+#define V4L2_CAP_RDS_OUTPUT		0x00000800  /* Is an RDS encoder */
-+
-+/* Is a video capture device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE	0x00001000
-+/* Is a video output device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE	0x00002000
-+
-+#define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
-+#define V4L2_CAP_AUDIO			0x00020000  /* has audio support */
-+#define V4L2_CAP_RADIO			0x00040000  /* is a radio device */
-+#define V4L2_CAP_MODULATOR		0x00080000  /* has a modulator */
-+
-+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
-+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
-+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
-+
-+/*
-+ *	V I D E O   I M A G E   F O R M A T
-+ */
-+struct v4l2_pix_format {
-+	__u32         		width;
-+	__u32			height;
-+	__u32			pixelformat;
-+	enum v4l2_field  	field;
-+	__u32            	bytesperline;	/* for padding, zero if unused */
-+	__u32          		sizeimage;
-+	enum v4l2_colorspace	colorspace;
-+	__u32			priv;		/* private data, depends on pixelformat */
-+};
-+
-+/*      Pixel format         FOURCC                          depth  Description  */
-+
-+/* RGB formats */
-+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
-+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
-+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
-+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
-+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
-+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
-+#define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6	  */
-+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
-+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
-+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
-+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
-+
-+/* Grey formats */
-+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
-+#define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
-+#define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
-+#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
-+#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
-+
-+/* Palette formats */
-+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
-+
-+/* Luminance+Chrominance formats */
-+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
-+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
-+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
-+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
-+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
-+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
-+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
-+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
-+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
-+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
-+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
-+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
-+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
-+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
-+
-+/* two planes -- one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
-+#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
-+#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
-+
-+/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
-+
-+/* three non contiguous planes - Y, Cb, Cr */
-+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
-+
-+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
-+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
-+	/* 10bit raw bayer DPCM compressed to 8 bits */
-+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
-+	/*
-+	 * 10bit raw bayer, expanded to 16 bits
-+	 * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
-+	 */
-+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
-+
-+/* compressed formats */
-+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
-+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
-+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
-+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4    */
-+
-+/*  Vendor-specific formats   */
-+#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
-+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
-+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
-+#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
-+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
-+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
-+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
-+#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
-+#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
-+#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
-+#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
-+#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
-+#define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
-+#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
-+#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
-+#define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
-+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
-+#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
-+
-+/*
-+ *	F O R M A T   E N U M E R A T I O N
-+ */
-+struct v4l2_fmtdesc {
-+	__u32		    index;             /* Format number      */
-+	enum v4l2_buf_type  type;              /* buffer type        */
-+	__u32               flags;
-+	__u8		    description[32];   /* Description string */
-+	__u32		    pixelformat;       /* Format fourcc      */
-+	__u32		    reserved[4];
-+};
-+
-+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-+#define V4L2_FMT_FLAG_EMULATED   0x0002
-+
-+#if 1
-+	/* Experimental Frame Size and frame rate enumeration */
-+/*
-+ *	F R A M E   S I Z E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmsizetypes {
-+	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
-+	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmsize_discrete {
-+	__u32			width;		/* Frame width [pixel] */
-+	__u32			height;		/* Frame height [pixel] */
-+};
-+
-+struct v4l2_frmsize_stepwise {
-+	__u32			min_width;	/* Minimum frame width [pixel] */
-+	__u32			max_width;	/* Maximum frame width [pixel] */
-+	__u32			step_width;	/* Frame width step size [pixel] */
-+	__u32			min_height;	/* Minimum frame height [pixel] */
-+	__u32			max_height;	/* Maximum frame height [pixel] */
-+	__u32			step_height;	/* Frame height step size [pixel] */
-+};
-+
-+struct v4l2_frmsizeenum {
-+	__u32			index;		/* Frame size number */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			type;		/* Frame size type the device supports. */
-+
-+	union {					/* Frame size */
-+		struct v4l2_frmsize_discrete	discrete;
-+		struct v4l2_frmsize_stepwise	stepwise;
-+	};
-+
-+	__u32   reserved[2];			/* Reserved space for future use */
-+};
-+
-+/*
-+ *	F R A M E   R A T E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmivaltypes {
-+	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
-+	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmival_stepwise {
-+	struct v4l2_fract	min;		/* Minimum frame interval [s] */
-+	struct v4l2_fract	max;		/* Maximum frame interval [s] */
-+	struct v4l2_fract	step;		/* Frame interval step size [s] */
-+};
-+
-+struct v4l2_frmivalenum {
-+	__u32			index;		/* Frame format index */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			width;		/* Frame width */
-+	__u32			height;		/* Frame height */
-+	__u32			type;		/* Frame interval type the device supports. */
-+
-+	union {					/* Frame interval */
-+		struct v4l2_fract		discrete;
-+		struct v4l2_frmival_stepwise	stepwise;
-+	};
-+
-+	__u32	reserved[2];			/* Reserved space for future use */
-+};
-+#endif
-+
-+/*
-+ *	T I M E C O D E
-+ */
-+struct v4l2_timecode {
-+	__u32	type;
-+	__u32	flags;
-+	__u8	frames;
-+	__u8	seconds;
-+	__u8	minutes;
-+	__u8	hours;
-+	__u8	userbits[4];
-+};
-+
-+/*  Type  */
-+#define V4L2_TC_TYPE_24FPS		1
-+#define V4L2_TC_TYPE_25FPS		2
-+#define V4L2_TC_TYPE_30FPS		3
-+#define V4L2_TC_TYPE_50FPS		4
-+#define V4L2_TC_TYPE_60FPS		5
-+
-+/*  Flags  */
-+#define V4L2_TC_FLAG_DROPFRAME		0x0001 /* "drop-frame" mode */
-+#define V4L2_TC_FLAG_COLORFRAME		0x0002
-+#define V4L2_TC_USERBITS_field		0x000C
-+#define V4L2_TC_USERBITS_USERDEFINED	0x0000
-+#define V4L2_TC_USERBITS_8BITCHARS	0x0008
-+/* The above is based on SMPTE timecodes */
-+
-+struct v4l2_jpegcompression {
-+	int quality;
-+
-+	int  APPn;              /* Number of APP segment to be written,
-+				 * must be 0..15 */
-+	int  APP_len;           /* Length of data in JPEG APPn segment */
-+	char APP_data[60];      /* Data in the JPEG APPn segment. */
-+
-+	int  COM_len;           /* Length of data in JPEG COM segment */
-+	char COM_data[60];      /* Data in JPEG COM segment */
-+
-+	__u32 jpeg_markers;     /* Which markers should go into the JPEG
-+				 * output. Unless you exactly know what
-+				 * you do, leave them untouched.
-+				 * Inluding less markers will make the
-+				 * resulting code smaller, but there will
-+				 * be fewer applications which can read it.
-+				 * The presence of the APP and COM marker
-+				 * is influenced by APP_len and COM_len
-+				 * ONLY, not by this property! */
-+
-+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-+					* allways use APP0 */
-+};
-+
-+/*
-+ *	M E M O R Y - M A P P I N G   B U F F E R S
-+ */
-+struct v4l2_requestbuffers {
-+	__u32			count;
-+	enum v4l2_buf_type      type;
-+	enum v4l2_memory        memory;
-+	__u32			reserved[2];
-+};
-+
-+/**
-+ * struct v4l2_plane - plane info for multi-planar buffers
-+ * @bytesused:		number of bytes occupied by data in the plane (payload)
-+ * @length:		size of this plane (NOT the payload) in bytes
-+ * @mem_offset:		when memory in the associated struct v4l2_buffer is
-+ *			V4L2_MEMORY_MMAP, equals the offset from the start of
-+ *			the device memory for this plane (or is a "cookie" that
-+ *			should be passed to mmap() called on the video node)
-+ * @userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
-+ *			pointing to this plane
-+ * @data_offset:	offset in the plane to the start of data; usually 0,
-+ *			unless there is a header in front of the data
-+ *
-+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
-+ * with two planes can have one plane for Y, and another for interleaved CbCr
-+ * components. Each plane can reside in a separate memory buffer, or even in
-+ * a completely separate memory node (e.g. in embedded devices).
-+ */
-+struct v4l2_plane {
-+	__u32			bytesused;
-+	__u32			length;
-+	union {
-+		__u32		mem_offset;
-+		unsigned long	userptr;
-+	} m;
-+	__u32			data_offset;
-+	__u32			reserved[11];
-+};
-+
-+/**
-+ * struct v4l2_buffer - video buffer info
-+ * @index:	id number of the buffer
-+ * @type:	buffer type (type == *_MPLANE for multiplanar buffers)
-+ * @bytesused:	number of bytes occupied by data in the buffer (payload);
-+ *		unused (set to 0) for multiplanar buffers
-+ * @flags:	buffer informational flags
-+ * @field:	field order of the image in the buffer
-+ * @timestamp:	frame timestamp
-+ * @timecode:	frame timecode
-+ * @sequence:	sequence count of this frame
-+ * @memory:	the method, in which the actual video data is passed
-+ * @offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
-+ *		offset from the start of the device memory for this plane,
-+ *		(or a "cookie" that should be passed to mmap() as offset)
-+ * @userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
-+ *		a userspace pointer pointing to this buffer
-+ * @planes:	for multiplanar buffers; userspace pointer to the array of plane
-+ *		info structs for this buffer
-+ * @length:	size in bytes of the buffer (NOT its payload) for single-plane
-+ *		buffers (when type != *_MPLANE); number of elements in the
-+ *		planes array for multi-plane buffers
-+ * @input:	input number from which the video data has has been captured
-+ *
-+ * Contains data exchanged by application and driver using one of the Streaming
-+ * I/O methods.
-+ */
-+struct v4l2_buffer {
-+	__u32			index;
-+	enum v4l2_buf_type      type;
-+	__u32			bytesused;
-+	__u32			flags;
-+	enum v4l2_field		field;
-+	struct timeval		timestamp;
-+	struct v4l2_timecode	timecode;
-+	__u32			sequence;
-+
-+	/* memory location */
-+	enum v4l2_memory        memory;
-+	union {
-+		__u32           offset;
-+		unsigned long   userptr;
-+		struct v4l2_plane *planes;
-+	} m;
-+	__u32			length;
-+	__u32			input;
-+	__u32			reserved;
-+};
-+
-+/*  Flags for 'flags' field */
-+#define V4L2_BUF_FLAG_MAPPED	0x0001  /* Buffer is mapped (flag) */
-+#define V4L2_BUF_FLAG_QUEUED	0x0002	/* Buffer is queued for processing */
-+#define V4L2_BUF_FLAG_DONE	0x0004	/* Buffer is ready */
-+#define V4L2_BUF_FLAG_KEYFRAME	0x0008	/* Image is a keyframe (I-frame) */
-+#define V4L2_BUF_FLAG_PFRAME	0x0010	/* Image is a P-frame */
-+#define V4L2_BUF_FLAG_BFRAME	0x0020	/* Image is a B-frame */
-+/* Buffer is ready, but the data contained within is corrupted. */
-+#define V4L2_BUF_FLAG_ERROR	0x0040
-+#define V4L2_BUF_FLAG_TIMECODE	0x0100	/* timecode field is valid */
-+#define V4L2_BUF_FLAG_INPUT     0x0200  /* input field is valid */
-+
-+/*
-+ *	O V E R L A Y   P R E V I E W
-+ */
-+struct v4l2_framebuffer {
-+	__u32			capability;
-+	__u32			flags;
-+/* FIXME: in theory we should pass something like PCI device + memory
-+ * region + offset instead of some physical address */
-+	void                    *base;
-+	struct v4l2_pix_format	fmt;
-+};
-+/*  Flags for the 'capability' field. Read only */
-+#define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
-+#define V4L2_FBUF_CAP_CHROMAKEY		0x0002
-+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-+#define V4L2_FBUF_CAP_BITMAP_CLIPPING	0x0008
-+#define V4L2_FBUF_CAP_LOCAL_ALPHA	0x0010
-+#define V4L2_FBUF_CAP_GLOBAL_ALPHA	0x0020
-+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA	0x0040
-+#define V4L2_FBUF_CAP_SRC_CHROMAKEY	0x0080
-+/*  Flags for the 'flags' field. */
-+#define V4L2_FBUF_FLAG_PRIMARY		0x0001
-+#define V4L2_FBUF_FLAG_OVERLAY		0x0002
-+#define V4L2_FBUF_FLAG_CHROMAKEY	0x0004
-+#define V4L2_FBUF_FLAG_LOCAL_ALPHA	0x0008
-+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA	0x0010
-+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA	0x0020
-+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY	0x0040
-+
-+struct v4l2_clip {
-+	struct v4l2_rect        c;
-+	struct v4l2_clip	*next;
-+};
-+
-+struct v4l2_window {
-+	struct v4l2_rect        w;
-+	enum v4l2_field  	field;
-+	__u32			chromakey;
-+	struct v4l2_clip	*clips;
-+	__u32			clipcount;
-+	void			*bitmap;
-+	__u8                    global_alpha;
-+};
-+
-+/*
-+ *	C A P T U R E   P A R A M E T E R S
-+ */
-+struct v4l2_captureparm {
-+	__u32		   capability;	  /*  Supported modes */
-+	__u32		   capturemode;	  /*  Current mode */
-+	struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
-+	__u32		   extendedmode;  /*  Driver-specific extensions */
-+	__u32              readbuffers;   /*  # of buffers for read */
-+	__u32		   reserved[4];
-+};
-+
-+/*  Flags for 'capability' and 'capturemode' fields */
-+#define V4L2_MODE_HIGHQUALITY	0x0001	/*  High quality imaging mode */
-+#define V4L2_CAP_TIMEPERFRAME	0x1000	/*  timeperframe field is supported */
-+
-+struct v4l2_outputparm {
-+	__u32		   capability;	 /*  Supported modes */
-+	__u32		   outputmode;	 /*  Current mode */
-+	struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-+	__u32		   extendedmode; /*  Driver-specific extensions */
-+	__u32              writebuffers; /*  # of buffers for write */
-+	__u32		   reserved[4];
-+};
-+
-+/*
-+ *	I N P U T   I M A G E   C R O P P I N G
-+ */
-+struct v4l2_cropcap {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        bounds;
-+	struct v4l2_rect        defrect;
-+	struct v4l2_fract       pixelaspect;
-+};
-+
-+struct v4l2_crop {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        c;
-+};
-+
-+/*
-+ *      A N A L O G   V I D E O   S T A N D A R D
-+ */
-+
-+typedef __u64 v4l2_std_id;
-+
-+/* one bit for each */
-+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-+
-+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-+
-+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
-+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
-+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
-+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)
-+
-+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
-+
-+/* ATSC/HDTV */
-+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-+
-+/* FIXME:
-+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
-+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
-+   this value to 32 bits.
-+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
-+   it should work fine. However, if needed to add more than two standards,
-+   v4l2-common.c should be fixed.
-+ */
-+
-+/* some merged standards */
-+#define V4L2_STD_MN	(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
-+#define V4L2_STD_B	(V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
-+#define V4L2_STD_GH	(V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
-+#define V4L2_STD_DK	(V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
-+
-+/* some common needed stuff */
-+#define V4L2_STD_PAL_BG		(V4L2_STD_PAL_B		|\
-+				 V4L2_STD_PAL_B1	|\
-+				 V4L2_STD_PAL_G)
-+#define V4L2_STD_PAL_DK		(V4L2_STD_PAL_D		|\
-+				 V4L2_STD_PAL_D1	|\
-+				 V4L2_STD_PAL_K)
-+#define V4L2_STD_PAL		(V4L2_STD_PAL_BG	|\
-+				 V4L2_STD_PAL_DK	|\
-+				 V4L2_STD_PAL_H		|\
-+				 V4L2_STD_PAL_I)
-+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M	|\
-+				 V4L2_STD_NTSC_M_JP     |\
-+				 V4L2_STD_NTSC_M_KR)
-+#define V4L2_STD_SECAM_DK      	(V4L2_STD_SECAM_D	|\
-+				 V4L2_STD_SECAM_K	|\
-+				 V4L2_STD_SECAM_K1)
-+#define V4L2_STD_SECAM		(V4L2_STD_SECAM_B	|\
-+				 V4L2_STD_SECAM_G	|\
-+				 V4L2_STD_SECAM_H	|\
-+				 V4L2_STD_SECAM_DK	|\
-+				 V4L2_STD_SECAM_L       |\
-+				 V4L2_STD_SECAM_LC)
-+
-+#define V4L2_STD_525_60		(V4L2_STD_PAL_M		|\
-+				 V4L2_STD_PAL_60	|\
-+				 V4L2_STD_NTSC		|\
-+				 V4L2_STD_NTSC_443)
-+#define V4L2_STD_625_50		(V4L2_STD_PAL		|\
-+				 V4L2_STD_PAL_N		|\
-+				 V4L2_STD_PAL_Nc	|\
-+				 V4L2_STD_SECAM)
-+#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
-+				 V4L2_STD_ATSC_16_VSB)
-+
-+#define V4L2_STD_UNKNOWN        0
-+#define V4L2_STD_ALL            (V4L2_STD_525_60	|\
-+				 V4L2_STD_625_50)
-+
-+struct v4l2_standard {
-+	__u32		     index;
-+	v4l2_std_id          id;
-+	__u8		     name[24];
-+	struct v4l2_fract    frameperiod; /* Frames, not fields */
-+	__u32		     framelines;
-+	__u32		     reserved[4];
-+};
-+
-+/*
-+ *	V I D E O	T I M I N G S	D V	P R E S E T
-+ */
-+struct v4l2_dv_preset {
-+	__u32	preset;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ *	D V	P R E S E T S	E N U M E R A T I O N
-+ */
-+struct v4l2_dv_enum_preset {
-+	__u32	index;
-+	__u32	preset;
-+	__u8	name[32]; /* Name of the preset timing */
-+	__u32	width;
-+	__u32	height;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ * 	D V	P R E S E T	V A L U E S
-+ */
-+#define		V4L2_DV_INVALID		0
-+#define		V4L2_DV_480P59_94	1 /* BT.1362 */
-+#define		V4L2_DV_576P50		2 /* BT.1362 */
-+#define		V4L2_DV_720P24		3 /* SMPTE 296M */
-+#define		V4L2_DV_720P25		4 /* SMPTE 296M */
-+#define		V4L2_DV_720P30		5 /* SMPTE 296M */
-+#define		V4L2_DV_720P50		6 /* SMPTE 296M */
-+#define		V4L2_DV_720P59_94	7 /* SMPTE 274M */
-+#define		V4L2_DV_720P60		8 /* SMPTE 274M/296M */
-+#define		V4L2_DV_1080I29_97	9 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I30		10 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I25		11 /* BT.1120 */
-+#define		V4L2_DV_1080I50		12 /* SMPTE 296M */
-+#define		V4L2_DV_1080I60		13 /* SMPTE 296M */
-+#define		V4L2_DV_1080P24		14 /* SMPTE 296M */
-+#define		V4L2_DV_1080P25		15 /* SMPTE 296M */
-+#define		V4L2_DV_1080P30		16 /* SMPTE 296M */
-+#define		V4L2_DV_1080P50		17 /* BT.1120 */
-+#define		V4L2_DV_1080P60		18 /* BT.1120 */
-+
-+/*
-+ *	D V 	B T	T I M I N G S
-+ */
-+
-+/* BT.656/BT.1120 timing data */
-+struct v4l2_bt_timings {
-+	__u32	width;		/* width in pixels */
-+	__u32	height;		/* height in lines */
-+	__u32	interlaced;	/* Interlaced or progressive */
-+	__u32	polarities;	/* Positive or negative polarity */
-+	__u64	pixelclock;	/* Pixel clock in HZ. Ex. 74.25MHz->74250000 */
-+	__u32	hfrontporch;	/* Horizpontal front porch in pixels */
-+	__u32	hsync;		/* Horizontal Sync length in pixels */
-+	__u32	hbackporch;	/* Horizontal back porch in pixels */
-+	__u32	vfrontporch;	/* Vertical front porch in pixels */
-+	__u32	vsync;		/* Vertical Sync length in lines */
-+	__u32	vbackporch;	/* Vertical back porch in lines */
-+	__u32	il_vfrontporch;	/* Vertical front porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vsync;	/* Vertical sync length for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vbackporch;	/* Vertical back porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	reserved[16];
-+} __attribute__ ((packed));
-+
-+/* Interlaced or progressive format */
-+#define	V4L2_DV_PROGRESSIVE	0
-+#define	V4L2_DV_INTERLACED	1
-+
-+/* Polarities. If bit is not set, it is assumed to be negative polarity */
-+#define V4L2_DV_VSYNC_POS_POL	0x00000001
-+#define V4L2_DV_HSYNC_POS_POL	0x00000002
-+
-+
-+/* DV timings */
-+struct v4l2_dv_timings {
-+	__u32 type;
-+	union {
-+		struct v4l2_bt_timings	bt;
-+		__u32	reserved[32];
-+	};
-+} __attribute__ ((packed));
-+
-+/* Values for the type field */
-+#define V4L2_DV_BT_656_1120	0	/* BT.656/1120 timing type */
-+
-+/*
-+ *	V I D E O   I N P U T S
-+ */
-+struct v4l2_input {
-+	__u32	     index;		/*  Which input */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of input */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32        tuner;             /*  Associated tuner */
-+	v4l2_std_id  std;
-+	__u32	     status;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+
-+/*  Values for the 'type' field */
-+#define V4L2_INPUT_TYPE_TUNER		1
-+#define V4L2_INPUT_TYPE_CAMERA		2
-+
-+/* field 'status' - general */
-+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-+#define V4L2_IN_ST_NO_COLOR    0x00000004
-+
-+/* field 'status' - sensor orientation */
-+/* If sensor is mounted upside down set both bits */
-+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
-+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
-+
-+/* field 'status' - analog */
-+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-+
-+/* field 'status' - digital */
-+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-+
-+/* field 'status' - VCR and set-top box */
-+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-+
-+/* capabilities flags */
-+#define V4L2_IN_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_IN_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_IN_CAP_STD			0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	V I D E O   O U T P U T S
-+ */
-+struct v4l2_output {
-+	__u32	     index;		/*  Which output */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of output */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32	     modulator;         /*  Associated modulator */
-+	v4l2_std_id  std;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_OUTPUT_TYPE_MODULATOR		1
-+#define V4L2_OUTPUT_TYPE_ANALOG			2
-+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY	3
-+
-+/* capabilities flags */
-+#define V4L2_OUT_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_OUT_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_OUT_CAP_STD		0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	C O N T R O L S
-+ */
-+struct v4l2_control {
-+	__u32		     id;
-+	__s32		     value;
-+};
-+
-+struct v4l2_ext_control {
-+	__u32 id;
-+	__u32 size;
-+	__u32 reserved2[1];
-+	union {
-+		__s32 value;
-+		__s64 value64;
-+		char *string;
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_ext_controls {
-+	__u32 ctrl_class;
-+	__u32 count;
-+	__u32 error_idx;
-+	__u32 reserved[2];
-+	struct v4l2_ext_control *controls;
-+};
-+
-+/*  Values for ctrl_class field */
-+#define V4L2_CTRL_CLASS_USER 0x00980000	/* Old-style 'user' controls */
-+#define V4L2_CTRL_CLASS_MPEG 0x00990000	/* MPEG-compression controls */
-+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000	/* Camera class controls */
-+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000	/* FM Modulator control class */
-+
-+#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
-+#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
-+
-+enum v4l2_ctrl_type {
-+	V4L2_CTRL_TYPE_INTEGER	     = 1,
-+	V4L2_CTRL_TYPE_BOOLEAN	     = 2,
-+	V4L2_CTRL_TYPE_MENU	     = 3,
-+	V4L2_CTRL_TYPE_BUTTON	     = 4,
-+	V4L2_CTRL_TYPE_INTEGER64     = 5,
-+	V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
-+	V4L2_CTRL_TYPE_STRING        = 7,
-+};
-+
-+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-+struct v4l2_queryctrl {
-+	__u32		     id;
-+	enum v4l2_ctrl_type  type;
-+	__u8		     name[32];	/* Whatever */
-+	__s32		     minimum;	/* Note signedness */
-+	__s32		     maximum;
-+	__s32		     step;
-+	__s32		     default_value;
-+	__u32                flags;
-+	__u32		     reserved[2];
-+};
-+
-+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-+struct v4l2_querymenu {
-+	__u32		id;
-+	__u32		index;
-+	__u8		name[32];	/* Whatever */
-+	__u32		reserved;
-+};
-+
-+/*  Control flags  */
-+#define V4L2_CTRL_FLAG_DISABLED		0x0001
-+#define V4L2_CTRL_FLAG_GRABBED		0x0002
-+#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
-+#define V4L2_CTRL_FLAG_UPDATE 		0x0008
-+#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
-+#define V4L2_CTRL_FLAG_SLIDER 		0x0020
-+#define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
-+
-+/*  Query flag, to be ORed with the control ID */
-+#define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
-+
-+/*  User-class control IDs defined by V4L2 */
-+#define V4L2_CID_BASE			(V4L2_CTRL_CLASS_USER | 0x900)
-+#define V4L2_CID_USER_BASE 		V4L2_CID_BASE
-+/*  IDs reserved for driver specific controls */
-+#define V4L2_CID_PRIVATE_BASE		0x08000000
-+
-+#define V4L2_CID_USER_CLASS 		(V4L2_CTRL_CLASS_USER | 1)
-+#define V4L2_CID_BRIGHTNESS		(V4L2_CID_BASE+0)
-+#define V4L2_CID_CONTRAST		(V4L2_CID_BASE+1)
-+#define V4L2_CID_SATURATION		(V4L2_CID_BASE+2)
-+#define V4L2_CID_HUE			(V4L2_CID_BASE+3)
-+#define V4L2_CID_AUDIO_VOLUME		(V4L2_CID_BASE+5)
-+#define V4L2_CID_AUDIO_BALANCE		(V4L2_CID_BASE+6)
-+#define V4L2_CID_AUDIO_BASS		(V4L2_CID_BASE+7)
-+#define V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)
-+#define V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)
-+#define V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)
-+#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11) /* Deprecated */
-+#define V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)
-+#define V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)
-+#define V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)
-+#define V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)
-+#define V4L2_CID_GAMMA			(V4L2_CID_BASE+16)
-+#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* Deprecated */
-+#define V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)
-+#define V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)
-+#define V4L2_CID_GAIN			(V4L2_CID_BASE+19)
-+#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)
-+#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
-+
-+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
-+#define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)
-+#define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)
-+
-+#define V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)
-+enum v4l2_power_line_frequency {
-+	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,
-+	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,
-+	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,
-+};
-+#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)
-+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)
-+#define V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27)
-+#define V4L2_CID_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)
-+#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
-+#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
-+#define V4L2_CID_COLORFX			(V4L2_CID_BASE+31)
-+enum v4l2_colorfx {
-+	V4L2_COLORFX_NONE	= 0,
-+	V4L2_COLORFX_BW		= 1,
-+	V4L2_COLORFX_SEPIA	= 2,
-+	V4L2_COLORFX_NEGATIVE = 3,
-+	V4L2_COLORFX_EMBOSS = 4,
-+	V4L2_COLORFX_SKETCH = 5,
-+	V4L2_COLORFX_SKY_BLUE = 6,
-+	V4L2_COLORFX_GRASS_GREEN = 7,
-+	V4L2_COLORFX_SKIN_WHITEN = 8,
-+	V4L2_COLORFX_VIVID = 9,
-+};
-+#define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
-+#define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)
-+
-+#define V4L2_CID_ROTATE				(V4L2_CID_BASE+34)
-+#define V4L2_CID_BG_COLOR			(V4L2_CID_BASE+35)
-+
-+#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
-+
-+#define V4L2_CID_ILLUMINATORS_1			(V4L2_CID_BASE+37)
-+#define V4L2_CID_ILLUMINATORS_2			(V4L2_CID_BASE+38)
-+
-+/* last CID + 1 */
-+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+39)
-+
-+/*  MPEG-class control IDs defined by V4L2 */
-+#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
-+#define V4L2_CID_MPEG_CLASS 			(V4L2_CTRL_CLASS_MPEG | 1)
-+
-+/*  MPEG streams */
-+#define V4L2_CID_MPEG_STREAM_TYPE 		(V4L2_CID_MPEG_BASE+0)
-+enum v4l2_mpeg_stream_type {
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
-+};
-+#define V4L2_CID_MPEG_STREAM_PID_PMT 		(V4L2_CID_MPEG_BASE+1)
-+#define V4L2_CID_MPEG_STREAM_PID_AUDIO 		(V4L2_CID_MPEG_BASE+2)
-+#define V4L2_CID_MPEG_STREAM_PID_VIDEO 		(V4L2_CID_MPEG_BASE+3)
-+#define V4L2_CID_MPEG_STREAM_PID_PCR 		(V4L2_CID_MPEG_BASE+4)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO 	(V4L2_CID_MPEG_BASE+5)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO 	(V4L2_CID_MPEG_BASE+6)
-+#define V4L2_CID_MPEG_STREAM_VBI_FMT 		(V4L2_CID_MPEG_BASE+7)
-+enum v4l2_mpeg_stream_vbi_fmt {
-+	V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
-+	V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
-+};
-+
-+/*  MPEG audio */
-+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ 	(V4L2_CID_MPEG_BASE+100)
-+enum v4l2_mpeg_audio_sampling_freq {
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_ENCODING 		(V4L2_CID_MPEG_BASE+101)
-+enum v4l2_mpeg_audio_encoding {
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-+	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
-+enum v4l2_mpeg_audio_l1_bitrate {
-+	V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE 		(V4L2_CID_MPEG_BASE+103)
-+enum v4l2_mpeg_audio_l2_bitrate {
-+	V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE 		(V4L2_CID_MPEG_BASE+104)
-+enum v4l2_mpeg_audio_l3_bitrate {
-+	V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE 		(V4L2_CID_MPEG_BASE+105)
-+enum v4l2_mpeg_audio_mode {
-+	V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
-+	V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
-+	V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
-+	V4L2_MPEG_AUDIO_MODE_MONO         = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION 	(V4L2_CID_MPEG_BASE+106)
-+enum v4l2_mpeg_audio_mode_extension {
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_EMPHASIS 		(V4L2_CID_MPEG_BASE+107)
-+enum v4l2_mpeg_audio_emphasis {
-+	V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
-+	V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
-+	V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_CRC 		(V4L2_CID_MPEG_BASE+108)
-+enum v4l2_mpeg_audio_crc {
-+	V4L2_MPEG_AUDIO_CRC_NONE  = 0,
-+	V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MUTE 		(V4L2_CID_MPEG_BASE+109)
-+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE		(V4L2_CID_MPEG_BASE+110)
-+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE		(V4L2_CID_MPEG_BASE+111)
-+enum v4l2_mpeg_audio_ac3_bitrate {
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
-+};
-+
-+/*  MPEG video */
-+#define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
-+enum v4l2_mpeg_video_encoding {
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
-+};
-+#define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
-+enum v4l2_mpeg_video_aspect {
-+	V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
-+	V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
-+	V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
-+	V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
-+};
-+#define V4L2_CID_MPEG_VIDEO_B_FRAMES 		(V4L2_CID_MPEG_BASE+202)
-+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE 		(V4L2_CID_MPEG_BASE+203)
-+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE 	(V4L2_CID_MPEG_BASE+204)
-+#define V4L2_CID_MPEG_VIDEO_PULLDOWN 		(V4L2_CID_MPEG_BASE+205)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE 	(V4L2_CID_MPEG_BASE+206)
-+enum v4l2_mpeg_video_bitrate_mode {
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
-+};
-+#define V4L2_CID_MPEG_VIDEO_BITRATE 		(V4L2_CID_MPEG_BASE+207)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK 	(V4L2_CID_MPEG_BASE+208)
-+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-+#define V4L2_CID_MPEG_VIDEO_MUTE 		(V4L2_CID_MPEG_BASE+210)
-+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV 		(V4L2_CID_MPEG_BASE+211)
-+
-+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-+#define V4L2_CID_MPEG_CX2341X_BASE 				(V4L2_CTRL_CLASS_MPEG | 0x1000)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+0)
-+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+1)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+2)
-+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+3)
-+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+4)
-+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+5)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE 		(V4L2_CID_MPEG_CX2341X_BASE+6)
-+enum v4l2_mpeg_cx2341x_video_median_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM 	(V4L2_CID_MPEG_CX2341X_BASE+7)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+8)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM	(V4L2_CID_MPEG_CX2341X_BASE+9)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+10)
-+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS 	(V4L2_CID_MPEG_CX2341X_BASE+11)
-+
-+/*  Camera class control IDs */
-+#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)
-+#define V4L2_CID_CAMERA_CLASS 		(V4L2_CTRL_CLASS_CAMERA | 1)
-+
-+#define V4L2_CID_EXPOSURE_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+1)
-+enum  v4l2_exposure_auto_type {
-+	V4L2_EXPOSURE_AUTO = 0,
-+	V4L2_EXPOSURE_MANUAL = 1,
-+	V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
-+	V4L2_EXPOSURE_APERTURE_PRIORITY = 3
-+};
-+#define V4L2_CID_EXPOSURE_ABSOLUTE		(V4L2_CID_CAMERA_CLASS_BASE+2)
-+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY		(V4L2_CID_CAMERA_CLASS_BASE+3)
-+
-+#define V4L2_CID_PAN_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+4)
-+#define V4L2_CID_TILT_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+5)
-+#define V4L2_CID_PAN_RESET			(V4L2_CID_CAMERA_CLASS_BASE+6)
-+#define V4L2_CID_TILT_RESET			(V4L2_CID_CAMERA_CLASS_BASE+7)
-+
-+#define V4L2_CID_PAN_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+8)
-+#define V4L2_CID_TILT_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+9)
-+
-+#define V4L2_CID_FOCUS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+10)
-+#define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
-+#define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
-+
-+#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
-+#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
-+#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
-+
-+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
-+
-+#define V4L2_CID_IRIS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+17)
-+#define V4L2_CID_IRIS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+18)
-+
-+/* FM Modulator class control IDs */
-+#define V4L2_CID_FM_TX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_TX | 0x900)
-+#define V4L2_CID_FM_TX_CLASS			(V4L2_CTRL_CLASS_FM_TX | 1)
-+
-+#define V4L2_CID_RDS_TX_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 1)
-+#define V4L2_CID_RDS_TX_PI			(V4L2_CID_FM_TX_CLASS_BASE + 2)
-+#define V4L2_CID_RDS_TX_PTY			(V4L2_CID_FM_TX_CLASS_BASE + 3)
-+#define V4L2_CID_RDS_TX_PS_NAME			(V4L2_CID_FM_TX_CLASS_BASE + 5)
-+#define V4L2_CID_RDS_TX_RADIO_TEXT		(V4L2_CID_FM_TX_CLASS_BASE + 6)
-+
-+#define V4L2_CID_AUDIO_LIMITER_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 64)
-+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 65)
-+#define V4L2_CID_AUDIO_LIMITER_DEVIATION	(V4L2_CID_FM_TX_CLASS_BASE + 66)
-+
-+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED	(V4L2_CID_FM_TX_CLASS_BASE + 80)
-+#define V4L2_CID_AUDIO_COMPRESSION_GAIN		(V4L2_CID_FM_TX_CLASS_BASE + 81)
-+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD	(V4L2_CID_FM_TX_CLASS_BASE + 82)
-+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 83)
-+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 84)
-+
-+#define V4L2_CID_PILOT_TONE_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 96)
-+#define V4L2_CID_PILOT_TONE_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 97)
-+#define V4L2_CID_PILOT_TONE_FREQUENCY		(V4L2_CID_FM_TX_CLASS_BASE + 98)
-+
-+#define V4L2_CID_TUNE_PREEMPHASIS		(V4L2_CID_FM_TX_CLASS_BASE + 112)
-+enum v4l2_preemphasis {
-+	V4L2_PREEMPHASIS_DISABLED	= 0,
-+	V4L2_PREEMPHASIS_50_uS		= 1,
-+	V4L2_PREEMPHASIS_75_uS		= 2,
-+};
-+#define V4L2_CID_TUNE_POWER_LEVEL		(V4L2_CID_FM_TX_CLASS_BASE + 113)
-+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR		(V4L2_CID_FM_TX_CLASS_BASE + 114)
-+
-+/*
-+ *	T U N I N G
-+ */
-+struct v4l2_tuner {
-+	__u32                   index;
-+	__u8			name[32];
-+	enum v4l2_tuner_type    type;
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			rxsubchans;
-+	__u32			audmode;
-+	__s32			signal;
-+	__s32			afc;
-+	__u32			reserved[4];
-+};
-+
-+struct v4l2_modulator {
-+	__u32			index;
-+	__u8			name[32];
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			txsubchans;
-+	__u32			reserved[4];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_TUNER_CAP_LOW		0x0001
-+#define V4L2_TUNER_CAP_NORM		0x0002
-+#define V4L2_TUNER_CAP_STEREO		0x0010
-+#define V4L2_TUNER_CAP_LANG2		0x0020
-+#define V4L2_TUNER_CAP_SAP		0x0020
-+#define V4L2_TUNER_CAP_LANG1		0x0040
-+#define V4L2_TUNER_CAP_RDS		0x0080
-+#define V4L2_TUNER_CAP_RDS_BLOCK_IO	0x0100
-+#define V4L2_TUNER_CAP_RDS_CONTROLS	0x0200
-+
-+/*  Flags for the 'rxsubchans' field */
-+#define V4L2_TUNER_SUB_MONO		0x0001
-+#define V4L2_TUNER_SUB_STEREO		0x0002
-+#define V4L2_TUNER_SUB_LANG2		0x0004
-+#define V4L2_TUNER_SUB_SAP		0x0004
-+#define V4L2_TUNER_SUB_LANG1		0x0008
-+#define V4L2_TUNER_SUB_RDS		0x0010
-+
-+/*  Values for the 'audmode' field */
-+#define V4L2_TUNER_MODE_MONO		0x0000
-+#define V4L2_TUNER_MODE_STEREO		0x0001
-+#define V4L2_TUNER_MODE_LANG2		0x0002
-+#define V4L2_TUNER_MODE_SAP		0x0002
-+#define V4L2_TUNER_MODE_LANG1		0x0003
-+#define V4L2_TUNER_MODE_LANG1_LANG2	0x0004
-+
-+struct v4l2_frequency {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      frequency;
-+	__u32		      reserved[8];
-+};
-+
-+struct v4l2_hw_freq_seek {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      seek_upward;
-+	__u32		      wrap_around;
-+	__u32		      spacing;
-+	__u32		      reserved[7];
-+};
-+
-+/*
-+ *	R D S
-+ */
-+
-+struct v4l2_rds_data {
-+	__u8 	lsb;
-+	__u8 	msb;
-+	__u8 	block;
-+} __attribute__ ((packed));
-+
-+#define V4L2_RDS_BLOCK_MSK 	 0x7
-+#define V4L2_RDS_BLOCK_A 	 0
-+#define V4L2_RDS_BLOCK_B 	 1
-+#define V4L2_RDS_BLOCK_C 	 2
-+#define V4L2_RDS_BLOCK_D 	 3
-+#define V4L2_RDS_BLOCK_C_ALT 	 4
-+#define V4L2_RDS_BLOCK_INVALID 	 7
-+
-+#define V4L2_RDS_BLOCK_CORRECTED 0x40
-+#define V4L2_RDS_BLOCK_ERROR 	 0x80
-+
-+/*
-+ *	A U D I O
-+ */
-+struct v4l2_audio {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_AUDCAP_STEREO		0x00001
-+#define V4L2_AUDCAP_AVL			0x00002
-+
-+/*  Flags for the 'mode' field */
-+#define V4L2_AUDMODE_AVL		0x00001
-+
-+struct v4l2_audioout {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*
-+ *	M P E G   S E R V I C E S
-+ *
-+ *	NOTE: EXPERIMENTAL API
-+ */
-+#if 1
-+#define V4L2_ENC_IDX_FRAME_I    (0)
-+#define V4L2_ENC_IDX_FRAME_P    (1)
-+#define V4L2_ENC_IDX_FRAME_B    (2)
-+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
-+
-+struct v4l2_enc_idx_entry {
-+	__u64 offset;
-+	__u64 pts;
-+	__u32 length;
-+	__u32 flags;
-+	__u32 reserved[2];
-+};
-+
-+#define V4L2_ENC_IDX_ENTRIES (64)
-+struct v4l2_enc_idx {
-+	__u32 entries;
-+	__u32 entries_cap;
-+	__u32 reserved[4];
-+	struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
-+};
-+
-+
-+#define V4L2_ENC_CMD_START      (0)
-+#define V4L2_ENC_CMD_STOP       (1)
-+#define V4L2_ENC_CMD_PAUSE      (2)
-+#define V4L2_ENC_CMD_RESUME     (3)
-+
-+/* Flags for V4L2_ENC_CMD_STOP */
-+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
-+
-+struct v4l2_encoder_cmd {
-+	__u32 cmd;
-+	__u32 flags;
-+	union {
-+		struct {
-+			__u32 data[8];
-+		} raw;
-+	};
-+};
-+
-+#endif
-+
-+
-+/*
-+ *	D A T A   S E R V I C E S   ( V B I )
-+ *
-+ *	Data services API by Michael Schimek
-+ */
-+
-+/* Raw VBI */
-+struct v4l2_vbi_format {
-+	__u32	sampling_rate;		/* in 1 Hz */
-+	__u32	offset;
-+	__u32	samples_per_line;
-+	__u32	sample_format;		/* V4L2_PIX_FMT_* */
-+	__s32	start[2];
-+	__u32	count[2];
-+	__u32	flags;			/* V4L2_VBI_* */
-+	__u32	reserved[2];		/* must be zero */
-+};
-+
-+/*  VBI flags  */
-+#define V4L2_VBI_UNSYNC		(1 << 0)
-+#define V4L2_VBI_INTERLACED	(1 << 1)
-+
-+/* Sliced VBI
-+ *
-+ *    This implements is a proposal V4L2 API to allow SLICED VBI
-+ * required for some hardware encoders. It should change without
-+ * notice in the definitive implementation.
-+ */
-+
-+struct v4l2_sliced_vbi_format {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	__u32   io_size;
-+	__u32   reserved[2];            /* must be zero */
-+};
-+
-+/* Teletext World System Teletext
-+   (WST), defined on ITU-R BT.653-2 */
-+#define V4L2_SLICED_TELETEXT_B          (0x0001)
-+/* Video Program System, defined on ETS 300 231*/
-+#define V4L2_SLICED_VPS                 (0x0400)
-+/* Closed Caption, defined on EIA-608 */
-+#define V4L2_SLICED_CAPTION_525         (0x1000)
-+/* Wide Screen System, defined on ITU-R BT1119.1 */
-+#define V4L2_SLICED_WSS_625             (0x4000)
-+
-+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
-+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
-+
-+struct v4l2_sliced_vbi_cap {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	enum v4l2_buf_type type;
-+	__u32   reserved[3];    /* must be 0 */
-+};
-+
-+struct v4l2_sliced_vbi_data {
-+	__u32   id;
-+	__u32   field;          /* 0: first field, 1: second field */
-+	__u32   line;           /* 1-23 */
-+	__u32   reserved;       /* must be 0 */
-+	__u8    data[48];
-+};
-+
-+/*
-+ * Sliced VBI data inserted into MPEG Streams
-+ */
-+
-+/*
-+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
-+ *
-+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
-+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
-+ * data
-+ *
-+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
-+ * definitions are not included here.  See the MPEG-2 specifications for details
-+ * on these headers.
-+ */
-+
-+/* Line type IDs */
-+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
-+#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
-+#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
-+#define V4L2_MPEG_VBI_IVTV_VPS            (7)
-+
-+struct v4l2_mpeg_vbi_itv0_line {
-+	__u8 id;	/* One of V4L2_MPEG_VBI_IVTV_* above */
-+	__u8 data[42];	/* Sliced VBI data for the line */
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_itv0 {
-+	__le32 linemask[2]; /* Bitmasks of VBI service lines present */
-+	struct v4l2_mpeg_vbi_itv0_line line[35];
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_ITV0 {
-+	struct v4l2_mpeg_vbi_itv0_line line[36];
-+} __attribute__ ((packed));
-+
-+#define V4L2_MPEG_VBI_IVTV_MAGIC0	"itv0"
-+#define V4L2_MPEG_VBI_IVTV_MAGIC1	"ITV0"
-+
-+struct v4l2_mpeg_vbi_fmt_ivtv {
-+	__u8 magic[4];
-+	union {
-+		struct v4l2_mpeg_vbi_itv0 itv0;
-+		struct v4l2_mpeg_vbi_ITV0 ITV0;
-+	};
-+} __attribute__ ((packed));
-+
-+/*
-+ *	A G G R E G A T E   S T R U C T U R E S
-+ */
-+
-+/**
-+ * struct v4l2_plane_pix_format - additional, per-plane format definition
-+ * @sizeimage:		maximum size in bytes required for data, for which
-+ *			this plane will be used
-+ * @bytesperline:	distance in bytes between the leftmost pixels in two
-+ *			adjacent lines
-+ */
-+struct v4l2_plane_pix_format {
-+	__u32		sizeimage;
-+	__u16		bytesperline;
-+	__u16		reserved[7];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_pix_format_mplane - multiplanar format definition
-+ * @width:		image width in pixels
-+ * @height:		image height in pixels
-+ * @pixelformat:	little endian four character code (fourcc)
-+ * @field:		field order (for interlaced video)
-+ * @colorspace:		supplemental to pixelformat
-+ * @plane_fmt:		per-plane information
-+ * @num_planes:		number of planes for this format
-+ */
-+struct v4l2_pix_format_mplane {
-+	__u32				width;
-+	__u32				height;
-+	__u32				pixelformat;
-+	enum v4l2_field			field;
-+	enum v4l2_colorspace		colorspace;
-+
-+	struct v4l2_plane_pix_format	plane_fmt[VIDEO_MAX_PLANES];
-+	__u8				num_planes;
-+	__u8				reserved[11];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_format - stream data format
-+ * @type:	type of the data stream
-+ * @pix:	definition of an image format
-+ * @pix_mp:	definition of a multiplanar image format
-+ * @win:	definition of an overlaid image
-+ * @vbi:	raw VBI capture or output parameters
-+ * @sliced:	sliced VBI capture or output parameters
-+ * @raw_data:	placeholder for future extensions and custom formats
-+ */
-+struct v4l2_format {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_pix_format		pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
-+		struct v4l2_pix_format_mplane	pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
-+		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
-+		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
-+		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
-+		__u8	raw_data[200];                   /* user-defined */
-+	} fmt;
-+};
-+
-+/*	Stream type-dependent parameters
-+ */
-+struct v4l2_streamparm {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_captureparm	capture;
-+		struct v4l2_outputparm	output;
-+		__u8	raw_data[200];  /* user-defined */
-+	} parm;
-+};
-+
-+/*
-+ *	E V E N T S
-+ */
-+
-+#define V4L2_EVENT_ALL				0
-+#define V4L2_EVENT_VSYNC			1
-+#define V4L2_EVENT_EOS				2
-+#define V4L2_EVENT_PRIVATE_START		0x08000000
-+
-+/* Payload for V4L2_EVENT_VSYNC */
-+struct v4l2_event_vsync {
-+	/* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
-+	__u8 field;
-+} __attribute__ ((packed));
-+
-+struct v4l2_event {
-+	__u32				type;
-+	union {
-+		struct v4l2_event_vsync vsync;
-+		__u8			data[64];
-+	} u;
-+	__u32				pending;
-+	__u32				sequence;
-+	struct timespec			timestamp;
-+	__u32				reserved[9];
-+};
-+
-+struct v4l2_event_subscription {
-+	__u32				type;
-+	__u32				reserved[7];
-+};
-+
-+/*
-+ *	A D V A N C E D   D E B U G G I N G
-+ *
-+ *	NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
-+ *	FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
-+ */
-+
-+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
-+
-+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
-+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
-+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
-+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
-+
-+struct v4l2_dbg_match {
-+	__u32 type; /* Match type */
-+	union {     /* Match this chip, meaning determined by type */
-+		__u32 addr;
-+		char name[32];
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_dbg_register {
-+	struct v4l2_dbg_match match;
-+	__u32 size;	/* register size in bytes */
-+	__u64 reg;
-+	__u64 val;
-+} __attribute__ ((packed));
-+
-+/* VIDIOC_DBG_G_CHIP_IDENT */
-+struct v4l2_dbg_chip_ident {
-+	struct v4l2_dbg_match match;
-+	__u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
-+	__u32 revision;    /* chip revision, chip specific */
-+} __attribute__ ((packed));
-+
-+/*
-+ *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
-+ *
-+ */
-+#define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
-+#define VIDIOC_RESERVED		  _IO('V',  1)
-+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
-+#define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
-+#define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
-+#define VIDIOC_REQBUFS		_IOWR('V',  8, struct v4l2_requestbuffers)
-+#define VIDIOC_QUERYBUF		_IOWR('V',  9, struct v4l2_buffer)
-+#define VIDIOC_G_FBUF		 _IOR('V', 10, struct v4l2_framebuffer)
-+#define VIDIOC_S_FBUF		 _IOW('V', 11, struct v4l2_framebuffer)
-+#define VIDIOC_OVERLAY		 _IOW('V', 14, int)
-+#define VIDIOC_QBUF		_IOWR('V', 15, struct v4l2_buffer)
-+#define VIDIOC_DQBUF		_IOWR('V', 17, struct v4l2_buffer)
-+#define VIDIOC_STREAMON		 _IOW('V', 18, int)
-+#define VIDIOC_STREAMOFF	 _IOW('V', 19, int)
-+#define VIDIOC_G_PARM		_IOWR('V', 21, struct v4l2_streamparm)
-+#define VIDIOC_S_PARM		_IOWR('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_G_STD		 _IOR('V', 23, v4l2_std_id)
-+#define VIDIOC_S_STD		 _IOW('V', 24, v4l2_std_id)
-+#define VIDIOC_ENUMSTD		_IOWR('V', 25, struct v4l2_standard)
-+#define VIDIOC_ENUMINPUT	_IOWR('V', 26, struct v4l2_input)
-+#define VIDIOC_G_CTRL		_IOWR('V', 27, struct v4l2_control)
-+#define VIDIOC_S_CTRL		_IOWR('V', 28, struct v4l2_control)
-+#define VIDIOC_G_TUNER		_IOWR('V', 29, struct v4l2_tuner)
-+#define VIDIOC_S_TUNER		 _IOW('V', 30, struct v4l2_tuner)
-+#define VIDIOC_G_AUDIO		 _IOR('V', 33, struct v4l2_audio)
-+#define VIDIOC_S_AUDIO		 _IOW('V', 34, struct v4l2_audio)
-+#define VIDIOC_QUERYCTRL	_IOWR('V', 36, struct v4l2_queryctrl)
-+#define VIDIOC_QUERYMENU	_IOWR('V', 37, struct v4l2_querymenu)
-+#define VIDIOC_G_INPUT		 _IOR('V', 38, int)
-+#define VIDIOC_S_INPUT		_IOWR('V', 39, int)
-+#define VIDIOC_G_OUTPUT		 _IOR('V', 46, int)
-+#define VIDIOC_S_OUTPUT		_IOWR('V', 47, int)
-+#define VIDIOC_ENUMOUTPUT	_IOWR('V', 48, struct v4l2_output)
-+#define VIDIOC_G_AUDOUT		 _IOR('V', 49, struct v4l2_audioout)
-+#define VIDIOC_S_AUDOUT		 _IOW('V', 50, struct v4l2_audioout)
-+#define VIDIOC_G_MODULATOR	_IOWR('V', 54, struct v4l2_modulator)
-+#define VIDIOC_S_MODULATOR	 _IOW('V', 55, struct v4l2_modulator)
-+#define VIDIOC_G_FREQUENCY	_IOWR('V', 56, struct v4l2_frequency)
-+#define VIDIOC_S_FREQUENCY	 _IOW('V', 57, struct v4l2_frequency)
-+#define VIDIOC_CROPCAP		_IOWR('V', 58, struct v4l2_cropcap)
-+#define VIDIOC_G_CROP		_IOWR('V', 59, struct v4l2_crop)
-+#define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
-+#define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
-+#define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
-+#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
-+#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
-+#define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
-+#define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
-+#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum v4l2_priority)
-+#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum v4l2_priority)
-+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
-+#define VIDIOC_LOG_STATUS         _IO('V', 70)
-+#define VIDIOC_G_EXT_CTRLS	_IOWR('V', 71, struct v4l2_ext_controls)
-+#define VIDIOC_S_EXT_CTRLS	_IOWR('V', 72, struct v4l2_ext_controls)
-+#define VIDIOC_TRY_EXT_CTRLS	_IOWR('V', 73, struct v4l2_ext_controls)
-+#if 1
-+#define VIDIOC_ENUM_FRAMESIZES	_IOWR('V', 74, struct v4l2_frmsizeenum)
-+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
-+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
-+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
-+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
-+#endif
-+
-+#if 1
-+/* Experimental, meant for debugging, testing and internal use.
-+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-+   You must be root to use these ioctls. Never use these in applications! */
-+#define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)
-+#define	VIDIOC_DBG_G_REGISTER 	_IOWR('V', 80, struct v4l2_dbg_register)
-+
-+/* Experimental, meant for debugging, testing and internal use.
-+   Never use this ioctl in applications! */
-+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-+#endif
-+
-+#define VIDIOC_S_HW_FREQ_SEEK	 _IOW('V', 82, struct v4l2_hw_freq_seek)
-+#define	VIDIOC_ENUM_DV_PRESETS	_IOWR('V', 83, struct v4l2_dv_enum_preset)
-+#define	VIDIOC_S_DV_PRESET	_IOWR('V', 84, struct v4l2_dv_preset)
-+#define	VIDIOC_G_DV_PRESET	_IOWR('V', 85, struct v4l2_dv_preset)
-+#define	VIDIOC_QUERY_DV_PRESET	_IOR('V',  86, struct v4l2_dv_preset)
-+#define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)
-+#define	VIDIOC_G_DV_TIMINGS	_IOWR('V', 88, struct v4l2_dv_timings)
-+#define	VIDIOC_DQEVENT		 _IOR('V', 89, struct v4l2_event)
-+#define	VIDIOC_SUBSCRIBE_EVENT	 _IOW('V', 90, struct v4l2_event_subscription)
-+#define	VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
-+
-+#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
-+
-+#endif /* __LINUX_VIDEODEV2_H */
diff --git a/testing/xf86-video-vesa/PKGBUILD b/testing/xf86-video-vesa/PKGBUILD
deleted file mode 100644
index eadf3d5f3..000000000
--- a/testing/xf86-video-vesa/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 150085 2012-02-12 09:45:57Z 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/testing/xf86-video-vesa/git-fixes.patch b/testing/xf86-video-vesa/git-fixes.patch
deleted file mode 100644
index c4f442265..000000000
--- a/testing/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/testing/xf86-video-vesa/revert-kernelcheck.patch b/testing/xf86-video-vesa/revert-kernelcheck.patch
deleted file mode 100644
index 37418cc3f..000000000
--- a/testing/xf86-video-vesa/revert-kernelcheck.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 08 Dec 2010 18:45:32 +0000
-Subject: Refuse to load if there's a kernel driver bound to the device
-
-Ported from the equivalent check in nv.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 168fde1..2523d76 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
-     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
- 				NULL, NULL, NULL, NULL, NULL);
-     if (pScrn != NULL) {
--	VESAPtr pVesa = VESAGetRec(pScrn);
-+	VESAPtr pVesa;
- 
-+	if (pci_device_has_kernel_driver(dev)) {
-+	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
-+	    return FALSE;
-+	}
-+
-+	pVesa = VESAGetRec(pScrn);
- 	VESAInitScrn(pScrn);
- 	pVesa->pciInfo = dev;
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-voodoo/PKGBUILD b/testing/xf86-video-voodoo/PKGBUILD
deleted file mode 100644
index 78320a904..000000000
--- a/testing/xf86-video-voodoo/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150089 2012-02-12 09:46:01Z 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/testing/xf86-video-xgixp/PKGBUILD b/testing/xf86-video-xgixp/PKGBUILD
deleted file mode 100644
index a8afd402d..000000000
--- a/testing/xf86-video-xgixp/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150091 2012-02-12 09:46:03Z 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/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
deleted file mode 100644
index f8cb64673..000000000
--- a/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 25 Mar 2011 22:46:55 +0000
-Subject: API compat fix for DRAWABLE_BUFFER
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index e54d8c7..189b84a 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr,
- {
-     switch (pDraw->type) {
-     case DRAWABLE_WINDOW:
-+#ifdef DRAWABLE_BUFFER
-     case DRAWABLE_BUFFER:
-+#endif
- 	*read_ptr = xg47_read_memory_swap_func;
- 	*write_ptr = xg47_write_memory_swap_func;
- 	break;
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf
deleted file mode 100644
index 7afad22dc..000000000
--- a/testing/xorg-server/10-quirks.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
-EndSection
diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD
deleted file mode 100644
index ec72f28f7..000000000
--- a/testing/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,194 +0,0 @@
-# $Id: PKGBUILD 154933 2012-03-31 09:51:27Z 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.12.0.901
-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=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7'
-          '63836e5cfb4ae7353fb2e31239a544409c7ead32'
-          '175de5630b43dbc97778adfba5563b7fdd77f11f'
-          '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-kdrive-evdev \
-      --enable-kdrive-kbd \
-      --enable-kdrive-mouse \
-      --enable-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -i hw/Makefile
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont 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/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index 6d5220ac7..000000000
--- a/testing/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1144,7 +1144,23 @@
-         int idx = 0;
- 
- #ifdef __linux__
--        driverList[idx++] = "nouveau";
-+	    switch (dev->device_id)
-+		{
-+		/* NV1 */
-+		case 0x0008:
-+		case 0x0009:
-+		    driverList[idx++] = "vesa";
-+		    break;
-+		/* NV3 */
-+		case 0x0018:
-+		case 0x0019:
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		default:
-+		    driverList[idx++] = "nouveau";
-+		    driverList[idx++] = "nvidia";
-+		    break;
-+		}
- #endif
-         driverList[idx++] = "nv";
-         break;
diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index 0b50049db..000000000
--- a/testing/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
-+++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1200,9 +1200,15 @@
-             break;
-         }
-         break;
--    case 0x1039:
--        driverList[0] = "sis";
--        break;
-+	case 0x1039:
-+	    switch (dev->device_id)
-+	    {
-+		case 0x6350: case 0x6351:
-+		    driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
-+		default:
-+		    driverList[0] = "sis"; break;
-+	    }
-+	    break;
-     case 0x126f:
-         driverList[0] = "siliconmotion";
-         break;
diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch
deleted file mode 100644
index 27da61eca..000000000
--- a/testing/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/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/testing/xorg-server/xvfb-run
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
-  echo "Xvfb failed to start" >&2
-  exit 1
-fi
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/testing/xorg-server/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/testing/xorg-xinput/PKGBUILD b/testing/xorg-xinput/PKGBUILD
deleted file mode 100644
index 7d9b5c2bf..000000000
--- a/testing/xorg-xinput/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150095 2012-02-12 09:46:08Z 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/testing/xz/PKGBUILD b/testing/xz/PKGBUILD
deleted file mode 100644
index 8b76f6420..000000000
--- a/testing/xz/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 154765 2012-03-30 16:41:04Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: François Charette <firmicus@gmx.net>
-
-pkgname=xz
-pkgver=5.0.3
-pkgrel=2
-pkgdesc='Library and command line tools for XZ and LZMA compressed files'
-arch=('i686' 'x86_64')
-url='http://tukaani.org/xz/'
-license=('GPL' 'LGPL' 'custom')
-depends=('sh')
-options=('!libtool')
-source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig"
-        'compile-fix.patch')
-md5sums=('fefe52f9ecd521de2a8ce38c21a27574'
-         'd0725667a6dae0853194dc691e900e26'
-         'b74e4f7793848cc5765c848ea30f971f')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	patch -p1 -i ${srcdir}/compile-fix.patch
-
-	./configure --prefix=/usr \
-		--disable-rpath \
-		--enable-werror
-	make
-}
-
-check() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make check
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/licenses/xz/
-	ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/
-	ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2
-}
diff --git a/testing/xz/compile-fix.patch b/testing/xz/compile-fix.patch
deleted file mode 100644
index f3b7878d1..000000000
--- a/testing/xz/compile-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001
-From: Lasse Collin <lasse.collin@tukaani.org>
-Date: Tue, 10 Jan 2012 17:13:03 +0200
-Subject: [PATCH] Tests: Fix a compiler warning with _FORTIFY_SOURCE.
-
-Reported here:
-http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385
----
- tests/create_compress_files.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c
-index 44367d8..bd5b4ef 100644
---- a/tests/create_compress_files.c
-+++ b/tests/create_compress_files.c
-@@ -79,7 +79,8 @@ static void
- write_abc(FILE *file)
- {
- 	for (size_t i = 0; i < 12345; ++i)
--		fwrite("abc\n", 4, 1, file);
-+		if (fwrite("abc\n", 4, 1, file) != 1)
-+			exit(1);
- }
- 
- 
--- 
-1.7.6
-
diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD
deleted file mode 100644
index c78f6d1dd..000000000
--- a/testing/ypbind-mt/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 149344 2012-02-06 23:02:05Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=4
-pkgdesc='Linux NIS daemon'
-url='http://www.linux-nis.org/nis/ypbind-mt/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib')
-optdepends=('yp-tools: to set a domain name')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--enable-dbus-nm \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
-	install -d -m755 "${pkgdir}"/var/yp/binding
-}
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0')
diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf
deleted file mode 100644
index bbbbf8fc7..000000000
--- a/testing/ypbind-mt/nisdomainname.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# NIS domain to be set in /etc/rc.d/ypbind
-#
-NISDOMAINNAME=""
diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/testing/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/testing/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD
deleted file mode 100644
index 2e125cbee..000000000
--- a/testing/ypserv/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 151498 2012-02-26 19:05:20Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypserv
-pkgver=2.27
-pkgrel=1
-pkgdesc='Linux NIS Server'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/ypserv/'
-license=('GPL2')
-depends=('gdbm' 'openslp' 'inetutils')
-optdepends=('gawk: for printcap support')
-backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	confpost.patch
-        'yppasswd'
-        'ypserv')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../confpost.patch
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
-	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
-	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
-}
-md5sums=('fd9c43aec932a92be07b723c647b02a4'
-         '8acb314f30d6e531ac9efa8655f68ccb'
-         '4bc84c48ed1bb9659698853acb5cfd76'
-         'c40befe5932f1b42efaced6b46809303')
diff --git a/testing/ypserv/confpost.patch b/testing/ypserv/confpost.patch
deleted file mode 100644
index 489e4368a..000000000
--- a/testing/ypserv/confpost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
-+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
-+ * libraries gdbm and qdbm have same symbol names. */
-+#undef HAVE_COMPAT_LIBGDBM
-+#ifdef HAVE_LIBGDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+#ifdef HAVE_LIBQDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+
diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd
deleted file mode 100755
index c2b00b2ca..000000000
--- a/testing/ypserv/yppasswd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Password Daemon"
-    /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Password Daemon"
-    killall -q /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/ypserv/ypserv b/testing/ypserv/ypserv
deleted file mode 100755
index c36e6901b..000000000
--- a/testing/ypserv/ypserv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Server"
-    /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ypserv
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Server"
-    killall -q /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ypserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/~lukeshu-closure-compiler/java-asm/PKGBUILD b/~lukeshu-closure-compiler/java-asm/PKGBUILD
deleted file mode 100644
index b1d817441..000000000
--- a/~lukeshu-closure-compiler/java-asm/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=asm
-pkgname=java-asm
-pkgver=3.3.1
-pkgrel=1
-pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
-arch=('any')
-url="http://asm.ow2.org/"
-license=('custom:BSD3')
-depends=('java-runtime')
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  rm examples/jasmin/test/jasmin.jar
-  rm cobertura.ser # This is just precompiled for convenience
-
-  echo 'paths.configured /lts' >> build.config
-  echo 'test.paths.configured /lts' >> build.config
-  ant dist
-}
-
-# Tests have more dependencies, and I can't be bothered to package them.
-#check() {
-#  cd "$srcdir/$_pkgname-$pkgver"
-#  ant test
-#}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd output/dist
-  
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc"
-  cp -r examples         "$pkgdir/usr/share/doc/$pkgname/examples"
-  
-  install -d "$pkgdir/usr/share/java/$_pkgname"
-  cp -r lib/* "$pkgdir/usr/share/java/$_pkgname"
-}
-
-md5sums=('433024df8176f09922646316e415631c')
diff --git a/~lukeshu-closure-compiler/java-jarjar/PKGBUILD b/~lukeshu-closure-compiler/java-jarjar/PKGBUILD
deleted file mode 100644
index 31f374427..000000000
--- a/~lukeshu-closure-compiler/java-jarjar/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=jarjar
-pkgname=java-jarjar
-pkgver=1.1
-pkgrel=1
-pkgdesc="A utility that makes it easy to repackage Java libraries and embed them into your own distribution."
-arch=('any')
-url="https://code.google.com/p/jarjar/"
-license=('Apache2')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm' 'maven')
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz")
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ln -s /usr/share/java/asm/asm-3.3.1.jar lib
-  ln -s /usr/share/java/asm/asm-commons-3.3.1.jar lib
-  ln -s /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar
-
-  # Define the version
-  sed -i "s/snapshot/$pkgver/" build.xml
-
-  # Fix a bug causing an incompatibility with newer versions of ant
-  sed -i 's/zipDir(null,/zipDir((java.io.File)null,/' \
-      src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java
-
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  install -d "$pkgdir/usr/share/java/$_pkgname"
-  install -D "dist/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname"
-  ln -s "$pkgname/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
-}
-
-md5sums=('af46c24b90d009169b7f83ee1e8bbd9c')
diff --git a/~lukeshu-closure-compiler/java-jarjar/SRCBUILD b/~lukeshu-closure-compiler/java-jarjar/SRCBUILD
deleted file mode 100644
index b716eeb51..000000000
--- a/~lukeshu-closure-compiler/java-jarjar/SRCBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=jarjar
-pkgname=java-jarjar
-pkgver=1.1
-pkgrel=1
-pkgdesc="A utility that makes it easy to repackage Java libraries and embed them into your own distribution."
-arch=('any')
-url="https://code.google.com/p/jarjar/"
-license=('Apache2')
-makedepends=('subversion' 'findutils')
-options=('!strip' 'docs' '!zipman' 'emptydirs')
-
-_svntrunk="https://jarjar.googlecode.com/svn/tags/release-$pkgver/$_pkgname"
-_svnver=131
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to SVN server...."
-
-  if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r "$_svnver")
-  else
-    svn co "$_svntrunk" --config-dir ./ -r "$_svnver" "$pkgname"
-  fi
-
-  msg "SVN checkout done or server timeout"
-
-  msg "Removing .svn files..."
-  find . -name .svn -print0 | xargs -0 rm -rf
-
-  msg "Removing precompiled binaries..."
-  cd "$srcdir/$pkgname"
-  rm -v src/test/*.class src/test/*.jar
-  rm -v lib/*.jar
-}
-
-package() {
-  PKGEXT=${SRCEXT}
-  PKGDEST=${SRCDEST}
-  cp -a "${srcdir}/${pkgname}" "${pkgdir}/"
-}
diff --git a/~lukeshu-closure-compiler/protobuf-java/PKGBUILD b/~lukeshu-closure-compiler/protobuf-java/PKGBUILD
deleted file mode 100644
index 473bf3f2f..000000000
--- a/~lukeshu-closure-compiler/protobuf-java/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Igor R. Dejanovic igor.dejanovic@gmail.com
-# Contributor: Igor R. Dejanovic igor.dejanovic@gmail.com
-
-pkgname=protobuf-java
-_xpkgname=protobuf
-pkgver=2.4.1
-pkgrel=1
-pkgdesc="Google's data interchange format utility (java API)."
-url="http://code.google.com/p/protobuf/"
-license=('custom:BSD')
-arch=('any')
-depends=("java-environment")
-makedepends=('java-environment' 'maven' "${_xpkgname}>=${pkgver}")
-source=(http://protobuf.googlecode.com/files/$_xpkgname-$pkgver.tar.bz2 protobuf-java.patch)
-md5sums=('ed436802019c9e1f40cc750eaf78f318'
-         '01a3244c88fc5ddfee07c658c0bc7df4')
-
-build() {
-
-  cd $srcdir/$_xpkgname-$pkgver
-  patch -p1 < ../protobuf-java.patch
-
-  cd $srcdir/$_xpkgname-$pkgver/java
-  mvn package
-
-}
-
-package() {
-  install -Dm644 "$srcdir/$_xpkgname-$pkgver/java/target/$pkgname-$pkgver.jar" \
-                "$pkgdir/usr/share/java/$pkgname/$pkgname-$pkgver.jar"
-  install -Dm644 "$srcdir/$_xpkgname-$pkgver/COPYING.txt" \
-      "$pkgdir/usr/share/licenses/$pkgname/COPYING.txt"
-}
-
diff --git a/~lukeshu-closure-compiler/protobuf-java/protobuf-java.patch b/~lukeshu-closure-compiler/protobuf-java/protobuf-java.patch
deleted file mode 100644
index 1286223ed..000000000
--- a/~lukeshu-closure-compiler/protobuf-java/protobuf-java.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur protobuf-2.4.1/java/pom.xml protobuf-2.4.1-patched/java/pom.xml
---- protobuf-2.4.1/java/pom.xml	2011-04-30 19:23:04.000000000 +0200
-+++ protobuf-2.4.1-patched/java/pom.xml	2011-05-09 17:58:09.000000000 +0200
-@@ -78,7 +78,7 @@
-             <configuration>
-               <tasks>
-                 <mkdir dir="target/generated-sources" />
--                <exec executable="../src/protoc">
-+                <exec executable="protoc">
-                   <arg value="--java_out=target/generated-sources" />
-                   <arg value="--proto_path=../src" />
-                   <arg value="../src/google/protobuf/descriptor.proto" />
-@@ -96,7 +96,7 @@
-             <configuration>
-               <tasks>
-                 <mkdir dir="target/generated-test-sources" />
--                <exec executable="../src/protoc">
-+                <exec executable="protoc">
-                   <arg value="--java_out=target/generated-test-sources" />
-                   <arg value="--proto_path=../src" />
-                   <arg value="--proto_path=src/test/java" />
diff --git a/~lukeshu/openni-git/PKGBUILD b/~lukeshu/openni-git/PKGBUILD
deleted file mode 100644
index 7ac6abb87..000000000
--- a/~lukeshu/openni-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-git/openni.install b/~lukeshu/openni-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-module-primesensor-git/PKGBUILD
deleted file mode 100644
index 0ebfac2e5..000000000
--- a/~lukeshu/openni-module-primesensor-git/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-_pkgname=openni-module-primesensor
-pkgname=${_pkgname}-git
-pkgver=20111115
-pkgrel=1
-pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device"
-arch=('i686')
-url="http://www.primesense.com/"
-license=('GPL')
-depends=('openni')
-makedepends=('git')
-provides=($_pkgname)
-conflicts=($_pkgname)
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/PrimeSense/Sensor.git"
-_gitname="primesensor"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone -b $_gitbranch $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/Linux-x86/Build
-  make NI_CONF_DIR=/etc || return 1
-}
-
-package() {
-  install -d -m755 ${pkgdir}/usr/{lib,bin}
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release
-  install XnSensorServer ${pkgdir}/usr/bin
-  install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib
-  chmod +s ${pkgdir}/usr/bin/XnSensorServer
-
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Install
-  install -d -m755 ${pkgdir}/etc/udev/rules.d
-  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
-
-  cd $srcdir/$_gitname-build/Data
-  install -d -m755 ${pkgdir}/etc/primesense
-  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
-
-  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
-}
diff --git a/~lukeshu/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-module-sensorkinect-git/PKGBUILD
deleted file mode 100644
index 2a2abbdc5..000000000
--- a/~lukeshu/openni-module-sensorkinect-git/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-pkgname=openni-module-sensorkinect-git
-pkgver=20111211
-pkgrel=2
-pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device"
-arch=('i686' 'x86_64')
-url="https://github.com/avin2/SensorKinect"
-license=('GPL')
-depends=('openni-unstable' 'kinect-udev')
-makedepends=('git')
-provides=('openni-module-sensorkinect')
-conflicts=('openni-module-sensorkinect' 'openni-module-primesensor')
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/avin2/SensorKinect.git"
-_gitname="sensorkinect"
-_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/${_platform}/Build
-  make
-  make redist
-}
-
-package() {
-  cd $srcdir/$_gitname-build
-  cd Platform/${_platform}/Redist
-
-  # This is all cloned from ./install.sh, which can't be used for a number
-  # of reasons.
-  install -d $pkgdir/usr/{lib,bin}
-  install -m755 Lib/* $pkgdir/usr/lib
-  install -m755 Bin/* $pkgdir/usr/bin
-
-  install -d $pkgdir/etc/primesense
-  install -m644 Config/GlobalDefaultsKinect.ini $pkgdir/etc/primesense
-
-  chmod +s $pkgdir/usr/bin/XnSensorServer
-
-  install -m777 -d $pkgdir/var/log/primesense/XnSensorServer
-}
diff --git a/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install
deleted file mode 100644
index d62d263d1..000000000
--- a/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-export MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
-
-post_install() {
-	for module in $MODULES; do
-		/usr/bin/niReg -r /usr/lib/$module /etc/primesense
-	done
-}
-
-pre_remove() {
-	for module in $MODULES;	do 
-		/usr/bin/niReg -u /usr/lib/$module
-	done
-}
diff --git a/~lukeshu/openni-unstable-git/PKGBUILD b/~lukeshu/openni-unstable-git/PKGBUILD
deleted file mode 100644
index 07f276b02..000000000
--- a/~lukeshu/openni-unstable-git/PKGBUILD
+++ /dev/null
@@ -1,286 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable-git'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=20111121
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-_gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${_gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable-git() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni' 'openni-unstable')
-  conflicts=('openni' 'openni-unstable')
-}
-
-package_openni-unstable-git-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs' 'openni-unstable-docs')
-  conflicts=('openni-docs' 'openni-unstable-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-git-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core' 'openni-unstable-core')
-  conflicts=('openni-core' 'openni-unstable-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-unstable-git-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java' 'openni-unstable-java')
-  conflicts=('openni-java' 'openni-unstable-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-git-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono' 'openni-unstable-mono')
-  conflicts=('openni-mono' 'openni-unstable-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-git-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples' 'openni-unstable-core-samples')
-  conflicts=('openni-core-samples' 'openni-unstable-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-git-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  conflicts=('openni-core-samples-source' 'openni-unstable-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-git-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples' 'openni-unstable-java-samples')
-  conflicts=('openni-java-samples' 'openni-unstable-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-git-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  conflicts=('openni-java-samples-source' 'openni-unstable-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-git-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples' 'openni-unstable-mono-samples')
-  conflicts=('openni-mono-samples' 'openni-unstable-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-git-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  conflicts=('openni-mono-samples-source' 'openni-unstable-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-unstable-git/openni.install b/~lukeshu/openni-unstable-git/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-unstable-git/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-unstable/PKGBUILD b/~lukeshu/openni-unstable/PKGBUILD
deleted file mode 100644
index 19d1575a1..000000000
--- a/~lukeshu/openni-unstable/PKGBUILD
+++ /dev/null
@@ -1,294 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf='-unstable'
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.4.0.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-options+=('!strip')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-_gitbranch="Unstable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x64;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  #if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-  #  git checkout master
-  #  git pull origin
-  #  msg "The local files are updated."
-  #else
-  #  git clone ${__gitroot} ${_gitname}
-  #  cd ${_gitname}
-  #fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  #rm -rf "${srcdir}/${_gitname}-build"
-  #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
-
-  for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do
-      echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile"
-  done
-
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_os}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_os}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples
-  cd "../Bin/${_arch}-Release"
-  ln NiViewer Sample-NiViewer
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni-unstable() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-unstable-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-unstable-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni-core.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-
-  install -d "${pkgdir}/var/lib/ni"
-}
-
-package_openni-unstable-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-unstable-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  install="openni-mono.install"
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_os}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  HandTracker
-  RecordSynthetic
-  SimpleCreate
-  UserSelection
-  Viewer
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-unstable-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  for sample in $CORE_SAMPLES; do
-    install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-unstable-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-unstable-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-unstable-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-unstable-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-unstable-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni-unstable/openni-core.install b/~lukeshu/openni-unstable/openni-core.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-unstable/openni-core.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~lukeshu/openni-unstable/openni-mono.install b/~lukeshu/openni-unstable/openni-mono.install
deleted file mode 100644
index 72a6fb23d..000000000
--- a/~lukeshu/openni-unstable/openni-mono.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr
-}
-
-post_remove() {
-	gacutil -u OpenNI.net -gacdir /usr
-}
diff --git a/~lukeshu/openni/PKGBUILD b/~lukeshu/openni/PKGBUILD
deleted file mode 100644
index 2cdc2fd7d..000000000
--- a/~lukeshu/openni/PKGBUILD
+++ /dev/null
@@ -1,288 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
-# Contributor: bugix
-# Contributor: Lubosz Sarnecki <lubosz at gmail>
-
-# unfortunately we can't use $_suf in function names, but sed makes it ok
-_suf=''
-pkgname=(
-    openni$_suf
-    openni$_suf-docs
-
-    openni$_suf-core
-    openni$_suf-core-samples
-    openni$_suf-core-samples-source
-    
-    openni$_suf-mono
-    openni$_suf-mono-samples
-    openni$_suf-mono-samples-source
-
-    openni$_suf-java
-    openni$_suf-java-samples
-    openni$_suf-java-samples-source
-    )
-pkgver=1.3.3.6
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openni.org/"
-license=('GPL')
-makedepends=('git' 'doxygen' 'graphviz')
-source=()
-md5sums=()
-
-__gitroot="git://github.com/OpenNI/OpenNI.git"
-_gitname="openni"
-#_gitbranch="unstable"
-#_gitbranch="master"
-_gitbranch="Stable-$pkgver"
-
-_os='Linux'
-case "${CARCH}" in
-'x86_64') _arch=x86;;
-'i686')   _arch=x86;;
-'arm')    _arch=Arm;; # untested
-*)        _arch=UNSUPPORTED_ARCH;;
-esac
-_platform="${_os}-${_arch}"
-
-export MAKEFLAGS+=' -j1 '
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d ${_gitname} ] ; then
-    cd ${_gitname}
-    git checkout master
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone ${__gitroot} ${_gitname}
-    cd ${_gitname}
-  fi
-  git checkout ${_gitbranch}
-  cd ..
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build"
-
-  # PATCH
-  sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker"
-  mv Wrappers/OpenNI.java/src/org/OpenNI/AlternativeView{p,P}ointCapability.java
-  echo '
-abs_core: $(ALL_MODULES) $(ALL_UTILS)
-abs_core_samples: $(CORE_SAMPLES)
-abs_java: $(ALL_JAVA_PROJS)
-abs_java_samples: $(JAVA_SAMPLES)
-abs_mono: $(ALL_MONO_PROJS)
-abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
-' >> "Platform/${_platform}/Build/Makefile"
-
-  
-  # BUILD
-  cd "Platform/${_platform}/Build"
-  make -j1 \
-      abs_core abs_core_samples \
-      abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
-
-  cd '../../../Source/DoxyGen'
-  mkdir html
-  doxygen Doxyfile
-  rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp
-}
-
-package_openni() {
-  pkgdesc="Open Natural Interface framework"
-  depends=("openni$_suf-core")
-  optdepends=("openni$_suf-docs: programmer documentation")
-  provides=('openni')
-  conflicts=('openni')
-}
-
-package_openni-docs() {
-  pkgdesc="OpenNI programmer documentation"
-  arch=('any')
-  provides=('openni-docs')
-  conflicts=('openni-docs')
-
-  cd "${srcdir}/${_gitname}-build/Source/DoxyGen/"
-  install -d "${pkgdir}/usr/share/openni"
-  cp -r html "${pkgdir}/usr/share/openni"
-}
-
-package_openni-core() {
-  pkgdesc="OpenNI core libraries"
-  depends=('libusb' 'freeglut')
-  install="openni.install"
-  provides=('openni-core')
-  conflicts=('openni-core')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  LIB_FILES='
-    libnimCodecs.so
-    libnimMockNodes.so
-    libnimRecorder.so
-    libOpenNI.so
-    '
-  install -d "${pkgdir}/usr/lib"
-  install -m755 $LIB_FILES "${pkgdir}/usr/lib"
-
-  BIN_FILES='niReg niLicense'
-  install -d "${pkgdir}/usr/bin"
-  install -m755 $BIN_FILES "${pkgdir}/usr/bin"
-
-  cd "${srcdir}/${_gitname}-build/Include"
-  install -d "${pkgdir}/usr/include/ni"
-  install -m644 *.h "${pkgdir}/usr/include/ni"
-  cp -r "${_platform}" "${pkgdir}/usr/include/ni"
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build"
-  install -d "${pkgdir}/usr/share"
-  cp -r Common "${pkgdir}/usr/share/common"
-}
-
-package_openni-java() {
-  pkgdesc="OpenNI java wrapper"
-  depends=("openni$_suf" 'java-environment')
-  provides=('openni-java')
-  conflicts=('openni-java')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-
-  install -d "${pkgdir}/usr/lib"
-  install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib"
-  
-  install -d "${pkgdir}/usr/share/openni/java"
-  install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java"
-}
-
-package_openni-mono() {
-  pkgdesc="OpenNI mono wrapper"
-  depends=("openni$_suf" 'mono')
-  provides=('openni-mono')
-  conflicts=('openni-mono')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  
-  install -d "${pkgdir}/usr/share/openni/mono"
-  install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono"
-}
-
-# SAMPLES
-
-_install_sample_source() {
-  sample=$1
-  makefile="Platform/${_platform}/Build/Samples/$sample/Makefile"
-  install -d                "${pkgdir}/usr/share/openni/samples"
-  cp -r "Samples/$sample"   "${pkgdir}/usr/share/openni/samples/$sample"
-  install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
-}
-
-# Leave out NiViewer, it's set up wrong
-CORE_SAMPLES='
-  AudioSample
-  BackRecorder
-  CRead
-  ConvertXToONI
-  RecordSynthetic
-  SimpleCreate
-              SimpleRead SimpleViewer UserTracker'
-MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
-JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
-
-package_openni-core-samples() {
-  pkgdesc="OpenNI sample programs"
-  depends=("openni$_suf-core")
-  optdepends=('openni-core-samples-source: source code for the samples')
-  provides=('openni-core-samples')
-  conflicts=('openni-core-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
-  for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
-  done
-}
-package_openni-core-samples-source() {
-  pkgdesc="OpenNI sample programs source code"
-  depends=("openni$_suf-core")
-  provides=('openni-core-samples-source')
-  conflicts=('openni-core-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in Viewer $CORE_SAMPLES; do
-    _install_sample_source Ni$sample
-  done
-}
-
-package_openni-java-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-java")
-  optdepends=("openni$_suf-java-samples-source: source code for the samples")
-  arch=('any')
-  provides=('openni-java-samples')
-  conflicts=('openni-java-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/java"
-  for sample in $JAVA_SAMPLES; do
-    install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java"
-    echo "#/bin/sh
-java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@
-" > "${pkgdir}/usr/bin/niSample-$sample.jar"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar"
-  done
-}
-package_openni-java-samples-source() {
-  pkgdesc="OpenNI java wrapper sample programs source code"
-  depends=("openni$_suf-java")
-  provides=('openni-java-samples-source')
-  conflicts=('openni-java-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $JAVA_SAMPLES; do
-    _install_sample_source $sample.java
-  done
-}
-
-package_openni-mono-samples() {
-  pkgdesc="OpenNI java wrapper sample programs"
-  depends=("openni$_suf-mono")
-  optdepends=("openni$_suf-mono-samples-source: source code for the samples")
-  provides=('openni-mono-samples')
-  conflicts=('openni-mono-samples')
-
-  cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}/usr/share/openni/mono"
-  for sample in $MONO_SAMPLES; do
-    install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono"
-    echo "#/bin/sh
-cd /usr/share/openni/mono
-mono $sample.net.exe $@
-" > "${pkgdir}/usr/bin/niSample-$sample.net"
-    chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net"
-  done
-}
-package_openni-mono-samples-source() {
-  pkgdesc="OpenNI mono wrapper sample programs source code"
-  depends=("openni$_suf-mono")
-  provides=('openni-mono-samples-source')
-  conflicts=('openni-mono-samples-source')
-  options+=('!strip')
-
-  cd "${srcdir}/${_gitname}-build"
-  for sample in $MONO_SAMPLES; do
-    _install_sample_source $sample.net
-  done
-}
diff --git a/~lukeshu/openni/openni.install b/~lukeshu/openni/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg /usr/lib/$module
-	done
-}
-
-pre_remove() {
-	rm /var/lib/ni/modules.xml
-}
diff --git a/~mtjm/h-client/PKGBUILD b/~mtjm/h-client/PKGBUILD
deleted file mode 100644
index 4df7f5f28..000000000
--- a/~mtjm/h-client/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
-
-pkgname=h-client
-_pkgver=0.0a0.dev-r80
-pkgver=${_pkgver/-/.}
-pkgrel=1
-pkgdesc="A client for an h-source server (such as http://www.h-node.com)"
-arch=('any')
-url="https://savannah.nongnu.org/projects/h-client/"
-license=('GPL3')
-depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
-options=(!emptydirs)
-# Official source is in SVN, this is made by "python2 setup.py sdist".
-source=("http://mtjm.eu/releases/hclient-${_pkgver}.tar.gz")
-sha512sums=('d148084be40aa741f012ba49285ea428b4d6c032a015f732e1a7987f8125acd04a033df97e4536cc9587a3535f701305e4d44f641479e99d0e49a0da652abf2a')
-
-check() {
-  cd "$srcdir/hclient-${_pkgver}"
-  python2 setup.py test
-}
-
-package() {
-  cd "$srcdir/hclient-${_pkgver}"
-  # Remove tests, they aren't useful after installation.
-  rm -rf {,build/lib/}tests_hclient
-  rm -rf {,build/lib/}hclient.egg-info
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~mtjm/python3-lxml/PKGBUILD b/~mtjm/python3-lxml/PKGBUILD
deleted file mode 100644
index 5d4effa47..000000000
--- a/~mtjm/python3-lxml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Based on python-lxml.
-# $Id: PKGBUILD 146500 2012-01-12 05:14:02Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Guillem Rieu <guillemr@gmx.net>
-
-pkgname=python3-lxml
-pkgver=2.3.3
-pkgrel=1
-pkgdesc="Python 3 binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64' 'mips64el')
-license=('BSD' 'custom')
-url="http://lxml.de/"
-depends=('python' 'libxslt')
-conflicts=('lxml')
-source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('a7825793c69d004f388ec6600bad7a6f'
-         '5c4b1a05f6e46a4dd7ebed8b5ad9e32e')
-
-check() {
-  cd "${srcdir}"/lxml-$pkgver
-  make test
-}
-
-package() {
-  cd "${srcdir}"/lxml-$pkgver
-
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}